From: Tom Hughes <tom@compton.nu>
Date: Tue, 19 Jul 2011 21:22:04 +0000 (+0100)
Subject: Add edit links to data browser pages
X-Git-Tag: live~6234
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f242c9de94fb197c79291c5c885bd9acfb74ab28?ds=sidebyside

Add edit links to data browser pages
---

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 65029e4ef..21ef26bac 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -48,6 +48,18 @@ class SiteController < ApplicationController
         @lat = params['mlat'].to_f
         @zoom = params['zoom'].to_i
 
+      elsif params['bbox']
+        bbox = params['bbox'].split(",")
+
+        @lon = ( bbox[0].to_f + bbox[2].to_f ) / 2.0
+        @lat = ( bbox[1].to_f + bbox[3].to_f ) / 2.0
+        @zoom = 16
+
+      elsif params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
+        @lon = ( params['maxlon'].to_f + params['minlon'].to_f ) / 2.0
+        @lat = ( params['maxlat'].to_f + params['minlat'].to_f ) / 2.0
+        @zoom = 16
+
       elsif params['gpx']
         @lon = Trace.find(params['gpx']).longitude
         @lat = Trace.find(params['gpx']).latitude
diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index 13a352820..e6409cc82 100644
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -1,24 +1,67 @@
 <%= javascript_include_tag '/openlayers/OpenLayers.js' %>
 <%= javascript_include_tag '/openlayers/OpenStreetMap.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 %>
   <div id="small_map">
   </div>
   <span id="loading"><%= t 'browse.map.loading' %></span>
-  <a id="area_larger_map" href=""></a>
+  <%= 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" }) %>
   <% unless map.instance_of? Changeset %>
     <br />
-    <a id="object_larger_map" href=""></a>
+    <%= 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" }) %>
   <% end %>
   <% else %>
     <%= t 'browse.map.deleted' %>
   <% end %>
 </div>
+
+<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>
+    <% 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>
+    <% 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 loaded = false;
+
+      $("linkloader").observe("load", function () { loaded = true; });
+
+      if (select) {
+        $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + bbox.left + "&top=" + bbox.top + "&right=" + bbox.right + "&bottom=" + bbox.bottom + "&select=" + select;
+      } else {
+        $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + bbox.left + "&top=" + bbox.top + "&right=" + bbox.right + "&bottom=" + bbox.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() ]
@@ -30,14 +73,28 @@
         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").innerHTML = "";
+        $("loading").style.display = "none";
+
+        $$("#browse_map .geolink").each(function (link) {
+          link.style.display = "inline";
+        });
 
-        $("area_larger_map").href = '/?minlon='+minlon+'&minlat='+minlat+'&maxlon='+maxlon+'&maxlat='+maxlat+'&box=yes';
-        $("area_larger_map").innerHTML = "<%= t 'browse.map.larger.area' %>";
+        $("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 %>;
@@ -53,23 +110,45 @@
         }
 
         addObjectToMap(url, true, function(extent) {
-          $("loading").innerHTML = "";
+          $("loading").style.display = "none";
+
+          $$("#browse_map .geolink").each(function (link) {
+            link.style.display = "inline";
+          });
 
           if (extent) {
             extent.transform(map.getProjectionObject(), map.displayProjection);
 
-            $("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' %>";
+            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 %>
-              $("object_larger_map").href = '/?<%= map.class.to_s.downcase %>=<%= map.id %>';
+              $("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;
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index df99b51da..9cb6d3df0 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -33,6 +33,7 @@
         historyclass = 'geolink bbox minzoom11'
         exportclass = 'geolink llz layers'
         traceclass = ''
+        diaryclass = ''
         viewclass += ' active' if params['controller'] == 'site' and params['action'] == 'index' 
         editclass += ' active' if params['controller'] == 'site' and params['action'] == 'edit' 
         historyclass += ' active' if params['controller'] == 'changeset' and params['action'] == 'list' 
@@ -53,7 +54,7 @@
       </ul>
     </div>
 
-    <div id="editmenu">
+    <div id="editmenu" 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 + 'anchor', :class => "geolink llz object"} %></li>
@@ -62,7 +63,7 @@
     </div>
 
     <script type="text/javascript">
-      createMenu("editanchor", "editmenu", 1000);
+      createMenu("editanchor", "editmenu", 1000, "left");
     </script>
 
     <div id="left">
diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index e417c2695..c4d990618 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -66,7 +66,13 @@ if params['node'] or params['way'] or params['relation']
 end
 
 # Decide on a lat lon to initialise the map with. Various ways of doing this
-if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
+if params['bbox']
+    bbox = true
+    minlon, minlat, maxlon, maxlat = h(params['bbox']).split(",")
+    layers = h(params['layers'])
+    box = true if params['box']=="yes"
+    object_zoom = false
+elsif params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
     bbox = true
     minlon = h(params['minlon'])
     minlat = h(params['minlat'])
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fbf650660..a907b9d2a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -157,6 +157,11 @@ en:
         node: "View node on larger map"
         way: "View way on larger map"
         relation: "View relation on larger map"
+      edit:
+        area: "Edit area"
+        node: "Edit node"
+        way: "Edit way"
+        relation: "Edit relation"
     node_details:
       coordinates: "Coordinates:"
       part_of: "Part of:"
diff --git a/public/javascripts/menu.js b/public/javascripts/menu.js
index 5b4c3050e..261517756 100644
--- a/public/javascripts/menu.js
+++ b/public/javascripts/menu.js
@@ -1,13 +1,21 @@
 /*
  * Open a menu.
  */
-function openMenu(anchor, menu) {
-  menu.style.display = "block";
+function openMenu(anchor, menu, align) {
+  var offset;
+
+  if (align == "left") {
+    offset = 0;
+  } else if (align == "right") {
+    offset = anchor.getWidth() - menu.getWidth();
+  }
 
   menu.clonePosition(anchor, {
     setLeft: true, setTop: true, setWidth: false, setHeight: false,
-    offsetLeft: 0, offsetTop: anchor.getHeight()
+    offsetLeft: offset, offsetTop: anchor.getHeight()
   });
+
+  menu.style.display = "block";
 }
 
 /*
@@ -21,14 +29,14 @@ function closeMenu(menu) {
 /*
  * Callback called when the mouse enters a menu anchor.
  */
-function enterMenuAnchor(event, anchor, menu, delay) {
+function enterMenuAnchor(event, anchor, menu, delay, align) {
   if (!anchor.hasClassName("disabled")) {
     clearTimeout(menu.timer);
 
     if (delay > 0) {
-      menu.timer = setTimeout(function () { openMenu(anchor, menu) }, delay);
+      menu.timer = setTimeout(function () { openMenu(anchor, menu, align) }, delay);
     } else {
-      openMenu(event, menu);
+      openMenu(event, menu, align);
     }
   }
 }
@@ -62,12 +70,12 @@ function leaveMenu(event, anchor, menu) {
 /*
  * Setup a menu, triggered by hovering over an anchor for a given time.
  */
-function createMenu(anchorid, menuid, delay) {
+function createMenu(anchorid, menuid, delay, align) {
   var anchor = $(anchorid);
   var menu = $(menuid);
 
   anchor.observe("mouseup", function (event) { closeMenu(menu) });
-  anchor.observe("mouseover", function (event) { enterMenuAnchor(anchor, anchor, menu, delay) });
+  anchor.observe("mouseover", function (event) { enterMenuAnchor(anchor, anchor, menu, delay, align) });
   anchor.observe("mouseout", function (event) { leaveMenuAnchor(event, anchor, menu) });
   menu.observe("mouseup", function (event) { closeMenu(menu) });
   menu.observe("mouseout", function (event) { leaveMenu(event, anchor, menu) });
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index c773a3218..fd4dfac6a 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -358,7 +358,7 @@ hr {
 
 /* Rules for edit menu */
 
-#editmenu {
+.menu {
   display: none;
   z-index: 10000;
   position: absolute;
@@ -366,15 +366,16 @@ hr {
   border: 1px solid black;
 }
 
-#editmenu ul {
+.menu ul {
   margin-top: 10px;
   margin-bottom: 10px;
   padding-left: 10px;
   padding-right: 10px;
 }
 
-#editmenu li {
+.menu li {
   list-style-type: none;
+  white-space: nowrap;
 }
 
 /* Rules for attribution text under the main map shown on printouts */
@@ -660,6 +661,10 @@ table.browse_details th {
   border: solid 1px black;
 }
 
+#browse_map .geolink {
+  display: none;
+}
+
 /* Rules for the trace list shown by the traces tab etc */
 
 #trace_list {