Upgrade to GeoMapFish 2.9rc16

camptocamp · Nov 28, 2024 · 5256a4b · 5256a4b
1 parent 466580c
commit 5256a4b
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 31 deletions.
diff --git a/CONST_create_template/docker-compose.override.sample.yaml b/CONST_create_template/docker-compose.override.sample.yaml
@@ -36,6 +36,11 @@ services:
   #   environment:
   #     - LOG_LEVEL=DEBUG
 
+  mapserver:
+    environment:
+      - MS_DEBUGLEVEL=5
+      - MAPSERVER_CATCH_SEGV=1
+
   # qgisserver:
   #   # volumes:
   #   #   - './../c2cgeoportal/docker/qgisserver/geomapfish_qgisserver/:/var/www/plugins/geomapfish_qgisserver/'

diff --git a/CONST_create_template/env.default b/CONST_create_template/env.default
@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.9.rc.15
+GEOMAPFISH_VERSION=2.9.rc.16
 GEOMAPFISH_MAIN_VERSION=2.9
 GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
 COMPOSE_PROJECT_NAME=geomapfish
@@ -46,7 +46,7 @@ TILECLOUDCHAIN_INTERNAL_PORT=8080
 # For internal print
 MAPSERVER_URL=http://mapserver:8080/
 TINYOWS_URL=http://tinyows:8080/
-QGISSERVER_URL=http://qgisserver:8080/mapserv_proxy
+QGISSERVER_URL=http://qgisserver:8080/
 QGIS_VERSION=3.34-gdal3.8
 POSTGRES_TAG=13-postgis-3
 

diff --git a/CONST_create_template/geoportal/vars.yaml b/CONST_create_template/geoportal/vars.yaml
@@ -13,7 +13,7 @@ vars:
   #  - vars.interfaces_config.default.constants.gmfVectorTilesOptions.tileGrid.origin
   srid: &srid 2056
 
-  main_ogc_server: source for image/png
+  main_ogc_server: MapServer
 
   alternate_projections: &alternate_projections
     - EPSG:4326

diff --git a/CONST_create_template/mapserver/mapserver.conf b/CONST_create_template/mapserver/mapserver.conf
@@ -3,13 +3,14 @@
 CONFIG
 
     ENV
-        MS_MAPFILE "/etc/mapserver/mapserver.map"
+        MS_MAP_PATTERN "^[a-zA-Z0-9_]+"
     END
 
     #
     # Map aliases
     #
     MAPS
+        MapServer "/etc/mapserver/mapserver.map"
     END
 
 END
diff --git a/CONST_create_template/mapserver/mapserver.map.tmpl b/CONST_create_template/mapserver/mapserver.map.tmpl
@@ -68,7 +68,7 @@ MAP
         METADATA
             "wms_title" "changeme"
             "wms_abstract" "changeme"
-            "ows_onlineresource" "${VISIBLE_WEB_PROTOCOL}://${VISIBLE_WEB_HOST}${VISIBLE_ENTRY_POINT}mapserv_proxy?ogcserver=source%20for%20image%2Fpng"
+            "ows_onlineresource" "${VISIBLE_WEB_PROTOCOL}://${VISIBLE_WEB_HOST}${VISIBLE_ENTRY_POINT}mapserv_proxy?ogcserver=MapServer"
             "wms_srs" "EPSG:2056"
             "wms_enable_request" "*"
             "wfs_enable_request" "!*"

