Rename purge to fresh_tiles for bypass in martin

Author: Rub21

.github/workflows/chartpress.yaml

@@ -4,7 +4,7 @@ on:
     branches:
       - 'main'
       - 'staging'
-      - 'martin_vtiles'
+      - 'req_fresh_tiles'
 jobs:
   build:
     runs-on: ubuntu-22.04
@@ -71,7 +71,7 @@ jobs:
           OHM_SLACK_WEBHOOK_URL: ${{ secrets.OHM_SLACK_WEBHOOK_URL }}
       ################ Staging secrets ################ 
       - name: Staging - substitute secrets
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/martin_vtiles'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/req_fresh_tiles'
         uses: bluwy/substitute-string-action@v1
         with:
           _input-file: 'values.staging.template.yaml'
@@ -189,14 +189,14 @@ jobs:
           PRODUCTION_OPENSTREETMAP_AUTH_SECRET: ${{ secrets.PRODUCTION_OPENSTREETMAP_AUTH_SECRET }}
 
       - name: AWS Credentials
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/martin_vtiles'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/req_fresh_tiles'
         uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-1
       - name: Setup Kubectl and Helm Dependencies
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/martin_vtiles'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/req_fresh_tiles'
         run: |
           sudo pip install awscli --ignore-installed six
           sudo curl -L -o /usr/bin/kubectl https://amazon-eks.s3.us-west-2.amazonaws.com/1.17.7/2020-07-08/bin/linux/amd64/kubectl
@@ -210,22 +210,22 @@ jobs:
           helm version
 
       - name: Update kube-config staging
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/martin_vtiles'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/req_fresh_tiles'
         run: aws eks --region us-east-1 update-kubeconfig --name osmseed-staging
       - name: Update kube-config prod
         if: github.ref == 'refs/heads/main'
         run: aws eks --region us-east-1 update-kubeconfig --name osmseed-production-v2
       - name: Add Helm repository
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/martin_vtiles'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/req_fresh_tiles'
         run: |
           helm repo add osm-seed https://osm-seed.github.io/osm-seed-chart/
           helm repo update
       - name: Install helm dependencies for
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/martin_vtiles'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/req_fresh_tiles'
         run: cd ohm && helm dep up
       # Staging
       - name: Staging - helm deploy
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/martin_vtiles'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/req_fresh_tiles'
         run: helm upgrade --install staging --wait ohm/ -f values.staging.yaml -f ohm/values.yaml
       # Production
       - name: Production - helm deploy

images/tiler-server-martin/config/nginx.conf.template

@@ -15,7 +15,7 @@ http {
 
     # === Tile cache (dynamic: ohm, ohm_admin, etc.) ===
     # Tiles expire automatically via proxy_cache_valid TTLs (per zoom range).
-    # Manual purge: append ?purge=1 to any tile URL to bypass cache and fetch fresh.
+    # Manual bypass: append ?fresh_tiles=1 to any tile URL to bypass cache and fetch fresh.
     proxy_cache_path /var/cache/nginx/tiles
         levels=1:2
         keys_zone=tiles:200m
@@ -46,17 +46,17 @@ http {
     # nginx proxy_cache TTL varies by zoom range (generated per location block).
     # Ranges match materialized view zoom ranges. Lower zooms cache longer
     # (less change), higher zooms expire faster (more edits).
-    # Manual purge via ?purge=1; TTLs are the automatic safety net.
+    # Manual bypass via ?fresh_tiles=1; TTLs are the automatic safety net.
     #   z0-2:   24h    z3-5:  24h    z6-7:  16h    z8-9:  12h
     #   z10-12:  8h    z13-15: 4h    z16-20: 1h
     # Browser Cache-Control is set to "no-store" for dynamic tiles so
     # browsers always revalidate with nginx.
 
-    # === Cache bypass for force-purge ===
-    # Append ?purge=1 to any tile URL to skip the cache and fetch fresh from Martin.
+    # === Cache bypass for fresh tiles ===
+    # Append ?fresh_tiles=1 to any tile URL to skip the cache and fetch fresh from Martin.
     # The fresh response replaces the old cache entry (cache_key = $uri, without query params).
-    # Usage: /maps/ohm/10/512/340.pbf?purge=1
-    map $arg_purge $cache_bypass {
+    # Usage: /maps/ohm/10/512/340.pbf?fresh_tiles=1
+    map $arg_fresh_tiles $cache_bypass {
         default 0;
         "1"     1;
     }

images/tiler-server-martin/start.sh

@@ -25,7 +25,7 @@ cat > /app/config/config.yaml <<EOF
 listen_addresses: '0.0.0.0:${MARTIN_INTERNAL_PORT}'
 worker_processes: ${MARTIN_WORKER_PROCESSES:-8}
 # Disable Martin's internal tile cache so tiles are always generated fresh.
-# Nginx handles caching with TTLs + ?purge=1 bypass.
+# Nginx handles caching with TTLs + ?fresh_tiles=1 bypass.
 cache_size_mb: 0
 
 postgres:

images/tiler-server-martin/static/index.html

@@ -68,9 +68,9 @@
     #map-controls button { background: rgba(22,33,62,0.9); border: 1px solid rgba(255,255,255,0.15); color: #eee; padding: 6px 12px; border-radius: 6px; font-size: 12px; cursor: pointer; }
     #map-controls button:hover { background: rgba(22,33,62,1); }
     #map-controls button.active { background: #0f3460; border-color: #4fc3f7; color: #4fc3f7; }
-    #map-controls button.purge { border-color: #e57373; color: #e57373; }
-    #map-controls button.purge:hover { background: rgba(229,115,115,0.15); }
-    #map-controls button.purge.active { background: #e57373; color: #fff; border-color: #e57373; }
+    #map-controls button.fresh-tiles { border-color: #e57373; color: #e57373; }
+    #map-controls button.fresh-tiles:hover { background: rgba(229,115,115,0.15); }
+    #map-controls button.fresh-tiles.active { background: #e57373; color: #fff; border-color: #e57373; }
     #zoom-level { background: rgba(22,33,62,0.9); padding: 8px 14px; border-radius: 6px; font-size: 13px; pointer-events: auto; }
 
     /* Tile info */
@@ -135,7 +135,7 @@ <h2>Martin</h2>
     <div id="map-header">
       <div id="map-controls">
         <button id="btn-grid" onclick="toggleGrid()">Grid</button>
-        <button id="btn-purge" class="purge" onclick="togglePurge()" title="Toggle cache bypass: tiles load fresh from Martin">Purge Cache</button>
+        <button id="btn-fresh-tiles" class="fresh-tiles" onclick="toggleFreshTiles()" title="Toggle cache bypass: tiles load fresh from Martin">Req Fresh Tiles</button>
       </div>
       <div id="zoom-level">z0</div>
     </div>
@@ -198,20 +198,20 @@ <h2>Martin</h2>
     }
     document.getElementById('btn-grid').classList.add('active');
 
-    // Purge mode: toggle ?purge=1 on all tile requests to bypass nginx cache
+    // Fresh tiles mode: toggle ?fresh_tiles=1 on all tile requests to bypass nginx cache
     // cacheBuster is appended to tile URLs to defeat MapLibre's in-memory cache.
-    // It is incremented each time purge is toggled off, so MapLibre sees new URLs
+    // It is incremented each time fresh tiles is toggled off, so MapLibre sees new URLs
     // and re-fetches from nginx (which already has the fresh tiles from BYPASS).
-    let purgeMode = false;
+    let freshTilesMode = false;
     let cacheBuster = 0;
 
-    function togglePurge() {
-      purgeMode = !purgeMode;
-      const btn = document.getElementById('btn-purge');
-      btn.classList.toggle('active', purgeMode);
-      btn.textContent = purgeMode ? 'Purge ON' : 'Purge Cache';
+    function toggleFreshTiles() {
+      freshTilesMode = !freshTilesMode;
+      const btn = document.getElementById('btn-fresh-tiles');
+      btn.classList.toggle('active', freshTilesMode);
+      btn.textContent = freshTilesMode ? 'Fresh Tiles ON' : 'Fresh Tiles';
 
-      if (!purgeMode) {
+      if (!freshTilesMode) {
         // Increment cache buster so MapLibre treats all tile URLs as new
         cacheBuster++;
       }
@@ -224,10 +224,10 @@ <h2>Martin</h2>
         if (!source || !source.tiles) return;
         const urls = source.tiles.map(url => {
           const base = url.split('?')[0];
-          if (purgeMode) {
-            return base + '?purge=1&_v=' + cacheBuster;
+          if (freshTilesMode) {
+            return base + '?fresh_tiles=1&_v=' + cacheBuster;
           }
-          // cacheBuster > 0 means we've done at least one purge cycle
+          // cacheBuster > 0 means we've done at least one fresh tiles cycle
           return cacheBuster > 0 ? base + '?_v=' + cacheBuster : base;
         });
         source.setTiles(urls);
@@ -429,7 +429,7 @@ <h2>Martin</h2>
     async function addCompositeSource(group) {
       const compositeFns = group.functions.join(',');
       const sourceId = `src-composite-${group.name}`;
-      // Use /maps/{group}/ route which goes through nginx cache + purge support,
+      // Use /maps/{group}/ route which goes through nginx cache + fresh_tiles support,
       // instead of Martin's native TileJSON URLs which bypass cache.
       const cachedTileUrl = `${MARTIN_BASE}/maps/${group.name}/{z}/{x}/{y}.pbf`;
       const tileJsonUrl = `${MARTIN_BASE}/${compositeFns}`;
@@ -470,7 +470,7 @@ <h2>Martin</h2>
         });
 
         activeSources['__composite__'] = { sourceId, layerIds, color: '#4fc3f7' };
-        if (purgeMode || cacheBuster > 0) applyTileUrls();
+        if (freshTilesMode || cacheBuster > 0) applyTileUrls();
       } catch (e) {
         console.error('Failed to add composite source:', e);
       }
@@ -608,7 +608,7 @@ <h2>Martin</h2>
       }
 
       activeSources[name] = { sourceId, layerIds, color };
-      if (purgeMode || cacheBuster > 0) applyTileUrls();
+      if (freshTilesMode || cacheBuster > 0) applyTileUrls();
       const el = document.getElementById(`src-item-${name}`);
       if (el) el.classList.add('active');
     }