diff --git a/src/main/webapp/WEB-INF/jsp/accession/map.jsp b/src/main/webapp/WEB-INF/jsp/accession/map.jsp index cd56ad4b7aa29a1444bda755294ee33ba9fb9695..be21c4f045bf633baa2bf1b9b4a6d395620f11e5 100644 --- a/src/main/webapp/WEB-INF/jsp/accession/map.jsp +++ b/src/main/webapp/WEB-INF/jsp/accession/map.jsp @@ -187,19 +187,15 @@ }) } }; + var cookieValue = cookieUtils.getCookie('mapProviders') || 'MapQuest'; [].forEach.call($('.label-map-provider'), function(label){ - label.innerText == cookieUtils.getCookie('mapProviders')? $(label).find('input:radio').prop('checked', true) + label.innerHTML.indexOf(cookieValue) > 1 ? $(label).find('input:radio').prop('checked', true) :$(label).find('input:radio').prop('checked', false); }); - if (cookieUtils.getCookie('mapProviders') && cookieUtils.getCookie('mapProviders') != '') { - mapProviders[cookieUtils.getCookie('mapProviders')].addTo(map); - topPane.appendChild(mapProviders[cookieUtils.getCookie('mapProviders')].getContainer()); - mapProviders[cookieUtils.getCookie('mapProviders')].setZIndex(0); - } else { - mapProviders.MapQuest.addTo(map); - topPane.appendChild(mapProviders[cookieUtils.getCookie('mapProviders')].getContainer()); - mapProviders.MapQuest.setZIndex(0); - } + + mapProviders[cookieValue].addTo(map); + topPane.appendChild(mapProviders[cookieValue].getContainer()); + mapProviders[cookieValue].setZIndex(0); $(document).on('cookieUpdate', function () { for (var key in mapProviders) { map.removeLayer(mapProviders[key]);