geo_rb 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '028b35e41da078d2419f0b7a9400fbd98c84c5d06c021ad9c0d8eb5b642b321a'
-  data.tar.gz: 5cefbfc862f9b3063e879e7427a41c51913330ddc73294d9299940fbe5f6ac24
+  metadata.gz: d7ef6fbc41f5f8f01523388fd1475698f01ed4877fcf9d6b3fb98a14b3658145
+  data.tar.gz: 557ed9d56a9ca5cee2804685bcb656feb21a076456fc7807eb4fb39f1737e5b8
 SHA512:
-  metadata.gz: 739a39e6937c42157b810f34fd32bf93c56c16db5a2e6e6359e7ed68b3469113353f007b21f70c06265132f7c79594ae1628bf51c60563980357c32460507e59
-  data.tar.gz: 6064574fdfac9cd8c2638a467e13a181d7c6fd03222d96048f4264c2a39fca01d2bb3d812c0fb9b0a63c5e231976364e561be8a04a008dc6cc30af8ceb6a2388
+  metadata.gz: 3e8ec814b6c58aea5c0249ec0fea828b1932a12519328dd21b799d917d105715df0208ee6a874af8d23c0ad7433bbba399c87d21b1d90205853c8e78657fd94f
+  data.tar.gz: 8f15cd64fd2a5bf8b2ca17f6c1bd824faf3548d173fb519ae94dcaede679c819231bfc68a884e18a728cd36169c4226d82d15d3b9c46ef4d3b2184ebba857e59

data/README.md

@@ -1,8 +1,5 @@
 # geo_rb
 
