open-location-code 0.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 378b33bb5f5bdf0ec82c286db7e7b54b762f2723
-  data.tar.gz: b2f0ded83b4ed9c914a0220c177ae6bb3e43adf5
+  metadata.gz: a0d234e42bc6ce5440921cf810d7dc09afb7db98
+  data.tar.gz: 9cc1ebd02ade1948031790c45dafaec52e71c21c
 SHA512:
-  metadata.gz: 052d9fb0aeeab2fd7969ae25b00824813e9f63b4877d7e73d5a5aa75d5d51c17fc1eeb51482c1f08f8cfa3d50ca3793ca2e44263c225c9244b9e5fa541f94c51
-  data.tar.gz: 34f7c50ad9dd924e7afaa441ab3cdefe80b32de655b97cdb17f5c06d3c698738855e5c80af8d3c08f1cdce82bb494e23b22580933893d8a77cfb686fe4fa5f47
+  metadata.gz: 596fcb762c45bc6eee4c3ec289e4310f4b12e61dd9b8c7589eed88e3f4f8f302580f92902df835796ae92678abd9c006f810b396769d6c94e504cbf011f25dd1
+  data.tar.gz: 0bbc96634049251bb8fb133baeed3c93622805d23c8740fb0a526748a08b33a1f911cb9d4cc98d5fe72a3dcd1970ab007a6e0b0303ee4d2b2ba796bf1e198293

data/lib/plus_codes.rb

@@ -9,6 +9,11 @@ module PlusCodes
   # The max number of characters can be placed before the separator.
   SEPARATOR_POSITION = 8
 
+  # Maxiumum code length using lat/lng pair encoding. The area of such a
+  # code is approximately 13x13 meters (at the equator), and should be suitable
+  # for identifying buildings. This excludes prefix and separator characters.
+  PAIR_CODE_LENGTH = 10
+
   # The character used to pad a code
   PADDING = '0'.freeze
 

data/lib/plus_codes/open_location_code.rb

@@ -41,7 +41,7 @@ module PlusCodes
     # @param longitude [Numeric] a longitude in degrees
     # @param code_length [Integer] the number of characters in the code, this excludes the separator
     # @return [String] a plus+codes
-    def encode(latitude, longitude, code_length = 10)
+    def encode(latitude, longitude, code_length = PAIR_CODE_LENGTH)
       raise ArgumentError,
       "Invalid Open Location Code(Plus+Codes) length: #{code_length}" if invalid_length?(code_length)
 
@@ -83,7 +83,7 @@ module PlusCodes
 
       digit = 0
       while digit < code.length
-        if digit < 10
+        if digit < PAIR_CODE_LENGTH
           lat_resolution /= 20
           lng_resolution /= 20
           south_latitude += lat_resolution * DECODE[code[digit].ord]
@@ -121,23 +121,21 @@ module PlusCodes
       code = prefix_by_reference(ref_lat, ref_lng, prefix_len) << short_code
       code_area = decode(code)
 
-      area_range = precision_by_length(prefix_len)
-      area_edge = area_range / 2
+      resolution = precision_by_length(prefix_len)
+      half_res = resolution / 2
 
       latitude = code_area.latitude_center
-      latitude_diff = latitude - ref_lat
-      if (latitude_diff > area_edge)
-        latitude -= area_range
-      elsif (latitude_diff < -area_edge)
-        latitude += area_range
+      if (ref_lat + half_res < latitude && latitude - resolution >= -90)
+        latitude -= resolution
+      elsif (ref_lat - half_res > latitude && latitude + resolution <= 90)
+        latitude += resolution
       end
 
       longitude = code_area.longitude_center
-      longitude_diff = longitude - ref_lng
-      if (longitude_diff > area_edge)
-        longitude -= area_range
-      elsif (longitude_diff < -area_edge)
-        longitude += area_range
+      if (ref_lng + half_res < longitude)
+        longitude -= resolution
+      elsif (ref_lng - half_res > longitude)
+        longitude += resolution
       end
 
       encode(latitude, longitude, code.length - SEPARATOR.length)
@@ -160,7 +158,7 @@ module PlusCodes
       lng_diff = (longitude - code_area.longitude_center).abs
       max_diff = [lat_diff, lng_diff].max
       [8, 6, 4].each do |removal_len|
-        area_edge = precision_by_length(removal_len + 2) / 2
+        area_edge = precision_by_length(removal_len) * 0.3
         return code[removal_len..-1] if max_diff < area_edge
       end
 
