-<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
-<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
+<%= javascript_include_tag 'openlayers.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(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 %>
<br />
- <a id="object_larger_map" href=""></a>
- <% end %>
+ <%= 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(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' %>
<% 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 %>");
+ 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").load(function () { loaded = true; });
+
+ if (select) {
+ $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select);
+ } else {
+ $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom);
+ }
+
+ setTimeout(function () {
+ if (!loaded) alert("<%=j t('site.index.remote_failed') %>");
+ }, 1000);
+
+ return false;
+ }
+
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 %>;
+ <% if map.instance_of? Changeset -%>
+ <% 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 centre = bbox.getCenterLonLat();
- setMapExtent(bbox);
+ map.zoomToExtent(proj(bbox));
addBoxToMap(bbox);
- $("loading").innerHTML = "";
+ $("#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 -%>
- $("area_larger_map").href = '/?minlon='+minlon+'&minlat='+minlat+'&maxlon='+maxlon+'&maxlat='+maxlat+'&box=yes';
- $("area_larger_map").innerHTML = "<%= t 'browse.map.larger.area' %>";
- <% else %>
+ 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 url = "/api/<%= "#{API_VERSION}" %>/<%= map.class.name.downcase %>/<%= 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;
}
- var osm_layer = new OpenLayers.Layer.GML("OSM", url, {
- format: OpenLayers.Format.OSM,
- projection: new OpenLayers.Projection("EPSG:4326")
- });
+ $("#object_larger_map").hide();
+ $("#object_edit").hide();
+
+ addObjectToMap(url, true, function(extent) {
+ $("#loading").hide();
+ $("#browse_map .geolink").show();
+
+ if (extent) {
+ extent.transform(map.getProjectionObject(), map.displayProjection);
- osm_layer.events.register("loadend", osm_layer, function() {
- $("loading").innerHTML = "";
-
- if (this.features.length) {
- var extent = this.features[0].geometry.getBounds();
-
- for (var i = 1; i < this.features.length; i++) {
- extent.extend(this.features[i].geometry.getBounds());
- }
-
- if (extent) {
- this.map.zoomToExtent(extent);
- } else {
- this.map.zoomToMaxExtent();
- }
-
- 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 %>
- $("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 %>
+ var centre = extent.getCenterLonLat();
+
+ $("#remote_area_edit").click(function (event) {
+ return remoteEditHandler(event, extent);
+ });
+
+ <% if preferred_editor == "remote" -%>
+ $("#area_edit").click(function (event) {
+ return remoteEditHandler(event, extent);
+ });
+ <% end -%>
+
+ $("#remote_object_edit").click(function (event) {
+ return remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
+ });
+
+ <% if preferred_editor == "remote" -%>
+ $("#object_edit").click(function (event) {
+ return remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
+ });
+ <% 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 {
- $("small_map").style.display = "none";
+ $("#small_map").hide();
}
});
+ <% end -%>
- map.addLayer(osm_layer);
-
- osm_layer.loadGML();
- osm_layer.loaded = true;
- <% end %>
+ createMenu("area_edit", "area_edit_menu", "right");
+ createMenu("object_edit", "object_edit_menu", "right");
}
window.onload = init;