geospatial 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7192e26af8621237a3727ebdc875df7af056a4ac9bf36dcadba378107c97b6a4
-  data.tar.gz: 833732089ee04ebedaf970430661cb51ec85fc878b1093d9b71440cf8a347327
+  metadata.gz: 6ef4b5ff93a87b5fb2733e6bbbe587be842c11ba2365131be98760bb66ee7143
+  data.tar.gz: 8468357c04f732b2a843ef154b7e93b8732dc334b9e76da989f22428b3eb18bf
 SHA512:
-  metadata.gz: ea63ff5c6dfa08038b891f2df6e3d0e78a77151834a9655a8f8dee85eca08d603860c99566f8d47b1ce0d45d60bd42fa2d09da187884f92e1ee637a21e7aef2c
-  data.tar.gz: 1c28ff01ced07bddb5091eea5aeadce0ebf4772752d3317a55ba3fcb8605b49573fb186b2dd27334930b0cffa5dfec5caf851c47aeb3468b1984bd401872f754
+  metadata.gz: 3c97d956c5ef2b8b959d85f4ce07877020000b0d24ba5496edf82ef824b3d23c7c7f9471e5e48ae53f9524aab2703dd11449dc476d7288a7d91a0c7fb58e8c13
+  data.tar.gz: 368fc193f939b360aa1945198c054aa7bf0f05620d1307b95a0ed89f1a09a374b605c2baecc3244e2ba81bc0fe70546ff357e705d3e423d3543163cf64394a89

data/lib/geospatial/location.rb

@@ -202,5 +202,20 @@ module Geospatial
 		def - other
 			Distance.new(self.distance_from(other))
 		end
+		
+		# Compute count midpoints between self and other.
+		# @param count [Integer] the number of segments to generate.
+		def midpoints_to(other, count)
+			return to_enum(:midpoints_to, other, count) unless block_given?
+			
+			distance = other.distance_from(self)
+			bearing = other.bearing_from(self)
+			
+			step = distance / count
+			
+			(1...count).each do |i|
+				yield self.location_by(bearing, step * i)
+			end
+		end
 	end
 end

data/lib/geospatial/polygon.rb

@@ -95,10 +95,12 @@ module Geospatial
 			end
 		end
 		
-		def simplify(minimum_distance = 1)
+		def simplify
 			simplified_points = @points.first(1)
 			
-			@points.each_with_index do |point, index|
+			(1...@points.size).each do |index|
+				point = @points[index]
+				
 				next_point = @points[(index+1) % @points.size]
 				
 				if yield(simplified_points.last, point, next_point)
@@ -109,6 +111,34 @@ module Geospatial
 			self.class.new(simplified_points, bounding_box)
 		end
 		
+		# @example
+		# polygon.subdivide do |a, b|
+		#		a = Geospatial::Location.new(*a)
+		#		b = Geospatial::Location.new(*b)
+		# 	if a.distance_from(b) > maximum_distance
+		# 		a.midpoints(b, 2)
+		# 	end
+		# end
+		def subdivide
+			simplified_points = @points.first(1)
+			
+			(1..@points.size).each do |index|
+				point = @points[index % @points.size]
+				next_point = @points[(index+1) % @points.size]
+				
+				if points = yield(simplified_points.last, point, next_point)
+					simplified_points.concat(points)
+				end
+				
+				# Polygons are represented by a closed sequence of points, but we need to subdivide by the last point at the first point too. However, we don't add the first point a 2nd time.
+				if index < @points.size
+					simplified_points << point
+				end
+			end
+			
+			self.class.new(simplified_points, bounding_box)
+		end
+		
 		def self.is_left(p0, p1, p2)
 			a = p1 - p0
 			b = p2 - p0

data/lib/geospatial/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Geospatial
-	VERSION = "1.13.0"
+	VERSION = "1.14.0"
 end

data/spec/geospatial/location_spec.rb

@@ -69,6 +69,29 @@ RSpec.describe Geospatial::Location do
 			expect(south.bearing_from(north)).to be_within(0.1).of(180)
 		end
 	end
+	
+	describe '#midpoints_to' do
+		let(:north) {Geospatial::Location.new(10, 10)}
+		let(:south) {Geospatial::Location.new(-10, -10)}
+		
+		it "can generate one midpoint" do
+			midpoints = north.midpoints_to(south, 4).to_a
+			
+			expect(midpoints.size).to be == 3
+			
+			expect(midpoints[0].distance_from(
+				Geospatial::Location.new(4.9616, 5.0190)
+			)).to be < 10
+			
+			expect(midpoints[1].distance_from(
+				Geospatial::Location.new(0, 0)
+			)).to be < 10
+			
+			expect(midpoints[2].distance_from(
+				Geospatial::Location.new(-4.9616, -5.0190)
+			)).to be < 10
+		end
+	end
 end
 
 require 'bigdecimal'

data/spec/geospatial/polygon_spec.rb

@@ -105,28 +105,49 @@ RSpec.describe Geospatial::Polygon do
 	end
 end
 
-RSpec.shared_context "visualize polygon" do
+RSpec.shared_context "visualize polygon" do |depth = 12|
 	it "can generate visualisation" do
 		map = Geospatial::Map.for_earth(30)
 		
 		coordinates = region_string.split(/\s+/).collect{|coordinate| Vector.elements(coordinate.split(',').collect(&:to_f).first(2))}
 		region = Geospatial::Polygon.new(coordinates)
 		
+		maximum_distance = 100_000
+		
+		region = region.subdivide do |a, b|
+			a = Geospatial::Location.new(*a)
+			b = Geospatial::Location.new(*b)
+			
+			distance = a.distance_from(b)
+			
+			if distance > maximum_distance
+				a.midpoints_to(b, (distance / maximum_distance).ceil).map{|p| Vector[*p]}
+			end
+		end
+		
 		Geospatial::Visualization.for_map(map) do |pdf, origin|
 			region.edges do |pa, pb|
 				pdf.line (origin + pa).to_a, (origin + pb).to_a
 			end
 			
 			count = 0
-			map.traverse(region, depth: 12) do |child, prefix, order|
+			map.traverse(region, depth: depth) do |child, prefix, order|
 				count += 1
 				size = child.size
 				top_left = (origin + child.min) + Vector[0, size[1]]
 				pdf.rectangle(top_left.to_a, *size.to_a)
-				# puts "#{top_left.to_a} #{size.to_a}"
+				# $stderr.puts "#{top_left.to_a} #{size.to_a}"
 			end
 			
-			# puts "count=#{count}"
+			# $stderr.puts "count=#{count}"
+			
+			pdf.fill_and_stroke
+			
+			pdf.fill_color 'aaaaff'
+			
+			region.points.each do |p|
+				pdf.fill_circle((origin + p).to_a, 0.01)
+			end
 			
 			pdf.fill_and_stroke
 		end.render_file "#{self.class.description}.pdf"
@@ -144,3 +165,10 @@ RSpec.describe "Whanganui Polygon" do
 	
 	include_context "visualize polygon"
 end
+
+
+RSpec.describe "New Zealand Bounding Box" do
+	let(:region_string) {"165.7930426042,-47.8671059558 179.1461410947,-47.8671059558 179.1461410947,-33.4566032676 165.7930426042,-33.4566032676"}
+	
+	include_context "visualize polygon", 20
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geospatial
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: covered