geospatial 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f5c7adeba4a6c4c4773d3f05ce924da0287e1b4
-  data.tar.gz: f927b7952f48e67dd30df8c6076aa4d590d8f5cc
+  metadata.gz: 1958264822cca7e6426c5aada4f60e5b810f91a1
+  data.tar.gz: 4a76a3c348d3c75d9f557de8bc84473711d42ad5
 SHA512:
-  metadata.gz: bb6ad414765df8a2c66706c1b157b51355b0e717fd1a9e779455bffc10c8d8a338c0f9c27171ca5023d78d5824414fe2c919be315c277380f4bebb73e6bda4c2
-  data.tar.gz: 4f1f8d46e132ec47cbb07ee5c361b5215088e816514e254d85f40405e8fb5fa0f77fd32cc1d696f73ac0c0a424a2dd7ebc1db6f5fb4c4136a3b10dd20289990a
+  metadata.gz: c7961e865029758de632520c6b821bc52040b36ed443773081787fe9e6dad6afd4861a7dbd1c80db321218c03697a8994dffe03bf29da91433125d1724a741a7
+  data.tar.gz: 6eb65f74cad756520215e97394bfc76d8e081535a68642945062aba035963b64d2b4873600f89cdcec32de9f525f6773e5c2108273b79618299caf29503020f7

data/lib/geospatial/distance.rb

@@ -0,0 +1,80 @@
+# Copyright, 2016, 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.
+
+module Geospatial
+	# This location is specifically relating to a WGS84 coordinate on Earth.
+	class Distance
+		# Distance in meters:
+		def initialize(value)
+			@value = value
+			@formatted_value = nil
+		end
+		
+		def freeze
+			formatted_value
+			
+			super
+		end
+		
+		UNITS = ['m', 'km'].freeze
+		
+		def formatted_value
+			unless @formatted_value
+				scale = 0
+				value = @value
+				
+				while value > 1000 and scale < UNITS.size
+					value /= 1000.0
+					scale += 1
+				end
+				
+				@formatted_value = sprintf("%0.#{scale}f%s", value, UNITS.fetch(scale))
+			end
+			
+			return @formatted_value
+		end
+		
+		alias to_s formatted_value
+		
+		def to_f
+			@value
+		end
+		
+		def + other
+			Distance.new(@value + other.to_f)
+		end
+		
+		def - other
+			Distance.new(@value - other.to_f)
+		end
+		
+		def * other
+			Distance.new(@value * other.to_f)
+		end
+		
+		def / other
+			Distance.new(@value / other.to_f)
+		end
+		
+		def == other
+			@value == other.to_f
+		end
+	end
+end

data/lib/geospatial/location.rb

@@ -42,10 +42,34 @@ module Geospatial
 		MIN_LATITUDE = -90.0 * D2R
 		MAX_LATITUDE = 90 * D2R
 		VALID_LATITUDE = MIN_LATITUDE...MAX_LATITUDE
-
+		
+		class << self
+			def from_ecef(x, y, z)
+				# Constants (WGS ellipsoid)
+				a = WGS84_A
+				e = WGS84_E
+		
+				b = Math::sqrt((a*a) * (1.0-(e*e)))
+				ep = Math::sqrt(((a*a)-(b*b))/(b*b))
+				
+				p = Math::sqrt((x*x)+(y*y))
+				th = Math::atan2(a*z, b*p)
+				
+				lon = Math::atan2(y, x)
+				lat = Math::atan2((z+ep*ep*b*(Math::sin(th) ** 3)), (p-e*e*a*(Math::cos(th)**3)))
+				
+				n = a / Math::sqrt(1.0-e*e*(Math::sin(lat) ** 2))
+				# alt = p / Math::cos(lat)-n
+				
+				return self.new(lat*R2D, lon*R2D)
+			end
+			
+			alias [] new
+		end
+		
 		def initialize(longitude, latitude)
-			@latitude = latitude
 			@longitude = longitude
