SSP accessibility labels

app/models/json_schemas/schedule_stop_pair.json

@@ -81,10 +81,10 @@
     "frequencyStartTime": { "type": ["string","null"] },
     "frequencyEndTime": { "type": ["string","null"] },
     "frequencyHeadwaySeconds": { "type": ["string","null"] },
-    "wheelchairAccessible": { "type": ["integer","null"] },
-    "bikesAllowed": { "type": ["integer","null"] },
-    "pickupType": { "type": ["integer","null"] },
-    "dropOffType": { "type": ["integer","null"] },
+    "wheelchairAccessible": { "type": ["boolean","null"] },
+    "bikesAllowed": { "type": ["boolean","null"] },
+    "pickupType": { "type": ["string","null"] },
+    "dropOffType": { "type": ["string","null"] },
     "shapeDistTraveled": { "type": ["number","null"] },
     "tags": { "type": "object" },
     "importedFromFeed": {

app/models/schedule_stop_pair.rb

@@ -27,10 +27,6 @@
 #  updated_at                         :datetime         not null
 #  block_id                           :string
 #  trip_short_name                    :string
-#  wheelchair_accessible              :integer
-#  bikes_allowed                      :integer
-#  pickup_type                        :integer
-#  drop_off_type                      :integer
 #  shape_dist_traveled                :float
 #  origin_timezone                    :string
 #  destination_timezone               :string
@@ -39,6 +35,10 @@
 #  origin_timepoint_source            :string
 #  destination_timepoint_source       :string
 #  operator_id                        :integer
+#  wheelchair_accessible              :boolean
+#  bikes_allowed                      :boolean
+#  pickup_type                        :string
+#  drop_off_type                      :string
 #
 # Indexes
 #

app/serializers/schedule_stop_pair_serializer.rb

@@ -27,10 +27,6 @@
 #  updated_at                         :datetime         not null
 #  block_id                           :string
 #  trip_short_name                    :string
-#  wheelchair_accessible              :integer
-#  bikes_allowed                      :integer
-#  pickup_type                        :integer
-#  drop_off_type                      :integer
 #  shape_dist_traveled                :float
 #  origin_timezone                    :string
 #  destination_timezone               :string
@@ -39,6 +35,10 @@
 #  origin_timepoint_source            :string
 #  destination_timepoint_source       :string
 #  operator_id                        :integer
+#  wheelchair_accessible              :boolean
+#  bikes_allowed                      :boolean
+#  pickup_type                        :string
+#  drop_off_type                      :string
 #
 # Indexes
 #

db/migrate/20151029001514_change_ssp_accessibility_from_integers.rb

@@ -0,0 +1,14 @@
+class ChangeSspAccessibilityFromIntegers < ActiveRecord::Migration
+  def change
+    ["current","old"].each do |version|
+      remove_column "#{version}_schedule_stop_pairs", :wheelchair_accessible, :integer
+      remove_column "#{version}_schedule_stop_pairs", :bikes_allowed, :integer
+      remove_column "#{version}_schedule_stop_pairs", :pickup_type, :integer
+      remove_column "#{version}_schedule_stop_pairs", :drop_off_type, :integer
+      add_column "#{version}_schedule_stop_pairs", :wheelchair_accessible, :boolean
+      add_column "#{version}_schedule_stop_pairs", :bikes_allowed, :boolean
+      add_column "#{version}_schedule_stop_pairs", :pickup_type, :string
+      add_column "#{version}_schedule_stop_pairs", :drop_off_type, :string
+    end
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151027003112) do
+ActiveRecord::Schema.define(version: 20151029001514) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -168,10 +168,6 @@
     t.datetime "updated_at",                                      null: false
     t.string   "block_id"
     t.string   "trip_short_name"
-    t.integer  "wheelchair_accessible"
-    t.integer  "bikes_allowed"
-    t.integer  "pickup_type"
-    t.integer  "drop_off_type"
     t.float    "shape_dist_traveled"
     t.string   "origin_timezone"
     t.string   "destination_timezone"
@@ -180,6 +176,10 @@
     t.string   "origin_timepoint_source"
     t.string   "destination_timepoint_source"
     t.integer  "operator_id"
+    t.boolean  "wheelchair_accessible"
+    t.boolean  "bikes_allowed"
+    t.string   "pickup_type"
+    t.string   "drop_off_type"
   end
 
   add_index "current_schedule_stop_pairs", ["created_or_updated_in_changeset_id"], name: "c_ssp_cu_in_changeset", using: :btree
@@ -428,10 +428,6 @@
     t.datetime "updated_at",                                      null: false
     t.string   "block_id"
     t.string   "trip_short_name"
-    t.integer  "wheelchair_accessible"
-    t.integer  "bikes_allowed"
-    t.integer  "pickup_type"
-    t.integer  "drop_off_type"
     t.float    "shape_dist_traveled"
     t.string   "origin_timezone"
     t.string   "destination_timezone"
@@ -440,6 +436,10 @@
     t.string   "origin_timepoint_source"
     t.string   "destination_timepoint_source"
     t.integer  "operator_id"
