gtfs-realtime 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d45dda0edeb7b008c75af74843fe4ef014a7baf2
-  data.tar.gz: 5226c23ff360cca5e244ccc6acadc98686b1e533
+  metadata.gz: f61ca284c49d493e298935aa54e94f612767a0ff
+  data.tar.gz: 66eefa1d79e49915a85d8a720b879fd20f6b5857
 SHA512:
-  metadata.gz: fffd4ac53ffee604318ea5e8a6c2375cdc36d99b175729872ebc3e8b6aca14a015e68c3a350d64438a7451d467d8c81b1ed9b4ae32db1209fbf7aed7bd3e03af
-  data.tar.gz: f3128ac25af2abbabab4872d97a46d42a1249d8d6d0351d855aefb3acef2e188b13b4bc420c51ce6be312eb3260614c35c5dbe76b33508222c109dbc7bd9acea
+  metadata.gz: 95f4fa73102e789c946e10eb6b62822c838f3fe7a5fc52506f8a648f1f390070ad8adc0b959b24a3807620f68554fd46090fad0263b08e70ae0fc92d52a03beb
+  data.tar.gz: 0763a7901716864e746c802553a2fa623a579be1e3724b056be7944ca87fa764a8bcbf46c2e97a703ce56ae2074d9f2db18177c5482c08a879e56f4077b728f1

data/README.md

@@ -41,10 +41,39 @@ end
 # that you would like to use. gtfs-realtime will generate the relevant tables.
 
 @nearby = GTFS::Realtime::Stop.nearby(41.834521, -71.396906)
