X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9dbe1a497af89d3e53aad1af091d296520a74c6f..5fe7a5bbbc0cb65a2372a0430580d25fc7b58a8d:/app/controllers/amf_controller.rb?ds=sidebyside

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index ed4f87b21..5771f4e3d 100644
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -1,6 +1,7 @@
 class AmfController < ApplicationController
   require 'stringio'
 
+  session :off
   before_filter :check_availability
 
   # to log:
@@ -122,6 +123,15 @@ preserved railway: railway=preserved
 disused railway tracks: railway=disused
 course of old railway: railway=abandoned
 
+way/natural
+forest: natural=wood,landuse=forest
+woodland: natural=wood,landuse=
+reservoir: natural=water,landuse=reservoir
+lake: natural=water,landuse=
+marsh: natural=marsh
+beach: natural=beach
+coastline: natural=coastline
+
 point/road
 mini roundabout: highway=mini_roundabout
 traffic lights: highway=traffic_signals
@@ -146,6 +156,9 @@ point/railway
 station: railway=station
 viaduct: railway=viaduct
 level crossing: railway=crossing
+
+point/natural
+peak: natural=peak
 EOF
 
     StringIO.open(txt) do |file|
@@ -297,10 +310,14 @@ EOF
       # compare node
       if node<0
         # new node - create
-        newnode=ActiveRecord::Base.connection.insert("INSERT INTO current_nodes (   latitude,longitude,timestamp,user_id,visible,tags) VALUES (           #{ys},#{xs},#{db_now},#{uid},1,#{tagsql})")
-        		ActiveRecord::Base.connection.insert("INSERT INTO nodes         (id,latitude,longitude,timestamp,user_id,visible,tags) VALUES (#{newnode},#{ys},#{xs},#{db_now},#{uid},1,#{tagsql})")
-        points[i][2]=newnode
-        renumberednodes[node.to_s]=newnode.to_s
+		if renumberednodes[node.to_s].nil?
+			newnode=ActiveRecord::Base.connection.insert("INSERT INTO current_nodes (   latitude,longitude,timestamp,user_id,visible,tags) VALUES (           #{ys},#{xs},#{db_now},#{uid},1,#{tagsql})")
+					ActiveRecord::Base.connection.insert("INSERT INTO nodes         (id,latitude,longitude,timestamp,user_id,visible,tags) VALUES (#{newnode},#{ys},#{xs},#{db_now},#{uid},1,#{tagsql})")
+			points[i][2]=newnode
+			renumberednodes[node.to_s]=newnode.to_s
+		else
+			points[i][2]=renumberednodes[node.to_s].to_i
+		end
 
       elsif xc.has_key?(node)
         # old node from original way - update
@@ -674,18 +691,33 @@ end
 def createuniquenodes(uqs_name,uqn_name)
 	# Finds nodes which appear in uniquesegments but no other segments
 	sql=<<-EOF
-		CREATE TEMPORARY TABLE #{uqn_name}
-			   SELECT DISTINCT node_id
-			      FROM (SELECT cn.id AS node_id
-						  FROM current_nodes AS cn,
-						       current_segments AS cs,
-						       #{uqs_name} AS us
-						 WHERE cs.id=us.segment_id
-						   AND (cn.id=cs.node_a OR cn.id=cs.node_b)) AS n
-					 LEFT JOIN current_segments AS cs2 ON node_id=cs2.node_a AND cs2.visible=1
-					 LEFT JOIN current_segments AS cs3 ON node_id=cs3.node_b AND cs3.visible=1
-					     WHERE cs2.node_a IS NULL
-					       AND cs3.node_b IS NULL
+	CREATE TEMPORARY TABLE #{uqn_name}
+	   SELECT DISTINCT node_id
+	   FROM (SELECT cn.id AS node_id
+	         FROM current_nodes AS cn,
+  	              current_segments AS cs,
+	              #{uqs_name} AS us
+	         WHERE cs.id=us.segment_id
+	           AND cn.id=cs.node_a) AS n
+	   LEFT JOIN current_segments AS cs2 ON node_id=cs2.node_a AND cs2.visible=1
+	   LEFT JOIN current_segments AS cs3 ON node_id=cs3.node_b AND cs3.visible=1
+	   WHERE cs2.node_a IS NULL
+	     AND cs3.node_b IS NULL
+	EOF
+	ActiveRecord::Base.connection.execute(sql)
+	sql=<<-EOF
+	INSERT INTO #{uqn_name}
+	   SELECT DISTINCT node_id
+	   FROM (SELECT cn.id AS node_id
+	         FROM current_nodes AS cn,
+  	              current_segments AS cs,
+	              #{uqs_name} AS us
+	         WHERE cs.id=us.segment_id
+	           AND cn.id=cs.node_b) AS n
+	   LEFT JOIN current_segments AS cs2 ON node_id=cs2.node_a AND cs2.visible=1
+	   LEFT JOIN current_segments AS cs3 ON node_id=cs3.node_b AND cs3.visible=1
+	   WHERE cs2.node_a IS NULL
+	     AND cs3.node_b IS NULL
 	EOF
 	ActiveRecord::Base.connection.execute(sql)
 end
@@ -719,12 +751,13 @@ def array2tag(a)
 end
 
 def getuserid(token)
-  token=sqlescape(token)
-  if (token=~/^(.+)\+(.+)$/) then
-    return ActiveRecord::Base.connection.select_value("SELECT id FROM users WHERE active=1 AND email='#{$1}' AND pass_crypt=MD5('#{$2}')")
+  if (token =~ /^(.+)\+(.+)$/) then
+    user = User.authenticate(:username => $1, :password => $2)
   else
-    return ActiveRecord::Base.connection.select_value("SELECT id FROM users WHERE active=1 AND token='#{token}'")
+    user = User.authenticate(:token => token)
   end
+
+  return user ? user.id : nil;
 end