itinerary.rb in ratis-3.3.4

- old
+ new
@@ -1,55 +1,21 @@
 module Ratis
 
   class Itinerary
 
-    attr_accessor :co2_auto, :co2_transit
-    attr_accessor :final_walk_dir, :legs
-    attr_accessor :reduced_fare, :regular_fare
-    attr_accessor :transit_time
+    attr_accessor :co2_auto, :co2_transit, :final_walk_dir, :legs, :reduced_fare, :regular_fare, :transit_time, :trace_info
 
-    def self.where(conditions)
-      date = conditions.delete :date
-      time = conditions.delete :time
-      minimize = conditions.delete(:minimize).to_s.upcase
-
-      origin_lat = conditions.delete(:origin_lat).to_f
-      origin_long = conditions.delete(:origin_long).to_f
-      destination_lat = conditions.delete(:destination_lat).to_f
-      destination_long = conditions.delete(:destination_long).to_f
-
-      raise ArgumentError.new('You must provide a date DD/MM/YYYY') unless DateTime.strptime(date, '%d/%m/%Y') rescue false
-      raise ArgumentError.new('You must provide a time as 24-hour HHMM') unless DateTime.strptime(time, '%H%M') rescue false
-      raise ArgumentError.new('You must provide a conditions of T|X|W to minimize') unless ['T', 'X', 'W'].include? minimize
-
-      raise ArgumentError.new('You must provide an origin latitude') unless Ratis.valid_latitude? origin_lat
-      raise ArgumentError.new('You must provide an origin longitude') unless Ratis.valid_longitude? origin_long
-      raise ArgumentError.new('You must provide an destination latitude') unless Ratis.valid_latitude? destination_lat
-      raise ArgumentError.new('You must provide an destination longitude') unless Ratis.valid_longitude? destination_long
-
-      Ratis.all_conditions_used? conditions
-
-      response = Request.get 'Plantrip',
-        'Date' => date, 'Time' => time, 'Minimize' => minimize,
-        'Originlat' => origin_lat, 'Originlong' => origin_long,
-        'Destinationlat' => destination_lat, 'Destinationlong' => destination_long
-
-      return [] unless response.success?
-
-      response.to_array(:plantrip_response, :itin).map do |itinerary|
-        atis_itinerary = Itinerary.new
-        atis_itinerary.co2_auto = itinerary[:co2auto].to_f
-        atis_itinerary.co2_transit = itinerary[:co2transit].to_f
-        atis_itinerary.final_walk_dir = itinerary[:finalwalkdir]
-        atis_itinerary.reduced_fare = itinerary[:reducedfare].to_f
-        atis_itinerary.regular_fare = itinerary[:regularfare].to_f
-        atis_itinerary.transit_time = itinerary[:transittime].to_i
-        atis_itinerary.legs = itinerary.to_array :legs, :leg
-
-        atis_itinerary
-      end
-
+    def initialize(response)
+      @co2_auto       = response[:co2auto].to_f
+      @co2_transit    = response[:co2transit].to_f
+      @final_walk_dir = response[:finalwalkdir]
+      @reduced_fare   = response[:reducedfare].to_f
+      @regular_fare   = response[:regularfare].to_f
+      @transit_time   = response[:transittime].to_i
+      @trace_info     = response[:traceinfo]
+      @legs           = response.to_array :legs, :leg
     end
 
   end
 
 end
+