geospatial 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af57f14cdc085ce808e8462af23af0e269797b86
-  data.tar.gz: f7bc6d182e0b5366a6ada00112c555a35576977b
+  metadata.gz: 15f0c8c532fe2f0546030210c5a72d2165049bec
+  data.tar.gz: 7ff3bcb66454f109bdd1c0eae8011d7a7594fb45
 SHA512:
-  metadata.gz: 20a32b175c72f9989a8ffe6f29fa06637af22fda65d8d61c240d25c701268468248e4e52bc719b33e9f1c3396702fac0c49924e4878fae2d8ff07af8a4564251
-  data.tar.gz: 471174aee8a1270436599bdfed01d623ff9a3d34dbce7b7221d63b9e266fbfdc5e4da8bd0ca990342a010b68281b7a3fddbd6f5fbfad33757de2ed05fa155c87
+  metadata.gz: ad01c05beaab5b05fa37c4a14a4bc2d69e74b59599e01e95d9d9d266a435ce5e147d78bfd58918d5d3eb0e7576d60f4c4fd6895d689c32d1356cced89ebf34c6
+  data.tar.gz: f260e9f9b7ab20b6211ce90abdb2e068d4d7913ad8042b322d9c2bf75cc85eb062ae5a144a0075b78d121946d2d7cca65be0545349547568607e444f68bb31bc

data/.rspec

@@ -1,2 +1,3 @@
---color 
---format documentation 
+--format documentation
+--warnings
+--require spec_helper

data/.rspec_status

@@ -0,0 +1,57 @@
+example_id                                      | status | run_time        |
+----------------------------------------------- | ------ | --------------- |
+./spec/geospatial/box_spec.rb[1:1]              | passed | 0.00096 seconds |
+./spec/geospatial/circle_spec.rb[1:1]           | passed | 0.00011 seconds |
+./spec/geospatial/circle_spec.rb[1:2]           | passed | 0.0001 seconds  |
+./spec/geospatial/circle_spec.rb[1:3]           | passed | 0.00009 seconds |
+./spec/geospatial/circle_spec.rb[1:4]           | passed | 0.00008 seconds |
+./spec/geospatial/circle_spec.rb[1:5]           | passed | 0.40939 seconds |
+./spec/geospatial/dimensions_spec.rb[1:1]       | passed | 0.0001 seconds  |
+./spec/geospatial/dimensions_spec.rb[1:2]       | passed | 0.00006 seconds |
+./spec/geospatial/distance_spec.rb[1:1]         | passed | 0.00005 seconds |
+./spec/geospatial/distance_spec.rb[1:2]         | passed | 0.00005 seconds |
+./spec/geospatial/distance_spec.rb[1:3]         | passed | 0.00005 seconds |
+./spec/geospatial/distance_spec.rb[1:4]         | passed | 0.00005 seconds |
+./spec/geospatial/distance_spec.rb[1:5]         | passed | 0.00004 seconds |
+./spec/geospatial/distance_spec.rb[1:6]         | passed | 0.00006 seconds |
+./spec/geospatial/distance_spec.rb[1:7]         | passed | 0.00007 seconds |
+./spec/geospatial/filter_spec.rb[1:1]           | passed | 0.4025 seconds  |
+./spec/geospatial/filter_spec.rb[1:2]           | passed | 0.14153 seconds |
+./spec/geospatial/hilbert_curve_spec.rb[1:1:1]  | passed | 0.00041 seconds |
+./spec/geospatial/hilbert_curve_spec.rb[1:2:1]  | passed | 0.00009 seconds |
+./spec/geospatial/hilbert_curve_spec.rb[1:3:1]  | passed | 0.00007 seconds |
+./spec/geospatial/hilbert_curve_spec.rb[1:4:1]  | passed | 0.00007 seconds |
+./spec/geospatial/hilbert_curve_spec.rb[2:1:1]  | passed | 0.00007 seconds |
+./spec/geospatial/hilbert_curve_spec.rb[2:2:1]  | passed | 0.00007 seconds |
+./spec/geospatial/hilbert_curve_spec.rb[2:3:1]  | passed | 0.00007 seconds |
+./spec/geospatial/hilbert_curve_spec.rb[2:4:1]  | passed | 0.00007 seconds |
+./spec/geospatial/hilbert_curve_spec.rb[3:1:1]  | passed | 0.00009 seconds |
+./spec/geospatial/hilbert_curve_spec.rb[3:2:1]  | passed | 0.00011 seconds |
+./spec/geospatial/hilbert_curve_spec.rb[3:3:1]  | passed | 0.0001 seconds  |
+./spec/geospatial/hilbert_curve_spec.rb[3:4:1]  | passed | 0.00011 seconds |
+./spec/geospatial/hilbert_traverse_spec.rb[1:1] | passed | 0.00025 seconds |
+./spec/geospatial/hilbert_traverse_spec.rb[2:1] | passed | 0.00384 seconds |
+./spec/geospatial/index_spec.rb[1:1:1]          | passed | 0.00008 seconds |
+./spec/geospatial/index_spec.rb[1:1:2]          | passed | 0.00008 seconds |
+./spec/geospatial/index_spec.rb[2:1:1]          | passed | 0.00012 seconds |
+./spec/geospatial/index_spec.rb[2:1:2]          | passed | 0.00009 seconds |
+./spec/geospatial/index_spec.rb[3:1:1]          | passed | 0.00014 seconds |
+./spec/geospatial/index_spec.rb[3:1:2]          | passed | 0.00014 seconds |
+./spec/geospatial/location_spec.rb[1:1]         | passed | 0.00006 seconds |
+./spec/geospatial/location_spec.rb[1:2]         | passed | 0.00006 seconds |
+./spec/geospatial/location_spec.rb[2:1]         | passed | 0.00006 seconds |
+./spec/geospatial/map_index_spec.rb[1:1]        | passed | 0.00009 seconds |
+./spec/geospatial/map_index_spec.rb[1:2]        | passed | 0.00011 seconds |
+./spec/geospatial/map_spec.rb[1:1]              | passed | 0.45715 seconds |
+./spec/geospatial/map_spec.rb[1:2]              | passed | 0.00018 seconds |
+./spec/geospatial/map_spec.rb[1:3]              | passed | 0.01971 seconds |
+./spec/geospatial/polygon_spec.rb[1:1]          | passed | 0.00007 seconds |
+./spec/geospatial/polygon_spec.rb[1:2]          | passed | 0.00011 seconds |
+./spec/geospatial/polygon_spec.rb[1:3]          | passed | 0.00006 seconds |
+./spec/geospatial/polygon_spec.rb[1:4]          | passed | 0.00007 seconds |
+./spec/geospatial/polygon_spec.rb[2:1]          | passed | 2.09 seconds    |
+./spec/geospatial/polygon_spec.rb[2:2]          | passed | 2.09 seconds    |
+./spec/geospatial/polygon_spec.rb[3:1]          | passed | 0.14057 seconds |
+./spec/geospatial/polygon_spec.rb[3:2]          | passed | 0.55125 seconds |
+./spec/geospatial/polygon_spec.rb[4:1]          | passed | 0.54482 seconds |
+./spec/geospatial/polygon_spec.rb[5:1]          | passed | 0.48422 seconds |

