geospatial 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 91eeac2469ee68ea87e60650e5c909a25e9af3cd
-  data.tar.gz: 712f71a592a0e803111c4380ebb78bd7a691f1e7
+SHA256:
+  metadata.gz: 7e053b1210f1e0fa945a2e07de86aa8c211cf77e792298c849f209a73e7a34c1
+  data.tar.gz: bcb46dc6b66f6b532a95006ee1013df86833492bc8486bdbde7ff7c4ac088639
 SHA512:
-  metadata.gz: 9bdb1fa1003101a6cd58be330b2730e75b7aeb64140297512ffa595f59e62874b101293b922d726b2974fe3378be002f96445fe21e582481b192fd337973ec71
-  data.tar.gz: f67b819573274641c82c356ada6b2c58275b6f612af20117145d595aa9b73ad78f5b408809da374be98d3bead97e0d50237aa3fb107d920040f1003baa9a12ee
+  metadata.gz: ed146165687208fde777a2ef91bd523b8a1a6ab8f9c4a3691828708c08aa4e450be46b639a0c8ac1b668b131db15c87901b4739bc50d9cd66c69bdf7e80f6aec
+  data.tar.gz: 9c7f1051fd9f06cb87281ba32b89e8cddedbb64e735817d777220a96690ba90aae4a4ea0d851a0f86407a5a2f2e3d7ebb2d65d3cb9aadc166e62933cd927b378

data/README.md

@@ -14,6 +14,8 @@ We had a need to query a database of places efficiently using SQLite. We did som
 
 After researching geospatial hashing algorithms, I found [this blog post](http://blog.notdot.net/2009/11/Damn-Cool-Algorithms-Spatial-indexing-with-Quadtrees-and-Hilbert-Curves) and decided to implement a geospatial hash using the Hilbert curve. This library exposes a fast indexing and querying mechanism based on Hilbert curves, for points on a map, which can be integrated into a database or other systems as required.
 
+The design of this library is inspired by [Space-Filling Curves in Scala](https://github.com/cne1x/sfseize), which exposes curves as composable mathematical hash functions.
+
 For another solution to this problem, Google uses [S2 Geometry](http://blog.christianperone.com/2015/08/googles-s2-geometry-on-the-sphere-cells-and-hilbert-curve/) which is a more specific implementation designed for geospatial indexes only.
 
 ## Installation

data/lib/geospatial/box.rb

@@ -88,6 +88,10 @@ module Geospatial
 			yield(Vector[@origin[0], max[1]])
 		end
 		
+		def center
+			@origin + (@size/2)
+		end
+		
 		# This yields the midpoints of the four sides of the box.
 		def midpoints
 			return to_enum(:midpoints) unless block_given?

data/lib/geospatial/histogram.rb

@@ -0,0 +1,69 @@
+#
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# This file is part of the "geospatial" project and is released under the MIT license.
+#
+
+module Geospatial
+	# This location is specifically relating to a WGS84 coordinate on Earth.
+	class Histogram
+		def initialize(min = 0, max = 1, scale = 0.1)
+			@min = min
+			@max = max
+			@scale = scale
+			
+			@count = ((@max - @min) / @scale).ceil
+			@bins = [0] * @count
+			@offset = 0
+			@scale = scale
+		end
+		
+		attr :bins
+		
+		attr :offset
+		attr :scale
+		
+		def add(value, amount = 1)
+			index = ((value - @min) / @scale).floor
+			
+			if @bins[index]
+				@bins[index] += amount
+			else
+				@bins[index] = amount
+			end
+			
+			return self
+		end
+		
+		def peaks
+			@bins.each_with_index
+		end
+		
+		def offset(index)
+			@min + (index * @scale)
+		end
+		
+		def inspect
+			buffer = String.new("\#<#{self.class}")
+			
+			@bins.each_with_index do |bin, index|
+				buffer << "\n#{offset(index).to_s.rjust(8)}: #{bin}"
+			end
+			
+			buffer << "\n>"
+		end
+	end
+	
+	class RadialHistogram < Histogram
+		def initialize(center, min = -180, max = 180, scale = 10)
+			super(min, max, scale)
+			
+			@center = center
+		end
+		
+		def add(point, value = 1)
+			super(point.bearing_from(@center), value)
+		end
+	end
+		
+end

data/lib/geospatial/location.rb

@@ -158,6 +158,18 @@ module Geospatial
 			return d
 		end
 		
+		def bearing_from(other)
+			lon1 = other.longitude * D2R 
+			lat1 = other.latitude * D2R 
+			lon2 = self.longitude * D2R 
+			lat2 = self.latitude * D2R 
+			
+			return Math::atan2(
+				Math::sin(lon2 - lon1) * Math::cos(lat2),
+				Math::cos(lat1) * Math::sin(lat2) - Math::sin(lat1) * Math::cos(lat2) * Math::cos(lon2-lon1)
+			) * R2D
+		end
+		
 		def - other
 			Distance.new(self.distance_from(other))
 		end

data/lib/geospatial/version.rb

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

data/spec/geospatial/location_spec.rb

@@ -21,15 +21,43 @@
 require 'geospatial/location'
 
 RSpec.describe Geospatial::Location do
-	let(:lake_tekapo) {Geospatial::Location.new(170.53, -43.89)}
-	let(:lake_alex) {Geospatial::Location.new(170.45, -43.94)}
+	context 'new zealand lakes' do
+		let(:lake_tekapo) {Geospatial::Location.new(170.53, -43.89)}
+		let(:lake_alex) {Geospatial::Location.new(170.45, -43.94)}
+		
+		it "should compute the correct distance between two points" do
+			expect(lake_alex.distance_from(lake_tekapo)).to be_within(100).of(8_500)
+		end
+		
+		it "should format nicely" do
+			expect("#{lake_alex}").to be == "Geospatial::Location[170.45, -43.94]"
+		end
+	end
 	
-	it "compute the correct distance between two points" do
-		expect(lake_alex.distance_from(lake_tekapo)).to be_within(100).of(8_500)
+	context 'points on equator' do
+		let(:west) {Geospatial::Location.new(-10, 0)}
+		let(:east) {Geospatial::Location.new(10, 0)}
+		
+		it "should compute the bearing between two points" do
+			expect(east.bearing_from(west)).to be_within(0.1).of(90)
+		end
+		
+		it "should compute the bearing between two points" do
+			expect(west.bearing_from(east)).to be_within(0.1).of(-90)
+		end
 	end
 	
-	it "should format nicely" do
-		expect("#{lake_alex}").to be == "Geospatial::Location[170.45, -43.94]"
+	context 'points on same latitude' do
+		let(:north) {Geospatial::Location.new(0, 10)}
+		let(:south) {Geospatial::Location.new(0, -10)}
+		
+		it "should compute the bearing between two points" do
+			expect(north.bearing_from(south)).to be_within(0.1).of(0)
+		end
+		
+		it "should compute the bearing between two points" do
+			expect(south.bearing_from(north)).to be_within(0.1).of(180)
+		end
 	end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geospatial
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -76,6 +76,7 @@ files:
 - lib/geospatial/filter.rb
 - lib/geospatial/hilbert.rb
 - lib/geospatial/hilbert/curve.rb
+- lib/geospatial/histogram.rb
 - lib/geospatial/index.rb
 - lib/geospatial/interleave.rb
 - lib/geospatial/location.rb
@@ -119,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Provides abstractions for dealing with geographical locations efficiently