Merge master

2 files changed, 40 insertions, 5 deletions

diff --git a/db/migrate/20130708084944_add_accessibility_to_stop_areas.ninoxe_engine.rb b/db/migrate/20130708084944_add_accessibility_to_stop_areas.ninoxe_engine.rb
new file mode 100644
index 000000000..88654bb05
--- /dev/null
+++ b/db/migrate/20130708084944_add_accessibility_to_stop_areas.ninoxe_engine.rb
@@ -0,0 +1,31 @@
+# This migration comes from ninoxe_engine (originally 20130708081951)
+class AddAccessibilityToStopAreas < ActiveRecord::Migration
+  def up
+    unless column_exists? :stop_areas, :mobility_restricted_suitability
+      add_column :stop_areas, :mobility_restricted_suitability, :boolean
+    end
+    unless column_exists? :stop_areas, :stairs_availability
+      add_column :stop_areas, :stairs_availability, :boolean
+    end
+    unless column_exists? :stop_areas, :lift_availability
+      add_column :stop_areas, :lift_availability, :boolean
+    end
+    unless column_exists? :stop_areas, :int_user_needs
+      add_column :stop_areas, :int_user_needs, :integer
+    end
+  end
+  def down
+    if column_exists? :stop_areas, :mobility_restricted_suitability
+      remove_column :stop_areas, :mobility_restricted_suitability
+    end
+    if column_exists? :stop_areas, :stairs_availability
+      remove_column :stop_areas, :stairs_availability
+    end
+    if column_exists? :stop_areas, :lift_availability
+      remove_column :stop_areas, :lift_availability
+    end
+    if column_exists? :stop_areas, :int_user_needs
+      remove_column :stop_areas, :int_user_needs
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f8bbe06f3..f967e6b0a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130628130528) do
+ActiveRecord::Schema.define(:version => 20130708084944) do
 
   create_table "access_links", :force => true do |t|
     t.integer  "access_point_id",                        :limit => 8
@@ -361,8 +361,8 @@ ActiveRecord::Schema.define(:version => 20130628130528) do
   end
 
   create_table "stop_areas", :force => true do |t|
-    t.integer  "parent_id",           :limit => 8
-    t.string   "objectid",                                                         :null => false
+    t.integer  "parent_id",                       :limit => 8
+    t.string   "objectid",                                                                     :null => false
     t.integer  "object_version"
     t.datetime "creation_time"
     t.string   "creator_id"
@@ -372,11 +372,15 @@ ActiveRecord::Schema.define(:version => 20130628130528) do
     t.string   "registration_number"
     t.string   "nearest_topic_name"
     t.integer  "fare_code"
-    t.decimal  "longitude",                        :precision => 19, :scale => 16
-    t.decimal  "latitude",                         :precision => 19, :scale => 16
+    t.decimal  "longitude",                                    :precision => 19, :scale => 16
+    t.decimal  "latitude",                                     :precision => 19, :scale => 16
     t.string   "long_lat_type"
     t.string   "country_code"
     t.string   "street_name"
+    t.boolean  "mobility_restricted_suitability"
+    t.boolean  "stairs_availability"
+    t.boolean  "lift_availability"
+    t.integer  "int_user_needs"
   end
 
   add_index "stop_areas", ["objectid"], :name => "stop_areas_objectid_key", :unique => true