Merge main back to develop (FixMyBerlin/atlas-geo#110)

There where a few commits that landed on main instead of develop.
FixMyBerlin · Mar 19, 2024 · 54af7c3 · 54af7c3
2 parents 8a4409f + b92a866
commit 54af7c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 24 deletions.
diff --git a/atlas-geo/configs/nginx.conf b/atlas-geo/configs/nginx.conf
@@ -48,29 +48,6 @@ http {
     server {
         listen 80;
 
-        # Cache lower zooms longer
-        location ~* ^/(?<tile_type>.+)/([0-8])/([0-9]+)/([0-9]+)$ {
-            proxy_pass              http://tiles_upstream/$uri$is_args$args;
-
-            proxy_connect_timeout   5m;
-            proxy_send_timeout      5m;
-            proxy_read_timeout      5m;
-            send_timeout            5m;
-
-            # Nginx file cache
-            proxy_cache             tiles_cache;
-            proxy_cache_lock        on;
-            proxy_cache_revalidate  on;
-            proxy_cache_valid       200 302 4d;
-            proxy_cache_valid       404 1m;
-            proxy_cache_use_stale   error timeout http_500 http_502 http_503 http_504;
-            add_header              X-Cache-Status $upstream_cache_status;
-
-            # Browser cache
-            expires 18h;
-            add_header Cache-Control "public, no-transform";
-        }
-
         # High zoom (and therefore volatile) Tile URLs will be cached shorter
         location ~* ^/(?<tile_type>.+)/([0-9]+)/([0-9]+)/([0-9]+)$ {
             proxy_pass              http://tiles_upstream/$uri$is_args$args;
@@ -90,7 +67,7 @@ http {
             add_header              X-Cache-Status $upstream_cache_status;
 
             # Browser cache
-            expires 18h;
+            expires 8h;
             add_header Cache-Control "public, no-transform";
         }
 

diff --git a/atlas-geo/configs/warm-cache.json b/atlas-geo/configs/warm-cache.json
@@ -12,6 +12,7 @@
   "urls": [
     "/roads/{z}/{x}/{y}",
     "/bikelanes_verified/{z}/{x}/{y}",
+    "/bikelanes/{z}/{x}/{y}",
     "/poiClassification/{z}/{x}/{y}",
     "/roadsPathClasses/{z}/{x}/{y}",
     "/boundaries,boundaryLabels/{z}/{x}/{y}",

diff --git a/atlas-geo/warm-cache/config.json b/atlas-geo/warm-cache/config.json
@@ -13,6 +13,7 @@
     "/roads/{z}/{x}/{y}",
     "/roadsPathClasses/{z}/{x}/{y}",
     "/bikelanes_verified/{z}/{x}/{y}",
+    "/bikelanes/{z}/{x}/{y}",
     "/poiClassification/{z}/{x}/{y}",
     "/boundaries,boundaryLabels/{z}/{x}/{y}",
     "/boundaryStats/{z}/{x}/{y}",