+			@latitude = latitude
 		end
 		
 		def valid?
@@ -57,7 +81,7 @@ module Geospatial
 		end
 		
 		def to_s
-			"#<Location longitude=#{@longitude.to_f} latitude=#{@latitude}>"
+			"#{self.class}#{self.to_a}"
 		end
 		
 		alias inspect to_s
@@ -113,34 +137,14 @@ module Geospatial
 	
 			return x, y, z
 		end
-	
-		def self.from_ecef(x, y, z)
-			# Constants (WGS ellipsoid)
-			a = WGS84_A
-			e = WGS84_E
-	
-			b = Math::sqrt((a*a) * (1.0-(e*e)))
-			ep = Math::sqrt(((a*a)-(b*b))/(b*b))
-			
-			p = Math::sqrt((x*x)+(y*y))
-			th = Math::atan2(a*z, b*p)
-			
-			lon = Math::atan2(y, x)
-			lat = Math::atan2((z+ep*ep*b*(Math::sin(th) ** 3)), (p-e*e*a*(Math::cos(th)**3)))
-			
-			n = a / Math::sqrt(1.0-e*e*(Math::sin(lat) ** 2))
-			# alt = p / Math::cos(lat)-n
-			
-			return self.new(lat*R2D, lon*R2D)
-		end
 		
 		# calculate distance in metres between us and something else
 		# ref: http://codingandweb.blogspot.co.nz/2012/04/calculating-distance-between-two-points.html
-		def distance_from(other_position)
+		def distance_from(other)
 			rlong1 = self.longitude * D2R 
 			rlat1 = self.latitude * D2R 
-			rlong2 = other_position.longitude * D2R 
-			rlat2 = other_position.latitude * D2R 
+			rlong2 = other.longitude * D2R 
+			rlat2 = other.latitude * D2R 
 			
 			dlon = rlong1 - rlong2
 			dlat = rlat1 - rlat2
@@ -151,5 +155,9 @@ module Geospatial
 			
 			return d
 		end
+		
+		def - other
+			Distance.new(self.distance_from(other))
+		end
 	end
 end

data/lib/geospatial/map.rb

@@ -44,6 +44,8 @@ module Geospatial
 		
 		attr :coordinates
 		
+		alias to_a coordinates
+		
 		def eql?(other)
 			self.class.eql?(other.class) and @coordinates.eql?(other.coordinates)
 		end
@@ -143,6 +145,7 @@ module Geospatial
 		def filter_for(region, **options)
 			filter = Filter.new
 			
+			# The filter will coalesce sequential segments of the curve into a single range.
 			traverse(region, **options) do |child, prefix, order|
 				filter.add(prefix, order)
 			end

data/lib/geospatial/version.rb

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

data/spec/geospatial/distance_spec.rb

@@ -0,0 +1,47 @@
+# 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/distance'
+
+RSpec.describe Geospatial::Distance.new(10000) do
+	it "should have correct value" do
+		expect(subject.to_f).to be == 10000.0
+	end
+	
+	it "should format string" do
+		expect(subject.to_s).to be == "10.0km"
+	end
+	
+	it "can divide distances" do
+		expect(subject / 2).to be == 5000.0
+	end
+	
+	it "can multiply distances" do
+		expect(subject * 2).to be == 20000.0
+	end
+	
+	it "can add distances" do
+		expect(subject + 100).to be == 10100.0
+	end
+	
+	it "can subtract distances" do
+		expect(subject - 100).to be == 9900.0
+	end
+end

data/spec/geospatial/filter_spec.rb

