winding-polygon 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85c02cb1aaf6a6c9f5a9e06f4731dbf064138e3c
-  data.tar.gz: 27b0ebb85854fdf76e29ffd49a23d87bae4526f2
+  metadata.gz: 81637ec0ec7f02d00c10a2e683c31ec31a2de7cb
+  data.tar.gz: 94db42e23f1df32e82af4e3353e69356e239a75c
 SHA512:
-  metadata.gz: 3c86d59427916f6f208c1d1a076aca97cb9d8df6477db51029d05bb73f12aa5030f37c3bcdc5e84af2174d4abc8c229caf539ce1a99a7d3ec59ec826795cb86a
-  data.tar.gz: 5bd346c94dba56d354e47631c7fc61edb00757c693ba44ece95da9b20d4041acc95b720f9d8fc469cbb08a454da9a614d7881bb4145676349c73e0e309b8bb47
+  metadata.gz: 9a661b1dbe28627aaa6638365b4065cc43b7f77f39a0dd7ebbbe8b649050bd71b7c9943ee68124e7f37663540ddc5565009164f29dd2578194faf4f2aaf1cc5b
+  data.tar.gz: 58debae2b8874308c7df1ecf6aa38a6643044a07f33fc878948ac3e42ebf511eced0feda11e355109e865241eb5c6d4543806c83908154dce446dc2eb2f59cff

data/lib/winding-polygon/event_queue.rb

@@ -26,19 +26,13 @@ module WindingPolygon
           @events[a][:type] = 'right'
           @events[b][:type] = 'left'
         end
-      end
 
-      @events.sort_by! {|event| event[:vertex].y}
-      left_y =  @events.select{|event| event[:type]=='left'}[0][:vertex].y
-      for i in 1..@events.size-1
-        if @events[i][:type]=='left' && left_y == @events[i][:vertex].y
-          @events[i][:vertex].y += 0.000000000000001
-          left_y = @events[i][:vertex].y
-        end
+        @events[a][:other_y]=@events[b][:vertex].y
+        @events[b][:other_y]=@events[a][:vertex].y
       end
 
       # sort events lexicographically
-      @events.sort!{|a,b| a[:vertex].compare(b[:vertex])}
+      @events.sort!{|a,b| a[:vertex].compare(b[:vertex]).nonzero? || a[:type]<=>b[:type] || a[:other_y]<=>b[:other_y] }
 
     end
 

data/lib/winding-polygon/point.rb

@@ -24,6 +24,20 @@ module WindingPolygon
       return 0
     end
 
+    def <=> other_point
+      raise Exception.new("Self is x=#{@x},y=#{@y}, the other_point is nil") if other_point.nil?
+      # x-coord first
+      return  1 if @x > other_point.x
+      return -1 if @x < other_point.x
+
+      # y-coord second
+      return  1 if @y > other_point.y
+      return -1 if @y < other_point.y
+
+      # they are the same point
+      return 0
+    end
+
     def == (other_point)
       @x==other_point.x && @y==other_point.y
     end

data/lib/winding-polygon/version.rb

@@ -1,3 +1,3 @@
 module WindingPolygon
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
 end

data/spec/winding-polygon_spec.rb

@@ -24,4 +24,45 @@ describe WindingPolygon do
 
   end
 
+
+  it 'should decompose a practical complex polygon into four simple polygons' do
+
+    points = JSON.parse("[[-98.4609375000036,40.3051841980949],[-98.4609375000036,38.057277897745],[-96.0878906250017,40.1038062719331],[-96.6152343750031,37.9880405545487],[-97.6152343750031,40.9880405545487],[-98.0152343750031,37.9880405545487],[-98.4609375000036,40.3051841980949]]")
+    polygon = WindingPolygon::Polygon.new(points.map{|item| WindingPolygon::Point.new(item[0],item[1])})
+
+    multi_polygons = []
+    WindingPolygon.decompose(polygon,multi_polygons)
+    multi_polygons.should_not be_nil
+
+    multi_polygons.size.should == 4
+
+  end
+
+  it 'should decompose a production complex polygon 2 into two simple polygons' do
+
+    points = JSON.parse("[[-95.6968,29.93101],[-95.6992,29.93101],[-95.7016,29.9319],[-95.70401,29.93309],[-95.7071,29.93428],[-95.7095,29.93488],[-95.7119,29.93547],[-95.71431,29.93607],[-95.7174,29.93666],[-95.72014,29.93726],[-95.72255,29.93785],[-95.72564,29.93875],[-95.72804,29.93994],[-95.72598,29.95094],[-95.72358,29.95303],[-95.72152,29.95481],[-95.71877,29.95659],[-95.71637,29.95778],[-95.71362,29.95838],[-95.71122,29.95838],[-95.70847,29.95838],[-95.70538,29.95808],[-95.70195,29.95778],[-95.69851,29.95719],[-95.69405,29.956],[-95.69165,29.9554],[-95.6889,29.95451],[-95.68615,29.95332],[-95.68307,29.95184],[-95.68066,29.95124],[-95.67723,29.94856],[-95.67483,29.94648],[-95.67242,29.9438],[-95.67448,29.93607],[-95.67689,29.93339],[-95.67895,29.93161],[-95.68101,29.93131],[-95.68341,29.93131],[-95.68615,29.93131],[-95.6889,29.93101],[-95.69165,29.93101],[-95.69439,29.93101],[-95.69748,29.93161],[-95.70023,29.9322],[-95.70435,29.93339],[-95.70641,29.93428],[-95.70984,29.93458],[-95.6968,29.93101]]")
+    polygon = WindingPolygon::Polygon.new(points.map{|item| WindingPolygon::Point.new(item[0].to_f,item[1].to_f)})
+
+    multi_polygons = []
+    WindingPolygon.decompose(polygon,multi_polygons)
+    multi_polygons.should_not be_nil
+
+    multi_polygons.size.should == 3
+
+  end
+
+  it 'should decompose a production complex polygon 3 into two simple polygons' do
+
+    points = JSON.parse("[[-95.6968,29.93101],[-95.6992,29.93101],[-95.7016,29.9319],[-95.70401,29.93309],[-95.7071,29.93428],[-95.70747130044843,29.934372825112106],[-95.70984,29.93458],[-95.6968,29.93101]]")
+    polygon = WindingPolygon::Polygon.new(points.map{|item| WindingPolygon::Point.new(item[0].to_f,item[1].to_f)})
+
+    multi_polygons = []
+    WindingPolygon.decompose(polygon,multi_polygons)
+    multi_polygons.should_not be_nil
+
+    multi_polygons.size.should == 2
+
+  end
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: winding-polygon
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Martin Xu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -28,31 +28,31 @@ dependencies:
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Use Bentley-Ottmann algorithm to solve self-intersecting polygon issue '
+description: 'Use Bentley-Ottmann algorithm to solve self-intersecting polygon issue '
 email:
 - mxu2008@gmail.com
 executables: []
@@ -92,17 +92,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Detect intersecting points and decompose it into multi-polygons