X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/63e0486ca13f2fc444eec195105727f52b25b06b..d0aa199e92a110c93791bcc9eeb2c691d004e87a:/app/controllers/amf_controller.rb diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index 876dbd10e..fd0296ae5 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -58,8 +58,8 @@ class AmfController < ApplicationController when 'getway_old'; results[index]=AMF.putdata(index,getway_old(args)) when 'getway_history'; results[index]=AMF.putdata(index,getway_history(args)) when 'putway'; r=putway(args,renumberednodes) - renumberednodes=r[3] - results[index]=AMF.putdata(index,r) + renumberednodes=r[3] + results[index]=AMF.putdata(index,r) when 'deleteway'; results[index]=AMF.putdata(index,deleteway(args)) when 'putpoi'; results[index]=AMF.putdata(index,putpoi(args)) when 'getpoi'; results[index]=AMF.putdata(index,getpoi(args)) @@ -109,18 +109,14 @@ class AmfController < ApplicationController RAILS_DEFAULT_LOGGER.info(" Message: whichways, bbox=#{xmin},#{ymin},#{xmax},#{ymax}") # find the way ids in an area - nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax,:conditions => "visible = 1", :include => :way_nodes) - waynodes_in_area = nodes_in_area.collect {|node| node.way_nodes }.flatten - ways = waynodes_in_area.collect {|way_node| way_node.id[0]}.uniq + nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => "current_nodes.visible = 1", :include => :ways) + way_ids = nodes_in_area.collect { |node| node.way_ids }.flatten.uniq # find the node ids in an area that aren't part of ways - node_ids_in_area = nodes_in_area.collect {|node| node.id}.uniq - node_ids_used_in_ways = waynodes_in_area.collect {|way_node| way_node.node_id}.uniq - node_ids_not_used_in_area = node_ids_in_area - node_ids_used_in_ways - nodes_not_used_in_area = Node.find(node_ids_not_used_in_area) - points = nodes_not_used_in_area.collect {|n| [n.id, n.lon_potlatch(baselong,masterscale), n.lat_potlatch(basey,masterscale), n.tags_as_hash] } + nodes_not_used_in_area = nodes_in_area.select { |node| node.ways.empty? } + points = nodes_not_used_in_area.collect { |n| [n.id, n.lon_potlatch(baselong,masterscale), n.lat_potlatch(basey,masterscale), n.tags_as_hash] } - [ways,points] + [way_ids,points] end # ----- whichways_deleted @@ -171,13 +167,16 @@ class AmfController < ApplicationController RAILS_DEFAULT_LOGGER.info(" Message: getway, id=#{wayid}") - way = Way.find_eager(wayid) + # Ideally we would do ":include => :nodes" here but if we do that + # then rails only seems to return the first copy of a node when a + # way includes a node more than once + way = Way.find(wayid) + long_array = [] lat_array = [] points = [] - way.way_nodes.each do |way_node| - node = way_node.node # get the node record + way.nodes.each do |node| projected_longitude = node.lon_potlatch(baselong,masterscale) # do projection for potlatch projected_latitude = node.lat_potlatch(basey,masterscale) id = node.id @@ -294,11 +293,13 @@ class AmfController < ApplicationController RAILS_DEFAULT_LOGGER.info(" Message: putway, id=#{originalway}") - # -- Temporary check for null IDs + # -- Check for null IDs or short ways 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 + + if points.length<2 then return -2,"Server error - way is only #{points.length} points long." end # -- 3. read original way into memory @@ -475,21 +476,21 @@ class AmfController < ApplicationController end # ----- getpoi - # read POI from database + # 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) #:doc: - id,baselong,basey,masterscale=args; id=id.to_i - poi=ActiveRecord::Base.connection.select_one("SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lng,tags "+ - "FROM current_nodes WHERE visible=1 AND id=#{id}") - if poi.nil? then return [nil,nil,nil,''] end - [id, - long2coord(poi['lng'].to_f,baselong,masterscale), - lat2coord(poi['lat'].to_f,basey,masterscale), - tag2array(poi['tags'])] + id,baselong,basey,masterscale = args + + n = Node.find(id.to_i) + if n + return [n.id, n.long_potlatch(baselong,masterscale), n.lat_potlatch(basey,masterscale), n.tags_as_hash] + else + return [nil,nil,nil,''] + end end # ----- deleteway @@ -499,52 +500,18 @@ class AmfController < ApplicationController # also removes ways/nodes from any relations they're in # out: [0] 0 (success), [1] way id (unchanged) def deleteway(args) #:doc: - - usertoken,way=args - - RAILS_DEFAULT_LOGGER.info(" Message: deleteway, id=#{way}") + usertoken,way_id=args + RAILS_DEFAULT_LOGGER.info(" Message: deleteway, id=#{way_id}") uid=getuserid(usertoken) if !uid then return -1,"You are not logged in, so the way could not be deleted." end - way=way.to_i - 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 - - sql=<<-EOF - INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tile) - SELECT DISTINCT cn.id,cn.latitude,cn.longitude,#{db_now},#{uid},0,cn.tile - FROM current_nodes AS cn,#{db_uqn} - WHERE cn.id=node_id - EOF - ActiveRecord::Base.connection.insert(sql) - - sql=<<-EOF - UPDATE current_nodes AS cn, #{db_uqn} - SET cn.timestamp=#{db_now},cn.visible=0,cn.user_id=#{uid} - WHERE cn.id=node_id - EOF - ActiveRecord::Base.connection.update(sql) + user = User.find(uid) - deleteuniquenoderelations(db_uqn,uid,db_now) - ActiveRecord::Base.connection.execute("DROP TEMPORARY TABLE #{db_uqn}") + way = Way.find(way_id) - # - delete way + way.delete_with_relations_and_nodes_and_history(user) - ActiveRecord::Base.connection.insert("INSERT INTO ways (id,user_id,timestamp,visible) VALUES (#{way},#{uid},#{db_now},0)") - ActiveRecord::Base.connection.update("UPDATE current_ways SET user_id=#{uid},timestamp=#{db_now},visible=0 WHERE id=#{way}") - 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) - [0,way] + return [0,way_id] end def readwayquery(id,insistonvisible) #:doc: @@ -559,9 +526,10 @@ class AmfController < ApplicationController ActiveRecord::Base.connection.select_all(sql) end + # Get the latest version id of a way def getlastversion(id,version) #:doc: - row=ActiveRecord::Base.connection.select_one("SELECT version FROM ways WHERE id=#{id} AND visible=1 ORDER BY version DESC LIMIT 1") - row['version'] + old_way = OldWay.find(:first, :conditions => ['visible=1 AND id=?' , id], :order => 'version DESC') + old_way.version end def readwayquery_old(id,version,historic) #:doc: @@ -732,11 +700,11 @@ class AmfController < ApplicationController # Co-ordinate conversion def lat2coord(a,basey,masterscale) #:doc: - -(lat2y(a)-basey)*masterscale+250 + -(lat2y(a)-basey)*masterscale end def long2coord(a,baselong,masterscale) #:doc: - (a-baselong)*masterscale+350 + (a-baselong)*masterscale end def lat2y(a) #:doc: @@ -744,11 +712,11 @@ class AmfController < ApplicationController end def coord2lat(a,masterscale,basey) #:doc: - y2lat((a-250)/-masterscale+basey) + y2lat(a/-masterscale+basey) end def coord2long(a,masterscale,baselong) #:doc: - (a-350)/masterscale+baselong + a/masterscale+baselong end def y2lat(a)