server-side-google-maps 0.1.2 → 0.2.0

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

@@ -78,34 +78,43 @@ module ServerSideGoogleMaps
     end
 
     def simplify(latlng_error2)
-      simplified_points = douglas_peucker_step(points, latlng_error2)
+      simplified_points = douglas_peucker(points, latlng_error2)
       Path.new(simplified_points)
     end
 
     private
 
-    def douglas_peucker_step(points, latlng_error2)
-      simple_points = [ points.first, points.last ]
-      max_i = 0
-      max_d = 0
-
-      points.each_with_index do |point, i|
-        next if i == 0 || i == points.length - 1
-        d = point.latlng_distance_squared_from_segment(points.first, points.last)
-        if d > max_d
-          max_d = d
-          max_i = i
+    def douglas_peucker(points, latlng_error2)
+      ret = [points[0]]
+
+      stack = []
+      stack.push([0, points.length - 1])
+
+      while !stack.empty?
+        left, right = stack.pop
+
+        segment = Segment.new(points[left], points[right])
+        max_i = 0
+        max_d = 0
+
+        (left...right).each do |i|
+          point = points[i]
+          d = point.latlng_distance_squared_from_segment(segment)
+          if d > max_d
+            max_i = i
+            max_d = d
+          end
         end
-      end
 
-      if max_d > latlng_error2
-        simple1 = douglas_peucker_step(points[0..max_i], latlng_error2)
-        simple2 = douglas_peucker_step(points[max_i..-1], latlng_error2)
-        simple1.pop
-        return simple1.concat(simple2)
-      else
-        return simple_points
+        if max_d > latlng_error2
+          stack.push([max_i, right])
+          stack.push([left, max_i])
+        else
+          ret << points[right]
+        end
       end
+
+      ret
     end
 
     def create_interpolated_point(point_before, point_after, fraction_after, options = {})

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

@@ -46,19 +46,22 @@ module ServerSideGoogleMaps
       latitude_difference * latitude_difference + longitude_difference * longitude_difference
     end
 
-    def latlng_distance_squared_from_segment(p1, p2)
+    def latlng_distance_squared_from_segment(segment)
+      p1 = segment.first
+
       vx = p1.latitude - latitude
       vy = p1.longitude - longitude
 
-      return vx*vx + vy*vy if p1 == p2
+      return vx*vx + vy*vy if segment.length2 == 0
 
-      ux = p2.latitude - p1.latitude
-      uy = p2.longitude - p1.longitude
-      length2 = ux*ux + uy*uy
+      ux = segment.dlat
+      uy = segment.dlon
 
       det = (-vx*ux) + (-vy*uy)
 
+      length2 = segment.length2
       if det < 0 || det > length2
+        p2 = segment.last
         # We're outside the line segment
         wx = p2.latitude - latitude
         wy = p2.longitude - longitude

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

@@ -0,0 +1,31 @@
+module ServerSideGoogleMaps
+  class Segment
+    attr_reader(:first, :last)
+
+    def initialize(point1, point2)
+      @first = point1
+      @last = point2
+    end
+
+    def dlat
+      @dlat ||= last.latitude - first.latitude
+    end
+
+    def dlon
+      @dlon ||= last.longitude - first.longitude
+    end
+
+    def length2
+      @length2 ||= dlat * dlat + dlon * dlon
+    end
+
+    def to_a
+      [first, last]
+    end
+
+    private
+
+    def calculate_length2
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module ServerSideGoogleMaps
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

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

@@ -8,6 +8,7 @@ require 'server-side-google-maps/path'
 require 'server-side-google-maps/point'
 require 'server-side-google-maps/route'
 require 'server-side-google-maps/server'
+require 'server-side-google-maps/segment'
 
 module ServerSideGoogleMaps
 end

data/spec/point_spec.rb

@@ -48,7 +48,7 @@ module ServerSideGoogleMaps
         p2 = Point.new(-1.0, 9.1)
         p3 = Point.new(7.0, 1.0)
 
-        distance2 = p2.latlng_distance_squared_from_segment(p1, p3)
+        distance2 = p2.latlng_distance_squared_from_segment(Segment.new(p1, p3))
         distance2.should == p2.latlng_distance_squared(p1)
       end
 
@@ -57,7 +57,7 @@ module ServerSideGoogleMaps
         p2 = Point.new(-1.0, 9.1)
         p3 = Point.new(1.0, 7.0)
 
-        distance2 = p2.latlng_distance_squared_from_segment(p1, p3)
+        distance2 = p2.latlng_distance_squared_from_segment(Segment.new(p1, p3))
         distance2.should == p2.latlng_distance_squared(p1)
       end
     end

data/spec/segment_spec.rb

@@ -0,0 +1,50 @@
+require 'spec'
+
+module ServerSideGoogleMaps
+  describe(Segment) do
+    describe('#first') do
+      it('should return the first element') do
+        point1 = Point.new(1, 2)
+        point2 = Point.new(2, 3)
+        segment = Segment.new(point1, point2)
+        segment.first.should == point1
+      end
+    end
+
+    describe('#last') do
+      it('should return the last element') do
+        point1 = Point.new(1, 2)
+        point2 = Point.new(2, 3)
+        segment = Segment.new(point1, point2)
+        segment.last.should == point2
+      end
+    end
+
+    describe('#length2') do
+      it('should return the length squared') do
+        point1 = Point.new(1, 2)
+        point2 = Point.new(2, 3)
+        segment = Segment.new(point1, point2)
+        segment.length2.should == 2
+      end
+
+      it('should return 0 for zero-length segment') do
+        point = Point.new(1, 2)
+        segment = Segment.new(point, point)
+        segment.length2.should == 0
+      end
+    end
+
+    describe('#to_a') do
+      it('should return the array') do
+        p1 = Point.new(1, 2)
+        p2 = Point.new(2, 3)
+        segment = Segment.new(p1, p2)
+        a = segment.to_a
+        a.length.should == 2
+        a[0].should == p1
+        a[1].should == p2
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: server-side-google-maps
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Adam Hooper
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-10 00:00:00 Z
+date: 2011-06-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
@@ -78,6 +78,7 @@ files:
 - lib/server-side-google-maps/path.rb
 - lib/server-side-google-maps/point.rb
 - lib/server-side-google-maps/route.rb
+- lib/server-side-google-maps/segment.rb
 - lib/server-side-google-maps/server.rb
 - lib/server-side-google-maps/version.rb
 - server-side-google-maps.gemspec
@@ -91,6 +92,7 @@ files:
 - spec/path_spec.rb
 - spec/point_spec.rb
 - spec/route_spec.rb
+- spec/segment_spec.rb
 - spec/spec.rb
 homepage: http://github.com/adamh/server-side-google-maps
 licenses: []