Merge branch 'master' of https://www.github.com/Viglino/ol-ext

Viglino · Jun 17, 2022 · ffa3cf2 · ffa3cf2
2 parents f5d00be + 673f658
commit ffa3cf2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/dist/ol-ext.js b/dist/ol-ext.js
@@ -31625,7 +31625,7 @@ ol.layer.Geoportail.getCapabilities = function(gppKey) {
           server: l.getElementsByTagName('gpp:Key')[0].innerHTML.replace(gppKey+"/",""), 
           layer: l.getElementsByTagName('Name')[0].innerHTML,
           title: l.getElementsByTagName('Title')[0].innerHTML,
-          format: l.getElementsByTagName('Format')[0].innerHTML,
+          format: l.getElementsByTagName('Format')[0] ? l.getElementsByTagName('Format')[0].innerHTML : 'image.jpeg',
           style: l.getElementsByTagName('Style')[0].getElementsByTagName('Name')[0].innerHTML,
           queryable: (l.attributes.queryable.value==='1'),
           tilematrix: 'PM',

diff --git a/dist/ol-ext.min.js b/dist/ol-ext.min.js
diff --git a/examples/layer/map.geoportail.wmts.html b/examples/layer/map.geoportail.wmts.html
@@ -165,20 +165,21 @@ <h1>ol-ext: IGN Géoservices</h1>
 <script type="text/javascript">
 
 var services = [
+  'administratif',
+  'agriculture',
+  'altimetrie',
   'cartes',
   'cartovecto',
+  'clc',
+  'economie',
+  'environnement',
   'ortho',
   'orthohisto',
   'satellite',
-  'economie',
-  'environnement',
   'sol',
   'parcellaire',
+  'topographie',
   'transports',
-  'administratif',
-  'altimetrie',
-  'agriculture',
-  'clc'
 ];
 
 var ul = $('#geoportail')

diff --git a/examples/layer/map.layer.geoportail.html b/examples/layer/map.layer.geoportail.html
@@ -135,6 +135,7 @@ <h1>ol-ext: Geoportail layer</h1>
         <option value="orthohisto">orthohisto</option>
         <option value="satellite">satellite</option>
         <option value="cartovecto">cartovecto</option>
+        <option value="topographie">topographie</option>
         <option value="economie">economie</option>
         <option value="environnement">environnement</option>
         <option value="sol">sol</option>

diff --git a/src/layer/Geoportail.js b/src/layer/Geoportail.js
@@ -290,7 +290,7 @@ ol_layer_Geoportail.getCapabilities = function(gppKey) {
           server: l.getElementsByTagName('gpp:Key')[0].innerHTML.replace(gppKey+"/",""), 
           layer: l.getElementsByTagName('Name')[0].innerHTML,
           title: l.getElementsByTagName('Title')[0].innerHTML,
-          format: l.getElementsByTagName('Format')[0].innerHTML,
+          format: l.getElementsByTagName('Format')[0] ? l.getElementsByTagName('Format')[0].innerHTML : 'image.jpeg',
           style: l.getElementsByTagName('Style')[0].getElementsByTagName('Name')[0].innerHTML,
           queryable: (l.attributes.queryable.value==='1'),
           tilematrix: 'PM',