Support OGC API

camptocamp · Nov 27, 2024 · da2fbd5 · da2fbd5
1 parent 088a836
commit da2fbd5
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 8 deletions.
diff --git a/.python-version b/.python-version
@@ -1 +1 @@
-3.13
+3.12
diff --git a/docker-compose-lib.yaml b/docker-compose-lib.yaml
@@ -97,6 +97,8 @@ services:
       - CPL_VSIL_CURL_CACHE_SIZE
       - CPL_VSIL_CURL_USE_HEAD
       - GDAL_DISABLE_READDIR_ON_OPEN
+    ports:
+      - 8090:8080
 
   qgisserver:
     image: camptocamp/geomapfish-qgisserver:gmf${GEOMAPFISH_MAIN_VERSION}-qgis${QGIS_VERSION}
@@ -143,6 +145,8 @@ services:
       - QGIS_SERVER_API_WFS3_MAX_LIMIT
       - QGIS_SERVER_LANDING_PAGE_PROJECTS_DIRECTORIES
       - QGIS_SERVER_OVERRIDE_SYSTEM_LOCALE
+    ports:
+      - 8091:8080
 
   tinyows:
     image: camptocamp/tinyows:master

diff --git a/env.default b/env.default
@@ -44,7 +44,7 @@ TILECLOUDCHAIN_INTERNAL_URL=http://tilecloudchain:8080
 TILECLOUDCHAIN_INTERNAL_HOST=tilecloudchain
 TILECLOUDCHAIN_INTERNAL_PORT=8080
 # For internal print
-MAPSERVER_URL=http://mapserver:8080/
+MAPSERVER_URL=http://mapserver:8080/mapserv_proxy
 TINYOWS_URL=http://tinyows:8080/
 QGISSERVER_URL=http://qgisserver:8080/mapserv_proxy
 QGIS_VERSION=3.34-gdal3.8

diff --git a/mapserver/mapserver.map.tmpl b/mapserver/mapserver.map.tmpl
@@ -69,13 +69,13 @@ MAP
     END
     WEB
         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_enable_request" "*"
+            "ows_title" "GeoMapFish demo"
+            "ows_abstract" "Some example layers"
             "ows_srs" "EPSG:2056"
-            "wms_enable_request" "*"
-            "wfs_enable_request" "*"
             "wms_allow_getmap_without_styles" "true"
+            "ows_onlineresource" "${VISIBLE_WEB_PROTOCOL}://${VISIBLE_WEB_HOST}${VISIBLE_ENTRY_POINT}mapserv_proxy/?ogcserver=MainPNG"
+            "oga_onlineresource" "${VISIBLE_WEB_PROTOCOL}://${VISIBLE_WEB_HOST}${VISIBLE_ENTRY_POINT}mapserv_proxy/mapserver/MainPNG/ogcapi"
         END
     END
     LEGEND

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -21,7 +21,8 @@
     "vite": "5.4.10"
   },
   "dependencies": {
-    "ngeo": "2.9.0-latest.20241030T072255Z.1c68af25a"
+    "ngeo": "2.9.0-latest.20241030T072255Z.1c68af25a",
+    "@camptocamp/ogc-client": "1.1.0"
   },
   "alias": {
     "ngeo/": "ngeo/distlib/src/",

diff --git a/ui/src/interfaces/ControllerDesktop.ts b/ui/src/interfaces/ControllerDesktop.ts
@@ -39,6 +39,7 @@ import ngeoStreetviewModule from 'ngeo/streetview/module';
 import ngeoRoutingModule from 'ngeo/routing/module';
 import ngeoStatemanagerWfsPermalink from 'ngeo/statemanager/WfsPermalink';
 import '../webcomponents/index';
+import {OgcApiEndpoint} from '@camptocamp/ogc-client';
 
 /**
  * @private
@@ -55,6 +56,37 @@ class Controller extends AbstractDesktopController {
     if (this.dimensions.FLOOR == undefined) {
       this.dimensions.FLOOR = '*';
     }
+
+    // const baseUrl = 'http://localhost:8090/mapserv_proxy/mapserver/MainPNG/ogcapi';
+    // const ogcAPIManager = new OgcApiEndpoint(baseUrl);
+    //
+    // // features in the bbox
+    // const bbox: [number, number, number, number] = [-6.8824, 58.1736, -6.7937, 58.2042];
+    // ogcAPIManager.getCollectionItems('osm_open', 100, 0, false, undefined, bbox).then((features) => {
+    //   console.log(features);
+    // });
+
+    // MapServer route: /mapserv_proxy/<ogc-server>/ogcapi/*
+    fetch(
+      'https://localhost:8484/mapserv_proxy/<ogc-server>/ogcapi/collections/<layer>/items?bbox=6.0,46.0,7.0,47.0&limit=100&offset=0',
+    );
+    fetch(
+      'http://localhost:8090/mapserv_proxy/MainPNG/ogcapi/collections/osm_open/items?bbox=6.0,46.0,7.0,47.0&limit=100&offset=0&ogcserver=MainPNG',
+    );
+
+    // QGISServer route: /mapserv_proxy/<ogc-server>/wfs3/*
+    fetch(
+      'https://localhost:8484/mapserv_proxy/<ogc-server>/wfs3/collections/<layer-name/items?bbox=6.0,46.0,7.0,47.0&limit=100&offset=0',
+    );
+    fetch(
+      'http://localhost:8091/mapserv_proxy/wfs3/collections/points/items?bbox=6.0,46.0,7.0,47.0&limit=100&map=/etc/qgisserver/project.qgs',
+    );
+
+    //fetch(
+    //  'http://localhost:8090/mapserv_proxy/mapserver/MainPNG/ogcapi/collections/osm_open/items?bbox=2600000.0,1200000.0,2800000.0,1400000.0&limit=100&offset=0&bbox-crs=http%3A%2F%2Fwww.opengis.net%2Fdef%2Fcrs%2FEPSG%2F0%2F2056'
+    //);
+    //view-source:http://www.opengis.net/def/crs/EPSG/0/2056
+    //fetch('https://localhost:8484/mapserv_proxy?ogcserver=Main%20PNG&bbox=-6.8824,58.1736,-6.7937,58.2042&limit=100&offset=0');
   }
 
   /**