Don't reset the session when the token refers to an invalid user

[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 ac6f32fc6dbea253fc2165995a7365b2fb11708d..4b2093e3f06ce061533fc97995145d3a3561446b 100644 (file)
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -1,90 +1,159 @@
 <%= javascript_include_tag '/openlayers/OpenLayers.js' %>
 <%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 <%= javascript_include_tag 'map.js' %>
 <%= javascript_include_tag '/openlayers/OpenLayers.js' %>
 <%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 <%= javascript_include_tag 'map.js' %>

-<td 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 %>
+
+<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>
+  <%= 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 />
     <br />

-    <a id="object_larger_map" href=""></a>
-    <% end %>
+    <%= 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 %>
   <% else %>
     <%= t 'browse.map.deleted' %>
   <% end %>

-</td>
-<% if map.instance_of? Changeset or map.visible %>
+</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 %>");
 
   <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 %>
     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 %>;
+        <% bbox = map.bbox.to_unscaled %>
+        var minlon = <%= bbox.min_lon %>;
+        var minlat = <%= bbox.min_lat %>;
+        var maxlon = <%= bbox.max_lon %>;
+        var maxlat = <%= bbox.max_lat %>;

         var bbox = new OpenLayers.Bounds(minlon, minlat, maxlon, maxlat);
         var bbox = new OpenLayers.Bounds(minlon, minlat, maxlon, maxlat);

+        var centre = bbox.getCenterLonLat();

 
         setMapExtent(bbox);
         addBoxToMap(bbox);
 
 
         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, bbox);
+        });
+
+        <% if preferred_editor == "remote" %>
+          $("area_edit").observe("click", function (event) {
+            remoteEditHandler(event, bbox);
+          });
+        <% 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 %>;
       <% 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";
         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;

         }
 
         }
 

-        var osm_layer = new OpenLayers.Layer.GML("OSM", url, {
-          format: OpenLayers.Format.OSM,
-          projection: new OpenLayers.Projection("EPSG:4326")
-        });
+        addObjectToMap(url, true, function(extent) {
+          $("loading").style.display = "none";

 
 

-        osm_layer.events.register("loadend", osm_layer, function() {
-          $("loading").innerHTML = "";
+          $$("#browse_map .geolink").each(function (link) {
+            link.style.display = "inline";
+          });

 
 

-          if (this.features.length) {
-            var extent =  this.features[0].geometry.getBounds();
+          if (extent) {
+            extent.transform(map.getProjectionObject(), map.displayProjection);

 
 

-            for (var i = 1; i < this.features.length; i++) {
-              extent.extend(this.features[i].geometry.getBounds());
-            }
+            var centre = extent.getCenterLonLat();

 
 

-            if (extent) {
-              this.map.zoomToExtent(extent);
-            } else {
-              this.map.zoomToMaxExtent();
-            }
+            $("remote_area_edit").observe("click", function (event) {
+              remoteEditHandler(event, extent);
+            });
+
+            <% if preferred_editor == "remote" %>
+              $("area_edit").observe("click", function (event) {
+                remoteEditHandler(event, extent);
+              });
+            <% end %>

 
 

-            var center = getMapCenter();
-            $("area_larger_map").href = '/?lat='+center.lat+'&lon='+center.lon+'&zoom='+this.map.getZoom();
-            $("area_larger_map").innerHTML = "<%= t 'browse.map.larger.area' %>";

             <% unless map.instance_of? Changeset %>
             <% 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) %>";
+              $("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 %>
             <% 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";
           }
         });
           } else {
             $("small_map").style.display = "none";
           }
         });

-
-        map.addLayer(osm_layer);
-
-        osm_layer.loadGML();
-        osm_layer.loaded = true;

       <% end %>
       <% end %>

+
+      createMenu("area_edit", "area_edit_menu", 1000, "right");
+      createMenu("object_edit", "object_edit_menu", 1000, "right");

     }
 
     window.onload = init;
     }
 
     window.onload = init;