@@ -0,0 +1,55 @@
+
+require 'geospatial/map'
+require 'geospatial/polygon'
+
+require_relative 'visualization'
+
+RSpec.describe Geospatial::Map.for_earth(30) do
+	let(:ranges) {[[888899773526966272, 888899773560520703], [888899773912842240, 888899775322128383], [888899775355682816, 888899775389237247], [888899775422791680, 888899775573786623], [888899775708004352, 888899776311984127], [888899776932741120, 888899776966295551], [888899776999849984, 888899777050181631], [888899781680693248, 888899782217564159], [888899782754435072, 888899783291305983], [888899787317837824, 888899788123144191], [888899788660015104, 888899816141094911], [888899816157872128, 888899816191426559], [888899816224980992, 888899816392753151], [888899816426307584, 888899816443084799], [888899816510193664, 888899817181282303], [888899817349054464, 888899817416163327], [888899817617489920, 888899817634267135], [888899817651044352, 888899821224591359], [888899821342031872, 888899821509804031], [888899822516436992, 888899822717763583], [888899822751318016, 888899823019753471], [888900520767389696, 888900520800944127], [888900520834498560, 888900520868052991], [888900521572696064, 888900521690136575], [888900521824354304, 888900521992126463], [888900525599227904, 888900525632782335], [888900525666336768, 888900525699891199], [888900525917995008, 888900526874296319], [888900527411167232, 888900527444721663], [888900527461498880, 888900580964040703], [888900581031149568, 888900581064703999], [888900581098258432, 888900581349916671], [888900582843088896, 888900582876643327], [888900583044415488, 888900583077969919], [888900583111524352, 888900583161855999], [888900584051048448, 888900584084602879], [888900584134934528, 888900584369815551], [888900584504033280, 888900587154833407], [888900587171610624, 888900587255496703], [888900587624595456, 888900587641372671], [888900587674927104, 888900587708481535], [888900587876253696, 888900587909808127], [888900587926585344, 888900587993694207], [888900588161466368, 888900588178243583], [888900588195020800, 888900591718236159], [888900591768567808, 888900591802122239], [888900591818899456, 888900593093967871], [888900593110745088, 888900593127522303], [888900593244962816, 888900593261740031], [888900593983160320, 888900594016714751], [888900594100600832, 888900594117378047], [888900594134155264, 888900594503254015], [888900594520031232, 888900594536808447], [888900594704580608, 888900594721357823], [888900594738135040, 888900594855575551], [888900594872352768, 888900623544614911], [888900623678832640, 888900633426395135], [888900633795493888, 888900633812271103], [888900633845825536, 888900633879379967], [888900634214924288, 888900634483359743], [888900634567245824, 888900634634354687], [888900634651131904, 888900634667909119], [888900636110749696, 888900636161081343], [888900636244967424, 888900636261744639], [888900636278521856, 888900636882501631], [888900636999942144, 888900637016719359], [888900637520035840, 888900637570367487], [888900644365139968, 888900644381917183], [888900644415471616, 888900644499357695], [888900644549689344, 888900645757648895], [888900645791203328, 888900645807980543], [888900645942198272, 888900646328074239], [888900646344851456, 888900646512623615], [888900649347973120, 888900649364750335], [888900677651136512, 888900677667913727], [888900677701468160, 888900677751799807], [888900677953126400, 888900677969903615], [888912854286073856, 888912854420291583], [888912854621618176, 888912858111279103], [888912858195165184, 888912858228719615], [888912858279051264, 888912858480377855], [888912858530709504, 888912858564263935], [888912858614595584, 888912859487010815], [888912859537342464, 888912859570896895], [888912859621228544, 888912859822555135], [888912859856109568, 888912877103087615], [888912877237305344, 888912877371523071], [888912877505740800, 888912878143275007], [888912878344601600, 888912878411710463], [888912878713700352, 888912878881472511], [888912878931804160, 888912878965358591], [888912879015690240, 888912879888105471], [888912879904882688, 888912879988768767], [888912885978234880, 888912886011789311], [888912886045343744, 888912886078898175], [888912886783541248, 888912886817095679], [888912886850650112, 888912886900981759], [888912887035199488, 888912887169417215], [888912891162394624, 888912891179171839], [888912891263057920, 888912891967700991], [888912892018032640, 888912892051587071], [888912892638789632, 888912892655566847], [888912892705898496, 888912901815926783], [888912901849481216, 888912901883035647], [888912901916590080, 888912902067585023], [888912902201802752, 888912903090995199], [888912903124549632, 888912903174881279], [888912903426539520, 888912903460093951], [888912903476871168, 888912903543980031], [888912906849091584, 888912906882646015], [888912906916200448, 888912909013352447], [888912909214679040, 888912909265010687], [888912909298565120, 888912909315342335], [888912910405861376, 888912910523301887], [888912910657519616, 888912910791737343], [888912911680929792, 888912911714484223], [888912911731261440, 888912912016474111], [888912912050028544, 888912912083582975], [888912912117137408, 888913026034434047], [888913026051211264, 888913026151874559], [888913026168651776, 888913026185428991], [888913026789408768, 888913026906849279], [888913026923626496, 888913027913482239], [888913027930259456, 888913028098031615], [888913028114808832, 888913028131586047], [888913028433575936, 888913028450353151], [888913028483907584, 888913028567793663], [888913028584570880, 888913028601348095], [888913037912702976, 888913037929480191], [888913038550237184, 888913038718009343], [888913038734786560, 888913039993077759], [888913040009854976, 888913040177627135], [888913040446062592, 888913040462839807], [888913040496394240, 888913040597057535], [888913040613834752, 888913056082427903], [888913056115982336, 888913056266977279], [888913056602521600, 888913056686407679], [888913056719962112, 888913059202990079], [888913059622420480, 888913059689529343], [888913713212424192, 888913713413750783], [888913713430528000, 888913713447305215], [888913713682186240, 888913713698963455], [888913713715740672, 888913716366540799], [888913716383318016, 888913716416872447], [888913716685307904, 888913716718862335], [888913716735639552, 888913716836302847], [888913716853080064, 888913716869857279], [888913720711839744, 888913720745394175], [888913720762171392, 888913720896389119], [888913721282265088, 888913721299042303], [888913721466814464, 888913721483591679], [888913721500368896, 888913723110981631], [888913723329085440, 888913756464087039], [888913756665413632, 888913756732522495], [888913756933849088, 888913757772709887], [888913761698578432, 888913761748910079], [888913761782464512, 888913762352889855], [888913762386444288, 888913762436775935], [888913762772320256, 888913762822651903], [888913762856206336, 888913763393077247], [888913763460186112, 888913763510517759], [888913769013444608, 888913769231548415], [888913769265102848, 888913769281880063], [888913769583869952, 888913769617424383], [888913769785196544, 888913771177705471], [888913771446140928, 888913771647467519]]}
+	
+	it "can generate visualisation" do
+		Geospatial::Visualization.for_map(subject) do |pdf, origin|
+			ranges.each do |(min, max)|
+				a = Vector.elements(subject.point_for_hash(min).to_a)
+				b = Vector.elements(subject.point_for_hash(max).to_a)
+				size = (b - a).collect(&:abs)
+				
+				top_left = origin + a + Vector[0, size[1]]
+				pdf.rectangle(top_left.to_a, *size.to_a)
+			end
+			
+			pdf.fill_and_stroke
+		end.render_file "kaikoura.pdf"
+	end
+	
+	let(:kaikoura_polygon) {Geospatial::Polygon[
+		Vector[173.7218528654108, -42.32817252073923],
+		Vector[173.6307775307161, -42.32729039137249],
+		Vector[173.5400659958715, -42.39758413896335],
+		Vector[173.5446498680837, -42.43847509799515],
+		Vector[173.6833471779081, -42.44870319335309],
+		Vector[173.7608096128163, -42.42144813099029],
+		Vector[173.7218528654108, -42.32817252073923],
+	]}
+	
+	it "should not contain point" do
+		map = Geospatial::Map.for_earth(30)
+		filter = map.filter_for(kaikoura_polygon, depth: 12)
+		
+		puts "filter.ranges.count: #{filter.ranges.count}"
+		
+		#ranges.each_with_index do |(min, max), index|
+		#	puts "#{min} -> #{max} :: #{filter.ranges[index].min} -> #{filter.ranges[index].max}"
+		#end
+		
+		location = Geospatial::Location[176.204319, -37.660294]
+		point = map.point_for_object(location)
+		
+		puts map.hash_for_coordinates(location.to_a)
+		# 888186547785722805
+		# 888900599658148001
+		
+		expect(filter).to_not include location
+	end
+end
+

