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

0.6c: bunch of minor improvements and bugfixes

Browse source
This commit is contained in:
Richard Fairhurst 2008-01-17 22:28:21 +00:00
parent 459e16861a
commit 3eecc3ee5b
3 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

47
app/controllers/amf_controller.rb
View file

@ -11,7 +11,7 @@ class AmfController < ApplicationController
# encoded in the Actionscript Message Format (AMF). # encoded in the Actionscript Message Format (AMF).
# #
# Public domain. Set your tab width to 4 to read this document. :) # Public domain. Set your tab width to 4 to read this document. :)
# editions Systeme D / Richard Fairhurst 2004-2007 # editions Systeme D / Richard Fairhurst 2004-2008
# to trap errors (getway_old,putway,putpoi,deleteway only): # to trap errors (getway_old,putway,putpoi,deleteway only):
# return(-1,"message") <-- just puts up a dialogue # return(-1,"message") <-- just puts up a dialogue
@ -225,7 +225,7 @@ class AmfController < ApplicationController
RAILS_DEFAULT_LOGGER.info(" Message: getway, id=#{wayid}") RAILS_DEFAULT_LOGGER.info(" Message: getway, id=#{wayid}")
readwayquery(wayid).each {|row| readwayquery(wayid,true).each {|row|
points<<[long2coord(row['longitude'].to_f,baselong,masterscale),lat2coord(row['latitude'].to_f,basey,masterscale),row['id'].to_i,nil,tag2array(row['tags'])] points<<[long2coord(row['longitude'].to_f,baselong,masterscale),lat2coord(row['latitude'].to_f,basey,masterscale),row['id'].to_i,nil,tag2array(row['tags'])]
xmin = [xmin,row['longitude'].to_f].min xmin = [xmin,row['longitude'].to_f].min
xmax = [xmax,row['longitude'].to_f].max xmax = [xmax,row['longitude'].to_f].max
@ -329,25 +329,17 @@ class AmfController < ApplicationController
xc={}; yc={}; tagc={}; vc={} xc={}; yc={}; tagc={}; vc={}
if originalway>0 if originalway>0
way=originalway way=originalway
if oldversion==0 if oldversion==0 then r=readwayquery(way,false)
readwayquery(way).each { |row| else r=readwayquery_old(way,oldversion,true) end
id=row['id'].to_i r.each { |row|
id=row['id'].to_i
if (id>0) then
xc[id]=row['longitude'].to_f xc[id]=row['longitude'].to_f
yc[id]=row['latitude' ].to_f yc[id]=row['latitude' ].to_f
tagc[id]=row['tags'] tagc[id]=row['tags']
vc[id]=1 vc[id]=row['visible'].to_i
} end
else }
readwayquery_old(way,oldversion,true).each { |row|
id=row['id'].to_i
if (id>0) then
xc[id]=row['longitude'].to_f
yc[id]=row['latitude' ].to_f
tagc[id]=row['tags']
vc[id]=row['visible'].to_i
end
}
end
ActiveRecord::Base.connection.update("UPDATE current_ways SET timestamp=#{db_now},user_id=#{uid},visible=1 WHERE id=#{way}") ActiveRecord::Base.connection.update("UPDATE current_ways SET timestamp=#{db_now},user_id=#{uid},visible=1 WHERE id=#{way}")
else else
way=ActiveRecord::Base.connection.insert("INSERT INTO current_ways (user_id,timestamp,visible) VALUES (#{uid},#{db_now},1)") way=ActiveRecord::Base.connection.insert("INSERT INTO current_ways (user_id,timestamp,visible) VALUES (#{uid},#{db_now},1)")
@ -392,7 +384,7 @@ class AmfController < ApplicationController
elsif xc.has_key?(node) elsif xc.has_key?(node)
nodelist.push(node) nodelist.push(node)
# old node from original way - update # old node from original way - update
if (xs!=xc[node] or (ys/0.0000001).round!=(yc[node]/0.0000001).round or tagstr!=tagc[node] or vc[node]==0) if ((xs/0.0000001).round!=(xc[node]/0.0000001).round or (ys/0.0000001).round!=(yc[node]/0.0000001).round or tagstr!=tagc[node] or vc[node]==0)
ActiveRecord::Base.connection.insert("INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tags,tile) VALUES (#{node},#{lat},#{long},#{db_now},#{uid},1,#{tagsql},#{tile})") ActiveRecord::Base.connection.insert("INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tags,tile) VALUES (#{node},#{lat},#{long},#{db_now},#{uid},1,#{tagsql},#{tile})")
ActiveRecord::Base.connection.update("UPDATE current_nodes SET latitude=#{lat},longitude=#{long},timestamp=#{db_now},user_id=#{uid},tags=#{tagsql},visible=1,tile=#{tile} WHERE id=#{node}") ActiveRecord::Base.connection.update("UPDATE current_nodes SET latitude=#{lat},longitude=#{long},timestamp=#{db_now},user_id=#{uid},tags=#{tagsql},visible=1,tile=#{tile} WHERE id=#{node}")
end end
@ -571,13 +563,16 @@ end
# ==================================================================== # ====================================================================
# Support functions for remote calls # Support functions for remote calls
def readwayquery(id) def readwayquery(id,insistonvisible)
ActiveRecord::Base.connection.select_all "SELECT latitude*0.0000001 AS latitude,longitude*0.0000001 AS longitude,current_nodes.id,tags "+ sql=<<-EOF
" FROM current_way_nodes,current_nodes "+ SELECT latitude*0.0000001 AS latitude,longitude*0.0000001 AS longitude,current_nodes.id,tags,visible
" WHERE current_way_nodes.id=#{id} "+ FROM current_way_nodes,current_nodes
" AND current_way_nodes.node_id=current_nodes.id "+ WHERE current_way_nodes.id=#{id}
" AND current_nodes.visible=1 "+ AND current_way_nodes.node_id=current_nodes.id
" ORDER BY sequence_id" EOF
if insistonvisible then sql+=" AND current_nodes.visible=1 " end
sql+=" ORDER BY sequence_id"
ActiveRecord::Base.connection.select_all(sql)
end end
def getlastversion(id,version) def getlastversion(id,version)

7
app/views/site/edit.rhtml
View file

@ -47,6 +47,13 @@
<script type="text/javascript"> <script type="text/javascript">
var brokenContentSize = $("content").offsetWidth == 0; var brokenContentSize = $("content").offsetWidth == 0;
var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "700", "600", "6", "#FFFFFF"); var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "700", "600", "6", "#FFFFFF");
var changesaved = true;
window.onbeforeunload=function() {
if (!changesaved) {
return "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point.)";
}
}
function doSWF(lat,lon,sc) { function doSWF(lat,lon,sc) {
if (sc < 11) sc = 11; if (sc < 11) sc = 11;

BIN
public/potlatch/potlatch.swf
View file

Binary file not shown.