Simplify geoportail helper

1 files changed, 12 insertions, 5 deletions

diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 5f8664f..432f2d5 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -75,10 +75,7 @@ var LayerSwitcher = function(options){
 }; // LayerSwitcher
 
 
-// Géoportail (IGN)
-// example: geoportail_layer('2mqbg0z6cx7ube8gsou10nrt', 'GEOGRAPHICALGRIDSYSTEMS.MAPS', 'Géoportail - Plan IGN', 18, 'image/jpeg', 'normal')
-// geoportail_layer('2mqbg0z6cx7ube8gsou10nrt', 'CADASTRALPARCELS.PARCELS', 'Géoportail - Cadastre', 20, 'image/png', 'bdparcellaire_b')
-function geoportail_layer(key, layer, name, max_zoom, image_format, style){
+function _geoportail_layer(key, layer, name, max_zoom, image_format, style, baselayer){
     var resolutions = [];
     var matrixIds = [];
     var proj3857 = ol.proj.get('EPSG:3857');
@@ -110,12 +107,22 @@ function geoportail_layer(key, layer, name, max_zoom, image_format, style){
     });
 
     return new ol.layer.Tile({
-       baselayer: true,
+       baselayer: baselayer,
        name: name,
        source: plan_ign_source
     });
 }
 
+// Géoportail (IGN)
+// example: geoportail_layer('2mqbg0z6cx7ube8gsou10nrt', 'GEOGRAPHICALGRIDSYSTEMS.MAPS', 'Géoportail - Plan IGN', 18)
+function geoportail_layer(key, layer, name, max_zoom){
+    return _geoportail_layer(key, layer, name, max_zoom, 'image/jpeg', 'normal', true);
+}
+
+// geoportail_layer('2mqbg0z6cx7ube8gsou10nrt', 'Géoportail - Cadastre', 20, 'bdparcellaire_b')
+function geoportail_cadastre_layer(key, max_zoom, style){
+    return _geoportail_layer(key, 'CADASTRALPARCELS.PARCELS', name, max_zoom, 'image/png', style, false);
+}
 
 function transformExtent(extent) {
   return ol.proj.transformExtent(