geon 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6577de5248ca2252cc91f3d93b76631c3ad6e367
-  data.tar.gz: 9763578bb38f6ef4a3b84770280c4339d7051145
+  metadata.gz: 1d54d0a320ac8a495594bb14fff9be7e51f0a769
+  data.tar.gz: 6c9dffd024c17ca6bdcdebef8652feb28f7009b0
 SHA512:
-  metadata.gz: 9eefd92a291f5d668ab66748be6f3394432d5cfef8cf8b9d5fcdcf2fa564a567b598cfd82e83e48d2eb2f22fad68b7f3d9cf21ba285324958a5b4a3c672ea602
-  data.tar.gz: 335bcf83de9c7fec219e8836822b9f98d04a720d2f24d47c2b2f9eee11aa1fbc3c56d4be6cd6ff41fde67ac3cc2b8834c0311090ea1c93ebc48d723f72d595f9
+  metadata.gz: 063d97b648c6dcb978150be90528be3e84d4434dd36e1c8fd861599f1a578d1e8f8e7305171472782bee2d3e383fa0cabc6e64eea264dd5f02ed9a045dfd4dc3
+  data.tar.gz: 39e077b6f1f27e561dafef3f72bc0cfe1a2d75b1029674960195e2effee55ef4d5652691b16e47d6859303b47cd5ef801dd1493b5b040d91c6057902330b7900

data/lib/geon.rb

@@ -1,13 +1,16 @@
 module Geon
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end
 
 require 'net/http'
 
+require 'geon/geo_object'
 require 'geon/http_loader'
 require 'geon/invalid_key_error'
 require 'geon/wikimapia_error'
 require 'geon/wikimapia_api'
 require 'geon/wikimapia'
+require 'geon/yandex_api'
+require 'geon/yandex'
 
 

data/lib/geon/geo_object.rb

@@ -0,0 +1,28 @@
+# coding: utf-8
+
+module Geon
+  class GeoObject < ::BasicObject
+
+    attr_accessor :coord, :type, :address, :detail
+
+    def initialize
+      @coord   = [0, 0]
+      @type    = :house
+      @address = ''
+      @detail  = {}
+    end
+
+    def longitude
+      @coord[1]
+    end
+
+    def latitude
+      @coord[0]
+    end
+
+    def to_hash
+      {coord: @coord, type: @type, address: @address, detail: @detail}
+    end
+
+  end
+end

data/lib/geon/yandex.rb

@@ -0,0 +1,40 @@
+module Geon
+  class Yandex
+    HOST = 'geocode-maps.yandex.ru'
+
+    def initialize(args = {})
+      loader = args[:loader] ? args[:loader] : HttpLoader.new(HOST)
+      @api   = YandexApi.new(loader)
+    end
+
+    def forward(lat, long)
+      raw        = @api.geocode({lat: lat, long: long})
+      geo_object = raw_geo_object raw
+      result     = GeoObject.new
+
+      result.address = geo_object['metaDataProperty']['GeocoderMetaData']['text']
+      raw_coord      = geo_object['Point']['pos'].split
+      result.coord   = [raw_coord[1].to_f, raw_coord[0].to_f]
+
+      result
+    end
+
+    def reverse(query)
+      raw = @api.geocode({query: query})
+      geo_object = raw_geo_object raw
+      result     = GeoObject.new
+
+      result.address = geo_object['metaDataProperty']['GeocoderMetaData']['text']
+      raw_coord      = geo_object['Point']['pos'].split
+      result.coord   = [raw_coord[1].to_f, raw_coord[0].to_f]
+
+      raw
+    end
+
+    private
+
+    def raw_geo_object(response)
+      response['response']['GeoObjectCollection']['featureMember'][0]['GeoObject']
+    end
+  end
+end

data/lib/geon/yandex_api.rb

@@ -0,0 +1,36 @@
+module Geon
+  class YandexApi
+    PATH = '/1.x/'
+
+    # @param [Geon::HttpLoader] downloader
+    # @param [Hash] param
+    def initialize(downloader, param = {})
+      @downloader = downloader
+
+      @general_param = {
+          results: 1,
+          format:  'json',
+          kind:    'house',
+      }.merge(param)
+
+    end
+
+    def geocode(args = {})
+      param = @general_param
+      if args[:lat] and args[:long]
+        param[:geocode] = "#{args[:long]},#{args[:lat]}"
+      end
+
+      if args[:query]
+        param[:geocode] = args[:query]
+      end
+
+      response = @downloader.get PATH , param
+      result   = JSON.parse(CGI::unescape response)
+
+      result
+    end
+
+  end
+
+end

