Add link to show a note on the map to the note browser page

[rails.git] / app / assets / javascripts / index / notes.js.erb

diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb
index c4f75848279f29e931ac37f6beb43ae0c2cc43d9..6245758bfce313a2871d52c529ff17c096ed9c78 100644 (file)
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -43,6 +43,20 @@ $(document).ready(function () {
     map.layersControl.addOverlay(noteLayer, I18n.t("browse.start_rjs.notes_layer_name"));
 
     if (params.notes) map.addLayer(noteLayer);
+
+    if (params.note) {
+      $.ajax({
+        url: "/api/" + OSM.API_VERSION + "/notes/" + params.note + ".json",
+        success: function (feature) {
+          var marker = updateMarker(notes[feature.properties.id], feature);
+
+          notes[feature.properties.id] = marker;
+
+          map.addLayer(noteLayer);
+          marker.openPopup();
+        }
+      });
+    }
   }
 
   function updateMarker(marker, feature) {
@@ -106,7 +120,13 @@ $(document).ready(function () {
   function popupOptions() {
     var mapSize = map.getSize();
 
-    return { maxHeight: mapSize.y * 2 / 3, autoPanPadding: new L.Point(60, 40) };
+    return {
+      minWidth: 320,
+      maxWidth: mapSize.y * 1 / 3,
+      maxHeight: mapSize.y * 2 / 3,
+      offset: new L.Point(0, -3),
+      autoPanPadding: new L.Point(60, 40)
+    };
   }
 
   function createPopupContent(marker, properties) {
@@ -176,9 +196,27 @@ $(document).ready(function () {
 
     if ($(e.target).hasClass("disabled")) return;
 
+    $(e.target).removeClass("geolink").addClass("disabled");
+
     map.addLayer(noteLayer);
 
-    var marker = L.marker(map.getCenter(), {
+    var mapSize = map.getSize();
+    var markerPosition;
+
+    if (mapSize.y > 800)
+    {
+      markerPosition = [mapSize.x / 2, mapSize.y / 2];
+    }
+    else if (mapSize.y > 400)
+    {
+      markerPosition = [mapSize.x / 2, 400];
+    }
+    else
+    {
+      markerPosition = [mapSize.x / 2, mapSize.y];
+    }
+
+    var marker = L.marker(map.containerPointToLatLng(markerPosition), {
       icon: noteIcons["new"],
       opacity: 0.7,
       draggable: true
@@ -195,6 +233,8 @@ $(document).ready(function () {
 
     $(".leaflet-popup-close-button").on("click.close", function (e) {
       map.removeLayer(marker);
+
+      $("#createnoteanchor").removeClass("disabled").addClass("geolink");
     });
 
     marker.on("dragend", function (e) {