geospatial 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e053b1210f1e0fa945a2e07de86aa8c211cf77e792298c849f209a73e7a34c1
-  data.tar.gz: bcb46dc6b66f6b532a95006ee1013df86833492bc8486bdbde7ff7c4ac088639
+  metadata.gz: 110738e0a022fbd6b133c9d9e28b12e0bcb695c7ab7649cf17d654e634172489
+  data.tar.gz: 9b95095906672c0e8e7cc1db514ef60ef3382bf26c64a6b3197d767a38582715
 SHA512:
-  metadata.gz: ed146165687208fde777a2ef91bd523b8a1a6ab8f9c4a3691828708c08aa4e450be46b639a0c8ac1b668b131db15c87901b4739bc50d9cd66c69bdf7e80f6aec
-  data.tar.gz: 9c7f1051fd9f06cb87281ba32b89e8cddedbb64e735817d777220a96690ba90aae4a4ea0d851a0f86407a5a2f2e3d7ebb2d65d3cb9aadc166e62933cd927b378
+  metadata.gz: 347668d651ee545201053b43be845dd9812e54cf1921125decd7aa6875423a9fb3bd8493c0187c8d77d2e85e9e720f9f8b503176bf7e584d277b99cb973c870c
+  data.tar.gz: 19228fff1b436087f3ce92a64b753b2a2338040d40f13c919b2d2a2d0d4f69f7428aca95ffb48ade10615c77439bc78714affa9141ee03e8d77796764139fd92

data/.travis.yml

@@ -1,18 +1,13 @@
 language: ruby
-sudo: false
-dist: trusty
 cache: bundler
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
   - 2.3
   - 2.4
+  - 2.5
+  - 2.6
   - jruby-head
   - ruby-head
-  - rbx-3
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: rbx-3

data/lib/geospatial/dimensions.rb

@@ -23,6 +23,10 @@ require 'matrix'
 module Geospatial
 	# An integral dimension which maps a continuous space into an integral space. The scale is the maximum integral unit.
 	class Dimension
+		def self.map(min, max, steps)
+			self.new(min, max-min, steps)
+		end
+		
 		def initialize(origin, size, scale = 1.0)
 			@origin = origin
 			@size = size

data/lib/geospatial/histogram.rb

@@ -23,8 +23,16 @@ module Geospatial
 		attr :offset
 		attr :scale
 		
+		def map(value)
+			((value - @min) / @scale)
+		end
+		
+		def unmap(index)
+			@min + ((index + 0.5) * @scale)
+		end
+		
 		def add(value, amount = 1)
-			index = ((value - @min) / @scale).floor
+			index = map(value).floor
 			
 			if @bins[index]
 				@bins[index] += amount
@@ -35,23 +43,23 @@ module Geospatial
 			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}"
+				buffer << "\n#{unmap(index).to_s.rjust(8)}: #{bin}"
 			end
 			
 			buffer << "\n>"
 		end
+		
+		def each
+			return to_enum unless block_given?
+			
+			@bins.each_with_index do |value, index|
+				yield unmap(index), value
+			end
+		end
 	end
 	
 	class RadialHistogram < Histogram
@@ -65,5 +73,4 @@ module Geospatial
 			super(point.bearing_from(@center), value)
 		end
 	end
-		
 end

data/lib/geospatial/location.rb

@@ -28,7 +28,8 @@ module Geospatial
 		# WGS 84 semi-minor axis constant in meters
 		WGS84_B = 6356752.3
 		
-		EARTH_RADIUS = (WGS84_A + WGS84_B) / 2.0
+		# Earth Radius
+		R = (WGS84_A + WGS84_B) / 2.0
 		
 		# WGS 84 eccentricity
 		WGS84_E = 8.1819190842622e-2
@@ -82,6 +83,10 @@ module Geospatial
 			[@longitude, @latitude]
 		end
 		
+		def to_ary
+			to_a
+		end
+		
 		def to_s
 			"#{self.class}[#{self.longitude.to_f}, #{self.latitude.to_f}]"
 		end
@@ -92,7 +97,7 @@ module Geospatial
 		attr :latitude # -90 -> 90 (equivalent to y)
 		
 		# http://janmatuschek.de/LatitudeLongitudeBoundingCoordinates
-		def bounding_box(distance, radius = EARTH_RADIUS)
+		def bounding_box(distance, radius = R)
 			raise ArgumentError.new("Invalid distance or radius") if distance < 0 or radius < 0
 
 			# angular distance in radians on a great circle