data/spec/geospatial/polygon_spec.rb

@@ -25,13 +25,13 @@ require_relative 'visualization'
 RSpec.shared_context "kaikoura region" do
 	let(:region) do
 		Geospatial::Polygon[
-			Vector[173.7218528654108, -42.32817252073923],
-			Vector[173.6307775307161, -42.32729039137249],
-			Vector[173.5400659958715, -42.39758413896335],
-			Vector[173.5446498680837, -42.43847509799515],
-			Vector[173.6833471779081, -42.44870319335309],
-			Vector[173.7608096128163, -42.42144813099029],
-			Vector[173.7218528654108, -42.32817252073923],
+		  Vector[173.7218528654108, -42.32817252073923],
+		  Vector[173.6307775307161, -42.32729039137249],
+		  Vector[173.5400659958715, -42.39758413896335],
+		  Vector[173.5446498680837, -42.43847509799515],
+		  Vector[173.6833471779081, -42.44870319335309],
+		  Vector[173.7608096128163, -42.42144813099029],
+		  Vector[173.7218528654108, -42.32817252073923],
 		]
 	end
 	
@@ -69,8 +69,14 @@ end
 RSpec.describe Geospatial::Polygon do
 	include_context "kaikoura region"
 	
+	it "generates correct number of ranges" do
+		map = Geospatial::Map.for_earth(30)
+		filter = map.filter_for(region, depth: 12)
+		expect(filter.ranges.count).to be 166
+	end
+	
 	it "can generate visualisation" do
