Merge pull request #15 from danstowell/jsrouting-highlightsegments

[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 e5fbdf7c83a7cc19ad0d3984b7f9558e51014b39..443e47e7600d1d313b7dec25bf8063df56d79e67 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -7,10 +7,10 @@ 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);
       .html('<span class="icon layers"></span>')
       .on('click', toggle)
       .appendTo($container);


@@ -22,10 +22,9 @@ L.OSM.layers = function(options) {
       .attr('class', 'sidebar_heading')
       .appendTo($ui)
       .append(
       .attr('class', 'sidebar_heading')
       .appendTo($ui)
       .append(

-        $('<a>')
+        $('<span>')

           .text(I18n.t('javascripts.close'))
           .text(I18n.t('javascripts.close'))

-          .attr('class', 'sidebar_close')
-          .attr('href', '#')
+          .attr('class', 'icon close')

           .bind('click', toggle))
       .append(
         $('<h4>')
           .bind('click', toggle))
       .append(
         $('<h4>')


@@ -35,10 +34,6 @@ L.OSM.layers = function(options) {
       .attr('class', 'section base-layers')
       .appendTo($ui);
 
       .attr('class', 'section base-layers')
       .appendTo($ui);
 

-    $('<p>')
-      .text(I18n.t('javascripts.map.layers.base'))
-      .appendTo(baseSection);
-

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


@@ -68,16 +63,20 @@ L.OSM.layers = function(options) {
 
         function shown() {
           miniMap.invalidateSize();
 
         function shown() {
           miniMap.invalidateSize();

-          setView();
-          map.on('moveend', setView);
+          setView({animate: false});
+          map.on('moveend', moved);

         }
 
         function hide() {
         }
 
         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);

         }
       });
 
         }
       });
 


@@ -85,9 +84,9 @@ L.OSM.layers = function(options) {
         .appendTo(item);
 
       var input = $('<input>')
         .appendTo(item);
 
       var input = $('<input>')

-        .attr('type', 'radio')
-        .prop('checked', map.hasLayer(layer))
-        .appendTo(label);
+         .attr('type', 'radio')
+         .prop('checked', map.hasLayer(layer))
+         .appendTo(label);

 
       label.append(layer.options.name);
 
 
       label.append(layer.options.name);
 


@@ -115,40 +114,66 @@ L.OSM.layers = function(options) {
 
       $('<p>')
         .text(I18n.t('javascripts.map.layers.overlays'))
 
       $('<p>')
         .text(I18n.t('javascripts.map.layers.overlays'))

+        .attr("class", "deemphasize")

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

-      function addOverlay(layer, name) {
+      function addOverlay(layer, name, maxArea) {

         var item = $('<li>')
         var item = $('<li>')

+          .tooltip({
+            placement: 'top'
+          })

           .appendTo(list);
 
         var label = $('<label>')
           .appendTo(item);
 
           .appendTo(list);
 
         var label = $('<label>')
           .appendTo(item);
 

+        var checked = map.hasLayer(layer);
+

         var input = $('<input>')
           .attr('type', 'checkbox')
         var input = $('<input>')
           .attr('type', 'checkbox')

-          .prop('checked', map.hasLayer(layer))
+          .prop('checked', checked)

           .appendTo(label);
 
           .appendTo(label);
 

-        label.append(name);
+        label.append(I18n.t('javascripts.map.layers.' + name));

 
         input.on('change', function() {
 
         input.on('change', function() {

-          if (input.is(':checked')) {
+          checked = input.is(':checked');
+          if (checked) {

             map.addLayer(layer);
           } else {
             map.removeLayer(layer);
           }
             map.addLayer(layer);
           } else {
             map.removeLayer(layer);
           }

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

         });
 
         map.on('layeradd layerremove', function() {
           input.prop('checked', map.hasLayer(layer));
         });
         });
 
         map.on('layeradd layerremove', function() {
           input.prop('checked', map.hasLayer(layer));
         });

+
+        map.on('zoomend', function() {
+          var disabled = map.getBounds().getSize() >= maxArea;
+          $(input).prop('disabled', disabled);
+
+          if (disabled && $(input).is(':checked')) {
+            $(input).prop('checked', false)
+              .trigger('change');
+            checked = true;
+          } else if (!disabled && !$(input).is(':checked') && checked) {
+            $(input).prop('checked', true)
+              .trigger('change');
+          }
+
+          $(item).attr('class', disabled ? 'disabled' : '');
+          item.attr('data-original-title', disabled ?
+            I18n.t('javascripts.site.map_' + name + '_zoom_in_tooltip') : '');
+        });

       }
 
       }
 

-      addOverlay(map.noteLayer, I18n.t('javascripts.map.layers.notes'));
-      addOverlay(map.dataLayer, I18n.t('javascripts.map.layers.data'));
+      addOverlay(map.noteLayer, 'notes', OSM.MAX_NOTE_REQUEST_AREA);
+      addOverlay(map.dataLayer, 'data', OSM.MAX_REQUEST_AREA);

     }
 
     options.sidebar.addPane($ui);
     }
 
     options.sidebar.addPane($ui);


@@ -156,7 +181,8 @@ L.OSM.layers = function(options) {
     function toggle(e) {
       e.stopPropagation();
       e.preventDefault();
     function toggle(e) {
       e.stopPropagation();
       e.preventDefault();

-      options.sidebar.togglePane($ui);
+      options.sidebar.togglePane($ui, button);
+      $('.leaflet-control .control-button').tooltip('hide');

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