From: Tom Hughes <tom@compton.nu>
Date: Mon, 20 Apr 2009 14:09:35 +0000 (+0000)
Subject: Add missing files from api06 merge.
X-Git-Tag: live~8665
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e733264687e8c212d0a54ef0389ad6e1525e4e11?hp=e8c7543bdd5001a69491b8119e793d6c889fe468

Add missing files from api06 merge.
---

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index de3c7583b..b0b3f13cf 100644
--- 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 754cc4b82..ab25fcbc6 100644
--- 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/old_node_tag.rb b/app/models/old_node_tag.rb
index 3fd4bf86b..dd339ad30 100644
--- a/app/models/old_node_tag.rb
+++ b/app/models/old_node_tag.rb
@@ -1,6 +1,6 @@
 class OldNodeTag < ActiveRecord::Base
   set_table_name 'node_tags'
-  
+
   belongs_to :user
 
   validates_presence_of :id, :version
diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index a62be6a55..c76ca23ae 100644
--- 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/config/mongrel_cluster.yml b/config/mongrel_cluster.yml
new file mode 100644
index 000000000..954be24af
--- /dev/null
+++ b/config/mongrel_cluster.yml
@@ -0,0 +1,5 @@
+---
+log_file: log/mongrel.log
+port: 8000
+pid_file: tmp/mongrel.pid
+servers: 8
\ No newline at end of file
diff --git a/db/migrate/026_add_changeset_user_index.rb b/db/migrate/026_add_changeset_user_index.rb
new file mode 100644
index 000000000..fed0af7c0
--- /dev/null
+++ b/db/migrate/026_add_changeset_user_index.rb
@@ -0,0 +1,9 @@
+class AddChangesetUserIndex < ActiveRecord::Migration
+  def self.up
+    add_index "changesets", ["user_id"], :name => "changesets_user_id_idx"
+  end
+
+  def self.down
+    remove_index "changesets", :name => "changesets_user_id_idx"
+  end
+end
diff --git a/db/migrate/027_add_changeset_indexes.rb b/db/migrate/027_add_changeset_indexes.rb
new file mode 100644
index 000000000..0d4bba0e8
--- /dev/null
+++ b/db/migrate/027_add_changeset_indexes.rb
@@ -0,0 +1,13 @@
+class AddChangesetIndexes < ActiveRecord::Migration
+  def self.up
+    add_index "nodes", ["changeset_id"], :name => "nodes_changeset_id_idx"
+    add_index "ways", ["changeset_id"], :name => "ways_changeset_id_idx"
+    add_index "relations", ["changeset_id"], :name => "relations_changeset_id_idx"
+  end
+
+  def self.down
+    remove_index "relations", :name => "relations_changeset_id_idx"
+    remove_index "ways", :name => "ways_changeset_id_idx"
+    remove_index "nodes", :name => "nodes_changeset_id_idx"
+  end
+end
diff --git a/public/images/new.png b/public/images/new.png
deleted file mode 100644
index 202e10eca..000000000
Binary files a/public/images/new.png and /dev/null differ