+    t.boolean  "wheelchair_accessible"
+    t.boolean  "bikes_allowed"
+    t.string   "pickup_type"
+    t.string   "drop_off_type"
   end
 
   add_index "old_schedule_stop_pairs", ["created_or_updated_in_changeset_id"], name: "o_ssp_cu_in_changeset", using: :btree

lib/gtfsgraph.rb

@@ -372,6 +372,7 @@ def make_change_ssp(entity)
       tripHeadsign: entity.trip_headsign,
       tripShortName: entity.trip_short_name,
       wheelchairAccessible: entity.wheelchair_accessible,
+      bikesAllowed: entity.bikes_allowed,
       dropOffType: entity.drop_off_type,
       pickupType: entity.pickup_type,
       shapeDistTraveled: entity.shape_dist_traveled,
@@ -410,12 +411,12 @@ def make_ssp(route, trip, origin, destination)
       trip: trip.id.presence,
       trip_headsign: (origin.stop_headsign || trip.trip_headsign).presence,
       trip_short_name: trip.trip_short_name.presence,
-      wheelchair_accessible: trip.wheelchair_accessible.to_i,
-      bikes_allowed: trip.bikes_allowed.to_i,
-      # Stop Time
-      drop_off_type: origin.drop_off_type.to_i,
-      pickup_type: origin.pickup_type.to_i,
-      shape_dist_traveled: origin.shape_dist_traveled.to_f,
+      shape_dist_traveled: destination.shape_dist_traveled.to_f,
+      # Accessibility
+      pickup_type: to_pickup_type(origin.pickup_type),
+      drop_off_type: to_pickup_type(destination.drop_off_type),
+      wheelchair_accessible: to_tfn(trip.wheelchair_accessible),
+      bikes_allowed: to_tfn(trip.bikes_allowed),
       # service period
       service_start_date: service_period.start_date,
       service_end_date: service_period.end_date,
@@ -424,10 +425,34 @@ def make_ssp(route, trip, origin, destination)
       service_except_dates: service_period.except_dates
     )
   end
+
+  def to_tfn(value)
+    case value.to_i
+    when 0
+      nil
+    when 1
+      true
+    when 2
+      false
+    end
+  end
+
+  def to_pickup_type(value)
+    case value.to_i
+    when 0
+      nil
+    when 1
+      :unavailable
+    when 2
+      :ask_agency
+    when 3
+      :ask_driver
+    end
+  end
 end
 
 if __FILE__ == $0
-  # ActiveRecord::Base.logger = Logger.new(STDOUT)
+  ActiveRecord::Base.logger = Logger.new(STDOUT)
   feed_onestop_id = ARGV[0] || 'f-9q9-caltrain'
   import_level = (ARGV[1] || 1).to_i
   feed = Feed.find_by!(onestop_id: feed_onestop_id)

spec/factories/schedule_stop_pair_factory.rb

@@ -27,10 +27,6 @@
 #  updated_at                         :datetime         not null
 #  block_id                           :string
 #  trip_short_name                    :string
-#  wheelchair_accessible              :integer
-#  bikes_allowed                      :integer
-#  pickup_type                        :integer
-#  drop_off_type                      :integer
 #  shape_dist_traveled                :float
 #  origin_timezone                    :string
 #  destination_timezone               :string
@@ -39,6 +35,10 @@
 #  origin_timepoint_source            :string
 #  destination_timepoint_source       :string
 #  operator_id                        :integer
+#  wheelchair_accessible              :boolean
+#  bikes_allowed                      :boolean
+#  pickup_type                        :string
+#  drop_off_type                      :string
 #
 # Indexes
 #

spec/models/schedule_stop_pair_spec.rb

@@ -27,10 +27,6 @@
 #  updated_at                         :datetime         not null
 #  block_id                           :string
 #  trip_short_name                    :string
-#  wheelchair_accessible              :integer
-#  bikes_allowed                      :integer
-#  pickup_type                        :integer
-#  drop_off_type                      :integer
 #  shape_dist_traveled                :float
 #  origin_timezone                    :string
 #  destination_timezone               :string
@@ -39,6 +35,10 @@
 #  origin_timepoint_source            :string
 #  destination_timepoint_source       :string
 #  operator_id                        :integer
+#  wheelchair_accessible              :boolean
+#  bikes_allowed                      :boolean
+#  pickup_type                        :string
+#  drop_off_type                      :string
 #
 # Indexes
 #

spec/services/gtfsgraph_spec.rb

@@ -151,9 +151,10 @@ def load_feed(import_level=1)
       expect(s.destination_timezone).to eq('America/Los_Angeles')
       expect(s.shape_dist_traveled).to eq(0.0)
       expect(s.block_id).to be_nil
-      expect(s.wheelchair_accessible).to eq(0)
-      expect(s.pickup_type).to eq(0)
-      expect(s.drop_off_type).to eq(0)
+      expect(s.wheelchair_accessible).to eq(nil)
+      expect(s.bikes_allowed).to eq(nil)
+      expect(s.pickup_type).to eq(nil)
+      expect(s.drop_off_type).to eq(nil)
       expect(s.origin_arrival_time).to eq('08:15:00')
       expect(s.origin_departure_time).to eq('08:15:00')
       expect(s.destination_arrival_time).to eq('08:20:00')