server-side-google-maps 0.1.0 → 0.1.1

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

@@ -55,11 +55,7 @@ module ServerSideGoogleMaps
       distance_step = 1.0 * total_distance / (n - 1)
 
       ret = []
-      ret << Point.new(
-        points[0].latitude,
-        points[0].longitude,
-        :distance_along_path => points[0].distance_along_path
-      )
+      ret << create_interpolated_point(points[0], points[0], 0.0, :distance_along_path => points[0].distance_along_path)
 
       j = 0
       current_distance = points[0].distance_along_path
@@ -74,24 +70,29 @@ module ServerSideGoogleMaps
         point_segment_length = point_after.distance_along_path - point_before.distance_along_path
 
         fraction_after = (1.0 * current_distance - point_before.distance_along_path) / point_segment_length
-        fraction_before = 1.0 - fraction_after
 
-        ret << Point.new(
-          fraction_before * point_before.latitude + fraction_after * point_after.latitude,
-          fraction_before * point_before.longitude + fraction_after * point_after.longitude,
-          :distance_along_path => current_distance.round
-        )
+        ret << create_interpolated_point(point_before, point_after, fraction_after, :distance_along_path => current_distance.to_i)
       end
 
-      ret << Point.new(
-        points[-1].latitude,
-        points[-1].longitude,
-        :distance_along_path => points[-1].distance_along_path
-      )
+      ret << create_interpolated_point(points[-1], points[-1], 0.0, :distance_along_path => points[-1].distance_along_path)
     end
 
     private
 
+    def create_interpolated_point(point_before, point_after, fraction_after, options = {})
+      fraction_before = 1.0 - fraction_after
+
+      if point_before.elevation && point_after.elevation && options[:elevation].nil?
+        options = options.merge(:elevation => fraction_before * point_before.elevation + fraction_after * point_after.elevation)
+      end
+
+      Point.new(
+        fraction_before * point_before.latitude + fraction_after * point_after.latitude,
+        fraction_before * point_before.longitude + fraction_after * point_after.longitude,
+        options
+      )
+    end
+
     def encoded_path
       @encoded_path ||= ::GoogleMapsPolyline::Encoder.new(StringIO.new).encode_points(points_1e5).string
     end

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

@@ -1,3 +1,3 @@
 module ServerSideGoogleMaps
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/path_spec.rb

@@ -105,6 +105,16 @@ module ServerSideGoogleMaps
         interpolated[6].distance_along_path.should == 666039
         interpolated[7].should == p3
       end
+
+      it('should interpolate elevations') do
+        p1 = Point.new(1.0, 1.0, :elevation => 10)
+        p2 = Point.new(2.0, 2.0, :elevation => 50)
+        path = Path.new([p1, p2])
+        interpolated = path.interpolate(5)
+        interpolated[0].elevation.should == 10
+        interpolated[1].elevation.should == 20
+        interpolated[4].elevation.should == 50
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: server-side-google-maps
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Adam Hooper