diff --git a/CONST_create_template/tests/test_app.py b/CONST_create_template/tests/test_app.py
@@ -18,13 +18,13 @@
         ("https://front/admin/layertree", {}, 10),
         ("https://front/admin/layertree/children", {}, 10),
         (
-            "http://mapserver:8080/mapserv_proxy/mapserver",
+            "http://mapserver:8080/mapserv_proxy/MapServer",
             {"SERVICE": "WMS", "REQUEST": "GetCapabilities"},
             60,
         ),
         (
             "https://front/mapserv_proxy",
-            {"ogcserver": "mapserver", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
+            {"ogcserver": "MapServer", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
             60,
         ),
         # (
@@ -39,12 +39,12 @@
         # ),
         # OGC API - Features
         # (
-        #     "http://mapserver:8080/mapserv_proxy/mapserver/ogcapi/collections/osm_protected/items",
+        #     "http://mapserver:8080/mapserv_proxy/MapServer/ogcapi/collections/osm_protected/items",
         #     {"bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
         #     60,
         # ),
         # (
-        #     "https://front/mapserv_proxy/mapserver/mapserver/ogcapi/collections/osm_open/items",
+        #     "https://front/mapserv_proxy/MapServer/ogcapi/collections/osm_open/items",
         #     {"bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
         #     60,
         # ),

diff --git a/docker-compose.override.sample.yaml b/docker-compose.override.sample.yaml
@@ -47,6 +47,11 @@ services:
   #   environment:
   #     - LOG_LEVEL=DEBUG
 
+  mapserver:
+    environment:
+      - MS_DEBUGLEVEL=5
+      - MAPSERVER_CATCH_SEGV=1
+
   # qgisserver:
   #   # volumes:
   #   #   - './../c2cgeoportal/docker/qgisserver/geomapfish_qgisserver/:/var/www/plugins/geomapfish_qgisserver/'

diff --git a/env.default b/env.default
@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.9.rc.15
+GEOMAPFISH_VERSION=2.9.rc.16
 GEOMAPFISH_MAIN_VERSION=2.9
 GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
 COMPOSE_PROJECT_NAME=geomapfish
@@ -46,7 +46,7 @@ TILECLOUDCHAIN_INTERNAL_PORT=8080
 # For internal print
 MAPSERVER_URL=http://mapserver:8080/
 TINYOWS_URL=http://tinyows:8080/
-QGISSERVER_URL=http://qgisserver:8080/mapserv_proxy
+QGISSERVER_URL=http://qgisserver:8080/
 QGIS_VERSION=3.34-gdal3.8
 POSTGRES_TAG=13-postgis-3
 

diff --git a/geoportal/CONST_vars.yaml b/geoportal/CONST_vars.yaml
@@ -2,7 +2,7 @@
 vars:
   # The package name
   package: 'geomapfish'
-  main_ogc_server: source for image/png
+  main_ogc_server: MapServer
 
   srid: EPSG:-1
 
@@ -1206,7 +1206,7 @@ vars:
         - '{VISIBLE_WEB_PROTOCOL}://{VISIBLE_WEB_HOST}'
 
   # Checker configuration
-  checker_ogc_server: source for image/png
+  checker_ogc_server: MapServer
   checker:
     forward_host: False
     base_internal_url: http://localhost:8080

diff --git a/geoportal/vars.yaml b/geoportal/vars.yaml
@@ -16,7 +16,7 @@ vars:
   #  - vars.interfaces_config.default.constants.gmfVectorTilesOptions.tileGrid.origin
   srid: &srid 2056
 
-  main_ogc_server: Main PNG
+  main_ogc_server: MapServer
 
   alternate_projections: &alternate_projections
     - EPSG:4326
@@ -116,7 +116,7 @@ vars:
         ngeoPermalinkOgcserverUrl:
           name: mapserverproxy
           params:
-            ogcserver: Main PNG
+            ogcserver: MapServer
 
     desktop:
       constants:
@@ -641,7 +641,7 @@ vars:
       - location
 
   tinyowsproxy:
-    ogc_server: Main PNG
+    ogc_server: MapServer
 
   api:
     # The name of the API in JavaScript
@@ -828,7 +828,7 @@ vars:
     - 127.0.0.1:6006
 
   # Checker configuration
-  checker_ogc_server: Main PNG
+  checker_ogc_server: MapServer
   checker:
     fulltextsearch:
       search: pau

diff --git a/mapserver/mapserver.conf b/mapserver/mapserver.conf
@@ -3,14 +3,14 @@
 CONFIG
 
     ENV
-        MS_MAPFILE "/etc/mapserver/mapserver.map"
+        MS_MAP_PATTERN "^[a-zA-Z0-9_]+"
     END
 
     #
     # Map aliases
     #
     MAPS
-        MainPNG "/etc/mapserver/mapserver.map"
+        MapServer "/etc/mapserver/mapserver.map"
     END
 
 END
diff --git a/mapserver/mapserver.map.tmpl b/mapserver/mapserver.map.tmpl
@@ -71,7 +71,7 @@ MAP
         METADATA
             "wms_title" "GeoMapFish demo"
             "wms_abstract" "Some example layers"
-            "ows_onlineresource" "${VISIBLE_WEB_PROTOCOL}://${VISIBLE_WEB_HOST}${VISIBLE_ENTRY_POINT}mapserv_proxy?ogcserver=Main+PNG"
+            "ows_onlineresource" "${VISIBLE_WEB_PROTOCOL}://${VISIBLE_WEB_HOST}${VISIBLE_ENTRY_POINT}mapserv_proxy?ogcserver=MapServer"
             "ows_srs" "EPSG:2056"
             "wms_enable_request" "*"
             "wfs_enable_request" "*"

diff --git a/tests/test_app.py b/tests/test_app.py
@@ -18,33 +18,33 @@
         # ("https://front/admin/layertree", {}, 10),
         # ("https://front/admin/layertree/children", {}, 10),
         (
-            "http://mapserver:8080/mapserv_proxy/MainPNG",
+            "http://mapserver:8080/mapserv_proxy/MapServer",
             {"SERVICE": "WMS", "REQUEST": "GetCapabilities"},
             60,
         ),
         (
             "http://mapserver:8080/mapserv_proxy/",
-            {"MAP": "MainPNG", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
+            {"MAP": "MapServer", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
             60,
         ),
         # (
         #     "https://front/mapserv_proxy",
-        #     {"ogcserver": "Main PNG", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
+        #     {"ogcserver": "MapServer", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
         #     60,
         # ),
         # (
-        #     "https://front/mapserv_proxy/Main+PNG",
+        #     "https://front/mapserv_proxy/MapServer",
         #     {"SERVICE": "WMS", "REQUEST": "GetCapabilities"},
         #     60,
         # ),
         # QGIS Server
         (
             "https://front/mapserv_proxy",
-            {"ogcserver": "QGIS server", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
+            {"ogcserver": "QGIS Server", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
             60,
         ),
         # (
-        #     "https://front/mapserv_proxy/QGIS+server",
+        #     "https://front/mapserv_proxy/QGIS_Server",
         #     {"SERVICE": "WMS", "REQUEST": "GetCapabilities"},
         #     60,
         # ),
@@ -55,27 +55,27 @@
         # ),
         # (
         #     "https://front/mapserv_proxy",
-        #     {"ogcserver": "qgisserver", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
+        #     {"ogcserver": "QGIS_Server", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
         #     60,
         # ),
         # OGC API - Features
         # (
-        #     "http://mapserver:8080/mapserv_proxy/mapserver/ogcapi/collections/osm_protected/items",
+        #     "http://mapserver:8080/mapserv_proxy/MapServer/ogcapi/collections/osm_protected/items",
         #     {"bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
         #     60,
         # ),
         # (
-        #     "https://front/mapserv_proxy/mapserver/mapserver/ogcapi/collections/osm_open/items",
+        #     "https://front/mapserv_proxy/MapServer/ogcapi/collections/osm_open/items",
         #     {"bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
         #     60,
         # ),
         # (
-        #     "http://qgisserver:8080/mapserv_proxy/qgisserver/wfs3/collections/points/items",
+        #     "http://qgisserver:8080/mapserv_proxy/QGIS_Server/wfs3/collections/points/items",
         #     {"map": "/etc/qgisserver/project.qgs", "bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
         #     60,
         # ),
         # (
-        #     "https://front/mapserv_proxy/qgisserver/wfs3/collections/points/items",
+        #     "https://front/mapserv_proxy/QGIS_Server/wfs3/collections/points/items",
         #     {"bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
         #     60,
         # ),