Potlatch 0.10d

This commit is contained in:
Richard Fairhurst 2008-10-05 00:21:35 +00:00
parent 98ed7a815c
commit 97726826e1
4 changed files with 325 additions and 221 deletions

View file

@ -159,7 +159,9 @@ class AmfController < ApplicationController
# way includes a node more than once
way = Way.find(wayid)
points = way.nodes.collect do |node|
[node.lon, node.lat, node.id, nil, node.tags_as_hash]
nodetags=node.tags_as_hash
nodetags.delete('created_by')
[node.lon, node.lat, node.id, nodetags]
end
tags = way.tags
end
@ -352,8 +354,10 @@ class AmfController < ApplicationController
savenode = true
else
node = Node.find(id)
nodetags=node.tags_as_hash
nodetags.delete('created_by')
if !fpcomp(lat, node.lat) or !fpcomp(lon, node.lon) or
Tags.join(n[4]) != node.tags or !node.visible?
n[4] != nodetags or !node.visible?
savenode = true
end
end
@ -582,7 +586,9 @@ class AmfController < ApplicationController
ORDER BY sequence_id
EOF
ActiveRecord::Base.connection.select_all(sql).each do |row|
points << [row['lon'].to_f,row['lat'].to_f,row['id'].to_i,nil,tagstring_to_hash(row['tags'])]
nodetags=tagstring_to_hash(row['tags'])
nodetags.delete('created_by')
points << [row['lon'].to_f,row['lat'].to_f,row['id'].to_i,nodetags]
end
points
end

View file

@ -48,7 +48,7 @@
<%= javascript_include_tag 'swfobject.js' %>
<script type="text/javascript" defer="defer">
var brokenContentSize = $("content").offsetWidth == 0;
var fo = new SWFObject("<%= compute_public_path("potlatch.swf", "potlatch") %>", "potlatch", "100%", "100%", "6", "#FFFFFF");
var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "6", "#FFFFFF");
// 700,600 for fixed size, 100%,100% for resizable
var changesaved=true;
var winie=false; if (document.all && window.print) { winie=true; }

File diff suppressed because it is too large Load diff

Binary file not shown.