X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ded28617c73090028c416e46ade69f7584536548..78d6bde4850a09a7cd9cb5774f394fd64680d664:/app/assets/javascripts/leaflet.layers.js

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index 57cd53d4d..a364588c1 100644
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -7,7 +7,7 @@ L.OSM.layers = function(options) {
     var $container = $('<div>')
       .attr('class', 'control-layers');
 
-    var link = $('<a>')
+    var button = $('<a>')
       .attr('class', 'control-button')
       .attr('href', '#')
       .attr('title', 'Layers')
@@ -18,69 +18,23 @@ L.OSM.layers = function(options) {
     var $ui = $('<div>')
       .attr('class', 'layers-ui');
 
-    $('<section>')
-       .appendTo($ui)
-       .append(
-          $('<a>')
-            .html('&raquo;')
-            .attr('class', 'close-button')
-            .attr('href', '#')
-            .bind('click', toggle))
-       .append(
-        $('<h2>')
+    $('<div>')
+      .attr('class', 'sidebar_heading')
+      .appendTo($ui)
+      .append(
+        $('<a>')
+          .text(I18n.t('javascripts.close'))
+          .attr('class', 'sidebar_close')
+          .attr('href', '#')
+          .bind('click', toggle))
+      .append(
+        $('<h4>')
           .text(I18n.t('javascripts.map.layers.header')));
 
-    if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
-      var overlaySection = $('<section>')
-        .addClass('overlay-layers')
-        .appendTo($ui);
-
-      $('<p>')
-        .text(I18n.t('javascripts.map.layers.overlays'))
-        .appendTo(overlaySection);
-
-      var list = $('<ul>')
-        .appendTo(overlaySection);
-
-      function addOverlay(layer, name) {
-        var item = $('<li>')
-          .appendTo(list);
-
-        var label = $('<label>')
-          .appendTo(item);
-
-        var input = $('<input>')
-          .attr('type', 'checkbox')
-          .prop('checked', map.hasLayer(layer))
-          .appendTo(label);
-
-        label.append(name);
-
-        input.on('change', function() {
-          if (input.is(':checked')) {
-            map.addLayer(layer);
-          } else {
-            map.removeLayer(layer);
-          }
-        });
-
-        map.on('layeradd layerremove', function() {
-          input.prop('checked', map.hasLayer(layer));
-        });
-      }
-
-      addOverlay(map.noteLayer, I18n.t('javascripts.map.layers.notes'));
-      addOverlay(map.dataLayer, I18n.t('javascripts.map.layers.data'));
-    }
-
-    var baseSection = $('<section>')
-      .addClass('base-layers')
+    var baseSection = $('<div>')
+      .attr('class', 'section base-layers')
       .appendTo($ui);
 
-    $('<p>')
-      .text(I18n.t('javascripts.map.layers.base'))
-      .appendTo(baseSection);
-
     list = $('<ul>')
       .appendTo(baseSection);
 
@@ -110,23 +64,33 @@ L.OSM.layers = function(options) {
 
         function shown() {
           miniMap.invalidateSize();
-          setView();
-          map.on('moveend', setView);
+          setView({animate: false});
+          map.on('moveend', moved);
         }
 
         function hide() {
-          map.off('moveend', setView);
+          map.off('moveend', moved);
+        }
+
+        function moved() {
+          setView();
         }
 
-        function setView() {
-          miniMap.setView(map.getCenter(), Math.max(map.getZoom() - 2, 0));
+        function setView(options) {
+          miniMap.setView(map.getCenter(), Math.max(map.getZoom() - 2, 0), options);
         }
       });
 
       var label = $('<label>')
-        .text(layer.options.name)
         .appendTo(item);
 
+      var input = $('<input>')
+        .attr('type', 'radio')
+        .prop('checked', map.hasLayer(layer))
+        .appendTo(label);
+
+      label.append(layer.options.name);
+
       item.on('click', function() {
         layers.forEach(function(other) {
           if (other === layer) {
@@ -135,19 +99,64 @@ L.OSM.layers = function(options) {
             map.removeLayer(other);
           }
         });
+        map.fire('baselayerchange', {layer: layer});
       });
 
       map.on('layeradd layerremove', function() {
         item.toggleClass('active', map.hasLayer(layer));
+        input.prop('checked', map.hasLayer(layer));
       });
     });
 
+    if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
+      var overlaySection = $('<div>')
+        .attr('class', 'section overlay-layers')
+        .appendTo($ui);
+
+      $('<p>')
+        .text(I18n.t('javascripts.map.layers.overlays'))
+        .appendTo(overlaySection);
+
+      var list = $('<ul>')
+        .appendTo(overlaySection);
+
+      function addOverlay(layer, name) {
+        var item = $('<li>')
+          .appendTo(list);
+
+        var label = $('<label>')
+          .appendTo(item);
+
+        var input = $('<input>')
+          .attr('type', 'checkbox')
+          .prop('checked', map.hasLayer(layer))
+          .appendTo(label);
+
+        label.append(name);
+
+        input.on('change', function() {
+          if (input.is(':checked')) {
+            map.addLayer(layer);
+          } else {
+            map.removeLayer(layer);
+          }
+        });
+
+        map.on('layeradd layerremove', function() {
+          input.prop('checked', map.hasLayer(layer));
+        });
+      }
+
+      addOverlay(map.noteLayer, I18n.t('javascripts.map.layers.notes'));
+      addOverlay(map.dataLayer, I18n.t('javascripts.map.layers.data'));
+    }
+
     options.sidebar.addPane($ui);
 
     function toggle(e) {
       e.stopPropagation();
       e.preventDefault();
-      options.sidebar.togglePane($ui);
+      options.sidebar.togglePane($ui, button);
     }
 
     return $container[0];