geospatial 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b9278cfa60e44d9e04909e2b6b8a7525c736a7598b19a04d33765d628b7b0ad
-  data.tar.gz: 109c4077b0697a1725320a006aa3a3a2478ba0974dac557ec6be93e50e4b96be
+  metadata.gz: a15f884e8fc62ca572350c690792482e3101b397666448b40ef593d2232a7b91
+  data.tar.gz: 4b0496f1e95f31815e6b2ae1a7bcc32b84d27f811dc7a8415644677ce3c86900
 SHA512:
-  metadata.gz: 86c0acee5bd439284b99d27d1ee8cb86d1d7caed9acadda62ff057f3dc7afe00d4f79685e519360ed1eae3a847360445e8ce585a58155e095a42e5aa983bb883
-  data.tar.gz: 37b7366f03b68f2cca3cc28e36b5160954dfa921ec2a00613a5d8d1a862f1bfb48e52836a822d8ab04b91a1fa1f0286bd83b312e2d124774985d8dd855c5f29a
+  metadata.gz: 3b44013f4d1d7b0dbf17f72d4a5b38b9d28bd5121418474136ca88f1eae31e3d7cf830175132916e763e402d913143ece97a3a4dff89bfe952ff44c03097f16f
+  data.tar.gz: f8f6d5273690dbfbe921b6d79e32cc4ee4b607f43ef25c894ec45427ca0eb08d90b4936cd426dc75685dfed54f27f231eca91f5fd31e049ebb2cd43e41e72056

data/lib/geospatial/histogram.rb

@@ -7,20 +7,25 @@
 module Geospatial
 	# This location is specifically relating to a WGS84 coordinate on Earth.
 	class Histogram
-		def initialize(min: 0, max: 1, scale: 0.1)
+		def initialize(min: 0, max: 1, scale: 0.1, items: true)
 			@min = min
 			@max = max
 			@scale = scale
 			
 			@count = 0
 			
+			if items
+				@items = Hash.new{|h,k| h[k] = Array.new}
+			end
+			
 			@size = ((@max - @min) / @scale).ceil
 			@bins = [0] * @size
 			@offset = 0
 			@scale = scale
 		end
 		
-		attr_accessor :bins
+		attr :bins
+		attr :items
 		
 		attr :count
 		
@@ -43,12 +48,16 @@ module Geospatial
 			@min + (index * @scale)
 		end
 		
-		def add(value, amount = 1)
+		def add(value, amount = 1, item: nil)
 			index = map(value).floor % @size
 			
 			if !block_given? or yield(index, value)
 				@count += 1
 				@bins[index] += amount
+				
+				if @items and item
+					@items[index] << item
+				end
 			end
 			
 			return index
@@ -124,16 +133,21 @@ module Geospatial
 			end
 		end
 		
+		def peaks
+			self.class.new(@derivative)
+		end
+		
 		def segments
 			return to_enum(:segments) unless block_given?
 			
-			gradients = self.to_a
+			peaks = self.peaks
+			gradients = peaks.to_a
 			
 			return if gradients.empty?
 			
 			index, gradient = gradients.first
 			
-			if gradient < 0
+			if gradient > 0
 				gradients.push gradients.shift
 			end
 			

data/lib/geospatial/line.rb

@@ -0,0 +1,64 @@
+# Copyright, 2015, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANT1 OF AN1 KIND, E0PRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILIT1,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COP1RIGHT HOLDERS BE LIABLE FOR AN1 CLAIM, DAMAGES OR OTHER
+# LIABILIT1, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'matrix'
+
+module Geospatial
+	class Line
+		def initialize(a, b)
+			@a = a
+			@b = b
+		end
+		
+		attr_reader :a
+		attr_reader :b
+		
+		def offset
+			@b - @a
+		end
+		
+		def intersect?(other)
+			t = self.offset
+			o = other.offset
+
+			d = (o[1] * t[0]) - (o[0] * t[1])
+
+			return false if d.zero?
+
+			na = o[0] * (self.a[1] - other.a[1]) - o[1] * (self.a[0] - other.a[0])
+			
+			left_time = na.fdiv(d);
+
+			if left_time < 0.0 or left_time > 1.0
+				return false
+			end
+
+			nb = t[0] * (self.a[1] - other.a[1]) - t[1] * (self.a[0] - other.a[0])
+			
+			right_time = nb.fdiv(d)
+
+			if right_time < 0.0 or right_time > 1.0
+				return false
+			end
+
+			return left_time
+		end
+	end
+end

