cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add edit links to data browser pages

Browse source
This commit is contained in:
Tom Hughes 2011-07-19 22:22:04 +01:00
parent 936a005f9f
commit f242c9de94
7 changed files with 139 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

97
app/views/browse/_map.html.erb
View file

@ -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";
$("area_larger_map").href = '/?minlon='+minlon+'&minlat='+minlat+'&maxlon='+maxlon+'&maxlat='+maxlat+'&box=yes';
$("area_larger_map").innerHTML = "<%= t 'browse.map.larger.area' %>";
$$("#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 %>;
@ -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;

5
app/views/layouts/site.html.erb
View file

@ -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">

8
app/views/site/index.html.erb
View file

@ -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'])