From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 11 Jun 2013 23:13:11 +0000 (-0700)
Subject: Layers work
X-Git-Tag: live~4850^2~36
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5e9ab5bc5edb63b7ab7719fa989a18f52e3637a2?ds=inline

Layers work
---

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index c9316ebae..fed4c1d8a 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -48,6 +48,9 @@ $(document).ready(function () {
 
   layers[0].addTo(map);
 
+  map.noteLayer = new L.LayerGroup({code: 'N'});
+  map.dataLayer = new L.OSM.DataLayer(null);
+
   $("#map").on("resized", function () {
     map.invalidateSize();
   });
diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index e98e56b27..e04a864f4 100644
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -10,20 +10,20 @@ function initializeBrowse(map) {
   var areasHidden = false;
   var locationFilter;
 
-  var dataLayer = new L.OSM.DataLayer(null, {
-    styles: {
-      way: {
-        weight: 3,
-        color: "#000000",
-        opacity: 0.4
-      },
-      area: {
-        weight: 3,
-        color: "#ff0000"
-      },
-      node: {
-        color: "#00ff00"
-      }
+  var dataLayer = map.dataLayer;
+
+  dataLayer.setStyle({
+    way: {
+      weight: 3,
+      color: "#000000",
+      opacity: 0.4
+    },
+    area: {
+      weight: 3,
+      color: "#ff0000"
+    },
+    node: {
+      color: "#00ff00"
     }
   });
 
@@ -35,10 +35,6 @@ function initializeBrowse(map) {
     onSelect(e.layer);
   });
 
-  if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
-//    map.layersControl.addOverlay(dataLayer, I18n.t("browse.start_rjs.data_layer_name"));
-  }
-
   map.on('layeradd', function (e) {
     if (e.layer === dataLayer) {
       $.ajax({ url: "/browse/start", success: function (sidebarHtml) {
diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb
index 1646e8b6d..3a2a15393 100644
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -3,7 +3,7 @@
 
 function initializeNotes(map) {
   var params = OSM.mapParams(),
-      noteLayer = new L.LayerGroup({code: 'N'}),
+      noteLayer = map.noteLayer,
       notes = {},
       newNote;
 
@@ -25,8 +25,6 @@ function initializeNotes(map) {
     })
   };
 
-  map.noteLayer = noteLayer;
-
   map.on("layeradd", function (e) {
     if (e.layer == noteLayer) {
       loadNotes();
diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index 15f114a5c..09cf1cf60 100644
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -1,72 +1,132 @@
-//= require templates/map/layers
-
 L.OSM.Layers = L.Control.extend({
   onAdd: function (map) {
     this._map = map;
-    this._initLayout(map);
-    return this._container;
+    this._initLayout();
+    return this.$container[0];
   },
 
   _initLayout: function () {
-    var className = 'leaflet-control-map-ui',
-      container = this._container = L.DomUtil.create('div', className);
+    var map = this._map,
+      layers = this.options.layers;
+
+    this.$container = $('<div>')
+      .attr('class', 'control-layers');
+
+    var link = $('<a>')
+      .attr('class', 'control-button')
+      .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 link = L.DomUtil.create('a', 'control-button', container);
-    link.innerHTML = "<span class='icon layers'></span>";
-    link.href = '#';
-    link.title = 'Layers';
+      var list = $('<ul>')
+        .appendTo(overlaySection);
 
-    this._ui = $(L.DomUtil.create('div', 'layers-ui', this.options.uiPane))
-      .html(JST["templates/map/layers"]());
+      function addOverlay(layer, name) {
+        var item = $('<li>')
+          .appendTo(list);
 
-    var list = this._ui.find('.base-layers ul');
+        var label = $('<label>')
+          .appendTo(item);
 
-    this.options.layers.forEach(function(layer) {
-      var item = $('<li></li>')
+        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(this.$ui);
+
+    $('<p>')
+      .text(I18n.t('javascripts.map.layers.base'))
+      .appendTo(baseSection);
+
+    list = $('<ul>')
+      .appendTo(baseSection);
+
+    layers.forEach(function(layer) {
+      var item = $('<li>')
         .appendTo(list);
 
-      if (this._map.hasLayer(layer)) {
+      if (map.hasLayer(layer)) {
         item.addClass('active');
       }
 
-      var div = $('<div></div>')
+      var div = $('<div>')
         .appendTo(item);
 
-      this._map.whenReady(function() {
-        var map = L.map(div[0], {attributionControl: false, zoomControl: false})
-          .setView(this._map.getCenter(), Math.max(this._map.getZoom() - 2, 0))
+      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);
 
-        map.dragging.disable();
-        map.touchZoom.disable();
-        map.doubleClickZoom.disable();
-        map.scrollWheelZoom.disable();
-      }, this);
+        miniMap.dragging.disable();
+        miniMap.touchZoom.disable();
+        miniMap.doubleClickZoom.disable();
+        miniMap.scrollWheelZoom.disable();
 
-      var label = $('<label></label>')
+        map.on('moveend', function() {
+          miniMap.setView(map.getCenter(), Math.max(map.getZoom() - 2, 0));
+        });
+
+        div.data('map', miniMap);
+      });
+
+      var label = $('<label>')
         .text(layer.options.name)
         .appendTo(item);
 
       item.on('click', function() {
-        this.options.layers.forEach(function(other) {
+        layers.forEach(function(other) {
           if (other === layer) {
-            this._map.addLayer(other);
+            map.addLayer(other);
           } else {
-            this._map.removeLayer(other);
+            map.removeLayer(other);
           }
-        }, this);
-      }.bind(this));
-
-      this._map.on('layeradd', function(e) {
-        if (e.layer === layer) {
-          item.addClass('active');
-        }
-      }).on('layerremove', function(e) {
-        if (e.layer === layer) {
-          item.removeClass('active');
-        }
+        });
       });
-    }, this);
+
+      map.on('layeradd layerremove', function() {
+        item.toggleClass('active', map.hasLayer(layer));
+      });
+    });
 
     $(link).on('click', $.proxy(this.toggleLayers, this));
   },
@@ -77,13 +137,17 @@ L.OSM.Layers = L.Control.extend({
 
     var controlContainer = $('.leaflet-control-container .leaflet-top.leaflet-right');
 
-    if ($(this._ui).is(':visible')) {
+    if (this.$ui.is(':visible')) {
       $(this.options.uiPane).hide();
       controlContainer.css({paddingRight: '0'});
     } else {
       $(this.options.uiPane).show();
       controlContainer.css({paddingRight: '230px'});
     }
+
+    this.$ui.find('.base-layers .leaflet-container').each(function() {
+      $(this).data('map').invalidateSize();
+    });
   }
 });
 
diff --git a/app/assets/javascripts/templates/map/layers.jst.ejs b/app/assets/javascripts/templates/map/layers.jst.ejs
deleted file mode 100644
index 76835c15c..000000000
--- a/app/assets/javascripts/templates/map/layers.jst.ejs
+++ /dev/null
@@ -1,13 +0,0 @@
-<h2><%= I18n.t('javascripts.map.layers.header') %></h2>
-<section class='overlay-layers'>
-    <p><%= I18n.t('javascripts.map.layers.overlays') %></p>
-    <ul>
-        <li><label><input type='checkbox' id='notes-layer-checkbox'><%= I18n.t('javascripts.map.layers.notes') %></label></li>
-        <li><label><input type='checkbox' id='data-layer-checkbox'><%= I18n.t('javascripts.map.layers.data') %></label></li>
-    </ul>
-</section>
-<section class='base-layers'>
-    <p><%= I18n.t('javascripts.map.layers.base') %></p>
-    <ul>
-    </ul>
-</section>
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 915647735..6ce66b665 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -578,14 +578,16 @@ a.donate {
   }
 
   li {
+    border-radius: 4px;
+    overflow: hidden;
     margin-bottom: 10px;
   }
 
   label {
-    border-radius: 4px;
     display: block;
     padding: 5px;
     background-color: #868e85;
+    cursor: pointer;
   }
 
   li.active label {
@@ -593,12 +595,7 @@ a.donate {
   }
 
   .base-layers {
-    label {
-      border-radius: 0px 0px 4px 4px;
-    }
-
     .leaflet-container {
-      border-radius: 4px 4px 0px 0px;
       width: 100%;
       height: 50px;
       cursor: pointer;