From ef96ca371220f04b9e81fd572727aeb8789e6db1 Mon Sep 17 00:00:00 2001 From: rldhont Date: Wed, 14 Jun 2017 16:15:00 +0200 Subject: [PATCH] [BUGFIX] startupBaselayer - enhance get clean name --- lizmap/www/js/map.js | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/lizmap/www/js/map.js b/lizmap/www/js/map.js index 56d6ab1af9..1b445eb126 100755 --- a/lizmap/www/js/map.js +++ b/lizmap/www/js/map.js @@ -2424,19 +2424,13 @@ var lizMap = function() { } else if ( 'startupBaselayer' in config.options ) { var startupBaselayer = config.options['startupBaselayer']; - if ( startupBaselayer in startupBaselayersReplacement ){ + if ( startupBaselayer in startupBaselayersReplacement ) startupBaselayer = startupBaselayersReplacement[startupBaselayer]; - } - else if ( startupBaselayer in config.layers ) { + else if ( startupBaselayer in config.layers ) startupBaselayer = cleanName(startupBaselayer); - } - if ( $('#switcher-baselayer-select option[value="'+startupBaselayer+'"]').length != 0){ + + if ( $('#switcher-baselayer-select option[value="'+startupBaselayer+'"]').length != 0) $('#switcher-baselayer-select').val(startupBaselayer).change(); - }else{ - if ( $('#switcher-baselayer-select option[value="'+lizMap.cleanName(startupBaselayer)+'"]').length != 0){ - $('#switcher-baselayer-select').val(lizMap.cleanName(startupBaselayer)).change(); - } - } } } else { // hide elements for baselayers