@@ -180,7 +178,7 @@ module PlusCodes
       if digit == 0
         latitude /= 20
         longitude /= 20
-      elsif digit < 10
+      elsif digit < PAIR_CODE_LENGTH
         latitude *= 20
         longitude *= 20
       else
@@ -193,7 +191,7 @@ module PlusCodes
     def build_code(digit_count, code, latitude, longitude)
       lat_digit = latitude.to_i
       lng_digit = longitude.to_i
-      if digit_count < 10
+      if digit_count < PAIR_CODE_LENGTH
         code << CODE_ALPHABET[lat_digit]
         code << CODE_ALPHABET[lng_digit]
         [digit_count + 2, latitude - lat_digit, longitude - lng_digit]
@@ -230,7 +228,7 @@ module PlusCodes
     end
 
     def invalid_length?(code_length)
-      code_length < 2 || (code_length < SEPARATOR_POSITION && code_length.odd?)
+      code_length < 2 || (code_length < PAIR_CODE_LENGTH && code_length.odd?)
     end
 
     def padded(code)
@@ -238,10 +236,10 @@ module PlusCodes
     end
 
     def precision_by_length(code_length)
-      if code_length <= 10
+      if code_length <= PAIR_CODE_LENGTH
         precision = 20 ** ((code_length / -2).to_i + 2)
       else
-        precision = (20 ** -3) / (5 ** (code_length - 10))
+        precision = (20 ** -3) / (5 ** (code_length - PAIR_CODE_LENGTH))
       end
       precision.to_r
     end

data/test/plus_codes_test.rb

@@ -19,7 +19,7 @@ class PlusCodesTest < Test::Unit::TestCase
       is_short_olc = @olc.short?(code)
       is_full_olc = @olc.full?(code)
       result = is_valid_olc == is_valid && is_short_olc == is_short && is_full_olc == is_full
-      assert_true(result)
+      assert(result)
     end
   end
 
@@ -33,10 +33,10 @@ class PlusCodesTest < Test::Unit::TestCase
         code = @olc.encode(cols[1].to_f, cols[2].to_f, cols[0].length - 1)
       end
       assert_equal(cols[0], code)
-      assert_true((code_area.south_latitude - cols[3].to_f).abs < 0.001)
-      assert_true((code_area.west_longitude - cols[4].to_f).abs < 0.001)
-      assert_true((code_area.north_latitude - cols[5].to_f).abs < 0.001)
-      assert_true((code_area.east_longitude - cols[6].to_f).abs < 0.001)
+      assert((code_area.south_latitude - cols[3].to_f).abs < 0.001)
+      assert((code_area.west_longitude - cols[4].to_f).abs < 0.001)
+      assert((code_area.north_latitude - cols[5].to_f).abs < 0.001)
+      assert((code_area.east_longitude - cols[6].to_f).abs < 0.001)
     end
   end
 
@@ -47,10 +47,15 @@ class PlusCodesTest < Test::Unit::TestCase
       lat = cols[1].to_f
       lng = cols[2].to_f
       short_code = cols[3]
-      short = @olc.shorten(code, lat, lng)
-      assert_equal(short_code, short)
-      expanded = @olc.recover_nearest(short, lat, lng)
-      assert_equal(code, expanded)
+      test_type = cols[4]
+      if test_type == 'B' || test_type == 'S'
+        short = @olc.shorten(code, lat, lng)
+        assert_equal(short_code, short)
+      end
+      if test_type == 'B' || test_type == 'R'
+        expanded = @olc.recover_nearest(short_code, lat, lng)
+        assert_equal(code, expanded)
+      end
     end
     @olc.shorten('9C3W9QCJ+2VX', 60.3701125, 10.202665625)
   end
@@ -63,6 +68,9 @@ class PlusCodesTest < Test::Unit::TestCase
     assert_raise ArgumentError do
       @olc.encode(20, 30, 1)
     end
+    assert_raise ArgumentError do
+      @olc.encode(20, 30, 9)
+    end
     assert_raise ArgumentError do
       @olc.recover_nearest('9C3W9QCJ-2VX', 51.3708675, -1.217765625)
     end
@@ -79,7 +87,7 @@ class PlusCodesTest < Test::Unit::TestCase
   end
 
   def test_valid_with_special_case
-    assert_false(@olc.valid?('3W00CJJJ+'))
+    assert(!@olc.valid?('3W00CJJJ+'))
   end
 
   def read_csv_lines(csv_file)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open-location-code
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Wei-Ming Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of Google Open Location Code(Plus+Codes)