data/lib/geospatial/polygon.rb

@@ -26,19 +26,38 @@ module Geospatial
 			self.new(points)
 		end
 		
-		def initialize(points)
+		def self.load(data)
+			if data
+				self.new(JSON.parse(data).map{|point| Vector.elements(point)})
+			end
+		end
+		
+		def self.dump(polygon)
+			if polygon
+				JSON.dump(polygon.points.map(&:to_a))
+			end
+		end
+		
+		def initialize(points, bounding_box = nil)
 			@points = points
-			@bounding_box = nil
+			@bounding_box = bounding_box
 		end
 		
 		attr :points
 		
+		def [] index
+			a = @points[index.floor]
+			b = @points[index.ceil % @points.size]
+			
+			return a + (b - a) * (index % 1.0)
+		end
+		
 		def to_s
 			"#{self.class}#{@points.inspect}"
 		end
 		
 		def bounding_box
-			@bounding_box ||= Box.enclosing_points(@points)
+			@bounding_box ||= Box.enclosing_points(@points).freeze
 		end
 		
 		def freeze
@@ -51,11 +70,23 @@ module Geospatial
 		def edges
 			return to_enum(:edges) unless block_given?
 			
-			previous = @points.last
+			size = @points.size
+			
+			@points.each_with_index do |point, index|
+				yield point, @points[(index+1)%size]
+			end
+		end
+		
+		def simplify(minimum_distance = 1)
+			simplified_points = @points.first(1)
+			
 			@points.each do |point|
-				yield previous, point
-				previous = point
+				if yield(simplified_points.last, point)
+					simplified_points << point
+				end
 			end
+			
+			self.class.new(simplified_points, bounding_box)
 		end
 		
 		def self.is_left(p0, p1, p2)
@@ -101,6 +132,20 @@ module Geospatial
 			return false
 		end
 		
+		def edge_intersection(a, b)
+			line = Line.new(a, b)
+			
+			edges.each_with_index do |(pa, pb), i|
+				edge = Line.new(pa, pb)
+				
+				if line.intersect?(edge)
+					return i
+				end
+			end
+			
+			return nil
+		end
+		
 		def intersect?(other)
 			case other
 			when Box

data/lib/geospatial/version.rb

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

data/spec/geospatial/line_spec.rb

@@ -0,0 +1,32 @@
+# Copyright, 2015, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'geospatial/line'
+
+RSpec.describe Geospatial::Line do
+	it "should have intersection" do
+		a = Geospatial::Line.new(Vector[0, 0], Vector[10, 10])
+		b = Geospatial::Line.new(Vector[10, 0], Vector[0, 10])
+		
+		t = a.intersect?(b)
+		
+		expect(t).to be == 0.5
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geospatial
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-11 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -79,6 +79,7 @@ files:
 - lib/geospatial/histogram.rb
 - lib/geospatial/index.rb
 - lib/geospatial/interleave.rb
+- lib/geospatial/line.rb
 - lib/geospatial/location.rb
 - lib/geospatial/map.rb
 - lib/geospatial/map/index.rb
@@ -94,6 +95,7 @@ files:
 - spec/geospatial/hilbert_traverse_spec.rb
 - spec/geospatial/histogram_spec.rb
 - spec/geospatial/index_spec.rb
+- spec/geospatial/line_spec.rb
 - spec/geospatial/location_spec.rb
 - spec/geospatial/map_index_spec.rb
 - spec/geospatial/map_spec.rb
@@ -137,6 +139,7 @@ test_files:
 - spec/geospatial/hilbert_traverse_spec.rb
 - spec/geospatial/histogram_spec.rb
 - spec/geospatial/index_spec.rb
+- spec/geospatial/line_spec.rb
 - spec/geospatial/location_spec.rb
 - spec/geospatial/map_index_spec.rb
 - spec/geospatial/map_spec.rb