-		map = Geospatial::Map.for_earth
+		map = Geospatial::Map.for_earth(30)
 		
 		map << kaikoura
 		
@@ -79,16 +85,16 @@ RSpec.describe Geospatial::Polygon do
 				pdf.line (origin + pa).to_a, (origin + pb).to_a
 			end
 			
-			#count = 0
-			map.traverse(region, depth: map.order - 15) do |child, prefix, order|
-				#count += 1
+			count = 0
+			map.traverse(region, depth: 12) 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}"
 			end
 			
-			#puts "count=#{count}"
+			# puts "count=#{count}"
 			
 			pdf.fill_and_stroke
 		end.render_file "polygon.pdf"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geospatial
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2016-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -72,6 +72,7 @@ files:
 - lib/geospatial/box.rb
 - lib/geospatial/circle.rb
 - lib/geospatial/dimensions.rb
+- lib/geospatial/distance.rb
 - lib/geospatial/filter.rb
 - lib/geospatial/hilbert.rb
 - lib/geospatial/hilbert/curve.rb
@@ -86,6 +87,8 @@ files:
 - spec/geospatial/box_spec.rb
 - spec/geospatial/circle_spec.rb
 - spec/geospatial/dimensions_spec.rb
+- spec/geospatial/distance_spec.rb
+- spec/geospatial/filter_spec.rb
 - spec/geospatial/hilbert_curve_spec.rb
 - spec/geospatial/hilbert_traverse_spec.rb
 - spec/geospatial/index_spec.rb
@@ -124,6 +127,8 @@ test_files:
 - spec/geospatial/box_spec.rb
 - spec/geospatial/circle_spec.rb
 - spec/geospatial/dimensions_spec.rb
+- spec/geospatial/distance_spec.rb
+- spec/geospatial/filter_spec.rb
 - spec/geospatial/hilbert_curve_spec.rb
 - spec/geospatial/hilbert_traverse_spec.rb
 - spec/geospatial/index_spec.rb