Merge branch 'redesign' of https://github.com/osmlab/openstreetmap-website into redesign

[rails.git] / app / assets / javascripts / leaflet.layers.js

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index bbc84701cfa7a36f405db7e6250e985c1b2d3300..d40a1b6037515f1276765fafd5b217f5c3953219 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -7,73 +7,33 @@ L.OSM.layers = function(options) {
     var $container = $('<div>')
       .attr('class', 'control-layers');
 
     var $container = $('<div>')
       .attr('class', 'control-layers');
 

-    var link = $('<a>')
+    var button = $('<a>')

       .attr('class', 'control-button')
       .attr('href', '#')
       .attr('class', 'control-button')
       .attr('href', '#')

-      .attr('title', 'Layers')
+      .attr('title', I18n.t('javascripts.map.layers.title'))

       .html('<span class="icon layers"></span>')
       .on('click', toggle)
       .appendTo($container);
 
     var $ui = $('<div>')
       .html('<span class="icon layers"></span>')
       .on('click', toggle)
       .appendTo($container);
 
     var $ui = $('<div>')

-      .attr('class', 'layers-ui')
-      .appendTo(options.uiPane);
-
-    $('<h2>')
-      .text(I18n.t('javascripts.map.layers.header'))
+      .attr('class', 'layers-ui');
+
+    $('<div>')
+      .attr('class', 'sidebar_heading')
+      .appendTo($ui)
+      .append(
+        $('<span>')
+          .text(I18n.t('javascripts.close'))
+          .attr('class', 'icon close')
+          .bind('click', toggle))
+      .append(
+        $('<h4>')
+          .text(I18n.t('javascripts.map.layers.header')));
+
+    var baseSection = $('<div>')
+      .attr('class', 'section base-layers')

       .appendTo($ui);
 
       .appendTo($ui);
 

-    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')
-      .appendTo($ui);
-
-    $('<p>')
-      .text(I18n.t('javascripts.map.layers.base'))
-      .appendTo(baseSection);
-

     list = $('<ul>')
       .appendTo(baseSection);
 
     list = $('<ul>')
       .appendTo(baseSection);
 


@@ -90,25 +50,46 @@ L.OSM.layers = function(options) {
 
       map.whenReady(function() {
         var miniMap = L.map(div[0], {attributionControl: false, zoomControl: false})
 
       map.whenReady(function() {
         var miniMap = L.map(div[0], {attributionControl: false, zoomControl: false})

-          .setView(map.getCenter(), Math.max(map.getZoom() - 2, 0))
-          .addLayer(new layer.constructor);
+          .addLayer(new layer.constructor());

 
         miniMap.dragging.disable();
         miniMap.touchZoom.disable();
         miniMap.doubleClickZoom.disable();
         miniMap.scrollWheelZoom.disable();
 
 
         miniMap.dragging.disable();
         miniMap.touchZoom.disable();
         miniMap.doubleClickZoom.disable();
         miniMap.scrollWheelZoom.disable();
 

-        map.on('moveend', function() {
-          miniMap.setView(map.getCenter(), Math.max(map.getZoom() - 2, 0));
-        });
+        $ui
+          .on('show', shown)
+          .on('hide', hide);
+
+        function shown() {
+          miniMap.invalidateSize();
+          setView({animate: false});
+          map.on('moveend', moved);
+        }
+
+        function hide() {
+          map.off('moveend', moved);
+        }

 
 

-        div.data('map', miniMap);
+        function moved() {
+          setView();
+        }
+
+        function setView(options) {
+          miniMap.setView(map.getCenter(), Math.max(map.getZoom() - 2, 0), options);
+        }

       });
 
       var label = $('<label>')
       });
 
       var label = $('<label>')

-        .text(layer.options.name)

         .appendTo(item);
 
         .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) {
       item.on('click', function() {
         layers.forEach(function(other) {
           if (other === layer) {


@@ -117,30 +98,64 @@ L.OSM.layers = function(options) {
             map.removeLayer(other);
           }
         });
             map.removeLayer(other);
           }
         });

+        map.fire('baselayerchange', {layer: layer});

       });
 
       map.on('layeradd layerremove', function() {
         item.toggleClass('active', map.hasLayer(layer));
       });
 
       map.on('layeradd layerremove', function() {
         item.toggleClass('active', map.hasLayer(layer));

+        input.prop('checked', map.hasLayer(layer));

       });
     });
 
       });
     });
 

-    function toggle(e) {
-      e.stopPropagation();
-      e.preventDefault();
+    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);

 
 

-      var controlContainer = $('.leaflet-control-container .leaflet-top.leaflet-right');
+        label.append(name);
+
+        input.on('change', function() {
+          if (input.is(':checked')) {
+            map.addLayer(layer);
+          } else {
+            map.removeLayer(layer);
+          }
+        });

 
 

-      if ($ui.is(':visible')) {
-        $(control.options.uiPane).hide();
-        controlContainer.css({paddingRight: '0'});
-      } else {
-        $(control.options.uiPane).show();
-        controlContainer.css({paddingRight: '230px'});
+        map.on('layeradd layerremove', function() {
+          input.prop('checked', map.hasLayer(layer));
+        });

       }
 
       }
 

-      $ui.find('.base-layers .leaflet-container').each(function() {
-        $(this).data('map').invalidateSize();
-      });
+      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, button);

     }
 
     return $container[0];
     }
 
     return $container[0];