X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d9d625f65186e846d12431cefede8999f65ca4e5..2e03861300bca1a44d50a9e9c684ffc0e2d6ad65:/app/controllers/amf_controller.rb diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index 3df6da6fa..c0b642eda 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -12,9 +12,12 @@ class AmfController < ApplicationController # # Public domain. Set your tab width to 4 to read this document. :) # editions Systeme D / Richard Fairhurst 2004-2007 - + + # to trap errors (getway_old,putway,putpoi,deleteway only): + # return(-1,"message") <-- just puts up a dialogue + # return(-2,"message") <-- also asks the user to e-mail me # to log: - # RAILS_DEFAULT_LOGGER.error("Args: #{args[0]}, #{args[1]}, #{args[2]}, #{args[3]}") + # RAILS_DEFAULT_LOGGER.error("Args: #{args[0]}, #{args[1]}, #{args[2]}, #{args[3]}") # ==================================================================== # Main AMF handler @@ -26,6 +29,7 @@ class AmfController < ApplicationController # (cf http://www.ruby-forum.com/topic/122163) req.read(2) # Skip version indicator and client ID results={} # Results of each body + renumberednodes={} # Shared across repeated putways # ------------- # Parse request @@ -53,7 +57,9 @@ class AmfController < ApplicationController when 'getway'; results[index]=putdata(index,getway(args)) when 'getway_old'; results[index]=putdata(index,getway_old(args)) when 'getway_history'; results[index]=putdata(index,getway_history(args)) - when 'putway'; results[index]=putdata(index,putway(args)) + when 'putway'; r=putway(args,renumberednodes) + renumberednodes=r[3] + results[index]=putdata(index,r) when 'deleteway'; results[index]=putdata(index,deleteway(args)) when 'putpoi'; results[index]=putdata(index,putpoi(args)) when 'getpoi'; results[index]=putdata(index,getpoi(args)) @@ -84,120 +90,16 @@ class AmfController < ApplicationController # return presets,presetmenus and presetnames arrays 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) - -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: point=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 @@ -215,7 +117,35 @@ EOF end } end - return [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) @@ -253,7 +183,7 @@ EOF points = pointlist.collect {|a| [a['id'],long2coord(a['lng'].to_f,baselong,masterscale),lat2coord(a['lat'].to_f,basey,masterscale),tag2array(a['tags'])] } # get a list of node ids and their tags - return [ways,points] + [ways,points] end # ----- whichways_deleted(left,bottom,right,top) @@ -315,7 +245,7 @@ EOF def getway_old(args) RAILS_DEFAULT_LOGGER.info(" Message: getway_old (server is #{SERVER_URL})") - return if SERVER_URL=='www.openstreetmap.org' +# 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 @@ -343,7 +273,7 @@ EOF attrlist.each {|a| attributes[a['k'].gsub(':','|')]=a['v'] } attributes['history']="Retrieved from v"+version.to_s - [objname,points,attributes,xmin,xmax,ymin,ymax,version] + [0,objname,points,attributes,xmin,xmax,ymin,ymax,version] end # ----- getway_history (way) @@ -357,11 +287,12 @@ EOF 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] @@ -372,28 +303,27 @@ EOF # returns current way ID, new way ID, hash of renumbered nodes, # xmin,xmax,ymin,ymax - # ** needs to be updated so that nodes with visible=0 (i.e. undeleted) - # no longer cause a problem - # best way to do this would be to know which version it was recovered from; - # then replace readwayquery with historic query. Line 506 would also need - # to check if visible had changed, and update if so - # (a side-effect is that merging/splitting ways will need to be forbidden - # for undeleted ways, I think) - - def putway(args) + def putway(args,renumberednodes) RAILS_DEFAULT_LOGGER.info(" putway started") usertoken,originalway,points,attributes,oldversion,baselong,basey,masterscale=args uid=getuserid(usertoken) - return if !uid + if !uid then return -1,"You are not logged in, so the way could not be saved." end + RAILS_DEFAULT_LOGGER.info(" putway authenticated happily") - db_uqn='unin'+uid.to_s+originalway.to_i.abs.to_s+Time.new.to_i.to_s # temp uniquenodes table name, typically 51 chars - db_now='@now'+uid.to_s+originalway.to_i.abs.to_s+Time.new.to_i.to_s # 'now' variable name, typically 51 chars + db_uqn='unin'+(rand*100).to_i.to_s+uid.to_s+originalway.to_i.abs.to_s+Time.new.to_i.to_s # temp uniquenodes table name, typically 51 chars + db_now='@now'+(rand*100).to_i.to_s+uid.to_s+originalway.to_i.abs.to_s+Time.new.to_i.to_s # 'now' variable name, typically 51 chars ActiveRecord::Base.connection.execute("SET #{db_now}=NOW()") originalway=originalway.to_i oldversion=oldversion.to_i RAILS_DEFAULT_LOGGER.info(" Message: putway, id=#{originalway}") + # -- Temporary check for null IDs + + points.each do |a| + if a[2]==0 or a[2].nil? then return -2,"Server error - node with id 0 found in way #{originalway}." end + end + # -- 3. read original way into memory xc={}; yc={}; tagc={}; vc={} @@ -432,7 +362,6 @@ EOF xmin=ymin= 999999 xmax=ymax=-999999 insertsql='' - renumberednodes={} nodelist=[] points.each_index do |i| @@ -493,7 +422,7 @@ EOF 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 @@ -529,7 +458,7 @@ EOF if (insertsql !='') then ActiveRecord::Base.connection.insert("INSERT INTO way_tags (id,k,v,version) VALUES #{insertsql}" ) end if (currentsql!='') then ActiveRecord::Base.connection.insert("INSERT INTO current_way_tags (id,k,v) VALUES #{currentsql}") end - [originalway,way,renumberednodes,xmin,xmax,ymin,ymax] + [0,originalway,way,renumberednodes,xmin,xmax,ymin,ymax] end # ----- putpoi (user token, id, x,y,tag array,visible,baselong,basey,masterscale) @@ -540,8 +469,9 @@ EOF def putpoi(args) usertoken,id,x,y,tags,visible,baselong,basey,masterscale=args uid=getuserid(usertoken) - return if !uid - db_now='@now'+uid.to_s+id.to_i.abs.to_s+Time.new.to_i.to_s # 'now' variable name, typically 51 chars + if !uid then return -1,"You are not logged in, so the point could not be saved." end + + db_now='@now'+(rand*100).to_i.to_s+uid.to_s+id.to_i.abs.to_s+Time.new.to_i.to_s # 'now' variable name, typically 51 chars ActiveRecord::Base.connection.execute("SET #{db_now}=NOW()") id=id.to_i @@ -549,7 +479,7 @@ EOF if visible==0 then # if deleting, check node hasn't become part of a way inway=ActiveRecord::Base.connection.select_one("SELECT cw.id FROM current_ways cw,current_way_nodes cwn WHERE cw.id=cwn.id AND cw.visible=1 AND cwn.node_id=#{id} LIMIT 1") - unless inway.nil? then return [id,id] end # should really return an error + unless inway.nil? then return -1,"The point has since become part of a way, so you cannot save it as a POI." end deleteitemrelations(id,'node',uid,db_now) end @@ -568,7 +498,7 @@ EOF newid=ActiveRecord::Base.connection.insert("INSERT INTO current_nodes (latitude,longitude,timestamp,user_id,visible,tags,tile) VALUES (#{lat},#{long},#{db_now},#{uid},#{visible},#{tagsql},#{tile})"); ActiveRecord::Base.connection.update("INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tags,tile) VALUES (#{newid},#{lat},#{long},#{db_now},#{uid},#{visible},#{tagsql},#{tile})"); end - [id,newid] + [0,id,newid] end # ----- getpoi (id,baselong,basey,masterscale) @@ -589,24 +519,24 @@ EOF # returns way ID only def deleteway(args) - usertoken,way,preserve=args + usertoken,way=args RAILS_DEFAULT_LOGGER.info(" Message: deleteway, id=#{way}") + uid=getuserid(usertoken) + if !uid then return -1,"You are not logged in, so the way could not be deleted." end - uid=getuserid(usertoken); if !uid then return end way=way.to_i - - db_uqn='unin'+uid.to_s+way.to_i.abs.to_s+Time.new.to_i.to_s # temp uniquenodes table name, typically 51 chars - db_now='@now'+uid.to_s+way.to_i.abs.to_s+Time.new.to_i.to_s # 'now' variable name, typically 51 chars + db_uqn='unin'+(rand*100).to_i.to_s+uid.to_s+way.to_i.abs.to_s+Time.new.to_i.to_s # temp uniquenodes table name, typically 51 chars + db_now='@now'+(rand*100).to_i.to_s+uid.to_s+way.to_i.abs.to_s+Time.new.to_i.to_s # 'now' variable name, typically 51 chars ActiveRecord::Base.connection.execute("SET #{db_now}=NOW()") # - delete any otherwise unused nodes createuniquenodes(way,db_uqn,[]) - unless (preserve.empty?) then - ActiveRecord::Base.connection.execute("DELETE FROM #{db_uqn} WHERE node_id IN ("+preserve.join(',')+")") - end +# unless (preserve.empty?) then +# ActiveRecord::Base.connection.execute("DELETE FROM #{db_uqn} WHERE node_id IN ("+preserve.join(',')+")") +# end sql=<<-EOF INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tile) @@ -624,7 +554,7 @@ EOF 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 @@ -633,7 +563,7 @@ EOF ActiveRecord::Base.connection.execute("DELETE FROM current_way_nodes WHERE id=#{way}") ActiveRecord::Base.connection.execute("DELETE FROM current_way_tags WHERE id=#{way}") deleteitemrelations(way,'way',uid,db_now) - way + [0,way] end @@ -680,28 +610,27 @@ def readwayquery_old(id,version,historic) 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'] @@ -790,31 +719,25 @@ end def sqlescape(a) - a.gsub(/[\000-\037]/,"").gsub("'","''").gsub(92.chr,92.chr+92.chr) + a.gsub(/[\000-\037]/,"").gsub("'","''").gsub(92.chr) {92.chr+92.chr} end def tag2array(a) tags={} - a.gsub(';;;','#%').split(';').each do |b| - b.gsub!('#%',';;;') - b.gsub!('===','#%') - k,v=b.split('=') - if k.nil? then k='' end - if v.nil? then v='' end - tags[k.gsub('#%','=').gsub(':','|')]=v.gsub('#%','=') + Tags.split(a) do |k, v| + tags[k.gsub(':','|')]=v end tags end def array2tag(a) - str='' + tags = [] a.each do |k,v| if v=='' then next end if v[0,6]=='(type ' then next end - if str!='' then str+=';' end - str+=k.gsub(';',';;;').gsub('=','===').gsub('|',':')+'='+v.gsub(';',';;;').gsub('=','===') + tags << [k.gsub('|',':'), v] end - str + return Tags.join(tags) end def getuserid(token)