data/.travis.yml

@@ -1,14 +1,18 @@
 language: ruby
 sudo: false
+dist: trusty
+cache: bundler
 rvm:
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - jruby-head
   - ruby-head
-  - rbx-2
-env: COVERAGE=true
+  - rbx-3
 matrix:
-  fast_finish: true
   allow_failures:
-    - rvm: "ruby-head"
-    - rvm: "rbx-2"
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: rbx-3

data/geospatial.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ["lib"]
 
-	spec.add_development_dependency "rspec", "~> 3.4"
+	spec.add_development_dependency "rspec", "~> 3.6"
 
 	spec.add_development_dependency "bundler", "~> 1.6"
 	spec.add_development_dependency "rake"

data/lib/geospatial/hilbert/curve.rb

@@ -20,7 +20,6 @@
 
 require_relative '../dimensions'
 require_relative '../index'
-require_relative 'traverse'
 
 module Geospatial
 	module Hilbert
@@ -55,10 +54,38 @@ module Geospatial
 			
 			# This is a helper entry point for traversing Hilbert space.
 			def traverse(&block)
-				if block_given?
-					self.class.traverse_recurse(@order, @rotation, 0, @origin, @size, &block)
-				else
-					self.class.to_enum(:traverse_recurse, @order, @rotation, 0, @origin, @size)
+				return to_enum(:traverse) unless block_given?
+				
+				traverse_recurse(@order-1, 0, 0, self.origin, self.size, &block)
+			end
+			
+			def bit_width
+				@dimensions.count
+			end
+			
+			# Traversal enumerates all regions of a curve, top-down.
+			def traverse_recurse(order, mask, value, origin, size, &block)
+				half_size = size.collect{|value| value * 0.5}.freeze
+				prefix_mask = (1 << order) | mask
+				
+				(2**bit_width).times do |prefix|
+					# These both do the same thing, not sure which one is faster:
+					child_value = (value << @dimensions.count) | prefix
+					prefix = child_value << (order*bit_width)
+					
+					index = HilbertIndex.from_integral(prefix, bit_width, @order).to_ordinal
+					
+					index = index & prefix_mask
+					
+					child_origin = @dimensions.unmap(index.axes).freeze
+					
+					# puts "yield(#{child_origin}, #{half_size}, #{prefix}, #{order})"
+					# We avoid calling traverse_recurse simply to hit the callback on the leaf nodes:
+					result = yield child_origin, half_size, prefix, order
+					
+					if order > 0 and result != :skip
+						self.traverse_recurse(order - 1, prefix_mask, child_value, child_origin, half_size, &block)
+					end
 				end
 			end
 			

