From: Richard Fairhurst <richard@systemed.net>
Date: Fri, 22 May 2009 19:43:56 +0000 (+0000)
Subject: adapt for larger fonts on Linux; fix indexing with renumbered nodes
X-Git-Tag: live~7364
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a3a792e13772282c006556081c65e12e37ad273b?hp=cdbfc1e341b703acd694aa8dd5ed6d7754b3cb15

adapt for larger fonts on Linux; fix indexing with renumbered nodes
---

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 13f742381..f903e1ce4 100644
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -127,8 +127,10 @@ class AmfController < ApplicationController
           results[index]=[-5,nil]
         else
           case message
-            when 'putway';			  r=putway(renumberednodes,*args)
-                      						renumberednodes=r[4]
+            when 'putway';			  orn=renumberednodes.dup
+                                  r=putway(renumberednodes,*args)
+                      						renumberednodes=r[4].dup
+                      						r[4].delete_if { |k,v| orn.has_key?(k) }
                       						if r[2] != r[3] then renumberedways[r[2]] = r[3] end
                       						results[index]=AMF.putdata(index,r)
             when 'putrelation';		results[index]=AMF.putdata(index,putrelation(renumberednodes, renumberedways, *args))
@@ -477,7 +479,7 @@ class AmfController < ApplicationController
         rels.push([rel.id, rel.tags, rel.members, rel.version])
       end
     else
-      RelationTag.find(:all, :limit => 11, :conditions => ["match(v) against (?)", searchterm] ).each do |t|
+      RelationTag.find(:all, :limit => 11, :conditions => ["v like ?", "%#{searchterm}%"] ).each do |t|
       if t.relation.visible then
 	      rels.push([t.relation.id, t.relation.tags, t.relation.members, t.relation.version])
 	    end
@@ -592,9 +594,7 @@ class AmfController < ApplicationController
     if pointlist.length < 2 then return -2,"Server error - way is only #{points.length} points long." end
 
     originalway = originalway.to_i
-logger.info("received #{pointlist} for #{originalway}")
   	pointlist.collect! {|a| a.to_i }
-logger.info("converted to #{pointlist}")
 
     way=nil	# this is returned, so scope it outside the transaction
     nodeversions = {}
@@ -634,11 +634,9 @@ logger.info("converted to #{pointlist}")
 
       # -- Save revised way
 
-logger.info("renumberednodes is #{renumberednodes.inspect}")
   	  pointlist.collect! {|a|
 	      renumberednodes[a] ? renumberednodes[a]:a
   	  } # renumber nodes
-logger.info("saving with #{pointlist}")
       new_way = Way.new
       new_way.tags = attributes
       new_way.nds = pointlist
diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index 372a70d3b..0080fa8d7 100644
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -71,7 +71,7 @@ zoom='14' if zoom.nil?
   
   window.onbeforeunload=function() {
 	if (!changesaved && !winie) {
-	    return "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point.)";
+	    return "You have unsaved changes.";
 	}
   }
 
diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index ad60cd485..25ae1cf7c 100755
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