data/spec/samples/yandex/empty.json

@@ -0,0 +1,22 @@
+{"response": {
+    "GeoObjectCollection": {
+        "metaDataProperty": {
+            "GeocoderResponseMetaData": {
+                "request": "55.757962,37.611006",
+                "found": "0",
+                "results": "1",
+                "boundedBy": {
+                    "Envelope": {
+                        "lowerCorner": "55.755465 37.608506",
+                        "upperCorner": "55.760460 37.613508"
+                    }
+                },
+                "Point": {
+                    "pos": "55.757962 37.611006"
+                },
+                "kind": "house"
+            }
+        },
+        "featureMember": []
+    }
+}}

data/spec/samples/yandex/yandex_geocode1.json

@@ -0,0 +1 @@
+{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"Москва, Тверская улица, дом 7","found":"5","results":"1"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Россия, Москва, Тверская улица, 7","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Москва, Тверская улица, 7","CountryNameCode":"RU","CountryName":"Россия","Locality":{"LocalityName":"Москва","Thoroughfare":{"ThoroughfareName":"Тверская улица","Premise":{"PremiseNumber":"7"}}}}}}},"description":"Москва, Россия","name":"Тверская улица, 7","boundedBy":{"Envelope":{"lowerCorner":"37.608958 55.756807","upperCorner":"37.613054 55.759117"}},"Point":{"pos":"37.611006 55.757962"}}}]}}}

data/spec/yandex_real_spec.rb

@@ -0,0 +1,15 @@
+describe Geon::Yandex, 'Yandex real geocode' do
+
+  it 'Разбор json ответа с одним результатом' do
+
+    yandex = Geon::Yandex.new
+
+    result = yandex.forward(55.757962, 37.611006)
+
+    expected         = Geon::GeoObject.new
+    expected.address = 'Россия, Москва, Тверская улица, 7'
+    expected.coord   = [55.757962, 37.611006] #long, lat
+
+    expected.to_hash.should eq result.to_hash
+  end
+end

data/spec/yandex_spec.rb

@@ -0,0 +1,19 @@
+
+describe Geon::Yandex, 'Yandex geocode' do
+
+  it 'simple request' do
+
+    loader = double("Geon::HttpLoader")
+    loader.stub(:get) { sample('yandex/yandex_geocode1.json') }
+
+    yandex = Geon::Yandex.new({loader: loader})
+
+    result = yandex.forward(55.757962, 37.611006)
+
+    expected         = Geon::GeoObject.new
+    expected.address = 'Россия, Москва, Тверская улица, 7'
+    expected.coord   = [55.757962, 37.611006] #long, lat
+
+    expected.to_hash.should eq result.to_hash
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geon
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Alexander Suslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies: []
 description: Geo data provider
 email:
@@ -21,11 +21,14 @@ files:
 - Gemfile
 - geon.gemspec
 - lib/geon.rb
+- lib/geon/geo_object.rb
 - lib/geon/http_loader.rb
 - lib/geon/invalid_key_error.rb
 - lib/geon/wikimapia.rb
 - lib/geon/wikimapia_api.rb
 - lib/geon/wikimapia_error.rb
+- lib/geon/yandex.rb
+- lib/geon/yandex_api.rb
 - spec/helper.rb
 - spec/samples/wikimapia/error__wrong_key.json
 - spec/samples/wikimapia/place.getbyarea__good.json
@@ -33,9 +36,13 @@ files:
 - spec/samples/wikimapia/place.getbyid__good.xml
 - spec/samples/wikimapia/place.getnearest__good.json
 - spec/samples/wikimapia/place.getnearest__good.xml
+- spec/samples/yandex/empty.json
+- spec/samples/yandex/yandex_geocode1.json
 - spec/wikimapia_api_spec.rb
 - spec/wikimapia_real_spec.rb
 - spec/wikimapia_spec.rb
+- spec/yandex_real_spec.rb
+- spec/yandex_spec.rb
 homepage: https://github.com/AlmazKo/geon
 licenses:
 - MIT
@@ -64,3 +71,5 @@ test_files:
 - spec/wikimapia_api_spec.rb
 - spec/wikimapia_real_spec.rb
 - spec/wikimapia_spec.rb
+- spec/yandex_real_spec.rb
+- spec/yandex_spec.rb