data/lib/geospatial/location.rb

@@ -46,10 +46,6 @@ module Geospatial
 		VALID_LATITUDE = MIN_LATITUDE...MAX_LATITUDE
 		
 		class << self
-			def [] (longitude:, latitude:)
-				self.new(longitude, latitude)
-			end
-			
 			def from_ecef(x, y, z)
 				# Constants (WGS ellipsoid)
 				a = WGS84_A
@@ -64,7 +60,7 @@ module Geospatial
 				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))
+				# 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)

data/lib/geospatial/map.rb

@@ -21,7 +21,8 @@
 require_relative 'location'
 require_relative 'box'
 require_relative 'filter'
-require_relative 'hilbert/traverse'
+
+require_relative 'hilbert/curve'
 
 module Geospatial
 	# A point is a location on a map with a specific hash representation based on the map. A point might store multi-dimentional data (e.g. longitude, latitude, time) which is hashed to a single column.

data/lib/geospatial/version.rb

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

data/spec/geospatial/hilbert_traverse_spec.rb

@@ -1,5 +1,5 @@
 
-require 'geospatial/hilbert/traverse'
+require 'geospatial/hilbert/curve'
 
 require_relative 'sorted'
 

data/spec/spec_helper.rb

@@ -0,0 +1,29 @@
+
+if ENV['COVERAGE'] || ENV['TRAVIS']
+	begin
+		require 'simplecov'
+		
+		SimpleCov.start do
+			add_filter "/spec/"
+		end
+		
+		if ENV['TRAVIS']
+			require 'coveralls'
+			Coveralls.wear!
+		end
+	rescue LoadError
+		warn "Could not load simplecov: #{$!}"
+	end
+end
+
+require "bundler/setup"
+require "geospatial"
+
+RSpec.configure do |config|
+	# Enable flags like --only-failures and --next-failure
+	config.example_status_persistence_file_path = ".rspec_status"
+
+	config.expect_with :rspec do |c|
+		c.syntax = :expect
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geospatial
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -61,6 +61,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rspec_status"
 - ".simplecov"
 - ".travis.yml"
 - Gemfile
@@ -76,7 +77,6 @@ files:
 - lib/geospatial/filter.rb
 - lib/geospatial/hilbert.rb
 - lib/geospatial/hilbert/curve.rb
-- lib/geospatial/hilbert/traverse.rb
 - lib/geospatial/index.rb
 - lib/geospatial/interleave.rb
 - lib/geospatial/location.rb
@@ -99,6 +99,7 @@ files:
 - spec/geospatial/sorted.rb
 - spec/geospatial/visualization.rb
 - spec/geospatial/world.png
+- spec/spec_helper.rb
 homepage: https://github.com/ioquatix/geospatial
 licenses:
 - MIT
@@ -139,3 +140,4 @@ test_files:
 - spec/geospatial/sorted.rb
 - spec/geospatial/visualization.rb
 - spec/geospatial/world.png
+- spec/spec_helper.rb

data/lib/geospatial/hilbert/traverse.rb

@@ -1,63 +0,0 @@
-# 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.
-
-require_relative 'curve'
-
-module Geospatial
-	module Hilbert
-		class Curve
-			def traverse(&block)
-				return to_enum(:traverse) unless block_given?
-				
-				traverse_recurse(@order-1, 0, 0, self.origin, self.size, &block)
-			end
-			
-			def bit_width
-				@dimensions.count
-			end
-			
-			# Traversal enumerates all regions of a curve, top-down.
-			def traverse_recurse(order, mask, value, origin, size, &block)
-				half_size = size.collect{|value| value * 0.5}.freeze
-				prefix_mask = (1 << order) | mask
-				
-				(2**bit_width).times do |prefix|
-					# These both do the same thing, not sure which one is faster:
-					child_value = (value << @dimensions.count) | prefix
-					prefix = child_value << (order*bit_width)
-					
-					index = HilbertIndex.from_integral(prefix, bit_width, @order).to_ordinal
-					
-					index = index & prefix_mask
-					
-					child_origin = @dimensions.unmap(index.axes).freeze
-					
-					# puts "yield(#{child_origin}, #{half_size}, #{prefix}, #{order})"
-					# We avoid calling traverse_recurse simply to hit the callback on the leaf nodes:
-					result = yield child_origin, half_size, prefix, order
-					
-					if order > 0 and result != :skip
-						self.traverse_recurse(order - 1, prefix_mask, child_value, child_origin, half_size, &block)
-					end
-				end
-			end
-		end
-	end
-end