# encoded in the Actionscript Message Format (AMF).
#
# 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):
# return(-1,"message") <-- just puts up a dialogue
presetnames={}; presetnames['point']={}; presetnames['way']={}; presetnames['POI']={}
presettype=''
presetcategory=''
-
# StringIO.open(txt) do |file|
File.open("#{RAILS_ROOT}/config/potlatch/presets.txt") do |file|
file.each_line {|line|
File.open("#{RAILS_ROOT}/config/potlatch/colours.txt") do |file|
file.each_line {|line|
t=line.chomp
- if (t=~/(\w+)\t+([^\t]+)\t+([^\t]+)\t+([^\t]+)/) then
+ if (t=~/(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/) then
tag=$1
if ($2!='-') then colours[tag]=$2.hex end
if ($3!='-') then casing[tag]=$3.hex end
end
}
end
- [presets,presetmenus,presetnames,colours,casing,areas]
+
+ # Read auto-complete
+ autotags={}; autotags['point']={}; autotags['way']={}; autotags['POI']={};
+ File.open("#{RAILS_ROOT}/config/potlatch/autocomplete.txt") do |file|
+ file.each_line {|line|
+ t=line.chomp
+ if (t=~/^(\w+)\/(\w+)\s+(.+)$/) then
+ tag=$1; type=$2; values=$3
+ if values=='-' then autotags[type][tag]=[]
+ else autotags[type][tag]=values.split(',').sort.reverse end
+ end
+ }
+ end
+
+ [presets,presetmenus,presetnames,colours,casing,areas,autotags]
end
# ----- whichways(left,bottom,right,top)
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'])]
xmin = [xmin,row['longitude'].to_f].min
xmax = [xmax,row['longitude'].to_f].max
def getway_old(args)
RAILS_DEFAULT_LOGGER.info(" Message: getway_old (server is #{SERVER_URL})")
- if SERVER_URL=="www.openstreetmap.org" then return -1,"Revert is not currently enabled on the OpenStreetMap server." end
+# if SERVER_URL=="www.openstreetmap.org" then return -1,"Revert is not currently enabled on the OpenStreetMap server." end
objname,wayid,version,baselong,basey,masterscale=args
wayid = wayid.to_i
EOF
histlist=ActiveRecord::Base.connection.select_all(sql)
histlist.each { |row|
- if row['data_public'] then user=row['display_name'] else user='anonymous' end
+ if row['data_public'].to_i==1 then user=row['display_name'] else user='anonymous' end
history<<[row['version'],row['timestamp'],row['visible'],user]
}
[history]
xc={}; yc={}; tagc={}; vc={}
if originalway>0
way=originalway
- if oldversion==0
- readwayquery(way).each { |row|
- id=row['id'].to_i
+ if oldversion==0 then r=readwayquery(way,false)
+ else r=readwayquery_old(way,oldversion,true) end
+ r.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]=1
- }
- 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
+ vc[id]=row['visible'].to_i
+ end
+ }
ActiveRecord::Base.connection.update("UPDATE current_ways SET timestamp=#{db_now},user_id=#{uid},visible=1 WHERE id=#{way}")
else
way=ActiveRecord::Base.connection.insert("INSERT INTO current_ways (user_id,timestamp,visible) VALUES (#{uid},#{db_now},1)")
elsif xc.has_key?(node)
nodelist.push(node)
# 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.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
# ====================================================================
# Support functions for remote calls
-def readwayquery(id)
- ActiveRecord::Base.connection.select_all "SELECT latitude*0.0000001 AS latitude,longitude*0.0000001 AS longitude,current_nodes.id,tags "+
- " FROM current_way_nodes,current_nodes "+
- " WHERE current_way_nodes.id=#{id} "+
- " AND current_way_nodes.node_id=current_nodes.id "+
- " AND current_nodes.visible=1 "+
- " ORDER BY sequence_id"
+def readwayquery(id,insistonvisible)
+ sql=<<-EOF
+ SELECT latitude*0.0000001 AS latitude,longitude*0.0000001 AS longitude,current_nodes.id,tags,visible
+ FROM current_way_nodes,current_nodes
+ WHERE current_way_nodes.id=#{id}
+ AND current_way_nodes.node_id=current_nodes.id
+ EOF
+ if insistonvisible then sql+=" AND current_nodes.visible=1 " end
+ sql+=" ORDER BY sequence_id"
+ ActiveRecord::Base.connection.select_all(sql)
end
def getlastversion(id,version)
projects / rails.git / blobdiff