Fix merge conflict

[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 8653a0921a3ade64badecb96ff244f723e3cd48c..ba1461b205f00125e32084c7b0485e9b3a8e683b 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>')
-      .attr('class', 'control-button')
+    var button = $('<a>')
+      .attr('class', 'control-button mobile-hide')

       .attr('href', '#')
       .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);


@@ -18,26 +18,22 @@ L.OSM.layers = function(options) {
     var $ui = $('<div>')
       .attr('class', 'layers-ui');
 
     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(
+        $('<span>')
+          .text(I18n.t('javascripts.close'))
+          .attr('class', 'icon close')
+          .bind('click', toggle))
+      .append(
+        $('<h4>')

           .text(I18n.t('javascripts.map.layers.header')));
 
           .text(I18n.t('javascripts.map.layers.header')));
 

-    var baseSection = $('<section>')
-      .addClass('base-layers')
+    var baseSection = $('<div>')
+      .attr('class', 'section base-layers')

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

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

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


@@ -67,23 +63,33 @@ 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);

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


@@ -97,16 +103,18 @@ L.OSM.layers = function(options) {
 
       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));

       });
     });
 
     if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
       });
     });
 
     if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {

-      var overlaySection = $('<section>')
-        .addClass('overlay-layers')
+      var overlaySection = $('<div>')
+        .attr('class', 'section overlay-layers')

         .appendTo($ui);
 
       $('<p>')
         .text(I18n.t('javascripts.map.layers.overlays'))
         .appendTo($ui);
 
       $('<p>')
         .text(I18n.t('javascripts.map.layers.overlays'))

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

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


@@ -148,7 +156,7 @@ 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);

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