-stop = @nearby.first
-upcoming_bus = stop.stop_time_updates.first
-trip_info = upcoming_bus.trip
-route_info = upcoming_bus.route
+@nearby.each do |stop|
+  puts stop.name
+  puts "-----"
+
+  # load all stop times for today, including updated live information
+  stop.stop_times_for_today.each do |st|
+    trip_info = st.trip
+    route_info = trip_info.route
+    shapes_info = trip_info.shapes
+    puts "#{st.scheduled_departure_time}: [#{st.trip.route.short_name}] #{st.trip.headsign}"
+
+    if st.live?
+      delay = st.actual_departure_delay / 60
+      delay_string = case
+        when delay < 0
+          "#{delay.abs} minute(s) early"
+        when delay > 0
+          "#{delay} minute(s) late"
+        else
+          "on time"
+        end
+
+      puts "- expected at #{st.departure_time}, #{delay_string}" if st.live?
+    end
+  end
+  puts "\n"
+end
+
+# refresh realtime info
+GTFS::Realtime.refresh_realtime_feed!
+
+# refresh static info
+GTFS::Realtime.load_static_feed!(force: true)
 ```
 
 ## Development

data/lib/gtfs/realtime.rb

@@ -7,6 +7,7 @@ require "sqlite3"
 require "gtfs/realtime/database"
 
 require "gtfs/gtfs_gem_patch"
+require "gtfs/realtime/calendar_date"
 require "gtfs/realtime/configuration"
 require "gtfs/realtime/route"
 require "gtfs/realtime/service_alert"
@@ -43,6 +44,17 @@ module GTFS
         return unless static_data
 
         GTFS::Realtime::Model.db.transaction do
+          GTFS::Realtime::CalendarDate.dataset.delete
+          GTFS::Realtime::CalendarDate.multi_insert(
+            static_data.calendar_dates.collect do |calendar_date|
+              {
+                service_id: calendar_date.service_id.strip,
+                date: Date.strptime(calendar_date.date, "%Y%m%d"),
+                exception_type: calendar_date.exception_type
+              }
+            end
+          )
+
           GTFS::Realtime::Route.dataset.delete
           GTFS::Realtime::Route.multi_insert(
             static_data.routes.collect do |route|
@@ -100,7 +112,8 @@ module GTFS
                 headsign: trip.headsign.strip,
                 route_id: trip.route_id.strip,
                 service_id: trip.service_id.strip,
-                shape_id: trip.shape_id.strip
+                shape_id: trip.shape_id.strip,
+                direction_id: trip.direction_id
               }
             end
           )
@@ -174,7 +187,11 @@ module GTFS
       def get_entities(path)
         return [] if path.nil?
 
-        data = Net::HTTP.get(URI.parse(path))
+        if File.exists?(path)
+          data = File.open(path, 'r'){|f| f.read}
+        else
+          data = Net::HTTP.get(URI.parse(path))
+        end
         feed = Transit_realtime::FeedMessage.decode(data)
         feed.entity   # array of entities
       end

data/lib/gtfs/realtime/calendar_date.rb

@@ -0,0 +1,10 @@
+module GTFS
+  class Realtime
+    class CalendarDate < GTFS::Realtime::Model
+      ADDED = 1
+      REMOVED = 2
+
+      many_to_one :trip, primary_key: :service_id, key: :service_id
+    end
+  end
+end

data/lib/gtfs/realtime/database.rb

@@ -13,6 +13,16 @@ module GTFS
           db = Sequel.connect(new_path || "sqlite://")
 
           # Set up all database tables
+          db.create_table? :gtfs_realtime_calendar_dates do
+            Integer :id, primary_key: true
+            String :service_id
+            Date :date
+            Integer :exception_type
+
+            index :id
+            index :service_id
+          end
+
           db.create_table? :gtfs_realtime_routes do
             String :id, primary_key: true
             String :short_name
@@ -57,6 +67,7 @@ module GTFS
             String :route_id
             String :service_id
             String :shape_id
+            Integer :direction_id
 
             index :id
             index :route_id

data/lib/gtfs/realtime/stop.rb

@@ -18,6 +18,24 @@ module GTFS
         [:stop_time_updates, :stop_id, :trip_update_id],
         [:trip_updates, :id, :route_id]
       ]
+
+      def stop_times_schedule_for(date)
+        # TODO: .all.first is a weird syntax to do eager loading correctly. Maybe there's a better way?
+        self_with_eager_loads = GTFS::Realtime::Stop.where(id: id).eager(stop_times: {trip: [:calendar_dates, :route, :shapes]}).all.first
+        self_with_eager_loads.stop_times.select{|st| st.trip.active?(Date.today)}.sort_by{|st| st.departure_time}
+      end
+
+      def stop_times_for_today
+        stop_times = stop_times_schedule_for(Date.today)
+        stop_time_updates.each do |stu|
+          # find a matching existing record in the schedule
+          stop_time = stop_times.find{|st| st.trip_id == stu.trip_update.trip_id}
+
+          # update its info
+          stop_time.set(stu)
+        end
+        stop_times
+      end
     end
   end
 end

data/lib/gtfs/realtime/stop_time.rb

@@ -3,6 +3,53 @@ module GTFS
     class StopTime < GTFS::Realtime::Model
       many_to_one :trip
       many_to_one :stop
+
+      attr_accessor :actual_arrival_time, :actual_arrival_delay, :actual_departure_time, :actual_departure_delay
+
+      def live?
+        actual_arrival_time || actual_arrival_delay || actual_departure_time || actual_departure_delay
+      end
+
+      def arrival_time
+        actual_arrival_time || scheduled_arrival_time
+      end
+
+      def departure_time
+        actual_departure_time || scheduled_departure_time
+      end
+
+      def scheduled_arrival_time
+        self.class.parse_time(self[:arrival_time])
+      end
+
+      def scheduled_departure_time
+        self.class.parse_time(self[:departure_time])
+      end
+
+      def set(val)
+        return super(val) unless val.is_a?(GTFS::Realtime::StopTimeUpdate)
+
+        @actual_arrival_time = val.arrival_time
+        @actual_arrival_delay = val.arrival_delay
+        @actual_departure_time = val.departure_time
+        @actual_departure_delay = val.departure_delay
+      end
+
+      private
+
+      def self.parse_time(time, date = Date.today)
+        # TODO: handle case where date != Date.today
+        day_adjustment = 0
+        hour = time[0...2].to_i
+
+        # handle timestamps like "24:30"
+        if hour > 24
+          days = hour / 24
+          time[0...2] = (hour % 24).to_s.rjust(2, '0')
+        end
+
+        Time.parse(time) + day_adjustment * 60 * 60 * 24
+      end
     end
   end
 end

data/lib/gtfs/realtime/trip.rb

@@ -3,8 +3,13 @@ module GTFS
     class Trip < GTFS::Realtime::Model
       many_to_one :route
       many_to_many :stops, join_table: :gtfs_realtime_stop_times
+      one_to_many :calendar_dates, primary_key: :service_id, key: :service_id
+      one_to_many :shapes, primary_key: :shape_id, key: :id
 
-      # TODO: find shapes by shape_id
+      def active?(date)
+        # can't use .where chaining b/c Sequel is weird
+        calendar_dates.find{|cd| cd.exception_type == GTFS::Realtime::CalendarDate::ADDED && cd.date == date}
+      end
     end
   end
 end

data/lib/gtfs/realtime/version.rb

@@ -1,5 +1,5 @@
 module GTFS
   class Realtime
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtfs-realtime
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ryan Laughlin
@@ -143,6 +143,7 @@ files:
 - gtfs-realtime.gemspec
 - lib/gtfs/gtfs_gem_patch.rb
 - lib/gtfs/realtime.rb
+- lib/gtfs/realtime/calendar_date.rb
 - lib/gtfs/realtime/configuration.rb
 - lib/gtfs/realtime/database.rb
 - lib/gtfs/realtime/nearby.rb