# 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
private
+
# ====================================================================
# Remote calls
# ----- getpresets
- # return presets,presetmenus and presetnames arrays
+ # in: none
+ # does: reads tag preset menus, colours, and autocomplete config files
+ # out: [0] presets, [1] presetmenus, [2] presetnames,
+ # [3] colours, [4] casing, [5] areas, [6] autotags (all hashes)
def getpresets
+ RAILS_DEFAULT_LOGGER.info(" Message: getpresets")
+
+ # Read preset menus
presets={}
presetmenus={}; presetmenus['point']=[]; presetmenus['way']=[]; presetmenus['POI']=[]
presetnames={}; presetnames['point']={}; presetnames['way']={}; presetnames['POI']={}
presettype=''
presetcategory=''
-
- RAILS_DEFAULT_LOGGER.info(" Message: getpresets")
-
- # File.open("config/potlatch/presets.txt") do |file|
-
- # Temporary patch to get around filepath problem
- # To remove this patch and make the code nice again:
- # 1. uncomment above line
- # 2. fix the path in the above line
- # 3. delete this here document, and the following line (StringIO....)
-
- txt=<<-EOF
-way/road
-motorway: highway=motorway,ref=(type road number)
-trunk road: highway=trunk,ref=(type road number),name=(type road name)
-primary road: highway=primary,ref=(type road number),name=(type road name)
-secondary road: highway=secondary,ref=(type road number),name=(type road name)
-tertiary road: highway=tertiary,ref=,name=(type road name)
-residential road: highway=residential,ref=,name=(type road name)
-unclassified road: highway=unclassified,ref=,name=(type road name)
-
-way/footway
-footpath: highway=footway,foot=yes
-bridleway: highway=bridleway,foot=yes
-byway: highway=unsurfaced,foot=yes
-permissive path: highway=footway,foot=permissive
-
-way/cycleway
-cycle lane: highway=cycleway,cycleway=lane,ncn_ref=
-cycle track: highway=cycleway,cycleway=track,ncn_ref=
-cycle lane (NCN): highway=cycleway,cycleway=lane,name=(type name here),ncn_ref=(type route number)
-cycle track (NCN): highway=cycleway,cycleway=track,name=(type name here),ncn_ref=(type route number)
-
-way/waterway
-canal: waterway=canal,name=(type name here)
-navigable river: waterway=river,boat=yes,name=(type name here)
-navigable drain: waterway=drain,boat=yes,name=(type name here)
-derelict canal: waterway=derelict_canal,name=(type name here)
-unnavigable river: waterway=river,boat=no,name=(type name here)
-unnavigable drain: waterway=drain,boat=no,name=(type name here)
-stream: waterway=stream,boat=no,name=(type name here)
-
-way/railway
-railway: railway=rail
-tramway: railway=tram
-light railway: railway=light_rail
-preserved railway: railway=preserved
-disused railway tracks: railway=disused
-course of old railway: railway=abandoned
-
-way/natural
-lake: natural=water,landuse=
-forest: landuse=forest,natural=
-
-point/road
-mini roundabout: highway=mini_roundabout
-traffic lights: highway=traffic_signals
-
-point/footway
-bridge: highway=bridge
-gate: highway=gate
-stile: highway=stile
-cattle grid: highway=cattle_grid
-
-point/cycleway
-gate: highway=gate
-
-point/waterway
-lock gate: waterway=lock_gate
-weir: waterway=weir
-aqueduct: waterway=aqueduct
-winding hole: waterway=turning_point
-mooring: waterway=mooring
-
-point/railway
-station: railway=station
-viaduct: railway=viaduct
-level crossing: railway=crossing
-
-point/natural
-peak: natural=peak
-
-POI/road
-car park: amenity=parking
-petrol station: amenity=fuel
-
-POI/cycleway
-bike park: amenity=bicycle_parking
-
-POI/place
-city: place=city,name=(type name here),is_in=(type region or county)
-town: place=town,name=(type name here),is_in=(type region or county)
-suburb: place=suburb,name=(type name here),is_in=(type region or county)
-village: place=village,name=(type name here),is_in=(type region or county)
-hamlet: place=hamlet,name=(type name here),is_in=(type region or county)
-
-POI/tourism
-attraction: tourism=attraction,amenity=,religion=,denomination=
-church: tourism=,amenity=place_of_worship,name=(type name here),religion=christian,denomination=(type denomination here)
-hotel: tourism=hotel,amenity=,religion=,denomination=
-other religious: tourism=,amenity=place_of_worship,name=(type name here),religion=(type religion),denomination=
-post box: amenity=post_box,tourism=,name=,religion=,denomination=
-post office: amenity=post_office,tourism=,name=,religion=,denomination=
-pub: tourism=,amenity=pub,name=(type name here),religion=,denomination=
-
-POI/natural
-peak: natural=peak
-EOF
-
- StringIO.open(txt) do |file|
+# StringIO.open(txt) do |file|
+ File.open("#{RAILS_ROOT}/config/potlatch/presets.txt") do |file|
file.each_line {|line|
t=line.chomp
if (t=~/(\w+)\/(\w+)/) then
end
}
end
- [presets,presetmenus,presetnames]
+
+ # Read colours/styling
+ colours={}; casing={}; areas={}
+ File.open("#{RAILS_ROOT}/config/potlatch/colours.txt") do |file|
+ file.each_line {|line|
+ t=line.chomp
+ 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
+ if ($4!='-') then areas[tag]=$4.hex end
+ end
+ }
+ end
+
+ # 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)
+ # ----- whichways
# return array of ways in current bounding box
- # at present, instead of using correct (=more complex) SQL to find
- # corner-crossing ways, it simply enlarges the bounding box by +/- 0.01
+
+ # in: [0] xmin, [1] ymin, [2] xmax, [3] ymax (bbox in degrees)
+ # [4] baselong (longitude of SWF map origin),
+ # [5] basey (projected latitude of SWF map origin),
+ # [6] masterscale (SWF map scale)
+ # does: finds all ways and POI nodes in bounding box
+ # at present, instead of using correct (=more complex) SQL to find
+ # corner-crossing ways, it simply enlarges the bounding box
+ # out: [0] array of way ids,
+ # [1] array of POIs
+ # (where each POI is an array containing:
+ # [0] id, [1] projected long, [2] projected lat, [3] hash of tags)
def whichways(args)
xmin = args[0].to_f-0.01
[ways,points]
end
- # ----- whichways_deleted(left,bottom,right,top)
+ # ----- whichways_deleted
# return array of deleted ways in current bounding box
+
+ # in: as whichways
+ # does: finds all deleted ways with a deleted node in bounding box
+ # out: [0] array of way ids
def whichways_deleted(args)
xmin = args[0].to_f-0.01
[ways]
end
- # ----- getway (objectname, way, baselong, basey, masterscale)
- # returns objectname, array of co-ordinates, attributes,
- # xmin,xmax,ymin,ymax
+ # ----- getway
+ # in: [0] SWF object name, [1] way id, [2] baselong, [3] basey,
+ # [4] masterscale
+ # does: gets way and all nodes
+ # out: [0] SWF object name (unchanged),
+ # [1] array of points
+ # (where each point is an array containing
+ # [0] projected long, [1] projected lat, [2] node id,
+ # [3] null, [4] hash of node tags),
+ # [2] xmin, [3] xmax, [4] ymin, [5] ymax (unprojected bbox)
def getway(args)
objname,wayid,baselong,basey,masterscale=args
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
[objname,points,attributes,xmin,xmax,ymin,ymax]
end
- # ----- getway_old (objectname, way, version, baselong, basey, masterscale)
- # returns old version of way
+ # ----- getway_old
+ # returns old version of way
+
+ # in: [0] SWF object name, [1] way id,
+ # [2] way version to get (or -1 for "last deleted version")
+ # [3] baselong, [4] basey, [5] masterscale
+ # does: gets old version of way and all constituent nodes
+ # for undelete, always uses the most recent version of each node
+ # (even if it's moved)
+ # for revert, uses the historic version of each node, but if that node is
+ # still visible and has been changed since, generates a new node id
+ # out: [0] 0 (code for success), [1] SWF object name,
+ # [2] array of points (as getway _except_ [3] is node.visible?, 0 or 1),
+ # [4] xmin, [5] xmax, [6] ymin, [7] ymax (unprojected bbox),
+ # [8] way version
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
[0,objname,points,attributes,xmin,xmax,ymin,ymax,version]
end
- # ----- getway_history (way)
- # returns array of previous versions (version,timestamp,visible,user)
- # should also show 'created_by'
+ # ----- getway_history
+ # find history of a way
+
+ # in: [0] way id
+ # does: finds history of a way
+ # out: [0] array of previous versions (where each is
+ # [0] version, [1] db timestamp, [2] visible 0 or 1,
+ # [3] username or 'anonymous')
def getway_history(wayid)
history=[]
FROM ways,users
WHERE ways.id=#{wayid}
AND ways.user_id=users.id
+ AND ways.visible=1
ORDER BY version DESC
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]
end
- # ----- putway (user token, way, array of co-ordinates, array of attributes,
- # baselong, basey, masterscale)
- # returns current way ID, new way ID, hash of renumbered nodes,
- # xmin,xmax,ymin,ymax
+ # ----- putway
+ # saves a way to the database
+
+ # in: [0] user token, [1] original way id (may be negative),
+ # [2] array of points (as getway/getway_old), [3] hash of way tags,
+ # [4] original way version (0 if not a reverted/undeleted way),
+ # [5] baselong, [6] basey, [7] masterscale
+ # does: saves way to the database
+ # all constituent nodes are created/updated as necessary
+ # (or deleted if they were in the old version and are otherwise unused)
+ # out: [0] 0 (code for success), [1] original way id (unchanged),
+ # [2] new way id, [3] hash of renumbered nodes (old id=>new id),
+ # [4] xmin, [5] xmax, [6] ymin, [7] ymax (unprojected bbox)
def putway(args,renumberednodes)
RAILS_DEFAULT_LOGGER.info(" putway started")
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
ActiveRecord::Base.connection.update(sql)
deleteuniquenoderelations(db_uqn,uid,db_now)
- ActiveRecord::Base.connection.execute("DROP TABLE #{db_uqn}")
+ ActiveRecord::Base.connection.execute("DROP TEMPORARY TABLE #{db_uqn}")
# 6b. insert new version of route into way_nodes
[0,originalway,way,renumberednodes,xmin,xmax,ymin,ymax]
end
- # ----- putpoi (user token, id, x,y,tag array,visible,baselong,basey,masterscale)
- # returns current id, new id
- # if new: add new row to current_nodes and nodes
- # if old: add new row to nodes, update current_nodes
+ # ----- putpoi
+ # save POI to the database
+
+ # in: [0] user token, [1] original node id (may be negative),
+ # [2] projected longitude, [3] projected latitude, [4] hash of tags,
+ # [5] visible (0 to delete, 1 otherwise),
+ # [6] baselong, [7] basey, [8] masterscale
+ # does: saves POI node to the database
+ # refuses save if the node has since become part of a way
+ # out: [0] 0 (success), [1] original node id (unchanged), [2] new node id
def putpoi(args)
usertoken,id,x,y,tags,visible,baselong,basey,masterscale=args
[0,id,newid]
end
- # ----- getpoi (id,baselong,basey,masterscale)
- # returns id,x,y,tag array
+ # ----- getpoi
+ # read POI from database
+ # (only called on revert: POIs are usually read by whichways)
+
+ # in: [0] node id, [1] baselong, [2] basey, [3] masterscale
+ # does: reads POI
+ # out: [0] id (unchanged), [1] projected long, [2] projected lat, [3] hash of tags
def getpoi(args)
id,baselong,basey,masterscale=args; id=id.to_i
tag2array(poi['tags'])]
end
- # ----- deleteway (user token, way, nodes to keep)
- # returns way ID only
+ # ----- deleteway
+ # delete way and constituent nodes from database
+
+ # in: [0] user token, [1] way id
+ # does: deletes way from db and any constituent nodes not used elsewhere
+ # also removes ways/nodes from any relations they're in
+ # out: [0] 0 (success), [1] way id (unchanged)
def deleteway(args)
usertoken,way=args
ActiveRecord::Base.connection.update(sql)
deleteuniquenoderelations(db_uqn,uid,db_now)
- ActiveRecord::Base.connection.execute("DROP TABLE #{db_uqn}")
+ ActiveRecord::Base.connection.execute("DROP TEMPORARY TABLE #{db_uqn}")
# - delete way
# ====================================================================
# 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)
EOF
rows=ActiveRecord::Base.connection.select_all(sql)
- # if historic (full revert), get the old version of each node,
- # and use this (though with a new id) if it differs from the current one
+ # if historic (full revert), get the old version of each node
+ # - if it's in another way now, generate a new id
+ # - if it's not in another way, use the old ID
if historic then
rows.each_index do |i|
sql=<<-EOF
- SELECT latitude*0.0000001 AS latitude,longitude*0.0000001 AS longitude,tags
- FROM nodes
- WHERE id=#{rows[i]['id']}
- AND timestamp<="#{waytime}"
- ORDER BY timestamp DESC
+ SELECT latitude*0.0000001 AS latitude,longitude*0.0000001 AS longitude,tags,cwn.id AS currentway
+ FROM nodes n
+ LEFT JOIN current_way_nodes cwn
+ ON cwn.node_id=n.id
+ WHERE n.id=#{rows[i]['id']}
+ AND n.timestamp<="#{waytime}"
+ AND cwn.id!=#{id}
+ ORDER BY n.timestamp DESC
LIMIT 1
EOF
row=ActiveRecord::Base.connection.select_one(sql)
unless row.nil? then
nx=row['longitude'].to_f
ny=row['latitude'].to_f
- if (nx!=rows[i]['longitude'].to_f or ny!=rows[i]['latitude'].to_f or row['tags']!=rows[i]['tags']) then
- rows[i]['id']=-1
- # This generates a new node id if x/y/tags differ from current node.
- # Strictly speaking, it need only do this for uniquenodes, but we're
- # not generating uniquenodes for historic ways (yet!).
- end
+ if (row['currentway'] && (nx!=rows[i]['longitude'].to_f or ny!=rows[i]['latitude'].to_f or row['tags']!=rows[i]['tags'])) then rows[i]['id']=-1 end
rows[i]['longitude']=nx
rows[i]['latitude' ]=ny
rows[i]['tags' ]=row['tags']
projects / rails.git / blobdiff