X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9a3ef885bb72adbde0b968ce67135b8f7b257f35..898cc828dd1f1167f85abbf35c8e3f0ed640ac1e:/app/views/browse/_map.html.erb?ds=sidebyside

diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index 5bb83b6bf..ed3cc0faf 100644
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -1,74 +1,107 @@
-<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
-<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
-<%= javascript_include_tag 'map.js' %>
-<td>
-  <div style="width: 250px; margin: auto; text-align: right"">
-    <% if map.instance_of? Changeset or map.visible %>
-      <div id="small_map" style="width:250px; height: 300px; border: solid 1px black">
-      </div>
-      <span id="loading"><%= t 'browse.map.loading' %></span>
-      <a id="area_larger_map" href=""></a>
-      <% unless map.instance_of? Changeset %>
-        <br />
-        <a id="object_larger_map" href=""></a>
-      <% end %>
-    <% else %>
-      <%= t 'browse.map.deleted' %>
-    <% end %>
-  </div>
-</td>
-<% if map.instance_of? Changeset or map.visible %>
-  <script type="text/javascript">
-    OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
-
-    function init() {
-      var map = createMap("small_map", {
-        controls: [ new OpenLayers.Control.Navigation() ]
-      });
-
-      <% if map.instance_of? Changeset %>
-        var minlon = <%= map.min_lon / GeoRecord::SCALE.to_f %>;
-        var minlat = <%= map.min_lat / GeoRecord::SCALE.to_f %>;
-        var maxlon = <%= map.max_lon / GeoRecord::SCALE.to_f %>;
-        var maxlat = <%= map.max_lat / GeoRecord::SCALE.to_f %>;
-        var bbox = new OpenLayers.Bounds(minlon, minlat, maxlon, maxlat);
+<iframe id="linkloader" style="display: none">
+</iframe>
 
-        setMapExtent(bbox);
-        addBoxToMap(bbox);
+<div id="browse_map" class='clearfix content_map'>
+  <% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible? %>
 
-        $("loading").innerHTML = "";
+  <% content_for :head do %>
+    <%= javascript_include_tag "browse" %>
+  <% end %>
 
-        $("area_larger_map").href = '/?minlon='+minlon+'&minlat='+minlat+'&maxlon='+maxlon+'&maxlat='+maxlat+'&box=yes';
-        $("area_larger_map").innerHTML = "<%= t 'browse.map.larger.area' %>";
-      <% else %>
-        var obj_type = "<%= map.class.name.downcase %>";
-        var obj_id = <%= map.id %>;
-        var url = "/api/<%= "#{API_VERSION}" %>/<%= map.class.name.downcase %>/<%= map.id %>";
+  <%
+     if map.instance_of? Changeset
+       bbox = map.bbox.to_unscaled
+       data = {
+         :type   => "changeset",
+         :id     => map.id,
+         :minlon => bbox.min_lon,
+         :minlat => bbox.min_lat,
+         :maxlon => bbox.max_lon,
+         :maxlat => bbox.max_lat
+       }
+     elsif map.instance_of? Note
+       data = {
+         :type => "note",
+         :id   => map.id,
+         :lon  => map.lon,
+         :lat  => map.lat
+       }
+     else
+       data = {
+         :type    => map.class.name.downcase,
+         :id      => map.id,
+         :version => map.version,
+         :visible => map.visible
+       }
+     end
+  %>
+  <%= content_tag "div", "", :id => "small_map", :data => data %>
+  <span id="loading"><%= t 'browse.map.loading' %></span>
 
-        if (obj_type != "node") {
-          url += "/full";
-        }
+<ul class='secondary-actions clearfix'>
+  <li>
+    <% if map.instance_of? Note -%>
+      <%= link_to t("browse.map.larger.area"),
+                  root_path(:notes => "yes"),
+                  :id => "area_larger_map",
+                  :class => "geolink bbox" %>
+    <% else -%>
+      <%= link_to t("browse.map.larger.area"),
+                  root_path(:box => "yes"),
+                  :id => "area_larger_map",
+                  :class => "geolink bbox" %>
+    <% end -%>
+  </li>
+  <li>
+    <%= link_to h(t("browse.map.edit.area")) + content_tag(:span, "▼", :class => "menuicon"),
+                edit_path,
+                :id => "area_edit",
+                :data => { :editor => preferred_editor },
+                :class => "geolink bbox" %>
+  </li>
+</ul>
 
-        addObjectToMap(url, true, function(extent) {
-          $("loading").innerHTML = "";
+  <% unless map.instance_of? Changeset %>
+  <ul class='secondary-actions clearfix'>
+    <li>
+      <%= link_to t("browse.map.larger." + map.class.to_s.downcase),
+                  root_path,
+                  :id => "object_larger_map",
+                  :class => "geolink object" %>
+    </li>
+    <li>
+      <%= link_to h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "▼", :class => "menuicon"),
+                  edit_path,
+                  :id => "object_edit",
+                  :data => { :editor => preferred_editor },
+                  :class => "geolink object" %>
+    </li>
+  </ul>
+  <% end %>
 
-          if (extent) {
-            extent.transform(map.getProjectionObject(), map.displayProjection);
+  <% else %>
+    <%= t 'browse.map.deleted' %>
+  <% end %>
+</div>
 
-            $("area_larger_map").href = '/?minlon='+extent.left+'&minlat='+extent.bottom+'&maxlon='+extent.right+'&maxlat='+extent.top;
-            $("area_larger_map").innerHTML = "<%= t 'browse.map.larger.area' %>";
-
-            <% unless map.instance_of? Changeset %>
-              $("object_larger_map").href = '/?<%= map.class.to_s.downcase %>=<%= map.id %>';
-              $("object_larger_map").innerHTML = "<%= t('browse.map.larger.' + map.class.to_s.downcase) %>";
-            <% end %>
-          } else {
-            $("small_map").style.display = "none";
-          }
-        });
-      <% end %>
-    }
+<div id="area_edit_menu" class="menu">
+  <ul>
+    <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
+      <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
+                      edit_path(:editor => editor),
+                      :data => {:editor => editor},
+                      :class => "geolink bbox" %></li>
+    <% end %>
+  </ul>
+</div>
 
-    window.onload = init;
-  </script>
-<% end %>
+<div id="object_edit_menu" class="menu">
+  <ul>
+    <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
+      <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
+                      edit_path(:editor => editor),
+                      :data => {:editor => editor},
+                      :class => "geolink object" %></li>
+    <% end %>
+  </ul>
+</div>