@@ -153,7 +158,7 @@ module Geospatial
 			
 			a = Math::sin(dlat/2) ** 2 + Math::cos(rlat1) * Math::cos(rlat2) * Math::sin(dlon/2) ** 2
 			c = 2 * Math::atan2(Math::sqrt(a), Math::sqrt(1-a))
-			d = EARTH_RADIUS * c
+			d = R * c
 			
 			return d
 		end
@@ -170,6 +175,17 @@ module Geospatial
 			) * R2D
 		end
 		
+		def location_by(bearing, distance)
+			lon1 = self.longitude * D2R
+			lat1 = self.latitude * D2R
+			
+			lat2 = Math::asin(Math::sin(lat1)*Math::cos(distance/R) + Math::cos(lat1)*Math::sin(distance/R)*Math::cos(bearing * D2R))
+			
+			lon2 = lon1 + Math::atan2(Math::sin(bearing * D2R)*Math::sin(distance/R)*Math::cos(lat1), Math::cos(distance/R)-Math::sin(lat1)*Math::sin(lat2))
+			
+			return self.class.new(lon2 * R2D, lat2 * R2D)
+		end
+		
 		def - other
 			Distance.new(self.distance_from(other))
 		end

data/lib/geospatial/tiles.rb

@@ -0,0 +1,68 @@
+# Copyright, 2018, 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_relative 'box'
+
+module Geospatial
+	class Tiles
+		# Radians to degrees multiplier
+		R2D = (180.0 / Math::PI)
+		D2R = (Math::PI / 180.0)
+		
+		def initialize(box, zoom = 5)
+			@box = box
+			@zoom = zoom
+		end
+		
+		attr :box
+		attr :zoom
+		
+		def map(longitude, latitude, zoom = @zoom)
+			n = 2 ** zoom
+			
+			x = n * ((longitude + 180.0) / 360.0)
+			y = n * (1.0 - (Math::log(Math::tan(latitude * D2R) + (1.0 / Math::cos(latitude * D2R))) / Math::PI)) / 2.0
+			
+			return x, y
+		end
+		
+		def unmap(x, y, zoom = @zoom)
+			n = 2 ** zoom
+			longitude = x / n * 360.0 - 180.0
+			latitude = Math::arctan(Math::sinh(Math::PI * (1.0 - 2.0 * y / n))) * R2D
+			
+			return longitude, latitude
+		end
+		
+		def each(zoom = @zoom)
+			return to_enum(:each, zoom) unless block_given?
+			
+			min = map(*@box.min, zoom)
+			max = map(*@box.max, zoom)
+			
+			(min[0].floor...max[0].ceil).each do |x|
+				# The y axis is reversed... (i.e. the origin is in the top left)
+				(max[1].floor...min[1].ceil).each do |y|
+					yield zoom, x, y
+				end
+			end
+		end
+	end
+end

data/lib/geospatial/version.rb

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

data/spec/geospatial/tiles_spec.rb

@@ -0,0 +1,31 @@
+# Copyright, 2018, 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/tiles'
+
+RSpec.describe Geospatial::Tiles do
+	let(:box) {Geospatial::Box.from_bounds(Vector[172.0,-44.0], Vector[173.5,-43.0])}
+	
+	subject {described_class.new(box)}
+	
+	it "should enumerate tiles" do
+		expect(subject.each.to_a).to be == [[5, 31, 20]]
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geospatial
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -83,6 +83,7 @@ files:
 - lib/geospatial/map.rb
 - lib/geospatial/map/index.rb
 - lib/geospatial/polygon.rb
+- lib/geospatial/tiles.rb
 - lib/geospatial/version.rb
 - spec/geospatial/box_spec.rb
 - spec/geospatial/circle_spec.rb
@@ -97,6 +98,7 @@ files:
 - spec/geospatial/map_spec.rb
 - spec/geospatial/polygon_spec.rb
 - spec/geospatial/sorted.rb
+- spec/geospatial/tiles_spec.rb
 - spec/geospatial/visualization.rb
 - spec/geospatial/world.png
 - spec/spec_helper.rb
@@ -138,6 +140,7 @@ test_files:
 - spec/geospatial/map_spec.rb
 - spec/geospatial/polygon_spec.rb
 - spec/geospatial/sorted.rb
+- spec/geospatial/tiles_spec.rb
 - spec/geospatial/visualization.rb
 - spec/geospatial/world.png
 - spec/spec_helper.rb