Skip to content

Commit 8bdd261

Browse files
lecaultlecault
authored
Merge pull request #296 from mviewer/develop
Version 4.0.2
2 parents ce784ff + 2f932e4 commit 8bdd261

File tree

10 files changed

+140
-153
lines changed

10 files changed

+140
-153
lines changed

‎.github/workflows/prettier-check.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Code style checking
1+
name: Front - Code style checking
22
on:
33
pull_request:
44
push:

‎config-php-sample.json‎

Lines changed: 64 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"app_conf": {
33
"studio_title": "GéoBretagne mviewer studio",
44
"mviewer_version": "3.9",
5-
"mviewerstudio_version": "4.0.1",
5+
"mviewerstudio_version": "4.0.2",
66
"is_php": "true",
77
"php": {
88
"upload_service": "srv/php/store.php",
@@ -49,13 +49,28 @@
4949
"id": "ortho_ign",
5050
"thumbgallery": "img/basemap/ortho.jpg",
5151
"title": "IGN",
52-
"label": "Photographies aériennes IGN",
52+
"label": "Photographies aériennes",
5353
"type": "WMTS",
54-
"url": "https://wxs.ign.fr/choisirgeoportail/geoportail/wmts?",
54+
"url": "https://data.geopf.fr/wmts",
5555
"layers": "ORTHOIMAGERY.ORTHOPHOTOS",
5656
"format": "image/jpeg",
5757
"fromcapacity": "false",
58-
"attribution": "<a href='https://geoservices.ign.fr' target='_blank'><img src='https://geoservices.ign.fr/images/logoIGN.png'></a>",
58+
"attribution": "<a href='https://geoservices.ign.fr/services-geoplateforme-diffusion' target='_blank'><img src='https://geobretagne.fr/pub/logo/099_ign.jpg'></a>",
59+
"style": "normal",
60+
"matrixset": "PM",
61+
"maxzoom": "22"
62+
},
63+
"plan_ign": {
64+
"id": "plan_ign",
65+
"thumbgallery": "img/basemap/scan-express.jpg",
66+
"title": "IGN",
67+
"label": "Plan IGN v2",
68+
"type": "WMTS",
69+
"url": "https://data.geopf.fr/wmts",
70+
"layers": "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2",
71+
"format": "image/png",
72+
"fromcapacity": "false",
73+
"attribution": "<a href='https://geoservices.ign.fr/services-geoplateforme-diffusion' target='_blank'><img src='https://geobretagne.fr/pub/logo/099_ign.jpg'></a>",
5974
"style": "normal",
6075
"matrixset": "PM",
6176
"maxzoom": "22"
@@ -79,50 +94,69 @@
7994
"url": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
8095
"attribution": "<a href=\"https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9\" target=\"_blank\" >Esri world imagery</a>"
8196
},
82-
"ortho1": {
83-
"id": "ortho1",
84-
"thumbgallery": "img/basemap/ortho.jpg",
85-
"title": "GéoBretagne",
86-
"label": "Photo aérienne actuelle GéoBretagne",
87-
"type": "WMTS",
88-
"url": "https://tile.geobretagne.fr/gwc02/service/wmts",
89-
"layers": "satellite",
90-
"format": "image/png",
91-
"style": "_null",
92-
"matrixset": "EPSG:3857",
93-
"fromcapacity": "false",
94-
"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>"
95-
},
9697
"ortho_ir": {
9798
"id": "ortho_ir",
9899
"thumbgallery": "img/basemap/ir.jpg",
99-
"title": "GéoBretagne",
100-
"label": "Photo aérienne infra rouge GéoBretagne",
100+
"title": "IGN",
101+
"label": "Photographies aériennes infrarouge",
101102
"type": "WMTS",
102-
"url": "https://geobretagne.fr/geoserver/gwc/service/wmts",
103-
"layers": "photo:ir-composite",
103+
"url": "https://data.geopf.fr/wmts",
104+
"layers": "ORTHOIMAGERY.ORTHOPHOTOS.IRC",
104105
"format": "image/jpeg",
105-
"style": "_null",
106-
"matrixset": "EPSG:3857",
107106
"fromcapacity": "false",
108-
"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>"
107+
"attribution": "<a href='https://geoservices.ign.fr/services-geoplateforme-diffusion' target='_blank'><img src='https://geobretagne.fr/pub/logo/099_ign.jpg'></a>",
108+
"style": "normal",
109+
"matrixset": "PM",
110+
"maxzoom": "22"
111+
},
112+
"ortho_ancienne": {
113+
"id": "ortho_ancienne",
114+
"thumbgallery": "img/basemap/ortho-ancien.jpg",
115+
"title": "IGN",
116+
"label": "Photographies aériennes anciennes",
117+
"type": "WMTS",
118+
"url": "https://data.geopf.fr/wmts",
119+
"layers": "ORTHOIMAGERY.ORTHOPHOTOS.1950-1965",
120+
"format": "image/png",
121+
"fromcapacity": "false",
122+
"attribution": "<a href='https://geoservices.ign.fr/services-geoplateforme-diffusion' target='_blank'><img src='https://geobretagne.fr/pub/logo/099_ign.jpg'></a>",
123+
"style": "normal",
124+
"matrixset": "PM",
125+
"maxzoom": "22"
109126
},
110127
"osm_google": {
111128
"id": "osm_google",
112129
"thumbgallery": "img/basemap/osm_google.png",
113130
"title": "GéoBretagne",
114-
"label": "OpenStreetMap GéoBretagne",
115-
"type": "WMS",
116-
"url": "https://osm.geobretagne.fr/gwc01/service/wms",
131+
"label": "OpenStreetMap style Google",
132+
"type": "WMTS",
133+
"url": "https://tile.geobretagne.fr/osm/service",
117134
"layers": "osm:google",
118135
"format": "image/png",
119-
"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>"
136+
"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>",
137+
"style": "normal",
138+
"matrixset": "PM",
139+
"maxzoom": "22"
140+
},
141+
"osm_grey": {
142+
"id": "osm_grey",
143+
"thumbgallery": "img/basemap/osm_grey.png",
144+
"title": "GéoBretagne - GéoGrandEst",
145+
"label": "OpenStreetMap style noir et blanc",
146+
"type": "WMTS",
147+
"url": "https://tile.geobretagne.fr/osm/service",
148+
"layers": "osm:grey",
149+
"format": "image/png",
150+
"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>",
151+
"style": "normal",
152+
"matrixset": "PM",
153+
"maxzoom": "22"
120154
},
121155
"osm": {
122156
"id": "osm",
123157
"thumbgallery": "img/basemap/osm.png",
124158
"title": "OSM",
125-
"label": "OpenStreetMap",
159+
"label": "OpenStreetMap classique",
126160
"type": "OSM",
127161
"url": "https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png",
128162
"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 @@
136170
"maxzoom": "20",
137171
"url": "https://tile.openstreetmap.bzh/br/{z}/{x}/{y}.png",
138172
"attribution": "Kendaolerien <a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">OpenStreetMap</a>"
139-
},
140-
"plan_ign": {
141-
"id": "plan_ign",
142-
"thumbgallery": "img/basemap/scan-express.jpg",
143-
"title": "IGN",
144-
"label": "Plan IGN v2",
145-
"type": "WMTS",
146-
"url": "https://wxs.ign.fr/choisirgeoportail/geoportail/wmts?",
147-
"layers": "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2",
148-
"format": "image/png",
149-
"fromcapacity": "false",
150-
"attribution": "<a href='https://geoservices.ign.fr' target='_blank'><img src='https://geoservices.ign.fr/images/logoIGN.png'></a>",
151-
"style": "normal",
152-
"matrixset": "PM",
153-
"maxzoom": "22"
154173
}
155174
},
156175
"data_providers": {

‎config-python-sample.json‎

Lines changed: 64 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"app_conf": {
33
"studio_title": "Mviewer Studio",
44
"mviewer_version": "3.9",
5-
"mviewerstudio_version": "4.0.1",
5+
"mviewerstudio_version": "4.0.2",
66
"api": "api/app",
77
"store_style_service": "api/style",
88
"mviewer_instance": "/mviewer/",
@@ -43,13 +43,28 @@
4343
"id": "ortho_ign",
4444
"thumbgallery": "img/basemap/ortho.jpg",
4545
"title": "IGN",
46-
"label": "Photographies aériennes IGN",
46+
"label": "Photographies aériennes",
4747
"type": "WMTS",
48-
"url": "https://wxs.ign.fr/choisirgeoportail/geoportail/wmts?",
48+
"url": "https://data.geopf.fr/wmts",
4949
"layers": "ORTHOIMAGERY.ORTHOPHOTOS",
5050
"format": "image/jpeg",
5151
"fromcapacity": "false",
52-
"attribution": "<a href='https://geoservices.ign.fr' target='_blank'><img src='https://geoservices.ign.fr/images/logoIGN.png'></a>",
52+
"attribution": "<a href='https://geoservices.ign.fr/services-geoplateforme-diffusion' target='_blank'><img src='https://geobretagne.fr/pub/logo/099_ign.jpg'></a>",
53+
"style": "normal",
54+
"matrixset": "PM",
55+
"maxzoom": "22"
56+
},
57+
"plan_ign": {
58+
"id": "plan_ign",
59+
"thumbgallery": "img/basemap/scan-express.jpg",
60+
"title": "IGN",
61+
"label": "Plan IGN v2",
62+
"type": "WMTS",
63+
"url": "https://data.geopf.fr/wmts",
64+
"layers": "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2",
65+
"format": "image/png",
66+
"fromcapacity": "false",
67+
"attribution": "<a href='https://geoservices.ign.fr/services-geoplateforme-diffusion' target='_blank'><img src='https://geobretagne.fr/pub/logo/099_ign.jpg'></a>",
5368
"style": "normal",
5469
"matrixset": "PM",
5570
"maxzoom": "22"
@@ -73,50 +88,69 @@
7388
"url": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
7489
"attribution": "<a href=\"https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9\" target=\"_blank\" >Esri world imagery</a>"
7590
},
76-
"ortho1": {
77-
"id": "ortho1",
78-
"thumbgallery": "img/basemap/ortho.jpg",
79-
"title": "GéoBretagne",
80-
"label": "Photo aérienne actuelle GéoBretagne",
81-
"type": "WMTS",
82-
"url": "https://tile.geobretagne.fr/gwc02/service/wmts",
83-
"layers": "satellite",
84-
"format": "image/png",
85-
"style": "_null",
86-
"matrixset": "EPSG:3857",
87-
"fromcapacity": "false",
88-
"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>"
89-
},
9091
"ortho_ir": {
9192
"id": "ortho_ir",
9293
"thumbgallery": "img/basemap/ir.jpg",
93-
"title": "GéoBretagne",
94-
"label": "Photo aérienne infra rouge GéoBretagne",
94+
"title": "IGN",
95+
"label": "Photographies aériennes infrarouge",
9596
"type": "WMTS",
96-
"url": "https://geobretagne.fr/geoserver/gwc/service/wmts",
97-
"layers": "photo:ir-composite",
97+
"url": "https://data.geopf.fr/wmts",
98+
"layers": "ORTHOIMAGERY.ORTHOPHOTOS.IRC",
9899
"format": "image/jpeg",
99-
"style": "_null",
100-
"matrixset": "EPSG:3857",
101100
"fromcapacity": "false",
102-
"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>"
101+
"attribution": "<a href='https://geoservices.ign.fr/services-geoplateforme-diffusion' target='_blank'><img src='https://geobretagne.fr/pub/logo/099_ign.jpg'></a>",
102+
"style": "normal",
103+
"matrixset": "PM",
104+
"maxzoom": "22"
105+
},
106+
"ortho_ancienne": {
107+
"id": "ortho_ancienne",
108+
"thumbgallery": "img/basemap/ortho-ancien.jpg",
109+
"title": "IGN",
110+
"label": "Photographies aériennes anciennes",
111+
"type": "WMTS",
112+
"url": "https://data.geopf.fr/wmts",
113+
"layers": "ORTHOIMAGERY.ORTHOPHOTOS.1950-1965",
114+
"format": "image/png",
115+
"fromcapacity": "false",
116+
"attribution": "<a href='https://geoservices.ign.fr/services-geoplateforme-diffusion' target='_blank'><img src='https://geobretagne.fr/pub/logo/099_ign.jpg'></a>",
117+
"style": "normal",
118+
"matrixset": "PM",
119+
"maxzoom": "22"
103120
},
104121
"osm_google": {
105122
"id": "osm_google",
106123
"thumbgallery": "img/basemap/osm_google.png",
107124
"title": "GéoBretagne",
108-
"label": "OpenStreetMap GéoBretagne",
109-
"type": "WMS",
110-
"url": "https://osm.geobretagne.fr/gwc01/service/wms",
125+
"label": "OpenStreetMap style Google",
126+
"type": "WMTS",
127+
"url": "https://tile.geobretagne.fr/osm/service",
111128
"layers": "osm:google",
112129
"format": "image/png",
113-
"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>"
130+
"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>",
131+
"style": "normal",
132+
"matrixset": "PM",
133+
"maxzoom": "22"
134+
},
135+
"osm_grey": {
136+
"id": "osm_grey",
137+
"thumbgallery": "img/basemap/osm_grey.png",
138+
"title": "GéoBretagne - GéoGrandEst",
139+
"label": "OpenStreetMap style noir et blanc",
140+
"type": "WMTS",
141+
"url": "https://tile.geobretagne.fr/osm/service",
142+
"layers": "osm:grey",
143+
"format": "image/png",
144+
"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>",
145+
"style": "normal",
146+
"matrixset": "PM",
147+
"maxzoom": "22"
114148
},
115149
"osm": {
116150
"id": "osm",
117151
"thumbgallery": "img/basemap/osm.png",
118152
"title": "OSM",
119-
"label": "OpenStreetMap",
153+
"label": "OpenStreetMap classique",
120154
"type": "OSM",
121155
"url": "https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png",
122156
"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 @@
130164
"maxzoom": "20",
131165
"url": "https://tile.openstreetmap.bzh/br/{z}/{x}/{y}.png",
132166
"attribution": "Kendaolerien <a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">OpenStreetMap</a>"
133-
},
134-
"plan_ign": {
135-
"id": "plan_ign",
136-
"thumbgallery": "img/basemap/scan-express.jpg",
137-
"title": "IGN",
138-
"label": "Plan IGN v2",
139-
"type": "WMTS",
140-
"url": "https://wxs.ign.fr/choisirgeoportail/geoportail/wmts?",
141-
"layers": "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2",
142-
"format": "image/png",
143-
"fromcapacity": "false",
144-
"attribution": "<a href='https://geoservices.ign.fr' target='_blank'><img src='https://geoservices.ign.fr/images/logoIGN.png'></a>",
145-
"style": "normal",
146-
"matrixset": "PM",
147-
"maxzoom": "22"
148167
}
149168
},
150169
"data_providers": {

‎docs/doc_user/param_appli.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ En :guilabel:`mode avancé`, il est possible de rajouter un fond de plan personn
158158
- OpenStreetMap GéoBretagne
159159
- BDTOPO IGN
160160
* - URL
161-
- https://wxs.ign.fr/agriculture/geoportail/wmts
162-
- https://osm.geobretagne.fr/gwc01/service/wms
161+
- https://data.geopf.fr/wmts
162+
- https://tile.geobretagne.fr/osm/service
163163
- https://wxs.ign.fr/topographie/geoportail/tms/1.0.0/BDTOPO/{z}/{x}/{y}.pbf
164164
* - Identifiant technique
165165
- LANDUSE.AGRICULTURE2021

‎img/basemap/osm_grey.png‎

83.8 KB
Loading

‎lib/ogc.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,6 @@ var ogc = (function () {
607607
VERSION: "1.0.0",
608608
REQUEST: "GETFEATURE",
609609
OUTPUTFORMAT: "application/json",
610-
MAXFEATURES: 100,
611610
...props,
612611
};
613612

‎lib/template-generator/Main.js‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)