Move base layer UI above overlay layer UI

[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 09cf1cf60f2bd3ba4ed6aef08f2eb1734f867b23..242f762857180c71046383373f907435d64216aa 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -1,15 +1,10 @@
-L.OSM.Layers = L.Control.extend({
-  onAdd: function (map) {
-    this._map = map;
-    this._initLayout();
-    return this.$container[0];
-  },
-
-  _initLayout: function () {
-    var map = this._map,
-      layers = this.options.layers;
-
-    this.$container = $('<div>')
+L.OSM.layers = function(options) {
+  var control = L.control(options);
+
+  control.onAdd = function (map) {
+    var layers = options.layers;
+
+    var $container = $('<div>')
       .attr('class', 'control-layers');
 
     var link = $('<a>')
@@ -17,62 +12,27 @@ L.OSM.Layers = L.Control.extend({
       .attr('href', '#')
       .attr('title', 'Layers')
       .html('<span class="icon layers"></span>')
-      .appendTo(this.$container);
-
-    if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
-      this.$ui = $('<div>')
-        .attr('class', 'layers-ui')
-        .appendTo(this.options.uiPane);
-
-      $('<h2>')
-        .text(I18n.t('javascripts.map.layers.header'))
-        .appendTo(this.$ui);
-
-      var overlaySection = $('<section>')
-        .addClass('overlay-layers')
-        .appendTo(this.$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'));
-    }
+      .on('click', toggle)
+      .appendTo($container);
+
+    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>')
+          .text(I18n.t('javascripts.map.layers.header')));
 
     var baseSection = $('<section>')
       .addClass('base-layers')
-      .appendTo(this.$ui);
+      .appendTo($ui);
 
     $('<p>')
       .text(I18n.t('javascripts.map.layers.base'))
@@ -94,19 +54,30 @@ L.OSM.Layers = L.Control.extend({
 
       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();
 
-        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();
+          map.on('moveend', setView);
+        }
 
-        div.data('map', miniMap);
+        function hide() {
+          map.off('moveend', setView);
+        }
+
+        function setView() {
+          miniMap.setView(map.getCenter(), Math.max(map.getZoom() - 2, 0));
+        }
       });
 
       var label = $('<label>')
@@ -128,29 +99,59 @@ L.OSM.Layers = L.Control.extend({
       });
     });
 
-    $(link).on('click', $.proxy(this.toggleLayers, this));
-  },
+    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);
 
-  toggleLayers: function (e) {
-    e.stopPropagation();
-    e.preventDefault();
+      function addOverlay(layer, name) {
+        var item = $('<li>')
+          .appendTo(list);
 
-    var controlContainer = $('.leaflet-control-container .leaflet-top.leaflet-right');
+        var label = $('<label>')
+          .appendTo(item);
 
-    if (this.$ui.is(':visible')) {
-      $(this.options.uiPane).hide();
-      controlContainer.css({paddingRight: '0'});
-    } else {
-      $(this.options.uiPane).show();
-      controlContainer.css({paddingRight: '230px'});
+        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'));
     }
 
-    this.$ui.find('.base-layers .leaflet-container').each(function() {
-      $(this).data('map').invalidateSize();
-    });
-  }
-});
+    options.sidebar.addPane($ui);
 
-L.OSM.layers = function(options) {
-  return new L.OSM.Layers(options);
+    function toggle(e) {
+      e.stopPropagation();
+      e.preventDefault();
+      options.sidebar.togglePane($ui);
+    }
+
+    return $container[0];
+  };
+
+  return control;
 };