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

Merge 15165:15373 from trunk.

Browse source
This commit is contained in:
Tom Hughes 2009-05-31 11:32:32 +00:00
parent e9bea64bf6
commit 3d906fe8c6
25 changed files with 191 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/controllers/amf_controller.rb
View file

@ -127,8 +127,10 @@ class AmfController < ApplicationController
results[index]=[-5,nil]
else
case message
when 'putway'; r=putway(renumberednodes,*args)
renumberednodes=r[4]
when 'putway'; orn=renumberednodes.dup
r=putway(renumberednodes,*args)
renumberednodes=r[4].dup
r[4].delete_if { |k,v| orn.has_key?(k) }
if r[2] != r[3] then renumberedways[r[2]] = r[3] end
results[index]=AMF.putdata(index,r)
when 'putrelation'; results[index]=AMF.putdata(index,putrelation(renumberednodes, renumberedways, *args))
@ -176,6 +178,7 @@ class AmfController < ApplicationController
cs = Changeset.new
cs.tags = cstags
cs.user_id = user.id
if !closecomment.empty? then cs.tags['comment']=closecomment end
# smsm1 doesn't like the next two lines and thinks they need to be abstracted to the model more/better
cs.created_at = Time.now.getutc
cs.closed_at = cs.created_at + Changeset::IDLE_TIMEOUT
@ -477,7 +480,7 @@ class AmfController < ApplicationController
rels.push([rel.id, rel.tags, rel.members, rel.version])
end
else
RelationTag.find(:all, :limit => 11, :conditions => ["match(v) against (?)", searchterm] ).each do |t|
RelationTag.find(:all, :limit => 11, :conditions => ["v like ?", "%#{searchterm}%"] ).each do |t|
if t.relation.visible then
rels.push([t.relation.id, t.relation.tags, t.relation.members, t.relation.version])
end
@ -592,9 +595,7 @@ class AmfController < ApplicationController
if pointlist.length < 2 then return -2,"Server error - way is only #{points.length} points long." end
originalway = originalway.to_i
logger.info("received #{pointlist} for #{originalway}")
pointlist.collect! {|a| a.to_i }
logger.info("converted to #{pointlist}")
way=nil # this is returned, so scope it outside the transaction
nodeversions = {}
@ -634,11 +635,9 @@ logger.info("converted to #{pointlist}")
# -- Save revised way
logger.info("renumberednodes is #{renumberednodes.inspect}")
pointlist.collect! {|a|
renumberednodes[a] ? renumberednodes[a]:a
} # renumber nodes
logger.info("saving with #{pointlist}")
new_way = Way.new
new_way.tags = attributes
new_way.nds = pointlist

4
app/controllers/browse_controller.rb
View file

@ -27,7 +27,7 @@ class BrowseController < ApplicationController
end
def way
@way = Way.find(params[:id])
@way = Way.find(params[:id], :include => [:way_tags, {:changeset => :user}, {:nodes => [:node_tags, {:ways => :way_tags}]}, :containing_relation_members])
@next = Way.find(:first, :order => "id ASC", :conditions => [ "visible = true AND id > :id", { :id => @way.id }] )
@prev = Way.find(:first, :order => "id DESC", :conditions => [ "visible = true AND id < :id", { :id => @way.id }] )
rescue ActiveRecord::RecordNotFound
@ -36,7 +36,7 @@ class BrowseController < ApplicationController
end
def way_history
@way = Way.find(params[:id])
@way = Way.find(params[:id], :include => [:way_tags, {:old_ways => {:changeset => :user}}])
rescue ActiveRecord::RecordNotFound
@type = "way"
render :action => "not_found", :status => :not_found

17
app/controllers/way_controller.rb
View file

@ -60,18 +60,19 @@ class WayController < ApplicationController
end
def full
way = Way.find(params[:id])
way = Way.find(params[:id], :include => {:nodes => :node_tags})
if way.visible
nd_ids = way.nds + [-1]
nodes = Node.find(:all, :conditions => ["visible = ? AND id IN (#{nd_ids.join(',')})", true])
# Render
changeset_cache = {}
user_display_name_cache = {}
doc = OSM::API.new.get_xml_doc
nodes.each do |node|
doc.root << node.to_xml_node()
way.nodes.each do |node|
if node.visible
doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
end
end
doc.root << way.to_xml_node()
doc.root << way.to_xml_node(nil, changeset_cache, user_display_name_cache)
render :text => doc.to_s, :content_type => "text/xml"
else

4
app/models/old_relation.rb
View file

@ -25,7 +25,7 @@ class OldRelation < ActiveRecord::Base
save!
clear_aggregation_cache
clear_association_cache
@attributes.update(OldRelation.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes'))
@attributes.update(OldRelation.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp], :order => "version desc").instance_variable_get('@attributes'))
# ok, you can touch from here on
@ -81,7 +81,7 @@ class OldRelation < ActiveRecord::Base
# has_many :relation_tags, :class_name => 'OldRelationTag', :foreign_key => 'id'
def old_members
OldRelationMember.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])
OldRelationMember.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version], :order => "sequence_id")
end
def old_tags

2
app/models/old_way.rb
View file

@ -30,7 +30,7 @@ class OldWay < ActiveRecord::Base
save!
clear_aggregation_cache
clear_association_cache
@attributes.update(OldWay.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes'))
@attributes.update(OldWay.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp], :order => "version desc").instance_variable_get('@attributes'))
# ok, you can touch from here on

47
app/models/relation.rb
View file

