Merge branch 'add-ovi' of git://github.com/datenimperator/geocoder in…

…to datenimperator-add-ovi

Conflicts:
	test/test_helper.rb

README.md

@@ -382,6 +382,17 @@ Yahoo BOSS is **not a free service**. As of November 17, 2012 Yahoo no longer of
 * **Terms of Service**: http://info.mapquest.com/terms-of-use/
 * **Limitations**: ?
 
+#### ovi.com (Nokia maps) (`:ovi`)
+
+* **API key**: required: `config.api_key = %w{app_id app_token}`
+* **Quota**: ?
+* **Region**: world
+* **SSL support**: no
+* **Languages**: English
+* **Documentation**: ?
+* **Terms of Service**: ?
+* **Limitations**: ?
+
 #### FreeGeoIP (`:freegeoip`)
 
 * **API key**: none

lib/geocoder/lookup.rb

@@ -29,6 +29,7 @@ def street_services
         :yandex,
         :nominatim,
         :mapquest,
+        :ovi,
         :test
       ]
     end

lib/geocoder/lookups/ovi.rb

@@ -0,0 +1,46 @@
+# ovi.com store
+
+require 'geocoder/lookups/base'
+require 'geocoder/results/ovi'
+
+module Geocoder::Lookup
+  class Ovi < Base
+
+    private # ---------------------------------------------------------------
+
+    def results(query)
+      return [] unless doc = fetch_data(query)
+      return [] unless doc['Response'] && doc['Response']['View']
+      if r=doc['Response']['View']
+        return [] if r.nil? || !r.is_a?(Array) || r.empty?
+        return r.first['Result']
+      end
+      []
+    end
+
+    def query_url_params(query)
+      super.merge(
+        :searchtext=>query.sanitized_text,
+        :gen=>1,
+        :app_id=>api_key,
+        :app_code=>api_code
+      )
+    end
+
+    def api_key
+      if a=Geocoder::Configuration.api_key
+        return a.first if a.is_a?(Array)
+      end
+    end
+
+    def api_code
+      if a=Geocoder::Configuration.api_key
+        return a.last if a.is_a?(Array)
+      end
+    end
+
+    def query_url(query)
+      "http://lbs.ovi.com/search/6.2/geocode.json?" + url_query_string(query)
+    end
+  end
+end

lib/geocoder/results/ovi.rb

@@ -0,0 +1,64 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class Ovi < Base
+
+    ##
+    # A string in the given format.
+    #
+    def address(format = :full)
+      fail unless d = @data['Location']['Address']
+      d['Label']
+    end
+
+    ##
+    # A two-element array: [lat, lon].
+    #
+    def coordinates
+      fail unless d = @data['Location']['DisplayPosition']
+      [d['Latitude'].to_f, d['Longitude'].to_f]
+    end
+
+    def state
+      fail unless d = @data['Location']['Address']
+      d['County']
+    end
+
+    def province
+      fail unless d = @data['Location']['Address']
+      d['County']
+    end
+
+    def postal_code
+      fail unless d = @data['Location']['Address']
+      d['PostalCode']
+    end
+
+    def city
+      fail unless d = @data['Location']['Address']
+      d['City']
+    end
+
+    def state_code
+      fail unless d = @data['Location']['Address']
+      d['State']
+    end
+
+    def province_code
+      fail unless d = @data['Location']['Address']
+      d['State']
+    end
+
+    def country
+      fail unless d = @data['Location']['Address']['AdditionalData']
+      if v = d.find{|ad| ad['key']=='CountryName'}
+        return v['value']
+      end
+    end
+
+    def country_code
+      fail unless d = @data['Location']['Address']
+      d['Country']
+    end
+  end
+end

test/fixtures/ovi_madison_square_garden.json

@@ -0,0 +1,72 @@
+{
+  "Response": {
+    "MetaInfo": {
+      "Timestamp": "2013-02-08T16:26:39.382+0000"
+    },
+    "View": [
+      {
+        "_type": "SearchResultsViewType",
+        "ViewId": 0,
+        "Result": [
+          {
+            "Relevance": 1.0,
+            "MatchLevel": "houseNumber",
+            "MatchQuality": {
+              "State": 1.0,
+              "City": 1.0,
+              "Street": [
+                1.0
+              ],
+              "HouseNumber": 1.0
+            },
+            "MatchType": "pointAddress",
+            "Location": {
+              "LocationId": "NT_ArsGdYbpo6dqjPQel9gTID_4",
+              "LocationType": "point",
+              "DisplayPosition": {
+                "Latitude": 40.7504692,
+                "Longitude": -73.9933777
+              },
+              "NavigationPosition": [
+                {
+                  "Latitude": 40.7500305,
+                  "Longitude": -73.9942398
+                }
+              ],
+              "MapView": {
+                "TopLeft": {
+                  "Latitude": 40.7515934,
+                  "Longitude": -73.9948616
+                },
+                "BottomRight": {
+                  "Latitude": 40.7493451,
+                  "Longitude": -73.9918938
+                }
+              },
+              "Address": {
+                "Label": "4 Penn Plz, New York, NY 10001, United States",
+                "Country": "USA",
+                "State": "NY",
+                "County": "New York",
+                "City": "New York",
+                "Street": "Penn Plz",
+                "HouseNumber": "4",
+                "PostalCode": "10001",
+                "AdditionalData": [
+                  {
+                    "value": "United States",
+                    "key": "CountryName"
+                  },
+                  {
+                    "value": "New York",
+                    "key": "StateName"
+                  }
+                ]
+              }
+            }
+          }
+        ]
+      }
+    ]
+  }
+}

test/fixtures/ovi_no_results.json

@@ -0,0 +1,8 @@
+{
+  "Response": {
+    "MetaInfo": {
+      "Timestamp": "2013-02-08T16:41:16.723+0000"
+    },
+    "View": []
+  }
+}