Merge pull request #296 from mviewer/develop

Version 4.0.2
mviewer · Apr 2, 2024 · 8bdd261 · 8bdd261
2 parents ce784ff + 2f932e4
commit 8bdd261
Show file tree

Hide file tree

Showing 10 changed files with 140 additions and 153 deletions.
diff --git a/.github/workflows/prettier-check.yaml b/.github/workflows/prettier-check.yaml
@@ -1,4 +1,4 @@
-name: Code style checking
+name: Front - Code style checking
 on:
   pull_request:
   push:

diff --git a/config-php-sample.json b/config-php-sample.json
@@ -2,7 +2,7 @@
     "app_conf": {
         "studio_title": "GéoBretagne mviewer studio",
         "mviewer_version":  "3.9",
-        "mviewerstudio_version":  "4.0.1",
+        "mviewerstudio_version":  "4.0.2",
         "is_php": "true",
         "php": {
             "upload_service": "srv/php/store.php",
@@ -49,13 +49,28 @@
                 "id": "ortho_ign",
                 "thumbgallery": "img/basemap/ortho.jpg",
                 "title": "IGN",
-                "label": "Photographies aériennes IGN",
+                "label": "Photographies aériennes",
                 "type": "WMTS",
-                "url": "https://wxs.ign.fr/choisirgeoportail/geoportail/wmts?",
+                "url": "https://data.geopf.fr/wmts",
                 "layers": "ORTHOIMAGERY.ORTHOPHOTOS",
                 "format": "image/jpeg",
                 "fromcapacity": "false",
-                "attribution": "<a href='https://geoservices.ign.fr' target='_blank'><img src='https://geoservices.ign.fr/images/logoIGN.png'></a>",
+                "attribution": "<a href='https://geoservices.ign.fr/services-geoplateforme-diffusion' target='_blank'><img src='https://geobretagne.fr/pub/logo/099_ign.jpg'></a>",
+                "style": "normal",
+                "matrixset": "PM",
+                "maxzoom": "22"
+            },
+            "plan_ign": {
+                "id": "plan_ign",
+                "thumbgallery": "img/basemap/scan-express.jpg",
+                "title": "IGN",
+                "label": "Plan IGN v2",
+                "type": "WMTS",
+                "url": "https://data.geopf.fr/wmts",
+                "layers": "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2",
+                "format": "image/png",
+                "fromcapacity": "false",
+                "attribution": "<a href='https://geoservices.ign.fr/services-geoplateforme-diffusion' target='_blank'><img src='https://geobretagne.fr/pub/logo/099_ign.jpg'></a>",
                 "style": "normal",
                 "matrixset": "PM",
                 "maxzoom": "22"
@@ -79,50 +94,69 @@
                 "url": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
                 "attribution": "<a href=\"https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9\" target=\"_blank\" >Esri world imagery</a>"
             },
-            "ortho1": {
-                "id": "ortho1",
-                "thumbgallery": "img/basemap/ortho.jpg",
-                "title": "GéoBretagne",
-                "label": "Photo aérienne actuelle GéoBretagne",
-                "type": "WMTS",
-                "url": "https://tile.geobretagne.fr/gwc02/service/wmts",
-                "layers": "satellite",
-                "format": "image/png",
-                "style": "_null",
-                "matrixset": "EPSG:3857",
-                "fromcapacity": "false",
-                "attribution": "<a href=\"https://geobretagne.fr/geonetwork/srv/fre/catalog.search#/metadata/3a0ac2e3-7af1-4dec-9f36-dae6b5a8c731\" target=\"_blank\" >partenaires GéoBretagne - Megalis Bretagne - IGN - PlanetObserver</a>"
-            },
             "ortho_ir": {
                 "id": "ortho_ir",
                 "thumbgallery": "img/basemap/ir.jpg",
-                "title": "GéoBretagne",
-                "label": "Photo aérienne infra rouge GéoBretagne",
+                "title": "IGN",
+                "label": "Photographies aériennes infrarouge",
                 "type": "WMTS",
-                "url": "https://geobretagne.fr/geoserver/gwc/service/wmts",
-                "layers": "photo:ir-composite",
+                "url": "https://data.geopf.fr/wmts",
+                "layers": "ORTHOIMAGERY.ORTHOPHOTOS.IRC",
                 "format": "image/jpeg",
-                "style": "_null",
-                "matrixset": "EPSG:3857",
                 "fromcapacity": "false",
-                "attribution": "<a href=\"https://geobretagne.fr/geonetwork/srv/fre/catalog.search#/metadata/434b82a8-8d3c-4d9f-9eb3-0485f1a63eb6\" target=\"_blank\" >partenaires GéoBretagne - Megalis Bretagne - IGN</a>"
+                "attribution": "<a href='https://geoservices.ign.fr/services-geoplateforme-diffusion' target='_blank'><img src='https://geobretagne.fr/pub/logo/099_ign.jpg'></a>",
+                "style": "normal",
+                "matrixset": "PM",
+                "maxzoom": "22"
+            },
+            "ortho_ancienne": {
+                "id": "ortho_ancienne",
+                "thumbgallery": "img/basemap/ortho-ancien.jpg",
+                "title": "IGN",
+                "label": "Photographies aériennes anciennes",
+                "type": "WMTS",
+                "url": "https://data.geopf.fr/wmts",
+                "layers": "ORTHOIMAGERY.ORTHOPHOTOS.1950-1965",
+                "format": "image/png",
+                "fromcapacity": "false",
+                "attribution": "<a href='https://geoservices.ign.fr/services-geoplateforme-diffusion' target='_blank'><img src='https://geobretagne.fr/pub/logo/099_ign.jpg'></a>",
+                "style": "normal",
+                "matrixset": "PM",
+                "maxzoom": "22"
             },
             "osm_google": {
                 "id": "osm_google",
                 "thumbgallery": "img/basemap/osm_google.png",
                 "title": "GéoBretagne",
-                "label": "OpenStreetMap GéoBretagne",
-                "type": "WMS",
-                "url": "https://osm.geobretagne.fr/gwc01/service/wms",
+                "label": "OpenStreetMap style Google",
+                "type": "WMTS",
+                "url": "https://tile.geobretagne.fr/osm/service",
                 "layers": "osm:google",
                 "format": "image/png",
-                "attribution": "GéoBretagne. Données : les contributeurs d'<a href=\"https://www.openstreetmap.org/\" target=\"_blank\">OpenStreetMap </a>,  <a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">ODbL </a>"
+                "attribution": "GéoBretagne. Données : les contributeurs d'<a href=\"https://www.openstreetmap.org/\" target=\"_blank\">OpenStreetMap </a>,  <a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">ODbL </a>",
+                "style": "normal",
+                "matrixset": "PM",
+                "maxzoom": "22"
+            },
+            "osm_grey": {
+                "id": "osm_grey",
+                "thumbgallery": "img/basemap/osm_grey.png",
+                "title": "GéoBretagne - GéoGrandEst",
+                "label": "OpenStreetMap style noir et blanc",
+                "type": "WMTS",
+                "url": "https://tile.geobretagne.fr/osm/service",
+                "layers": "osm:grey",
+                "format": "image/png",
+                "attribution": "GéoBretagne - GéoGrandEst. Données : les contributeurs d'<a href=\"https://www.openstreetmap.org/\" target=\"_blank\">OpenStreetMap </a>,  <a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">ODbL </a>",
+                "style": "normal",
+                "matrixset": "PM",
+                "maxzoom": "22"
             },
             "osm": {
                 "id": "osm",
                 "thumbgallery": "img/basemap/osm.png",
                 "title": "OSM",
-                "label": "OpenStreetMap",
+                "label": "OpenStreetMap classique",
                 "type": "OSM",
                 "url": "https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png",
                 "attribution": "Données : les contributeurs d'<a href=\"https://www.openstreetmap.org/\" target=\"_blank\">OpenStreetMap </a><a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">ODbL </a>"
@@ -136,21 +170,6 @@
                 "maxzoom": "20",
                 "url": "https://tile.openstreetmap.bzh/br/{z}/{x}/{y}.png",
                 "attribution": "Kendaolerien <a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">OpenStreetMap</a>"
-            },
-            "plan_ign": {
-                "id": "plan_ign",
-                "thumbgallery": "img/basemap/scan-express.jpg",
-                "title": "IGN",
-                "label": "Plan IGN v2",
-                "type": "WMTS",
-                "url": "https://wxs.ign.fr/choisirgeoportail/geoportail/wmts?",
-                "layers": "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2",
-                "format": "image/png",
-                "fromcapacity": "false",
-                "attribution": "<a href='https://geoservices.ign.fr' target='_blank'><img src='https://geoservices.ign.fr/images/logoIGN.png'></a>",
-                "style": "normal",
-                "matrixset": "PM",
-                "maxzoom": "22"
             }
         },
         "data_providers": {

diff --git a/config-python-sample.json b/config-python-sample.json
@@ -2,7 +2,7 @@
     "app_conf": {
         "studio_title": "Mviewer Studio",
         "mviewer_version":  "3.9",
-        "mviewerstudio_version":  "4.0.1",
+        "mviewerstudio_version":  "4.0.2",
         "api": "api/app",
         "store_style_service": "api/style",
         "mviewer_instance": "/mviewer/",
@@ -43,13 +43,28 @@
                 "id": "ortho_ign",
                 "thumbgallery": "img/basemap/ortho.jpg",
                 "title": "IGN",
-                "label": "Photographies aériennes IGN",
+                "label": "Photographies aériennes",
                 "type": "WMTS",
-                "url": "https://wxs.ign.fr/choisirgeoportail/geoportail/wmts?",
+                "url": "https://data.geopf.fr/wmts",
                 "layers": "ORTHOIMAGERY.ORTHOPHOTOS",
                 "format": "image/jpeg",
                 "fromcapacity": "false",
-                "attribution": "<a href='https://geoservices.ign.fr' target='_blank'><img src='https://geoservices.ign.fr/images/logoIGN.png'></a>",
+                "attribution": "<a href='https://geoservices.ign.fr/services-geoplateforme-diffusion' target='_blank'><img src='https://geobretagne.fr/pub/logo/099_ign.jpg'></a>",
+                "style": "normal",
+                "matrixset": "PM",
+                "maxzoom": "22"
+            },
+            "plan_ign": {
+                "id": "plan_ign",
+                "thumbgallery": "img/basemap/scan-express.jpg",
+                "title": "IGN",
+                "label": "Plan IGN v2",
+                "type": "WMTS",
+                "url": "https://data.geopf.fr/wmts",
+                "layers": "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2",
+                "format": "image/png",
+                "fromcapacity": "false",
+                "attribution": "<a href='https://geoservices.ign.fr/services-geoplateforme-diffusion' target='_blank'><img src='https://geobretagne.fr/pub/logo/099_ign.jpg'></a>",
                 "style": "normal",
                 "matrixset": "PM",
                 "maxzoom": "22"
@@ -73,50 +88,69 @@
                 "url": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
                 "attribution": "<a href=\"https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9\" target=\"_blank\" >Esri world imagery</a>"
             },
-            "ortho1": {
-                "id": "ortho1",
-                "thumbgallery": "img/basemap/ortho.jpg",
-                "title": "GéoBretagne",
-                "label": "Photo aérienne actuelle GéoBretagne",
-                "type": "WMTS",
-                "url": "https://tile.geobretagne.fr/gwc02/service/wmts",
-                "layers": "satellite",
-                "format": "image/png",
-                "style": "_null",
-                "matrixset": "EPSG:3857",
-                "fromcapacity": "false",
-                "attribution": "<a href=\"https://geobretagne.fr/geonetwork/srv/fre/catalog.search#/metadata/3a0ac2e3-7af1-4dec-9f36-dae6b5a8c731\" target=\"_blank\" >partenaires GéoBretagne - Megalis Bretagne - IGN - PlanetObserver</a>"
-            },
             "ortho_ir": {
                 "id": "ortho_ir",
                 "thumbgallery": "img/basemap/ir.jpg",
-                "title": "GéoBretagne",
-                "label": "Photo aérienne infra rouge GéoBretagne",
+                "title": "IGN",
+                "label": "Photographies aériennes infrarouge",
                 "type": "WMTS",
-                "url": "https://geobretagne.fr/geoserver/gwc/service/wmts",
-                "layers": "photo:ir-composite",
+                "url": "https://data.geopf.fr/wmts",
+                "layers": "ORTHOIMAGERY.ORTHOPHOTOS.IRC",
                 "format": "image/jpeg",
-                "style": "_null",
-                "matrixset": "EPSG:3857",
                 "fromcapacity": "false",
-                "attribution": "<a href=\"https://geobretagne.fr/geonetwork/srv/fre/catalog.search#/metadata/434b82a8-8d3c-4d9f-9eb3-0485f1a63eb6\" target=\"_blank\" >partenaires GéoBretagne - Megalis Bretagne - IGN</a>"
+                "attribution": "<a href='https://geoservices.ign.fr/services-geoplateforme-diffusion' target='_blank'><img src='https://geobretagne.fr/pub/logo/099_ign.jpg'></a>",
+                "style": "normal",
+                "matrixset": "PM",
+                "maxzoom": "22"
+            },
+            "ortho_ancienne": {
+                "id": "ortho_ancienne",
+                "thumbgallery": "img/basemap/ortho-ancien.jpg",
+                "title": "IGN",
+                "label": "Photographies aériennes anciennes",
+                "type": "WMTS",
+                "url": "https://data.geopf.fr/wmts",
+                "layers": "ORTHOIMAGERY.ORTHOPHOTOS.1950-1965",
+                "format": "image/png",
+                "fromcapacity": "false",
+                "attribution": "<a href='https://geoservices.ign.fr/services-geoplateforme-diffusion' target='_blank'><img src='https://geobretagne.fr/pub/logo/099_ign.jpg'></a>",
+                "style": "normal",
+                "matrixset": "PM",
+                "maxzoom": "22"
             },
             "osm_google": {
                 "id": "osm_google",
                 "thumbgallery": "img/basemap/osm_google.png",
                 "title": "GéoBretagne",
-                "label": "OpenStreetMap GéoBretagne",
-                "type": "WMS",
-                "url": "https://osm.geobretagne.fr/gwc01/service/wms",
+                "label": "OpenStreetMap style Google",
+                "type": "WMTS",
+                "url": "https://tile.geobretagne.fr/osm/service",
                 "layers": "osm:google",
                 "format": "image/png",
-                "attribution": "GéoBretagne. Données : les contributeurs d'<a href=\"https://www.openstreetmap.org/\" target=\"_blank\">OpenStreetMap </a>,  <a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">ODbL </a>"
+                "attribution": "GéoBretagne. Données : les contributeurs d'<a href=\"https://www.openstreetmap.org/\" target=\"_blank\">OpenStreetMap </a>,  <a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">ODbL </a>",
+                "style": "normal",
+                "matrixset": "PM",
+                "maxzoom": "22"
+            },
+            "osm_grey": {
+                "id": "osm_grey",
+                "thumbgallery": "img/basemap/osm_grey.png",
+                "title": "GéoBretagne - GéoGrandEst",
+                "label": "OpenStreetMap style noir et blanc",
+                "type": "WMTS",
+                "url": "https://tile.geobretagne.fr/osm/service",
+                "layers": "osm:grey",
+                "format": "image/png",
+                "attribution": "GéoBretagne - GéoGrandEst. Données : les contributeurs d'<a href=\"https://www.openstreetmap.org/\" target=\"_blank\">OpenStreetMap </a>,  <a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">ODbL </a>",
+                "style": "normal",
+                "matrixset": "PM",
+                "maxzoom": "22"
             },
             "osm": {
                 "id": "osm",
                 "thumbgallery": "img/basemap/osm.png",
                 "title": "OSM",
-                "label": "OpenStreetMap",
+                "label": "OpenStreetMap classique",
                 "type": "OSM",
                 "url": "https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png",
                 "attribution": "Données : les contributeurs d'<a href=\"https://www.openstreetmap.org/\" target=\"_blank\">OpenStreetMap </a><a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">ODbL </a>"
@@ -130,21 +164,6 @@
                 "maxzoom": "20",
                 "url": "https://tile.openstreetmap.bzh/br/{z}/{x}/{y}.png",
                 "attribution": "Kendaolerien <a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">OpenStreetMap</a>"
-            },
-            "plan_ign": {
-                "id": "plan_ign",
-                "thumbgallery": "img/basemap/scan-express.jpg",
-                "title": "IGN",
-                "label": "Plan IGN v2",
-                "type": "WMTS",
-                "url": "https://wxs.ign.fr/choisirgeoportail/geoportail/wmts?",
-                "layers": "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2",
-                "format": "image/png",
-                "fromcapacity": "false",
-                "attribution": "<a href='https://geoservices.ign.fr' target='_blank'><img src='https://geoservices.ign.fr/images/logoIGN.png'></a>",
-                "style": "normal",
-                "matrixset": "PM",
-                "maxzoom": "22"
             }
         },
         "data_providers": {

diff --git a/docs/doc_user/param_appli.rst b/docs/doc_user/param_appli.rst
@@ -158,8 +158,8 @@ En :guilabel:`mode avancé`, il est possible de rajouter un fond de plan personn
      - OpenStreetMap GéoBretagne
      - BDTOPO IGN
    * - URL
-     - https://wxs.ign.fr/agriculture/geoportail/wmts
-     - https://osm.geobretagne.fr/gwc01/service/wms
+     - https://data.geopf.fr/wmts
+     - https://tile.geobretagne.fr/osm/service
      - https://wxs.ign.fr/topographie/geoportail/tms/1.0.0/BDTOPO/{z}/{x}/{y}.pbf
    * - Identifiant technique
      - LANDUSE.AGRICULTURE2021

diff --git a/img/basemap/osm_grey.png b/img/basemap/osm_grey.png
diff --git a/lib/ogc.js b/lib/ogc.js
@@ -607,7 +607,6 @@ var ogc = (function () {
         VERSION: "1.0.0",
         REQUEST: "GETFEATURE",
         OUTPUTFORMAT: "application/json",
-        MAXFEATURES: 100,
         ...props,
       };
 

diff --git a/lib/template-generator/Main.js b/lib/template-generator/Main.js