jetblue_plane_tracker 0.2.3 → 0.2.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDVjNmYyYWQ4NTU5OGU2NDExNWU1ZmY2ZTgwNTA5NjVjM2M5YmNhNw==
+    ZGIwZjNmYTQ2NDVjMjlkY2U3YTZhNjU4N2JmM2UwNjE1Njg5NWQyZA==
   data.tar.gz: !binary |-
-    MzY5Y2NkOGUxMThiOGM2NmZhOWM5OWIwNjM4M2JjNjMxYmZiMDE0Yg==
+    OTQ1YjM0OGE3NTBhNTJlNGJkNzVhNjFlZGI4Y2U5MDI5MDViYTliMw==
 SHA512:
   metadata.gz: !binary |-
-    ZjQzMTg4YWE3YzZlOTRhZWUxZGI4YzVkNjFhZDJjNTI5NGU3NzZkZGNmMmNh
-    Njc2ZjlhOWM3ZWNlMDZmMGFmMzMwZDlhZWE5ODljM2RhZTZiMjI4MmUwYjUw
-    OTFmN2QwYTlkMzg0NTAxNzkzMDlkMDlmZjEzMDc0M2FkMDIxMzY=
+    NDI1NDU1YjcwOTk2NDY2MzFiNTllNTZlNzc0Y2U2ZWYwZjVjOGFhNmIxNDUw
+    MTYzNzJlZGNiZmQzNWNlOTA3MWU2ZDUzYmEzMTM5MWM5MTQ1MDA1OGRjNDgx
+    MGMzZGU3NzUwYmUzZjZlMzZiMzVhYjJkOWRhMGE0ZmVhNDI5MDY=
   data.tar.gz: !binary |-
-    ZTg3MDZlMzE2NTk4NjBmMjZkMmJmNzliZDZkMjM3MjU3OGEzZTc5NTFlZjgx
-    YWI1NzM1ZDkxMTQzNmZkNTU5YzlmM2ZmYTQ1OGEwNDA4YjRlMWQwMDJmMWFl
-    MzBiODYxOTBjYTg4MjY2MmUxOGYyNDE5YjIzMGQzZTQ5Y2E5YTE=
+    OTI5NjM3ZjQwYTNlMmI5NTQzZTgzNDVjYTU0ODgwYzFiOTE5NWE0ZDNlODY3
+    Y2ZjZjQ2NGRmMTA0NGFkMWZlYTU1MjYyYmVkZmFiNWFiNjdkYzA5MTA4MTEw
+    YTJhZWJmM2IyOWRmMDMwZWNmOTdmZGE0YzA2NWE2NTNlMWQxMGY=

data/lib/jetblue_plane_tracker/leg.rb

@@ -1,14 +1,15 @@
 module JetBluePlaneTracker
 	class Leg
-		attr_accessor :number, :date, :departure, :arrival, :status, :progress
+		attr_accessor :number, :date, :departure, :arrival, :status, :progress, :current_location
 
 		def initialize(number, date, departure, arrival, status)
 			self.number = number
 			self.date = date
 			self.departure = departure
-			self.arrival = arrival 
+			self.arrival = arrival
 			self.status = status
 			self.progress = flight_tracker_progress
+			self.current_location = current_location
 		end
 
 		def to_s
@@ -22,28 +23,50 @@ module JetBluePlaneTracker
 				"departure" => self.departure.to_json,
 				"arrival" =>  self.arrival.to_json,
 				"status" => self.status,
-				"progress" => self.progress
+				"progress" => self.progress,
+				"current_location" => current_location
 			}.to_json
 		end
 
 		def flight_tracker_progress
 			min_progress = 0
 			max_progress = 1
-			progress = 0
-			
-			current_datetime = Time.now.to_i
-			actual_arrival = Time.parse(self.arrival.actual_takeoff).to_i
-			actual_departure = Time.parse(self.departure.actual_takeoff).to_i
-			
-			progress = (current_datetime - actual_departure).to_f / (actual_arrival- actual_departure).to_f
-			
-			progress = progress < min_progress ? min_progress : progress
+			progress = 0			
+			# Arrival airport timezone (UTC)
+			utc = self.arrival.airport.timezone
+			# Convert dates to the actual arrival airport timezone
+			current_datetime = DateTime.now.change(:offset => utc.to_s).to_i
+
+			actual_arrival = self.arrival.actual_takeoff.change(:offset => utc.to_s).to_i
+
+			actual_departure = self.departure.actual_takeoff.change(:offset => utc.to_s).to_i
+
+			progress = (current_datetime - actual_departure).to_f / (actual_arrival - actual_departure).to_f
 			
-			progress = progress > max_progress ? max_progress : progress
+			# Check if progress is minor than min progress or max progress
+			progress = (progress < min_progress) ? min_progress : progress
+			progress = (progress > max_progress) ? max_progress : progress
 			
 			progress * 100
 		end
 
+		# To be tested in different coordinates
+		def current_location
+			departude_longitude = self.departure.airport.longitude.to_f
+			arrival_longitude = self.arrival.airport.longitude.to_f
+			current_progress = self.progress / 100
+			
+			current_latitude = self.arrival.airport.latitude
+			current_longitude = get_plane_longitude(departude_longitude, arrival_longitude, current_progress)
+
+			{latitude: current_latitude, longitude: current_longitude}
+		end
+
+		private
+			def get_plane_longitude(departurelng, arrivallng, progress)
+				(progress > 0) ? ((arrivallng + ((1-progress)*arrivallng)) - progress) : departurelng
+			end
+
 	end
 	
 end

data/lib/jetblue_plane_tracker/travel.rb

@@ -5,8 +5,8 @@ module JetBluePlaneTracker
 		def initialize(airport, scheduled_takeoff, actual_takeoff, terminal, gate, temperature)
 			super()
 			self.airport = Airport.find(iata: Airport.parse_airport_iata(airport))
-			self.scheduled_takeoff = scheduled_takeoff
-			self.actual_takeoff = actual_takeoff
+			self.scheduled_takeoff = DateTime.parse(scheduled_takeoff)
+			self.actual_takeoff = DateTime.parse(actual_takeoff)
 			self.terminal = terminal
 			self.gate = gate
 			self.temperature = temperature

data/lib/jetblue_plane_tracker/version.rb

@@ -1,3 +1,3 @@
 module JetBluePlaneTracker
-  VERSION = '0.2.3'
+  VERSION = '0.2.4.1'
 end

data/lib/jetblue_plane_tracker.rb

@@ -1,9 +1,10 @@
 require 'json'
 require 'httparty'
+require 'active_support/time'
 require File.expand_path('../jetblue_plane_tracker/airport', __FILE__)
 require File.expand_path('../jetblue_plane_tracker/flight', __FILE__)
 require File.expand_path('../jetblue_plane_tracker/leg', __FILE__)
 require File.expand_path('../jetblue_plane_tracker/travel', __FILE__)
 require File.expand_path('../jetblue_plane_tracker/departure', __FILE__)
 require File.expand_path('../jetblue_plane_tracker/arrival', __FILE__)
-require File.expand_path('../jetblue_plane_tracker/tracker', __FILE__)
+require File.expand_path('../jetblue_plane_tracker/tracker', __FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jetblue_plane_tracker
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4.1
 platform: ruby
 authors:
 - Brian Díaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby wrapper for JetBlue flights status API
 email: brian@briandiaz.me
 executables: []