@ -208,7 +208,7 @@ class Relation < ActiveRecord::Base
def add_member(type,id,role)
@members = Array.new unless @members
@members += [[type,id,role]]
@members += [[type,id.to_i,role]]
end
def add_tag_keyval(k, v)
@ -385,21 +385,18 @@ class Relation < ActiveRecord::Base
# changed members in an array, as the bounding box updates for
# elements are per-element, not blanked on/off like for tags.
changed_members = Array.new
members = Hash.new
self.members.each do |m|
# should be: h[[m.id, m.type]] = m.role, but someone prefers arrays
members[[m[1], m[0]]] = m[2]
end
relation_members.each do |old_member|
key = [old_member.member_id.to_s, old_member.member_type]
if members.has_key? key
members.delete key
else
members = self.members.clone
self.relation_members.each do |old_member|
key = [old_member.member_type, old_member.member_id, old_member.member_role]
i = members.index key
if i.nil?
changed_members << key
else
members.delete_at i
end
end
# any remaining members must be new additions
changed_members += members.keys
changed_members += members
# update the members. first delete all the old members, as the new
# members may be in a different order and i don't feel like implementing
@ -433,21 +430,17 @@ class Relation < ActiveRecord::Base
changed_members.collect { |id,type| type == "relation" }.
inject(false) { |b,s| b or s }
if tags_changed or any_relations
# add all non-relation bounding boxes to the changeset
# FIXME: check for tag changes along with element deletions and
# make sure that the deleted element's bounding box is hit.
self.members.each do |type, id, role|
if type != "Relation"
update_changeset_element(type, id)
end
end
else
# add only changed members to the changeset
changed_members.each do |id, type|
if type != "Relation"
update_changeset_element(type, id)
end
update_members = if tags_changed or any_relations
# add all non-relation bounding boxes to the changeset
# FIXME: check for tag changes along with element deletions and
# make sure that the deleted element's bounding box is hit.
self.members
else
changed_members
end
update_members.each do |type, id, role|
if type != "Relation"
update_changeset_element(type, id)
end
end

5
app/views/browse/_node_details.rhtml
View file

@ -2,6 +2,11 @@
<%= render :partial => "common_details", :object => node_details %>
<tr>
<th>Coordinates:</th>
<td><div class="geo"><a href="/?lat=<%= h(node_details.lat) %>&lon=<%= h(node_details.lon) %>&zoom=18"><span class="latitude"><%= h(node_details.lat) %></span>, <span class="longitude"><%= h(node_details.lon) %></span></a></div></td>
</tr>
<% unless node_details.ways.empty? and node_details.containing_relation_members.empty? %>
<tr valign="top">
<th><%= t 'browse.node_details.part_of' %></th>

2
app/views/browse/_tag.rhtml
View file

@ -1,3 +1,3 @@
<tr>
<td><%= h(tag[0]) %> = <%= h(tag[1]) %></td>
<td><%= h(tag[0]) %> = <%= sanitize(auto_link(tag[1])) %></td>
</tr>

7
app/views/browse/_way_details.rhtml
View file

@ -7,7 +7,12 @@
<td>
<table cellpadding="0">
<% way_details.way_nodes.each do |wn| %>
<tr><td><%= link_to h(printable_name(wn.node)), :action => "node", :id => wn.node_id.to_s %></td></tr>
<tr><td>
<%= link_to h(printable_name(wn.node)), :action => "node", :id => wn.node_id.to_s %>
<% if wn.node.ways.size > 1 then %>
(also part of <%= wn.node.ways.reject { |w| w.id == way_details.id }.map { |w| link_to(h(printable_name(w)), :action => "way", :id => w.id.to_s) }.join(", ") %>)
<% end %>
</td></tr>
<% end %>
</table>
</td>

6
app/views/changeset/_changeset.rhtml
View file

@ -5,14 +5,14 @@
#<%= changeset.id %>
</td>
<td class="<%= cl %>">
<td class="<%= cl %> date">
<% if changeset.closed_at > DateTime.now %> <%= t'changeset.changeset.still_editing' %>
<% else %><%= changeset.closed_at.strftime("%d %b %Y %H:%M") %><% end %>
</td>
<%if showusername %>
<td class="<%= cl %>">
<td class="<%= cl %> user">
<% if changeset.user.data_public? %>
<%= link_to h(changeset.user.display_name), :controller => "changeset", :action => "list_user", :display_name => changeset.user.display_name %>
<% else %>
@ -29,7 +29,7 @@
<% end %>
</td>
<td class="<%= cl %>">
<td class="<%= cl %> area">
<% if changeset.min_lat.nil? %>
<%= t'changeset.changeset.no_edits' %>
<% else

2
app/views/export/start.rjs
View file

@ -327,7 +327,7 @@ page << <<EOJ
var ymax = bounds.top * Math.PI / 180;
var yzoom = Math.LOG2E * (Math.log(2000 * 2 * Math.PI) - Math.log(Math.log((Math.tan(ymax) + 1 / Math.cos(ymax)) / (Math.tan(ymin) + 1 / Math.cos(ymin)))))
return Math.floor(Math.min(xzoom, yzoom));
return Math.min(Math.floor(Math.min(xzoom, yzoom)), 17);
}
function roundScale(scale) {

2
app/views/layouts/site.rhtml
View file

@ -110,7 +110,7 @@
</div>
<div id="sotm" class="notice">
<%= t 'layouts.sotm' %>
<%= link_to image_tag("sotm.png", :alt => "State of the Map", :border => "0"), "http://www.stateofthemap.org/" %>
</div>
<%= yield :optionals %>