diff --git a/README.md b/README.md
index 82b218e3ec3491da08a970875825c05b967e42c4..96644fb7eefe780613b3de416eceb4582d218391 100644
--- a/README.md
+++ b/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/Nokia (`:ovi`)
+
+* **API key**: not required, but performance restricted without it
+* **Quota**: ?
+* **Region**: world
+* **SSL support**: no
+* **Languages**: English
+* **Documentation**: http://api.maps.ovi.com/devguide/overview.html
+* **Terms of Service**: http://www.developer.nokia.com/Develop/Maps/TC.html
+* **Limitations**: ?
+
#### FreeGeoIP (`:freegeoip`)
* **API key**: none
diff --git a/lib/geocoder/lookup.rb b/lib/geocoder/lookup.rb
index 472a164a01193e823eac1cea726dfae4f685f074..07656203119f820ced05476f97868b400e8483af 100644
--- a/lib/geocoder/lookup.rb
+++ b/lib/geocoder/lookup.rb
@@ -29,6 +29,7 @@ module Geocoder
:yandex,
:nominatim,
:mapquest,
+ :ovi,
:test
]
end
diff --git a/lib/geocoder/lookups/ovi.rb b/lib/geocoder/lookups/ovi.rb
new file mode 100644
index 0000000000000000000000000000000000000000..6007eb4d9feaad4ca22d72d1aa9eab78ca337ec3
--- /dev/null
+++ b/lib/geocoder/lookups/ovi.rb
@@ -0,0 +1,52 @@
+require 'geocoder/lookups/base'
+require 'geocoder/results/ovi'
+
+module Geocoder::Lookup
+ class Ovi < Base
+
+ def name
+ "Ovi"
+ end
+
+ def required_api_key_parts
+ []
+ end
+
+ def query_url(query)
+ "#{protocol}://lbs.ovi.com/search/6.2/geocode.json?" + url_query_string(query)
+ end
+
+ 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=configuration.api_key
+ return a.first if a.is_a?(Array)
+ end
+ end
+
+ def api_code
+ if a=configuration.api_key
+ return a.last if a.is_a?(Array)
+ end
+ end
+ end
+end
diff --git a/lib/geocoder/results/ovi.rb b/lib/geocoder/results/ovi.rb
new file mode 100644
index 0000000000000000000000000000000000000000..984034a1307316789e2d694790e1dfb0d068df70
--- /dev/null
+++ b/lib/geocoder/results/ovi.rb
@@ -0,0 +1,62 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+ class Ovi < Base
+
+ ##
+ # A string in the given format.
+ #
+ def address(format = :full)
+ address_data['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
+ address_data['County']
+ end
+
+ def province
+ address_data['County']
+ end
+
+ def postal_code
+ address_data['PostalCode']
+ end
+
+ def city
+ address_data['City']
+ end
+
+ def state_code
+ address_data['State']
+ end
+
+ def province_code
+ address_data['State']
+ end
+
+ def country
+ fail unless d = address_data['AdditionalData']
+ if v = d.find{|ad| ad['key']=='CountryName'}
+ return v['value']
+ end
+ end
+
+ def country_code
+ address_data['Country']
+ end
+
+ private # ----------------------------------------------------------------
+
+ def address_data
+ @data['Location']['Address'] || fail
+ end
+ end
+end
diff --git a/test/fixtures/ovi_madison_square_garden b/test/fixtures/ovi_madison_square_garden
new file mode 100644
index 0000000000000000000000000000000000000000..464b8f851ef5795b68c6f543274c34de0e517ac7
--- /dev/null
+++ b/test/fixtures/ovi_madison_square_garden
@@ -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"
+ }
+ ]
+ }
+ }
+ }
+ ]
+ }
+ ]
+ }
+}
diff --git a/test/fixtures/ovi_no_results b/test/fixtures/ovi_no_results
new file mode 100644
index 0000000000000000000000000000000000000000..26fdaf93a8c450af5e6229de2ee34f5d1127a774
--- /dev/null
+++ b/test/fixtures/ovi_no_results
@@ -0,0 +1,8 @@
+{
+ "Response": {
+ "MetaInfo": {
+ "Timestamp": "2013-02-08T16:41:16.723+0000"
+ },
+ "View": []
+ }
+}