jetblue_plane_tracker 0.2.5 → 0.2.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGY1MTRjZTE4OTIxYjNhNzEyMWM4ZDZmNzVlZWE0ZmQxZDA0ZjFiZA==
+    OWM0MTdlMjNmYWY3ZTk2N2FiNGU4NGFjM2E5YjQwMTliMDI1ODhjMA==
   data.tar.gz: !binary |-
-    YWNkZWY3NjZmNWY3MzU3NzJlOTQwNDYxYjYzNDdkZDhiOGNjZDYyOA==
+    MWY5MGRmZDdkMjNkZTZhOGIxYTk2YWQyMWYxZjA5MzJiNTFhNTA1OQ==
 SHA512:
   metadata.gz: !binary |-
-    MDFhNjk3YTZjZDQ1MTBjOTc4Mzk4ZDE4ZjNhMDhkZjM4MmQwNGFhMzAwNGNm
-    YjM0OWVkNDFhY2M3MTIwZmUxZDQ4MDM2MTM1ZDRlYzdjMDI4N2NmNjUwZmYw
-    MDhiODQ0MTZkZjk5ZmEyOGVlNDI2NTJlYjkyZjU3MjM5ZjdjNTI=
+    NzljODQ5MzEyNDY4ZjFkNjE1ZmNiMjU5YjZjYjAzMDRlYmMxYzBhNWRjOWJj
+    ZWZiZjJkNzNiOTlkZjkwM2Y2NDNlNGRiMDRhODdkYTM5NmEyNWU0N2MwMWU5
+    Yjc2ODE2MjQzYzI1MGQxNWVmNWI4MGRmYjJhNzkwNWUyYmFlOGY=
   data.tar.gz: !binary |-
-    NWYxNjU2MmFlNmJkNjRmYjY1ODI0NDgyN2U0MmExN2MwZjIwZmQ5ZGM3NDg1
-    NjlkN2UxMjhkMjAwOWZiOTc3MmZlMTNmZTc2MGQ4MTU0N2RlOTc2ZjAxNGFm
-    Y2FjZTY5OGUwZWU2ZWQ1NTA2NmQ0MzQxNzBhMTM5MDE5YTMyNzA=
+    ZjFmZDlhNmM4ZDAyNjJiMDNhZjRkZDczM2Q5YmEyZDM5ODljMGZjYzU2MjNh
+    ZThjYmFiYzNmMmY4NzJhZjVkNzA2NjcyNjdlZmFiMmQxYmRhZGU3YWRiYzIx
+    NDAwNTMxNGI2N2QyZjI3YWFmZTc2OTg0NTZkNGZjZTgyMjU0OTU=

data/lib/jetblue_plane_tracker/airport.rb

@@ -10,8 +10,8 @@
       self.name           =   name
       self.city           =   city
       self.country        =   country
-      self.longitude      =   longitude
-      self.latitude       =   latitude
+      self.longitude      =   longitude.to_f
+      self.latitude       =   latitude.to_f
       self.altitude       =   altitude
       self.timezone       =   timezone
       self.dst            =   dst
@@ -29,17 +29,17 @@
 
     def to_json
       {
-        "iata" => self.iata,
-        "icao" => self.icao,
-        "name" => self.name,
-        "city" => self.city,
-        "country" => self.country,
-        "latitude" => self.latitude,
-        "longitude" => self.longitude,
-        "altitude" => self.altitude,
-        "timezone" => self.timezone,
-        "dst" => self.dst
-      }.to_json
+        iata: self.iata,
+        icao: self.icao,
+        name: self.name,
+        city: self.city,
+        country: self.country,
+        latitude: self.latitude,
+        longitude: self.longitude,
+        altitude: self.altitude,
+        timezone: self.timezone,
+        dst: self.dst
+      }
     end
 
     class << self

data/lib/jetblue_plane_tracker/arrival.rb

@@ -1,9 +1,5 @@
 module JetBluePlaneTracker
 	class Arrival < Travel
-		
-		def initialize(airport, scheduled_takeoff, actual_takeoff, terminal, gate, temperature)
-			super(airport, scheduled_takeoff, actual_takeoff, terminal, gate, temperature)
-		end
 
 		class << self
 

data/lib/jetblue_plane_tracker/departure.rb

@@ -1,11 +1,6 @@
 module JetBluePlaneTracker
 	class Departure < Travel
 
-		def initialize(airport, scheduled_takeoff, actual_takeoff, terminal, gate, temperature)
-			super(airport, scheduled_takeoff, actual_takeoff, terminal, gate, temperature)
-		end
-	
-		
 		class << self
 
 			def parse(leg)

data/lib/jetblue_plane_tracker/flight.rb

@@ -21,7 +21,7 @@ module JetBluePlaneTracker
 				"origin" => self.origin.to_json,
 				"destination" => self.destination.to_json,
 				"legs" => self.legs.map{ |leg| leg.to_json }
-			}.to_json
+			}
 		end
 
 	end

data/lib/jetblue_plane_tracker/leg.rb

@@ -16,18 +16,6 @@ module JetBluePlaneTracker
 			"##{number}\n#{departure}\n#{arrival}\n#{status}\n#{progress}"
 		end
 
-		def to_json
-			{
-				"number" => self.number,
-				"date" => self.date,
-				"departure" => self.departure.to_json,
-				"arrival" =>  self.arrival.to_json,
-				"status" => self.status,
-				"progress" => self.progress,
-				"current_location" => self.current_location
-			}.to_json
-		end
-
 		def flight_tracker_progress
 			min_progress = 0
 			max_progress = 1
@@ -50,21 +38,33 @@ module JetBluePlaneTracker
 			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}
+		    departure = self.departure.airport
+		    arrival = self.arrival.airport
+		    current_progress = self.progress/100
+
+		    latitude = get_plane_coordinate(departure.latitude, arrival.latitude, current_progress)
+		    longitude = get_plane_coordinate(departure.longitude, arrival.longitude, current_progress)
+
+		    {
+		        latitude: latitude,
+		        longitude: longitude
+		    }
 		end
 
 		private
-			def get_plane_longitude(departurelng, arrivallng, progress)
-				(progress > 0) ? ((arrivallng + ((1-progress)*arrivallng)) - progress) : departurelng
+			def get_plane_coordinate(coordinate_x, coordinate_y, progress)
+				new_coordinate = 0
+
+				if(coordinate_x != coordinate_y)
+			        new_coordinate = coordinate_x + progress * (coordinate_y - coordinate_x)
+			    else
+			        new_coordinate = coordinate_x
+			    end
+
+			    new_coordinate
 			end
 
 	end

data/lib/jetblue_plane_tracker/travel.rb

@@ -16,7 +16,6 @@ module JetBluePlaneTracker
 			"#{type}-> Airport: #{airport.name} Scheduled Take-Off: #{scheduled_takeoff} - Actual Take-Off: #{actual_takeoff} [Terminal: #{terminal}, Gate: #{gate}, Temperature: #{temperature}]"
 		end
 
-
 		def to_json
 			{
 				"airport" => self.airport.to_json,
@@ -25,7 +24,7 @@ module JetBluePlaneTracker
 				"terminal" => self.terminal,
 				"gate" => self.gate,
 				"temperature" => self.temperature
-			}.to_json
+			}
 		end
 
 		def type

data/lib/jetblue_plane_tracker/version.rb

@@ -1,3 +1,3 @@
 module JetBluePlaneTracker
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

metadata

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