diff --git a/docker-compose-lib.yaml b/docker-compose-lib.yaml index 138196303..2e6853f8e 100644 --- a/docker-compose-lib.yaml +++ b/docker-compose-lib.yaml @@ -145,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/mapserver/mapserver.map.tmpl b/mapserver/mapserver.map.tmpl index aec335511..794614e7c 100644 --- a/mapserver/mapserver.map.tmpl +++ b/mapserver/mapserver.map.tmpl @@ -69,14 +69,11 @@ MAP END WEB METADATA - "wms_title" "GeoMapFish demo" - "wms_abstract" "Some example layers" + "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_title" "GeoMapFish demo" - "oga_enable_request" "*" "oga_onlineresource" "${VISIBLE_WEB_PROTOCOL}://${VISIBLE_WEB_HOST}${VISIBLE_ENTRY_POINT}mapserv_proxy/mapserver/MainPNG/ogcapi" END END diff --git a/ui/src/interfaces/ControllerDesktop.ts b/ui/src/interfaces/ControllerDesktop.ts index 347eabbe9..8da5235a2 100644 --- a/ui/src/interfaces/ControllerDesktop.ts +++ b/ui/src/interfaces/ControllerDesktop.ts @@ -57,18 +57,33 @@ class Controller extends AbstractDesktopController { this.dimensions.FLOOR = '*'; } - const baseUrl = 'https://localhost:8090/mapserv_proxy/mapserver/MainPNG/ogcapi'; - const ogcAPIManager = new OgcApiEndpoint(baseUrl); + // 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); + // }); - // 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); - }); + fetch( + 'https://localhost:8484/mapserv_proxy//wfs3/collections//ogcapi/collections//items?bbox=6.0,46.0,7.0,47.0&limit=100&offset=0', ); + fetch( + 'http://localhost:8090/mapserv_proxy/mapserver/MainPNG/ogcapi/collections/osm_open/items?bbox=6.0,46.0,7.0,47.0&limit=100&offset=0&ogcserver=MainPNG', + ); + + //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'); }