Start refactoring notes layer

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index a9c76d17f9dec28c353231cd8faf8df5bb2f96a4..2ea37878784efde0dd05ac4645c9ebb35fa46c1c 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -7,6 +7,7 @@
 //= require leaflet.osm
 //= require leaflet.locationfilter
 //= require leaflet.locate
+//= require leaflet.note
 //= require i18n/translations
 //= require oauth
 //= require osm

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 8d3a043d6f8e00a47d9281b7166a4bec5f2b9cb7..9f5c9d1ac41b3846e3131defee33a96179faae74 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -30,6 +30,10 @@ $(document).ready(function () {
       }
   }).addTo(map);
 
+  L.control.note({
+      position: 'topright'
+  }).addTo(map);
+
   L.control.locate({
       position: 'topright'
   }).addTo(map);

diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb
index e540826ecb77de37b24151fa91ba17de71d8915c..54e0d5df7d2e700715dbfd27d42a835c1fb64365 100644 (file)
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -2,7 +2,10 @@
 //= require templates/notes/new
 
 $(document).ready(function () {
-  var params = OSM.mapParams();
+  var params = OSM.mapParams(),
+      noteLayer = new L.LayerGroup(),
+      notes = {},
+      newNote;
 
   var noteIcons = {
     "new": L.icon({
@@ -22,52 +25,40 @@ $(document).ready(function () {
     })
   };
 
-  var noteLayer = new L.LayerGroup();
-  var notes = {};
-  var newNote;
-
   layers.push({
     layer: noteLayer,
     layerCode: "N"
   });
 
+  map.noteLayer = noteLayer;
+
   map.on("layeradd", function (e) {
     if (e.layer == noteLayer) {
       loadNotes();
       map.on("moveend", loadNotes);
     }
-  });
-
-  map.on("layerremove", function (e) {
+  }).on("layerremove", function (e) {
     if (e.layer == noteLayer) {
       map.off("moveend", loadNotes);
       noteLayer.clearLayers();
       notes = {};
     }
-  });
-
-  // Don't focus the text area on touch devices to avoid flashing the keyboard
-  if (!('ontouchstart' in document.documentElement)) {
-    map.on("popupopen", function (e) {
-      $(e.popup._container).find(".comment").focus();
-    });
-  }
-
-  map.on("popupclose", function (e) {
+  }).on("popupclose", function (e) {
     if (newNote && e.popup == newNote._popup) {
       $(newNote).oneTime(10, "removenote", function () {
         map.removeLayer(newNote);
         newNote = null;
       });
     }
+  }).on("popupopen", function (e) {
+    if (!('ontouchstart' in document.documentElement)) {
+      $(e.popup._container).find(".comment").focus();
+    }
   });
 
   if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
-//    map.layersControl.addOverlay(noteLayer, I18n.t("browse.start_rjs.notes_layer_name"));
-
     if (params.layers) setMapLayers(params.layers);
     if (params.notes) map.addLayer(noteLayer);
-
     if (params.note) {
       $.ajax({
         url: "/api/" + OSM.API_VERSION + "/notes/" + params.note + ".json",
@@ -84,16 +75,13 @@ $(document).ready(function () {
   }
 
   function updateMarker(marker, feature) {
-    if (marker)
-    {
+    if (marker) {
       marker.setIcon(noteIcons[feature.properties.status]);
       marker.setPopupContent(createPopupContent(
-        marker, feature.properties, 
+        marker, feature.properties,
         $(marker._popup._content).find("textarea").val()
       ));
-    }
-    else
-    {
+    } else {
       marker = L.marker(feature.geometry.coordinates.reverse(), {
         icon: noteIcons[feature.properties.status],
         opacity: 0.9
@@ -121,26 +109,28 @@ $(document).ready(function () {
 
       noteLoader = $.ajax({
         url: url,
-        success: function (json) {
-          var oldNotes = notes;
+        success: success
+      });
+    }
 
-          notes = {};
+    function success(json) {
+      var oldNotes = notes;
 
-          json.features.forEach(function (feature) {
-            var marker = oldNotes[feature.properties.id];
+      notes = {};
 
-            delete oldNotes[feature.properties.id];
+      json.features.forEach(updateMarkers);
 
-            notes[feature.properties.id] = updateMarker(marker, feature);
-          });
+      function updateMarkers(feature) {
+        var marker = oldNotes[feature.properties.id];
+        delete oldNotes[feature.properties.id];
+        notes[feature.properties.id] = updateMarker(marker, feature);
+      }
 
-          for (id in oldNotes) {
-            noteLayer.removeLayer(oldNotes[id]);
-          }
+      for (id in oldNotes) {
+        noteLayer.removeLayer(oldNotes[id]);
+      }
 
-          noteLoader = null;
-        }
-      });
+      noteLoader = null;
     }
   };
 
@@ -201,15 +191,17 @@ $(document).ready(function () {
         lon: location.lng,
         text: $(form.text).val()
       },
-      success: function (feature) {
-        $(marker._popup._content).find("textarea").val("");
+      success: noteCreated
+    });
 
-        notes[feature.properties.id] = updateMarker(marker, feature);
-        newNote = null;
+    function noteCreated(feature) {
+      $(marker._popup._content).find("textarea").val("");
 
-        $("#createnoteanchor").removeClass("disabled").addClass("geolink");
-      }
-    });
+      notes[feature.properties.id] = updateMarker(marker, feature);
+      newNote = null;
+
+      $("#createnoteanchor").removeClass("disabled").addClass("geolink");
+    }
   }
 
   function updateNote(marker, form, method, url) {
@@ -249,16 +241,11 @@ $(document).ready(function () {
     var mapSize = map.getSize();
     var markerPosition;
 
-    if (mapSize.y > 800)
-    {
+    if (mapSize.y > 800) {
       markerPosition = [mapSize.x / 2, mapSize.y / 2];
-    }
-    else if (mapSize.y > 400)
-    {
+    } else if (mapSize.y > 400) {
       markerPosition = [mapSize.x / 2, 400];
-    }
-    else
-    {
+    } else {
       markerPosition = [mapSize.x / 2, mapSize.y];
     }
 
@@ -268,17 +255,15 @@ $(document).ready(function () {
       draggable: true
     });
 
-    var popupContent = $(JST["templates/notes/new"]({ create_url: $(e.target).attr("href") }));
+    var popupContent = $(JST["templates/notes/new"]({
+        create_url: $(e.target).attr("href")
+    }));
 
-    popupContent.find("textarea").on("input", function (e) {
-      var form = e.target.form;
+    popupContent.find("textarea").on("input", disableWhenBlank);
 
-      if ($(e.target).val() == "") {
-        $(form.add).prop("disabled", true);
-      } else {
-        $(form.add).prop("disabled", false);
-      }
-    });
+    function disableWhenBlank(e) {
+      $(e.target.form).prop("disabled", $(e.target).val() === "");
+    }
 
     popupContent.find("input[type=submit]").on("click", function (e) {
       e.preventDefault();

diff --git a/app/assets/javascripts/leaflet.note.js b/app/assets/javascripts/leaflet.note.js
new file mode 100644 (file)
index 0000000..14a3364
--- /dev/null
+++ b/app/assets/javascripts/leaflet.note.js
@@ -0,0 +1,27 @@
+L.Control.Note = L.Control.extend({
+    options: {
+        position: 'topright',
+        title: 'Notes',
+    },
+
+    onAdd: function (map) {
+        var className = 'leaflet-control-locate',
+            classNames = className + ' leaflet-control-zoom leaflet-bar leaflet-control',
+            container = L.DomUtil.create('div', classNames);
+
+        var link = L.DomUtil.create('a', 'leaflet-bar-part leaflet-bar-part-single', container);
+        link.href = '#';
+        link.title = this.options.title;
+
+        L.DomEvent
+            .on(link, 'click', L.DomEvent.stopPropagation)
+            .on(link, 'click', L.DomEvent.preventDefault)
+            .on(link, 'dblclick', L.DomEvent.stopPropagation);
+
+        return container;
+    }
+});
+
+L.control.note = function(options) {
+    return new L.Control.Note(options);
+};

diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index 7d5eb0cc9780bd472a4869e7202532ce6a0e614f..83cc035f9428e6741b492c743c1f0aecd0479d03 100644 (file)
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -1,5 +1,3 @@
-//= require templates/map/share
-
 L.Control.Share = L.Control.extend({
     options: {
         position: 'topright',

diff --git a/app/assets/javascripts/templates/map/share.jst.ejs b/app/assets/javascripts/templates/map/share.jst.ejs
deleted file mode 100644 (file)
index b86c04e..0000000
--- a/app/assets/javascripts/templates/map/share.jst.ejs
+++ /dev/null
@@ -1,7 +0,0 @@
-<h2><%- I18n.t('javascripts.share.title') %></h2>
-
-<input type='text' id='share-coordinates' />
-
-<button id='cancel'>
-<%- I18n.t('javascripts.share.cancel') %>
-</button>