server-side-google-maps 0.0.4 → 0.0.5

data/lib/server-side-google-maps/directions.rb

@@ -90,6 +90,10 @@ module ServerSideGoogleMaps
       @distance ||= calculate_distance
     end
 
+    def estimated_distance
+      @estimated_distance ||= calculate_estimated_distance
+    end
+
     private
 
     def origin_point_without_server
@@ -131,11 +135,23 @@ module ServerSideGoogleMaps
     end
 
     def calculate_distance
-      return GeoMath.latlng_distance(*points) if @direct
+      return estimated_distance if @direct
       if !leg['distance']
         return leg['steps'].collect{|s| s['distance']}.collect{|d| d ? d['value'].to_i : 0}.inject(0){|s,v| s += v}
       end
       leg['distance']['value']
     end
+
+    def calculate_estimated_distance
+      d = 0
+      last_point = points[0]
+
+      points[1..-1].each do |point|
+        d += GeoMath.latlng_distance(last_point, point)
+        last_point = point
+      end
+
+      d
+    end
   end
 end

data/lib/server-side-google-maps/route.rb

@@ -40,6 +40,10 @@ module ServerSideGoogleMaps
       @distance ||= @directionses.map{|d| d.distance}.inject(:+)
     end
 
+    def estimated_distance
+      @estimated_distance ||= @directionses.map{|d| d.estimated_distance}.inject(:+)
+    end
+
     private
 
     def calculate_points

data/lib/server-side-google-maps/version.rb

@@ -1,3 +1,3 @@
 module ServerSideGoogleMaps
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/directions_spec.rb

@@ -94,6 +94,12 @@ module ServerSideGoogleMaps
         distance.should == 199901
       end
 
+      it('should supply an estimated_distance') do
+        directions = Directions.new('Montreal,QC', 'Ottawa,ON')
+        distance = directions.estimated_distance
+        distance.should == 199127
+      end
+
       it('should suggest a straight line, with :direct') do
         directions = Directions.new('Montreal,QC', 'Ottawa,ON', :mode => :direct)
         directions.points.should == [[45.50867, -73.55368], [45.4119, -75.69846]]

data/spec/route_spec.rb

@@ -78,6 +78,12 @@ module ServerSideGoogleMaps
         distance.should == 649742
       end
 
+      it('should have the proper estimated_distance') do
+        route = Route.new(['Montreal,QC', 'Ottawa,ON', 'Toronto,ON'])
+        distance = route.estimated_distance
+        distance.should == 647730
+      end
+
       it('should not alter params') do
         original_params = {
           :mode => :driving,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: server-side-google-maps
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Adam Hooper
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 -06:00
+date: 2011-05-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency