From a70042a6cfcdc7805182727fc9981f1bfa1d1ae1 Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Wed, 5 Mar 2014 11:58:02 -0500
Subject: [PATCH] Maxmind Local result should define #coordinates
instead of #latitude and #longitude. This fixes #613.
---
lib/geocoder/results/maxmind_local.rb | 11 ++++-------
test/unit/lookups/maxmind_local_test.rb | 1 +
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/lib/geocoder/results/maxmind_local.rb b/lib/geocoder/results/maxmind_local.rb
index 4f311194..370bf92f 100644
--- a/lib/geocoder/results/maxmind_local.rb
+++ b/lib/geocoder/results/maxmind_local.rb
@@ -2,17 +2,14 @@ require 'geocoder/results/base'
module Geocoder::Result
class MaxmindLocal < Base
+
def address(format = :full)
s = state.to_s == "" ? "" : ", #{state}"
"#{city}#{s} #{postal_code}, #{country}".sub(/^[ ,]*/, "")
end
- def latitude
- @data[:latitude]
- end
-
- def longitude
- @data[:longitude]
+ def coordinates
+ [@data[:latitude], @data[:longitude]]
end
def city
@@ -49,4 +46,4 @@ module Geocoder::Result
end
end
end
-end
\ No newline at end of file
+end
diff --git a/test/unit/lookups/maxmind_local_test.rb b/test/unit/lookups/maxmind_local_test.rb
index 162de0f0..751fd92b 100644
--- a/test/unit/lookups/maxmind_local_test.rb
+++ b/test/unit/lookups/maxmind_local_test.rb
@@ -18,6 +18,7 @@ class MaxmindLocalTest < GeocoderTestCase
assert_equal '94043', result.postal_code
assert_equal 37.41919999999999, result.latitude
assert_equal -122.0574, result.longitude
+ assert_equal [37.41919999999999, -122.0574], result.coordinates
end
def test_loopback
--
GitLab