wheretz 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e41cda2d85607a26ed55eca8587c6014611a39a3
-  data.tar.gz: 242f0817239a37c7c1ae41f85dc8389d2d5eb6f0
+  metadata.gz: 68585df38909578b7e89a731f3ee4f89c0600787
+  data.tar.gz: 5ef6f73de30fe6f954b132ec74f8407b33a619af
 SHA512:
-  metadata.gz: 28fc8de7c3308c7f5212c64ca9237392c06f0af8b394e477c7d95804af9a05292de6380578573ad98b8adedb85793faee45d0a436ce84f093d48dd78fcc00eec
-  data.tar.gz: d1b239c68d11b09f09d4476c18d83b5befa180aa80cf173783db43bc9f9c6cd1ffde224992ba3b7b00c944d43716cc973587907ce39144514f110348b5333165
+  metadata.gz: e84235f01b2c82c75a9af7eec670b598641071f7f1262bce3d0f6980daa6b9635f7a630880ba6ca26d6004645c684d4b250f9abe051372a345c62a77616edb72
+  data.tar.gz: 74bc547aa0bd00c26a4e9cdcbb0036e49ca68a8f7c4c32293f1eee6830358be22c349cb636c96a728f1b2f80faac05e206317a69bfc85410d689e7f579c94c1f

data/Changelog.md

@@ -0,0 +1,9 @@
+# WhereTZ changelog
+
+## 0.0.2 (2016-03-04)
+
+Fixed edge case (point slightly outside any of polygon).
+
+## 0.0.1 (2016-01-28)
+
+Initial.

data/README.md

@@ -32,7 +32,7 @@ WhereTZ.get(50.004444, 36.231389)
 # you should have tzinfo gem installed, wheretz doesn't list it as dependency
 ```
 
-From commandline, after gem installed:
+From command-line, after gem installed:
 
 ```bash
 wheretz 50.004444,36.231389
@@ -51,11 +51,14 @@ wheretz 50.004444,36.231389
 4. If there's several intersecting bounding boxes, `WhereTZ` reads only
   relevant timezone files (which are not very large) and checks which
   polygon actually contains the point.
+5. **Added in 0.0.2** If point occures outside any of polygons, find
+  the closest one (it's last resort for really rare cases and slower
+  than other approaches).
 
 ## Known problems
 
-* On "bounding box only" check, some points deeply in sea (and actally
-  belonging to no timezone polygon) can be wrongfly guessed as belonging
+* On "bounding box only" check, some points deeply in sea (and actually
+  belonging to no timezone polygon) can be wrongly guessed as belonging
   to some timezone;
 * Loading/unloading `.geojson` files can be uneffective when called
   multiple times; future releases will provide option for preserve

data/lib/wheretz.rb

@@ -8,7 +8,7 @@ require 'geo_ruby/geojson'
 # ```ruby
 # WhereTZ.lookup(50.004444, 36.231389)
 # # => 'Europe/Kiev'
-# 
+#
 # WhereTZ.get(50.004444, 36.231389)
 # # => #<TZInfo::DataTimezone: Europe/Kiev>
 # ```
@@ -80,17 +80,36 @@ module WhereTZ
   def lookup_geo(lat, lng, candidates)
     point = GeoRuby::SimpleFeatures::Point.from_coordinates([lng, lat])
 
-    candidates = candidates.map{|fname, zone, *|
+    polygons = candidates.map{|fname, zone, *|
       [zone, PARSER.parse(File.read(fname)).features.first.geometry]
-    }.select{|_, multipolygon|
+    }
+    candidates = polygons.select{|_, multipolygon|
       multipolygon.geometries.any?{|polygon| polygon.contains_point?(point)}
     }
 
     case candidates.size
-    when 0 then nil
+    when 0 then guess_outside(point, polygons)
     when 1 then candidates.first.first
     else
       fail(AmbigousTimezone, "Ambigous timezone: #{candidates.map(&:first)}")
     end
   end
+
+  # Last resort: pretty slow check for the cases when the point
+  # is slightly outside polygons.
+  # See https://github.com/zverok/wheretz/issues/4
+  def guess_outside(point, polygons)
+    # create pairs [timezone, distance to closest point of its polygon]
+    distances = polygons.map{|zone, multipolygon|
+      [
+        zone,
+        multipolygon.geometries.map(&:rings).flatten.
+          map{|p| p.ellipsoidal_distance(point)}.min
+      ]
+    }
+
+    # FIXME: maybe need some tolerance range for maximal reasonable distance?
+
+    distances.sort_by(&:last).first.first
+  end
 end

data/wheretz.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'wheretz'
-  s.version  = '0.0.1'
+  s.version  = '0.0.2'
   s.authors  = ['Victor Shepelev']
   s.email    = 'zverok.offline@gmail.com'
   s.homepage = 'https://github.com/zverok/wheretz'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wheretz
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Victor Shepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby
@@ -116,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".yardopts"
+- Changelog.md
 - LICENSE.txt
 - README.md
 - bin/wheretz