From: Tom Hughes <tom@compton.nu>
Date: Sun, 3 Feb 2013 17:44:05 +0000 (+0000)
Subject: Add link to show a note on the map to the note browser page
X-Git-Tag: live~5064^2~31
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a51509c668cb09a28ed35c6cb1a76d15f9afcaa5?ds=inline

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

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index 2934b8bd9..7149b3481 100644
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -45,6 +45,8 @@ $(document).ready(function () {
     var centre = bbox.getCenter();
     updatelinks(centre.lon, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
   } else if (params.type == "note") {
+    var object = {type: params.type, id: params.id};
+
     map.setView([params.lat, params.lon], 16);
 
     L.marker([params.lat, params.lon], { icon: getUserIcon() }).addTo(map);
@@ -60,7 +62,8 @@ $(document).ready(function () {
 
     updatelinks(params.lon, params.lat, 16, null, 
                 bbox.getWestLng(), bbox.getSouthLat(),
-                bbox.getEastLng(), bbox.getNorthLat());
+                bbox.getEastLng(), bbox.getNorthLat(),
+                object);
   } else {
     $("#object_larger_map").hide();
     $("#object_edit").hide();
diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index e0428b4ac..ed3cc0faf 100644
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -22,6 +22,7 @@
      elsif map.instance_of? Note
        data = {
          :type => "note",
+         :id   => map.id,
          :lon  => map.lon,
          :lat  => map.lat
        }
@@ -60,7 +61,7 @@
   </li>
 </ul>
 
-  <% unless map.instance_of? Changeset or map.instance_of? Note %>
+  <% unless map.instance_of? Changeset %>
   <ul class='secondary-actions clearfix'>
     <li>
       <%= link_to t("browse.map.larger." + map.class.to_s.downcase),
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 00bc48097..3161dc381 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -158,11 +158,13 @@ en:
         node: "View node on larger map"
         way: "View way on larger map"
         relation: "View relation on larger map"
+        note: "View note on larger map"
       edit:
         area: "Edit area"
         node: "Edit node"
         way: "Edit way"
         relation: "Edit relation"
+        note: "Edit note"
     node_details:
       coordinates: "Coordinates:"
       part_of: "Part of:"