mybustracker 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54a03b29fb608175ede8ece1d2edd85a90fdf3df
-  data.tar.gz: b9fee2a737759b20a6c0b830db3f0e5e40329f08
+  metadata.gz: a801fd044ed04b944a8d68f6f17d306ce3caa373
+  data.tar.gz: 4e36c945203320806c6bf718ed85feaf08cfd954
 SHA512:
-  metadata.gz: 416ab8ca11c80f68f38d38ac40a8b8a03d6149988d4737612ff892405db1df1220d4fc7000f86e4c7892d7bb5ec8b0189cfa2f588f003507cc52873aaed7397b
-  data.tar.gz: df8b09df88105badb3f94c01593b0b9a058997ffc819181ada379935ef8791b422fcbf2dab481bdc3630739dca2395b39500378b64e4b5dfdcf4f0f779dd5c13
+  metadata.gz: 69a20bd482a626dab9b1e7735b5b8d779d2b0304acfec739c54cae73c7d53478d8c87acae690c343e12ba2e28877d4d820876e3f4787fda68540c2578035708f
+  data.tar.gz: 0eaa2a5bebf2d10e7263ea94b3fbb74296e09a6e9889b72c2272a44525ccc77ad98d4e541d5d92c9491ca4cfad6c2431455dc17809e88b2fc7f5ac1e86337e18

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-q�n[��#)�>�"����<���N�� ��.��۔h4���e
t�3������^p��[���o&E�r��􅌶�.����n9BG��Z�UƂ���,��^���N��
-
�f��
�f���K��$7L�8&���O�8��5rΟ�3��ҽ
�:.��/v�9ݴ��=S]�I���'�g
+���y���]����y��y1��W踺L׽���Z�/y.�ApR�B�Ak�-�����spj}�a�>(V$�=K|�L� �@"���l�t��+1I`��P �X험+yE�8�ͨ�^
+7�(9�H�laZ����F�!�ۓ�4e1�ef�L�{��s�k�fMh�l�1
�R�Fb���
+e

data.tar.gz.sig

@@ -1 +1,2 @@
-9��������t��B��F(��^$/Fk��n�j�nDRGX���:���;����$��!9�tGM�:����T�s5x�_�YA4c�� �=D����&�ǩ�cջa߲�X���W|�k촡�
�*��'
+Q��D$��-&X�p''^�����b��u�aH�Q�����5�lE��b��u���X�st�^{ȼ�?G�����N���+����2�K�7g��za��E��Na��\�v�+�'�a�����t�U�<��]�`���`t�g
+�WV�i����1z�F��=Ӄ�s���,ˈ"��\�:��[�^VTT���W��$NG���\��#�g`-�+;

����N��]�);,�A`�ɳ9:

data/lib/mybustracker.rb

@@ -23,28 +23,28 @@ class MyBusTracker
     
     attr_reader :ref, :operator, :number, :name, :bus_stops
     
-    def initialize(client, appkey, service, all_dests, 
-                   all_bus_stops, number='')
+    def initialize(client, appkey, service, all_bus_stops, number='')
       
       if number.empty? then
         raise MyBusTrackerException::Service, 'provide a bus service number'
       end
       
-      @client, @appkey = client, appkey
-      
-      # find out the reference number from the service hash object      
-
-      #e.g. => {:ref=>"7", :operator_id=>"LB", :mnemo=>"4", :name=>"The Jewel
-      #-- Hillend", :type=>nil, :dests=>{:list=>["458752", ...]}
+      @client, @appkey = client, appkey      
       
       @number, @name, @ref, relative_dests, operator  = \
           %i(mnemo name ref dests operator).map {|field| service[field]}
       
       @all_bus_stops = all_bus_stops
+      
+      Thread.new{ fetch_bus_stops() }
 
       
     end
     
+    def inspect()
+      "<#<MyBusTracker::Service:%s @number=\"%s\">" % [self.object_id, @number]
+    end
+    
     # accepts a bus service number and returns the relative bus times
     #
     def query(times: 'next hour', from: nil, to: nil)
@@ -56,36 +56,74 @@ class MyBusTracker
       
       # get the bus times
       
-      @bus_stops, journey_times = get_stop_journeys(start_bus_stop1)
+      bus_times = get_bus_times(start_bus_stop1)            
+      
+      journey_times = get_stop_journeys(start_bus_stop1, bus_times, index: 0)
+      return unless journey_times
 
       # select the bus stop end
       
       end_stop = journey_times.find do |x| 
-        x[:stop_id] == end_bus_stop1[:stop_id] or x[:stop_id] == end_bus_stop2[:stop_id]
+        x[:stop_id] == end_bus_stop1[:stop_id] or 
+            x[:stop_id] == end_bus_stop2[:stop_id]
       end
+      
+
             
       if end_stop then
         start_bus_stop = start_bus_stop1
       else
         start_bus_stop = start_bus_stop2
-        @bus_stops, journey_times = get_stop_journeys(start_bus_stop2) unless end_stop
-        return unless @bus_stops
+        bus_times = get_bus_times(start_bus_stop2)
+        
+        unless end_stop
+          journey_times = get_stop_journeys(start_bus_stop2, bus_times)
+        end
+        
+        return unless journey_times
         # select the bus stop end
 
         end_stop = journey_times.find do |x|
-          (x[:stop_id] == end_bus_stop1[:stop_id]) or (x[:stop_id] == end_bus_stop2[:stop_id])
+          (x[:stop_id] == end_bus_stop1[:stop_id]) or 
+              (x[:stop_id] == end_bus_stop2[:stop_id])
         end
         
       end
+      
+      stop_id = end_stop[:stop_id]      
+      
+      # get the other journeys
+      # still todo
+      journeys = [[journey_times[0][:time], end_stop[:time]]]
+      journey = get_stop_journeys(start_bus_stop, bus_times, index: 1)      
+      
+      if journey then
+        end_stop = journey.find {|x| x[:stop_id] == stop_id }
+        puts 'end_stop:' + end_stop.inspect
+
+        journeys << [journey[0][:time], end_stop[:time]] 
+      end
+      
+      # get the journeys for the given period
+      #secs = journeys[1][0][:time] - journey_times[0][:time]
+      
+      from_times = journeys.map(&:first)
+      to_times = journeys.map(&:last)
 
-      tstart = Time.strptime(journey_times[0][:time],"%H:%M")
-      tend = Time.strptime(end_stop[:time],"%H:%M")
+      tstart = Time.strptime(journeys[0][0],"%H:%M")
+      tend = Time.strptime(journeys[0][-1],"%H:%M")
       travel_time = '~' + Subunit.new(units={minutes:60, hours:60}, \
                                  seconds: tend - tstart).to_s(omit: [:seconds])
       
+      index = journey_times.index journey_times.find {|x| x[:stop_id] == stop_id}
+      stops = journey_times[0..index].map {|x| x[:stop_name] }
+      
       {
-        from: {bus_stop: start_bus_stop[:name], bus_stop_id: start_bus_stop[:stop_id]},
-        to: {bus_stop: end_stop[:stop_name], bus_stop_id: end_stop[:stop_id]},
+        from: {bus_stop: start_bus_stop[:name], bus_stop_id: 
+               start_bus_stop[:stop_id], times: from_times},
+        to: {bus_stop: end_stop[:stop_name], bus_stop_id: end_stop[:stop_id], 
+             times: to_times},
+        stops: stops ,
         start: journey_times[0][:time], 
         end: end_stop[:time],
         travel_time: travel_time
@@ -113,57 +151,68 @@ class MyBusTracker
             
     end
     
-    def get_stop_journeys(start_bus_stop)
+    def get_bus_times(start_bus_stop)
       
-      response = @client.call(:get_bus_times, message: { key: @appkey, time_requests: {list: [{stop_id: start_bus_stop[:stop_id] }]} })
+      response = @client.call(:get_bus_times, message: { key: @appkey, 
+               time_requests: {list: [{stop_id: start_bus_stop[:stop_id] }]} })
       
-      bus_times = response.body[:bus_times_response][:bus_times][:list].find do |bus_time|
+      response.body[:bus_times_response][:bus_times][:list].find do |bus_time|
         bus_time[:ref_service] == @ref
-      end
+      end      
+    end
+    
+    def get_stop_journeys(start_bus_stop, bus_times, index: 0)
       
-      #e.g.r.keys  => [:operator_id, :stop_id, :stop_name, :ref_service, :mnemo_service, :name_service, 
-      # :time_datas, :global_disruption, :service_disruption, :bus_stop_disruption, :service_diversion]
       
       return unless bus_times
       
       # get the 1st journey id
       list = bus_times[:time_datas][:list]
-      journey_id = list.is_a?(Array) ? list[0][:journey_id] : list[:journey_id]
+           
+      journey_id = list.is_a?(Array) ? list[index][:journey_id] : \
+                      list[:journey_id]    
+      response = @client.call(:get_journey_times, message: { key: @appkey, 
+                 journey_id: journey_id,  stop_id: start_bus_stop[:stop_id]  })
+
+      return unless response.body[:journey_times_response][:journey_times]
       
-      response = @client.call(:get_journey_times, message: { key: @appkey, journey_id: journey_id,  stop_id: start_bus_stop[:stop_id]  })
       journey = response.body[:journey_times_response][:journey_times][:list]
-#=> [:journey_id, :bus_id, :operator_id, :ref_service, :mnemo_service, :name_service, :ref_dest, :name_dest, :terminus, :journey_time_datas, :global_disruption, :service_disruption, :service_diversion] 
 
       journey_times = journey[:journey_time_datas][:list]
-      # get the bus stops
-      [journey_times.inject({}) {|r,x| r.merge(x[:stop_name] => {id: x[:stop_id]}) }, journey_times]
+                                             
+      return journey_times
     end
     
-    # method no longer used
+    # returns all bus stops for outbound route ("R")
     #
-    def fetch_bus_stops2()
-      # find the outbound destination
-      dest = relative_dests[:list].find do |ref|
-        all_dests.find {|x| x[:ref] == ref and x[:direction] == 'R' }
-      end      
+    def fetch_bus_stops()
       
-      # go through each bus stop to find the dests
+      client, appkey, ref = @client, @appkey, @ref
+      
+      response = client.call(:get_dests, message: { key: appkey  })
+      r = response.body
+
+      response = client.call(:get_bus_stops, message: { key: appkey  })
+      all_bus_stops = response.body[:bus_stops_response][:bus_stops][:list]
+
+      r[:dests_response][:dests][:list][0].keys
+      #=> [:ref, :operator_id, :name, :direction, :service] 
+
+      dest = r[:dests_response][:dests][:list].find do |d|
+        d[:service] == ref and d[:direction] == 'R'
+      end
 
       raw_bus_stops = all_bus_stops.select do |bus_stop|
-        bus_stop[:dests][:list].include? dest
+        bus_stop[:dests][:list].include? dest[:ref]
       end
 
       c = ->(coord){ coord.to_f.round(4)}      
-      
+
       response = client.call(:get_service_points, message: \
-                             { key: appkey, ref: ref  })
+                            { key: appkey, ref: ref  })
       all_service_points = response.body[:service_points_response]\
           [:service_points][:list]      
-      
-      # select only the 1st chain
-      #service_points = all_service_points#.group_by {|x| x[:chainage]}.first[-1]
-      #puts 'service_points: ' + service_points.inspect
-      
+
       unsorted_bus_stops = []
       raw_bus_stops.each do |bus_stop|
 
@@ -174,21 +223,18 @@ class MyBusTracker
         end
 
         r.each do |x|
-          unsorted_bus_stops << [bus_stop[:name], bus_stop[:stop_id], x, x[:order].to_i ]
+          unsorted_bus_stops << [bus_stop[:name], 
+                                 bus_stop[:stop_id], x, x[:order].to_i ]
         end
 
       end
-
-      
-      #@bus_stops = unsorted_bus_stops.compact.sort_by(&:last)
-#=begin      
+          
       # find the correct chainage by the most records
       h = unsorted_bus_stops.group_by {|x| x[2][:chainage]}
       a = h.map {|k,v| v.count {|x| x[2][:chainage] == k}}      
+
+      @bus_stops = h.to_a[a.index(a.max)].last.sort_by(&:last).map(&:first)
       
-      @bus_stops = h.to_a[a.index(a.max)].last\
-          .sort_by(&:last).inject({}){|r, x| r.merge(x[0] => {id: x[1]}) }
-#=end            
     end
     
   end
@@ -211,10 +257,7 @@ class MyBusTracker
                                               Time.now.strftime("%Y%m%d%H"))
     
     response = client.call(:get_services, message: { key: appkey  })
-    @all_services= response.body[:services_response][:services][:list]
-    
-    response = client.call(:get_dests, message: { key: appkey  })
-    @all_dests = response.body[:dests_response][:dests][:list]
+    @all_services= response.body[:services_response][:services][:list]    
     
     response = client.call(:get_bus_stops, message: { key: appkey  })
     @all_bus_stops = response.body[:bus_stops_response][:bus_stops][:list]
@@ -222,6 +265,10 @@ class MyBusTracker
 
   end
 
+  def inspect()
+    "<#<MyBusTracker:%s>" % [self.object_id]
+  end  
+
   # returns the number and name of all bus services
   #
   def services()
@@ -235,7 +282,7 @@ class MyBusTracker
   def service(number='')
     
     service = @all_services.find {|x| x[:mnemo] == number }        
-    Service.new @client, @appkey, service, @all_dests, @all_bus_stops, number
+    Service.new @client, @appkey, service, @all_bus_stops, number
     
   end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mybustracker
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   C8VA38E3Zv6BW0qJKU1AtzULrvfSjB6DHafrzks8aANOZ48CMYywrbaiNHG6cJaZ
   0Hd2sNogoB6McA==
   -----END CERTIFICATE-----
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon