XPLANBOX-2574 - added grid gdi_de_3857

xplan-configuration/xplan-mapproxy-config/src/main/resources/mapproxy.yaml

@@ -10,7 +10,7 @@ parts:
       srs: 'EPSG:4326'
   cache_cfg: &cache_cfg
     format: image/png
-    grids: [gdi_de_25832]
+    grids: [gdi_de_25832, gdi_de_3857]
     disable_storage: ${XPLAN_MAPPROXY_CACHE_DISABLE}
     cache:
       type: s3
@@ -61,13 +61,13 @@ layers:
       - name: bplan_raster
         title: Rasterdarstellung der Bebauungspläne
         sources: [bplan_raster_cache]
-        tile_sources: [bplan_raster_cache, bplan_raster_cache_3857]
+        tile_sources: [bplan_raster_cache]
         min_res: 1.4
         max_res: 0.28
       - name: bplan_vektor
         title: Vektordarstellung der Bebauungspläne
         sources: [bplan_vektor_cache]
-        tile_sources: [bplan_vektor_cache, bplan_vektor_cache_3857]
+        tile_sources: [bplan_vektor_cache]
         min_res: 1.4
         max_res: 0.28
   - name: xplan_fplan
@@ -76,13 +76,13 @@ layers:
       - name: fplan_raster
         title: Rasterdarstellung der Flächennutzungspläne
         sources: [fplan_raster_cache]
-        tile_sources: [fplan_raster_cache, fplan_raster_cache_3857]
+        tile_sources: [fplan_raster_cache]
         min_res: 7.0
         max_res: 1.4
       - name: fplan_vektor
         title: Vektordarstellung der Flächennutzungspläne
         sources: [fplan_vektor_cache]
-        tile_sources: [fplan_vektor_cache, fplan_vektor_cache_3857]
+        tile_sources: [fplan_vektor_cache]
         min_res: 7.0
         max_res: 1.4
   - name: xplan_lplan
@@ -91,13 +91,13 @@ layers:
       - name: lplan_raster
         title: Rasterdarstellung der Landschaftspläne
         sources: [lplan_raster_cache]
-        tile_sources: [lplan_raster_cache, lplan_raster_cache_3857]
+        tile_sources: [lplan_raster_cache]
         min_res: 7.0
         max_res: 1.4
       - name: lplan_vektor
         title: Vektordarstellung der Landschaftspläne
         sources: [lplan_vektor_cache]
-        tile_sources: [lplan_vektor_cache, lplan_vektor_cache_3857]
+        tile_sources: [lplan_vektor_cache]
         min_res: 7.0
         max_res: 1.4
   - name: xplan_rplan
@@ -106,13 +106,13 @@ layers:
       - name: rplan_raster
         title: Rasterdarstellung der Regionalpläne
         sources: [rplan_raster_cache]
-        tile_sources: [rplan_raster_cache, rplan_raster_cache_3857]
+        tile_sources: [rplan_raster_cache]
         min_res: 7.0
         max_res: 1.4
       - name: rplan_vektor
         title: Vektordarstellung der Regionalpläne
         sources: [rplan_vektor_cache]
-        tile_sources: [rplan_vektor_cache, rplan_vektor_cache_3857]
+        tile_sources: [rplan_vektor_cache]
         min_res: 7.0
         max_res: 1.4
   - name: xplan_soplan
@@ -121,46 +121,16 @@ layers:
       - name: soplan_raster
         title: Rasterdarstellung der sonstigen raumbezogenen Pläne
         sources: [soplan_raster_cache]
-        tile_sources: [soplan_raster_cache, soplan_raster_cache_3857]
+        tile_sources: [soplan_raster_cache]
         min_res: 1.4
         max_res: 0.28
       - name: soplan_vektor
         title: Vektordarstellung der sonstigen raumbezogenen Pläne
         sources: [soplan_vektor_cache]
-        tile_sources: [soplan_vektor_cache, soplan_vektor_cache_3857]
+        tile_sources: [soplan_vektor_cache]
         min_res: 1.4
         max_res: 0.28
 caches:
-  bplan_raster_cache_3857:
-    grids: [GLOBAL_WEBMERCATOR]
-    sources: [bplan_raster_cache]
-  bplan_vektor_cache_3857:
-    grids: [GLOBAL_WEBMERCATOR]
-    sources: [bplan_vektor_cache]
-  fplan_raster_cache_3857:
-    grids: [GLOBAL_WEBMERCATOR]
-    sources: [fplan_raster_cache]
-  fplan_vektor_cache_3857:
-    grids: [GLOBAL_WEBMERCATOR]
-    sources: [fplan_vektor_cache]
-  lplan_raster_cache_3857:
-    grids: [GLOBAL_WEBMERCATOR]
-    sources: [lplan_raster_cache]
-  lplan_vektor_cache_3857:
-    grids: [GLOBAL_WEBMERCATOR]
-    sources: [lplan_vektor_cache]
-  rplan_raster_cache_3857:
-    grids: [GLOBAL_WEBMERCATOR]
-    sources: [rplan_raster_cache]
-  rplan_vektor_cache_3857:
-    grids: [GLOBAL_WEBMERCATOR]
-    sources: [rplan_vektor_cache]
-  soplan_raster_cache_3857:
-    grids: [GLOBAL_WEBMERCATOR]
-    sources: [soplan_raster_cache]
-  soplan_vektor_cache_3857:
-    grids: [GLOBAL_WEBMERCATOR]
-    sources: [soplan_vektor_cache]
   bplan_raster_cache:
     <<: *cache_cfg
     cache:
@@ -260,6 +230,13 @@ grids:
     bbox: [${XPLAN_SERVICES_BBOX_4326}]
     bbox_srs: 'EPSG:4326'
     origin: 'ul'
+  gdi_de_3857:
+      srs: 'EPSG:3857'
+      tile_size: [512, 512]
+      res: [28.0,14.0,7.0,2.8,1.4,0.7,0.28]
+      bbox: [${XPLAN_SERVICES_BBOX_4326}]
+      bbox_srs: 'EPSG:4326'
+      origin: 'ul'
 globals:
   cache:
     lock_dir: "./cache_data/locks"