X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/849397a33616f0802294047131fbca52b844ce51..df3db35c96b55af95389271da6a5bba23224ad99:/app/controllers/amf_controller.rb diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index bffff484e..ca45de55d 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -29,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 @@ -56,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)) @@ -87,120 +90,17 @@ 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 @@ -218,7 +118,21 @@ EOF 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+)\t+([^\t]+)\t+([^\t]+)\t+([^\t]+)/) 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 + [presets,presetmenus,presetnames,colours,casing,areas] end # ----- whichways(left,bottom,right,top) @@ -318,7 +232,7 @@ EOF 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 @@ -360,6 +274,7 @@ 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) @@ -375,7 +290,7 @@ EOF # returns current way ID, new way ID, hash of renumbered nodes, # xmin,xmax,ymin,ymax - 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) @@ -434,7 +349,6 @@ EOF xmin=ymin= 999999 xmax=ymax=-999999 insertsql='' - renumberednodes={} nodelist=[] points.each_index do |i| @@ -495,7 +409,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 @@ -627,7 +541,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 @@ -683,28 +597,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'] @@ -793,31 +706,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)