Merge vendor tree from api06 branch.

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index de3c7583b42d9977f255a581afbc5fe9265121b2..b0b3f13cf6c1947914caa7583e3fef58ff4bc392 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -55,7 +55,7 @@ class AmfController < ApplicationController
 
     # Parse request
 
-    headers=AMF.getint(req)                                    # Read number of headers
+       headers=AMF.getint(req)                                 # Read number of headers
 
     headers.times do                                           # Read each header
       name=AMF.getstring(req)                          #  |
@@ -276,7 +276,7 @@ class AmfController < ApplicationController
 
     [wayid, points, tags, version]
   end
-
+  
   # Get an old version of a way, and all constituent nodes.
   #
   # For undelete (version<0), always uses the most recent version of each node, 

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 754cc4b8216b15acd900d3646cdb399c31d6faba..ab25fcbc67a2ed407955953287d3550c99c46812 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -10,14 +10,14 @@ class ExportController < ApplicationController
     if format == "osm"
       #redirect to API map get
       redirect_to "http://api.openstreetmap.org/api/#{API_VERSION}/map?bbox=#{bbox}"
-      
+
     elsif format == "mapnik"
       #redirect to a special 'export' cgi script
       format = params[:mapnik_format]
       scale = params[:mapnik_scale]
 
       redirect_to "http://tile.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"
-      
+
     elsif format == "osmarender"
       #redirect to the t@h 'MapOf' service
       format = params[:osmarender_format]

diff --git a/app/models/node_tag.rb b/app/models/node_tag.rb
deleted file mode 100644 (file)
index 4942601..0000000
--- a/app/models/node_tag.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class NodeTag < ActiveRecord::Base
-  set_table_name 'current_node_tags'
-
-  belongs_to :node, :foreign_key => 'id'
-  
-  validates_presence_of :id
-  validates_length_of :k, :v, :maximum => 255, :allow_blank => true
-  validates_uniqueness_of :id, :scope => :k
-  validates_numericality_of :id, :only_integer => true
-end

diff --git a/app/models/old_node_tag.rb b/app/models/old_node_tag.rb
deleted file mode 100644 (file)
index 3fd4bf8..0000000
--- a/app/models/old_node_tag.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class OldNodeTag < ActiveRecord::Base
-  set_table_name 'node_tags'
-  
-  belongs_to :user
-
-  validates_presence_of :id, :version
-  validates_length_of :k, :v, :maximum => 255, :allow_blank => true
-  validates_uniqueness_of :id, :scope => [:k, :version]
-  validates_numericality_of :id, :version, :only_integer => true
-end

diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index a62be6a55d94ad9a9a35a0b861dc78f6cae71b13..c76ca23ae620055bdbe1db9aca8569bfaf371468 100644 (file)
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -107,4 +107,4 @@
 <br/>
 <% if @user and @this_user.id == @user.id %>
 <%= link_to 'change your settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %>
-<% end %>
\ No newline at end of file
+<% end %>

diff --git a/public/images/new.png b/public/images/new.png
deleted file mode 100644 (file)
index 202e10e..0000000
Binary files a/public/images/new.png and /dev/null differ