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

Don't show coordinates for deleted nodes

Browse source
This commit is contained in:
Andy Allan 2012-07-11 14:07:50 +01:00 • committed by Tom Hughes
parent bda393e7e2
commit 2c67c079ac
7 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/browse/_node_details.html.erb
View file

@ -5,10 +5,12 @@
<%= render :partial => "common_details", :object => node_details %>
<% if node_details.visible -%>
<tr>
<th><%= t 'browse.node_details.coordinates' %></th>
<td><div class="geo"><%= link_to(content_tag(:span, number_with_delimiter(node_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(node_details.lon), :class => "longitude"), {:controller => 'site', :action => 'index', :lat => h(node_details.lat), :lon => h(node_details.lon), :zoom => "18"}) %></div></td>
</tr>
<% end -%>
<% unless node_details.ways.empty? and node_details.containing_relation_members.empty? %>
<tr valign="top">

11
app/views/browse/node.html.erb
View file

@ -7,10 +7,13 @@
<% end %>
<%= render :partial => "navigation" %>
<h2><%= t'browse.node.node_title', :node_name => @name %></h2>
<% if @node.visible -%>
<%= render :partial => "map", :object => @node %>
<% end -%>
<%= render :partial => "node_details", :object => @node %>
<hr />
<%= raw t'browse.node.download', :download_xml_link => link_to(t('browse.node.download_xml'), :controller => "old_node", :action => "version", :version => @node.version),
:view_history_link => link_to(t('browse.node.view_history'), :action => "node_history"),
:edit_link => link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id)
%>
<%= link_to(t('browse.node.download_xml'), :controller => "old_node", :action => "version", :version => @node.version) %>
| <%= link_to(t('browse.node.view_history'), :action => "node_history") %>
<% if @node.visible -%>
| <%= link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id) %>
<% end -%>

2
app/views/browse/node_history.html.erb
View file

@ -3,7 +3,9 @@
@title = t('browse.node_history.node_history') + ' | ' + @name
%>
<h2><%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %></h2>
<% if @node.visible -%>
<%= render :partial => "map", :object => @node %>
<% end -%>
<% @node.old_nodes.reverse.each do |node| %>
<%= render :partial => "node_details", :object => node %>
<hr />