update cache config with separate cache for full layers, add full false color layer to client

cache/Dockerfile

@@ -56,7 +56,9 @@ ENV COLLECTION_ID= \
     OS_PASSWORD= \
     OS_TENANT_NAME= \
     OS_TENANT_ID= \
-    OS_REGION_NAME=
+    OS_REGION_NAME= \
+    BUCKET_NAME= \
+    BUCKET_NAME_FULL=
 
 ADD configure.sh \
     run-httpd.sh \

cache/configure.sh

@@ -13,6 +13,7 @@ cat /mapcache-template.xml \
     | sed -e "s/{{OS_USERNAME}}/$(echo ${OS_USERNAME} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \
     | sed -e "s/{{OS_PASSWORD}}/$(echo ${OS_PASSWORD} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \
     | sed -e "s/{{BUCKET_NAME}}/$(echo ${BUCKET_NAME} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \
+    | sed -e "s/{{BUCKET_NAME_FULL}}/$(echo ${BUCKET_NAME_FULL} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \
     | sed -e "s/{{DB_USER}}/$(echo ${DB_USER} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \
     | sed -e "s/{{DB_PW}}/$(echo ${DB_PW} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \
     | sed -e "s/{{DB_HOST}}/$(echo ${DB_HOST} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \

config/dem_mapcache-ops.xml

@@ -52,7 +52,7 @@
     <username>{{OS_USERNAME}}</username>
     <password>{{OS_PASSWORD}}</password>
     <container>{{BUCKET_NAME}}</container>
-    <key>/{tileset}/{grid}/{dim}/{z}/{x}/{y}.{ext}</key>
+    <key>{tileset}/{grid}/{dim:time}/{z}/{x}/{y}.{ext}</key>
   </cache>
 
   <source type="wms" name="dem_grayscale">

config/emg_mapcache-ops.xml

@@ -54,7 +54,7 @@
     <username>{{OS_USERNAME}}</username>
     <password>{{OS_PASSWORD}}</password>
     <container>{{BUCKET_NAME}}</container>
-    <key>/{tileset}/{grid}/{dim}/{z}/{x}/{y}.{ext}</key>
+    <key>{tileset}/{grid}/{dim:time}/{z}/{x}/{y}.{ext}</key>
   </cache>
 
   <!-- SOURCES Emergency -->

config/vhr18_index-dev.html

@@ -389,6 +389,22 @@
                 "synchronizeTime": false,
                 "style": "default",
             },
+        },
+        {
+            "id": 'VHR_IMAGE_2018_Level_3__FALSE_COLOR__Full',
+            "displayName": 'VHR Image 2018 Level 3 False Color Full Coverage',
+            "display": {
+                "id": 'VHR_IMAGE_2018_Level_3__FALSE_COLOR__Full',
+                "visible": false,
+                "protocol": 'WMTS',
+                "url": baseUrl + ':83/ows/wmts',
+                "format": 'image/png',
+                "projection": 'EPSG:4326',
+                "matrixSet": "WGS84",
+                "maxZoom": 17,
+                "synchronizeTime": false,
+                "style": "default",
+            },
         }
     ]
 };

config/vhr18_index-ops.html

@@ -409,6 +409,22 @@
                 "synchronizeTime": false,
                 "style": "default",
             },
+        },
+        {
+            "id": 'VHR_IMAGE_2018_Level_3__FALSE_COLOR__Full',
+            "displayName": 'VHR Image 2018 Level 3 False Color Full Coverage',
+            "display": {
+                "id": 'VHR_IMAGE_2018_Level_3__FALSE_COLOR__Full',
+                "visible": false,
+                "protocol": 'WMTS',
+                "urls": baseUrlsWMTS,
+                "format": 'image/png',
+                "projection": 'EPSG:4326',
+                "matrixSet": "WGS84",
+                "maxZoom": 17,
+                "synchronizeTime": false,
+                "style": "default",
+            },
         }
     ]
 };

config/vhr18_mapcache-ops.xml

@@ -54,9 +54,17 @@
     <username>{{OS_USERNAME}}</username>
     <password>{{OS_PASSWORD}}</password>
     <container>{{BUCKET_NAME}}</container>
-    <key>/{tileset}/{grid}/{dim}/{z}/{x}/{y}.{ext}</key>
+    <key>{tileset}/{grid}/{dim:time}/{z}/{x}/{y}.{ext}</key>
+  </cache>
+  <cache name="vhr18_full" type="swift">
+    <auth_url>{{OS_AUTH_URL_SHORT}}</auth_url>
+    <auth_version>{{ST_AUTH_VERSION}}</auth_version>
+    <tenant>{{OS_TENANT_ID}}</tenant>
+    <username>{{OS_USERNAME}}</username>
+    <password>{{OS_PASSWORD}}</password>
+    <container>{{BUCKET_NAME_FULL}}</container>
+    <key>{tileset}/{grid}/{z}/{x}/{y}.{ext}</key>
   </cache>
-
   <!-- SOURCES VHR_IMAGE_2018 -->
   <source type="wms" name="vhr18_true_color">
     <getmap>
@@ -409,7 +417,7 @@
       <abstract>VHR Image 2018 Level 3 True Color Full Coverage</abstract>
     </metadata>
     <source>vhr18_true_color_l3</source>
-    <cache>vhr18</cache>
+    <cache>vhr18_full</cache>
     <grid restricted_extent="-24.7 27.5 45 71.3" max-cached-zoom="15" out-of-zoom-strategy="reassemble">WGS84</grid>
     <format>mixed</format>
     <metatile>1 1</metatile>
@@ -421,7 +429,7 @@
       <abstract>VHR Image 2018 Level 3 True Color with masked validity Full Coverage</abstract>
     </metadata>
     <source>vhr18_validity_l3</source>
-    <cache>vhr18</cache>
+    <cache>vhr18_full</cache>
     <grid restricted_extent="-24.7 27.5 45 71.3" max-cached-zoom="15" out-of-zoom-strategy="reassemble">WGS84</grid>
     <format>mixed</format>
     <metatile>1 1</metatile>
@@ -433,7 +441,7 @@
       <abstract>VHR Image 2018 Level 3 False Color Full Coverage</abstract>
     </metadata>
     <source>vhr18_false_color_l3</source>
-    <cache>vhr18</cache>
+    <cache>vhr18_full</cache>
     <grid restricted_extent="-24.7 27.5 45 71.3" max-cached-zoom="15" out-of-zoom-strategy="reassemble">WGS84</grid>
     <format>mixed</format>
     <metatile>1 1</metatile>