-[![Gem Version](http://img.shields.io/gem/v/geo_rb.svg)][gem]
-[![Code Climate](https://codeclimate.com/github/kucho/geo_rb.svg)][codeclimate]
-
 geo_rb makes it easy for Ruby developers to locate the coordinates of addresses, cities, countries, and landmarks across the globe using third-party geocoders.
 
 It is heavily inspired by [geopy](https://github.com/geopy/geopy).
@@ -13,10 +10,15 @@ It is heavily inspired by [geopy](https://github.com/geopy/geopy).
 
 ## Usage
 
-### Address lookup
+### Distance between two points
 ```ruby
 plaza = GeoRb::Location.lookup("Plaza San Martin, Lima, Peru")
 palacio = GeoRb::Location.lookup("Palacio de Justicia, Lima, Peru")
 plaza.distance_to(palacio).km # => 0.6649563608870949
 palacio.distance_to(plaza).km # => 0.6649563608870949
 ```
+
+### Distance between multiple points
+```ruby
+
+```

data/geo_rb.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.version = GeoRb::VERSION
   spec.platform = Gem::Platform::RUBY
   spec.summary = "Client for geolocation services"
-  spec.description = "geo_rb makes it easy for Ruby developers to locate the coordinates of addresses, cities, countries, and landmarks across the globe using third-party geocoders and other data sources"
+  spec.description = "geo_rb makes it easy for Ruby developers to locate the coordinates of addresses, cities, countries, and landmarks across the globe using third-party geocoders."
   spec.authors = ["Victor Rodriguez"]
   spec.email = "victor.rodriguez.guriz@gmail.com"
   spec.license = "MIT"
@@ -22,7 +22,8 @@ Gem::Specification.new do |spec|
     "changelog_uri" => "https://github.com/kucho/geo_rb/blob/master/CHANGELOG.md"
   }
 
-  spec.add_runtime_dependency("geographiclib", "~> 0.0.2")
+  spec.add_runtime_dependency("concurrent-ruby", "~> 1.1.8")
+  spec.add_runtime_dependency("geodesic_wgs84", "~> 1.46.1")
 
   spec.add_development_dependency("bundler", "~> 2.2")
   spec.add_development_dependency("standardrb", "~> 1.0")

data/lib/geo_rb/distance.rb

@@ -1,22 +1,39 @@
-require "geographiclib"
+require "bigdecimal/util"
+require "concurrent"
+require "geodesic_wgs84"
+
 
 module GeoRb
   class Distance
     EARTH_RADIUS = 6_371.0088
 
-    attr_reader :kilometers
+    attr_reader :kilometers, :meters
     alias_method :km, :kilometers
+    alias_method :m, :meters
+
+    def self.between(*addresses, adapter: GeoRb::GeoCoders::Nominatim)
+      return new if addresses.size == 1
+
+      requests = addresses.map do |address|
+        Concurrent::Promises.future(address) { |a| adapter.new.geocode(a) }
+      end
+
+      locations = Concurrent::Promises.zip(*requests).value!
+      new(*locations)
+    end
 
     def initialize(*locations)
-      @kilometers = case locations.size
-      when 1
-        Float(locations.first) if locations.size == 1
+      GeoRb.logger.debug locations
+      @meters = case locations.size
+      when 0..1
+        0
       else
         locations.each_cons(2).reduce(0) do |distance, pair|
           a, b = sanitize_location(pair.first), sanitize_location(pair.last)
           distance + measure(a, b)
         end
       end
+      @kilometers = @meters.to_d / 1_000
     end
 
     def ensure_same_altitude(a, b)
@@ -25,8 +42,8 @@ module GeoRb
 
     def measure(a, b)
       ensure_same_altitude(a, b)
-      r = GeographicLib::Geodesic::WGS84.inverse(a.latitude, a.longitude, b.latitude, b.longitude)
-      r[:s12] / 1_000
+      r = Wgs84.new.distance(a.latitude, a.longitude, b.latitude, b.longitude).first
+      r.to_d
     end
 
     private

data/lib/geo_rb/version.rb

@@ -1,3 +1,3 @@
 module GeoRb
-  VERSION = Gem::Version.new("0.0.1")
+  VERSION = Gem::Version.new("0.0.2")
 end

data/spec/geo_rb/distance_spec.rb

@@ -28,7 +28,31 @@ describe GeoRb::Distance do
     context "when trip between poles" do
       let(:locations) { [north_pole, south_pole] }
 
-      it { should be_within(12).of(earth_circumference / 2) }
+      it { should be_within(13).of(earth_circumference / 2) }
+    end
+  end
+
+  describe ".between" do
+    subject { described_class.between(*locations).km }
+
+    context "with one valid address" do
+      let(:locations) { ["Jockey Plaza, Lima"] }
+
+      it { is_expected.to eq 0 }
+    end
+
+    context "with two valid addresses" do
+      let(:locations) { ["Plaza San Martin, Lima", "Palacio de Justicia, Lima"] }
+
+      it { is_expected.to eq 0.6650 }
+    end
+
+    context "with mixed addresses" do
+      let(:locations) { ["rhu9223u8r2f", "Palacio de Justicia, Lima"] }
+
+      it "fails" do
+        expect { subject }.to raise_error(GeoRb::LocationError)
+      end
     end
   end
 end

data/spec/geo_rb/geo_coders/location_spec.rb

@@ -0,0 +1,24 @@
+describe GeoRb::Location do
+  describe ".lookup" do
+    context "with valid location" do
+      let(:plaza) { described_class.lookup("Plaza San Martin, Lima") }
+
+      it "has the expected points" do
+        expect(plaza.latitude).to eq(-12.05165965)
+        expect(plaza.longitude).to eq(-77.03460482707533)
+      end
+    end
+  end
+
+  describe "#distance_to" do
+    context "from valid location" do
+      let(:plaza) { described_class.lookup("Plaza San Martin, Lima, Peru") }
+      context "to valid destination" do
+        let(:palacio) { described_class.lookup("Palacio de Justicia, Lima, Peru") }
+        subject { plaza.distance_to(palacio).km }
+
+        it { is_expected.to eq 0.6650 }
+      end
+    end
+  end
+end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: geo_rb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Victor Rodriguez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: geographiclib
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.1.8
+- !ruby/object:Gem::Dependency
+  name: geodesic_wgs84
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.46.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.46.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,8 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.10'
 description: geo_rb makes it easy for Ruby developers to locate the coordinates of
-  addresses, cities, countries, and landmarks across the globe using third-party geocoders
-  and other data sources
+  addresses, cities, countries, and landmarks across the globe using third-party geocoders.
 email: victor.rodriguez.guriz@gmail.com
 executables: []
 extensions: []
@@ -90,6 +103,7 @@ files:
 - lib/geo_rb/point.rb
 - lib/geo_rb/version.rb
 - spec/geo_rb/distance_spec.rb
+- spec/geo_rb/geo_coders/location_spec.rb
 - spec/geo_rb/geo_coders/nominatim_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/kucho/geo_rb
@@ -113,11 +127,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Client for geolocation services
 test_files:
 - spec/geo_rb/distance_spec.rb
+- spec/geo_rb/geo_coders/location_spec.rb
 - spec/geo_rb/geo_coders/nominatim_spec.rb
 - spec/spec_helper.rb