ocean-names 0.3.4 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bae097bab35a19f1d7a9f8df2924387d6948fee8965cc308a1fffab8baedd53e
-  data.tar.gz: 9d798670d00d48cd2b93473385e1957ba166bf5ec28a385621517b62429a003a
+  metadata.gz: ef91ec19173f79820a3c26b30d51a9b29964cc1b03fe91aa8de0db18e23eb2c8
+  data.tar.gz: 4d0ed8778da8f19ee8a28db34ae0640146a19a649dfd59d01c5aad9cdfb18ca4
 SHA512:
-  metadata.gz: 3def51ff10c058007636d8d199460acf860dad61ef125728779346c4dea715837322b981151024bbb2a6b92a65c703c1fd04bc06c041c06399aa8335585167d9
-  data.tar.gz: 1161be402544502a0d4c74f7b3e180d5b6b5794b46c0cf1168a5eb266ca51b613ce9a8bea6d157dbe8b3921aabed1fd5608fac4cfe833eeb773be94cac2421bb
+  metadata.gz: 8c13e6bc08996d3fc1953e9830433c1dd811d35d8a73c2f2dea13493ace414ab5b6332ca1e677d54c7502126db99f02a4a5a3625f833270dc621cae2fbfc8d25
+  data.tar.gz: e0072013b5f4af66332f09894ff75b8b06b60d1241ab7b4450a9792f2702bd78637a9803b82740f17e2a744735857ca208a63c7a015df45093435bbaf3f2732c

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    ocean-names (0.2.4)
-      geokit (~> 1.13)
+    ocean-names (0.3.4)
       oj (~> 3.3)
 
 GEM
@@ -11,7 +10,6 @@ GEM
     coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.3.2)
-    geokit (1.13.1)
     json (2.2.0)
     method_source (0.9.2)
     oj (3.9.2)

data/lib/ocean/names/polygon.rb

@@ -0,0 +1,37 @@
+module Ocean
+  module Names
+    class Polygon
+      attr_accessor :points
+
+      def initialize(points)
+        @points = points
+        @points << points[0] if points[0] != points[-1]
+      end
+
+      def contains?(lat:, lng:)
+        last_point = points[-1]
+
+        odd_node = false
+
+        x = lng
+        y = lat
+
+        points.each do |p|
+          # p = [lat, lng]
+          y1 = p.first
+          x1 = p.last
+          y2 = last_point.first
+          x2 = last_point.last
+
+          if y1 < y && y2 >= y || y2 < y && y1 >= y
+            odd_node = !odd_node if x1 + (y - y1) / (y2 - y1) * (x2 - x1) < x
+          end
+
+          last_point = p
+        end
+
+        odd_node
+      end
+    end
+  end
+end

data/lib/ocean/names/version.rb

@@ -1,5 +1,5 @@
 module Ocean
   module Names
-    VERSION = "0.3.4"
+    VERSION = "0.4.4"
   end
 end

data/lib/ocean/names.rb

@@ -1,17 +1,19 @@
 require "ocean/names/version"
+require "ocean/names/polygon"
 require "oj"
-require "geokit"
 
 module Ocean
   module Names
     class Error < StandardError; end
 
+    # drill down to main geometry points array
     GET_POINTS = ->(arg) {
       return arg unless arg.first.first.is_a?(Array)
 
       GET_POINTS.(arg.first)
     }
 
+    # check bounds to avoid
     WITHIN_BOUNDS = ->(record, x, y) {
       record["min_x"] <= x &&
       record["max_x"] >= x &&
@@ -20,18 +22,14 @@ module Ocean
     }
 
     def self.reverse_geocode(lat:, lng:)
-      point = Geokit::LatLng.new(lat, lng)
-
       rec = data.find do |record|
         # avoid check of obviously false geometries
         next unless WITHIN_BOUNDS.(record, lat, lng)
 
         # get points from nested arrays
-        source = GET_POINTS.(record["geometry"])
-
-        points = source.map { |x| Geokit::LatLng.new(*x) }
-        polygon = Geokit::Polygon.new(points)
-        polygon.contains?(point)
+        points = GET_POINTS.(record["geometry"])
+        polygon = Ocean::Names::Polygon.new(points)
+        polygon.contains?(lat: lat, lng: lng)
       end
 
       rec&.reject do |key|

data/ocean-names.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "oj", "~> 3.3"
-  spec.add_dependency "geokit", "~> 1.13"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-names
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.4
 platform: ruby
 authors:
 - rafael
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
-- !ruby/object:Gem::Dependency
-  name: geokit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +129,7 @@ files:
 - bin/setup
 - data/water.json
 - lib/ocean/names.rb
+- lib/ocean/names/polygon.rb
 - lib/ocean/names/version.rb
 - ocean-names.gemspec
 homepage: https://github.com/skcc321/ocean-names