mybustracker 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a801fd044ed04b944a8d68f6f17d306ce3caa373
-  data.tar.gz: 4e36c945203320806c6bf718ed85feaf08cfd954
+  metadata.gz: 5bfe5361ebaaf8cfb2d4041c6c5be7d6f71c33bf
+  data.tar.gz: bb54cf30465299d3b636705e2a76e65753cbe693
 SHA512:
-  metadata.gz: 69a20bd482a626dab9b1e7735b5b8d779d2b0304acfec739c54cae73c7d53478d8c87acae690c343e12ba2e28877d4d820876e3f4787fda68540c2578035708f
-  data.tar.gz: 0eaa2a5bebf2d10e7263ea94b3fbb74296e09a6e9889b72c2272a44525ccc77ad98d4e541d5d92c9491ca4cfad6c2431455dc17809e88b2fc7f5ac1e86337e18
+  metadata.gz: 8aea94a9cae4527ef23b1027b93df78314a6b97f872730efbb404c64396a324e3de3be87175b3bc626cb6dfa0da409d5441e4acfb2424b70568b5bdfd5f76e19
+  data.tar.gz: 724ea11b6e270d4d9c3bd8e9f8a101f7b91f661fed8037337d7c062449fe557a1d86921280dac14bde2fd1bb6023b0c78cc3b833ff8601e61ab0d6ac73dd73fe

data.tar.gz.sig

@@ -1,2 +1,3 @@
-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:
+���~�L��˂.f��M��q�����X���[6`��-����t�����V�ZcX糲�:�nq���v�T���H�{3
{ft
+
�.���_�X�ϼB�$}^�W�^�PL?ʝͼ�7:�w�,–&c�u�1��V��;�A�P7����t�UÂ����i���c?#k����W�93�Lt��1��%��)5�h�
+�3�}O���,�h���������ܐ��2�z����A�Oc/m����Y

data/lib/mybustracker.rb

@@ -23,27 +23,24 @@ class MyBusTracker
     
     attr_reader :ref, :operator, :number, :name, :bus_stops
     
-    def initialize(client, appkey, service, all_bus_stops, number='')
+    def initialize(client, appkey, mbt,  service, number='')
       
       if number.empty? then
         raise MyBusTrackerException::Service, 'provide a bus service number'
       end
       
-      @client, @appkey = client, appkey      
+      @client, @appkey, @mbt = client, appkey, mbt
       
       @number, @name, @ref, relative_dests, operator  = \
-          %i(mnemo name ref dests operator).map {|field| service[field]}
-      
-      @all_bus_stops = all_bus_stops
+          %i(mnemo name ref dests operator).map {|field| service[field]}      
       
       Thread.new{ fetch_bus_stops() }
-
       
     end
     
     def inspect()
       "<#<MyBusTracker::Service:%s @number=\"%s\">" % [self.object_id, @number]
-    end
+    end    
     
     # accepts a bus service number and returns the relative bus times
     #
@@ -53,7 +50,7 @@ class MyBusTracker
       
       start_bus_stop1, start_bus_stop2 = find_bus_stop(from)
       end_bus_stop1, end_bus_stop2 = find_bus_stop(to)
-      
+
       # get the bus times
       
       bus_times = get_bus_times(start_bus_stop1)            
@@ -68,7 +65,6 @@ class MyBusTracker
             x[:stop_id] == end_bus_stop2[:stop_id]
       end
       
-
             
       if end_stop then
         start_bus_stop = start_bus_stop1
@@ -99,7 +95,6 @@ class MyBusTracker
       
       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
@@ -107,8 +102,8 @@ class MyBusTracker
       # 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)
+      from_times = journeys.map {|x| Time.strptime(x.first, "%H:%M").strftime("%-I:%M%P")}
+      to_times = journeys.map {|x| Time.strptime(x.last, "%H:%M").strftime("%-I:%M%P")}
 
       tstart = Time.strptime(journeys[0][0],"%H:%M")
       tend = Time.strptime(journeys[0][-1],"%H:%M")
@@ -124,33 +119,23 @@ class MyBusTracker
         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],
+        start: tstart.strftime("%-I:%M%P"), 
+        end: tend.strftime("%-I:%M%P"),
         travel_time: travel_time
       }
       
     end
     
+        
     private    
     
     def find_bus_stop(address)
       
-      results = Geocoder.search(address.sub(/,? *edinburgh$/i,'') \
-                                + ", Edinburgh")
-      
-      p1    = Geodesic::Position.new(*results[0].coordinates)
-
-      a = @all_bus_stops.sort_by do |h|
-        
-        x, y = %i(x y).map {|fields| h[fields].to_f.round(4)}
-
-        p2 = Geodesic::Position.new(x, y)
-        d = Geodesic::dist_haversine(p1.lat, p1.lon, p2.lat, p2.lon).round(4)
-      end
-      a.take 2
+      @mbt.find_nearest_stops(address, limit: 2).map(&:first)
             
     end
     
+
     def get_bus_times(start_bus_stop)
       
       response = @client.call(:get_bus_times, message: { key: @appkey, 
@@ -262,12 +247,33 @@ class MyBusTracker
     response = client.call(:get_bus_stops, message: { key: appkey  })
     @all_bus_stops = response.body[:bus_stops_response][:bus_stops][:list]
 
+  end
+  
+  def find_nearest_stops(address, limit: 4)
+
+    results = Geocoder.search(address.sub(/,? *edinburgh$/i,'') \
+                              + ", Edinburgh")
+    
+    p1    = Geodesic::Position.new(*results[0].coordinates)
+
+    a = @all_bus_stops.map do |h|
+      
+      x, y = %i(x y).map {|fields| h[fields].to_f.round(4)}
+
+      p2 = Geodesic::Position.new(x, y)
+      d = Geodesic::dist_haversine(p1.lat, p1.lon, p2.lat, p2.lon).round(4)
+      [h,d]
+    end
+    
+    a.sort_by(&:last).take limit
 
   end
 
+  alias nearest_stops find_nearest_stops
+
   def inspect()
     "<#<MyBusTracker:%s>" % [self.object_id]
-  end  
+  end
 
   # returns the number and name of all bus services
   #
@@ -282,9 +288,8 @@ class MyBusTracker
   def service(number='')
     
     service = @all_services.find {|x| x[:mnemo] == number }        
-    Service.new @client, @appkey, service, @all_bus_stops, number
-    
-  end
+    Service.new @client, @appkey, self, service,  number
     
+  end            
   
 end

metadata

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