Fix layer map bounciness (#361)

[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 6641b0dd71f2e3ea3711aadbae52f23db84cdeb6..ed3cc0faf169b829b828caab84b00ad67a1bce1d 100644 (file)
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -1,24 +1,84 @@
-<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
-<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
-<%= javascript_include_tag 'map.js' %>
-

 <iframe id="linkloader" style="display: none">
 </iframe>
 
 <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 %>
-  <div id="small_map">
-  </div>
+<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? %>
+
+  <% content_for :head do %>
+    <%= javascript_include_tag "browse" %>
+  <% end %>
+
+  <%
+     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>
   <span id="loading"><%= t 'browse.map.loading' %></span>

-  <%= link_to(t("browse.map.larger.area"), { :controller => :site, :action => :index, :box => "yes" }, { :id => "area_larger_map", :class => "geolink bbox" }) %>
-  <br />
-  <%= link_to(t("browse.map.edit.area"), { :controller => :site, :action => :edit }, { :id => "area_edit", :class => "geolink bbox" }) %>
+
+<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>
+

   <% unless map.instance_of? Changeset %>
   <% unless map.instance_of? Changeset %>

-    <br />
-    <%= link_to("", { :controller => :site, :action => :index }, { :id => "object_larger_map", :class => "geolink object" }) %>
-    <br />
-    <%= link_to("", { :controller => :site, :action => :edit }, { :id => "object_edit", :class => "geolink object" }) %>
+  <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 %>
   <% end %>

+

   <% else %>
     <%= t 'browse.map.deleted' %>
   <% end %>
   <% else %>
     <%= t 'browse.map.deleted' %>
   <% end %>


@@ -26,135 +86,22 @@
 
 <div id="area_edit_menu" class="menu">
   <ul>
 
 <div id="area_edit_menu" class="menu">
   <ul>

-    <% Editors::ALL_EDITORS.each do |editor| %>
-      <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), { :controller => :site, :action => :edit, :editor => editor }, { :id => "#{editor}_area_edit", :class => "geolink bbox" } %></li>
+    <% 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>
 
 <div id="object_edit_menu" class="menu">
   <ul>
     <% end %>
   </ul>
 </div>
 
 <div id="object_edit_menu" class="menu">
   <ul>

-    <% Editors::ALL_EDITORS.each do |editor| %>
-      <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), { :controller => :site, :action => :edit, :editor => editor }, { :id => "#{editor}_object_edit", :class => "geolink object" } %></li>
+    <% 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>
     <% end %>
   </ul>
 </div>

-
-<% 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;
-      var right = bbox.right + 0.0001;
-      var bottom = bbox.bottom - 0.0001;
-      var loaded = false;
-
-      $("linkloader").observe("load", function () { loaded = true; });
-
-      if (select) {
-        $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select;
-      } else {
-        $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom;
-      }
-
-      setTimeout(function () {
-        if (!loaded) alert("<%= escape_javascript(t('site.index.remote_failed')) %>");
-      }, 1000);
-
-      event.stop();
-    }
-
-    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);
-        var centre = bbox.getCenterLonLat();
-
-        setMapExtent(bbox);
-        addBoxToMap(bbox);
-
-        $("loading").style.display = "none";
-
-        $$("#browse_map .geolink").each(function (link) {
-          link.style.display = "inline";
-        });
-
-        $("remote_area_edit").observe("click", function (event) {
-          remoteEditHandler(event, extent);
-        });
-
-        <% if preferred_editor == "remote" %>
-          $("area_edit").observe("click", function (event) {
-            remoteEditHandler(event, extent);
-          });
-        <% end %>
-
-        updatelinks(centre.lon, centre.lat, 16, null, minlon, minlat, maxlon, maxlat)
-      <% else %>
-        var obj_type = "<%= map.class.name.downcase %>";
-        var obj_id = <%= map.id %>;
-        var obj_version = <%= map.version %>;
-        var obj_visible = <%= map.visible %>;
-        var url = "/api/<%= "#{API_VERSION}" %>/<%= map.class.name.downcase %>/<%= map.id %>";
-
-        if (obj_type != "node") {
-          url += "/full";
-        } else if (!obj_visible) {
-          var previous_version = obj_version - 1;
-          url += "/" + previous_version;
-        }
-
-        addObjectToMap(url, true, function(extent) {
-          $("loading").style.display = "none";
-
-          $$("#browse_map .geolink").each(function (link) {
-            link.style.display = "inline";
-          });
-
-          if (extent) {
-            extent.transform(map.getProjectionObject(), map.displayProjection);
-
-            var centre = extent.getCenterLonLat();
-
-            $("remote_area_edit").observe("click", function (event) {
-              remoteEditHandler(event, extent);
-            });
-
-            <% if preferred_editor == "remote" %>
-              $("area_edit").observe("click", function (event) {
-                remoteEditHandler(event, extent);
-              });
-            <% end %>
-
-            <% unless map.instance_of? Changeset %>
-              $("remote_object_edit").observe("click", function (event) {
-                remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
-              });
-
-              $("object_larger_map").innerHTML = "<%= t('browse.map.larger.' + map.class.to_s.downcase) %>";
-              $("object_edit").innerHTML = "<%= t('browse.map.edit.' + map.class.to_s.downcase) %>";
-            <% end %>
-
-            updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, "<%= map.class.to_s.downcase %>", <%= map.id %>)
-          } else {
-            $("small_map").style.display = "none";
-          }
-        });
-      <% end %>
-
-      createMenu("area_edit", "area_edit_menu", 1000, "right");
-      createMenu("object_edit", "object_edit_menu", 1000, "right");
-    }
-
-    window.onload = init;
-  </script>
-<% end %>