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))
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
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
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
# 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,[])
+ user = User.find(uid)
- # unless (preserve.empty?) then
- # ActiveRecord::Base.connection.execute("DELETE FROM #{db_uqn} WHERE node_id IN ("+preserve.join(',')+")")
- # end
+ way = Way.find(way_id)
- 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)
+ way.delete_with_relations_and_nodes_and_history(user)
- 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)
-
- deleteuniquenoderelations(db_uqn,uid,db_now)
- ActiveRecord::Base.connection.execute("DROP TEMPORARY TABLE #{db_uqn}")
-
- # - delete way
-
- 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:
# Get the latest version id of a way
def getlastversion(id,version) #:doc:
- old_way = OldWay.find(:first, :conditions => ['id = ?' , id], :order => 'version DESC')
+ old_way = OldWay.find(:first, :conditions => ['visible=1 AND id=?' , id], :order => 'version DESC')
old_way.version
end
# 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:
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)
projects / rails.git / blobdiff