Merge branch 'master' into openstreetbugs

[rails.git] / app / views / browse / _map.html.erb

diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index fda602bf0ac57e462359d69daa88aa6b4de24886..44823218bf16d7fafc1a8b5b02645cb3539dfe70 100644 (file)
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -1,22 +1,23 @@
-<%= javascript_include_tag 'openlayers.js' %>
-<%= javascript_include_tag 'map.js' %>
-
 <iframe id="linkloader" style="display: none">
 </iframe>
 
 <div id="browse_map">
-  <% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %>
+  <% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible? %>
   <div id="small_map">
   </div>
   <span id="loading"><%= t 'browse.map.loading' %></span>
+  <% if map.instance_of? Note -%>
+  <%= link_to(t("browse.map.larger.area"), { :controller => :site, :action => :index, :notes => "yes" }, { :id => "area_larger_map", :class => "geolink bbox" }) %>
+  <% else -%>
   <%= link_to(t("browse.map.larger.area"), { :controller => :site, :action => :index, :box => "yes" }, { :id => "area_larger_map", :class => "geolink bbox" }) %>
+  <% end -%>
   <br />
-  <%= link_to(t("browse.map.edit.area"), { :controller => :site, :action => :edit }, { :id => "area_edit", :class => "geolink bbox" }) %>
-  <% unless map.instance_of? Changeset %>
+  <%= link_to(h(t("browse.map.edit.area")) + content_tag(:span, "▾", :class => "menuicon"), { :controller => :site, :action => :edit }, { :id => "area_edit", :class => "geolink bbox" }) %>
+  <% unless map.instance_of? Changeset or map.instance_of? Note %>
     <br />
-    <%= link_to("", { :controller => :site, :action => :index }, { :id => "object_larger_map", :class => "geolink object" }) %>
+    <%= link_to(t("browse.map.larger." + map.class.to_s.downcase), { :controller => :site, :action => :index }, { :id => "object_larger_map", :class => "geolink object" }) %>
     <br />
-    <%= link_to("", { :controller => :site, :action => :edit }, { :id => "object_edit", :class => "geolink object" }) %>
+    <%= link_to(h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "▾", :class => "menuicon"), { :controller => :site, :action => :edit }, { :id => "object_edit", :class => "geolink object" }) %>
   <% end %>
   <% else %>
     <%= t 'browse.map.deleted' %>
@@ -39,10 +40,8 @@
   </ul>
 </div>
 
-<% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %>
+<% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible? %>
   <script type="text/javascript">
-    OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
-
     function remoteEditHandler(event, bbox, select) {
       var left = bbox.left - 0.0001;
       var top = bbox.top + 0.0001;
@@ -95,8 +94,30 @@
         });
         <% end -%>
 
-        updatelinks(centre.lon, centre.lat, 16, null, minlon, minlat, maxlon, maxlat);
-      <% else -%>
+        updatelinks(centre.lon, centre.lat, 16, null, minlon, minlat, maxlon, maxlat)
+      <% elsif map.instance_of? Note %>
+        var centre = new OpenLayers.LonLat(<%= map.lon %>, <%= map.lat %>);
+
+        setMapCenter(centre, 16);
+        addMarkerToMap(centre);
+
+        var bbox = getMapExtent();
+
+        $("#loading").hide();
+        $("#browse_map .geolink").show();
+
+        $("#remote_area_edit").click(function (event) {
+          return remoteEditHandler(event, bbox);
+        });
+
+        <% if preferred_editor == "remote" -%>
+        $("#area_edit").click(function (event) {
+          return remoteEditHandler(event, bbox);
+        });
+        <% end -%>
+
+        updatelinks(centre.lon, centre.lat, 16, null, bbox.left, bbox.bottom, bbox.right, bbox.top)
+      <% else %>
         var obj_type = "<%= map.class.name.downcase %>";
         var obj_id = <%= map.id %>;
         var obj_version = <%= map.version %>;
@@ -110,6 +131,9 @@
           url += "/" + previous_version;
         }
 
+        $("#object_larger_map").hide();
+        $("#object_edit").hide();
+
         addObjectToMap(url, true, function(extent) {
           $("#loading").hide();
           $("#browse_map .geolink").show();
@@ -129,7 +153,6 @@
             });
             <% end -%>
 
-            <% unless map.instance_of? Changeset -%>
             $("#remote_object_edit").click(function (event) {
               return remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
             });
@@ -140,9 +163,8 @@
             });
             <% end -%>
 
-            $("#object_larger_map").html("<%=j t('browse.map.larger.' + map.class.to_s.downcase) %>");
-            $("#object_edit").html("<%=j t('browse.map.edit.' + map.class.to_s.downcase) %>");
-            <% end -%>
+            $("#object_larger_map").show();
+            $("#object_edit").show();
 
             updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, "<%= map.class.to_s.downcase %>", <%= map.id %>);
           } else {
@@ -151,8 +173,8 @@
         });
       <% end -%>
 
-      createMenu("area_edit", "area_edit_menu", 1000, "right");
-      createMenu("object_edit", "object_edit_menu", 1000, "right");
+      createMenu("area_edit", "area_edit_menu", "right");
+      createMenu("object_edit", "object_edit_menu", "right");
     }
 
     window.onload = init;