baidu_api-geocoding 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d0119c07ff0759739f3244c10b03ff106fbccae
-  data.tar.gz: 352c9d16c35137c619e88dcc50d54a4d5afbf8ac
+  metadata.gz: cb1da98293ff938d23b05e5f955b9afd97b51f2e
+  data.tar.gz: c978f7368484d1fe9e709885b07de15cbe14ca2e
 SHA512:
-  metadata.gz: 2e78cfde4bb1df680c79aa94ae8d91f5dc98eb89989946d87a5368626d6dbe99b4afb2a009ab2070da70c91d73b92161b5c4dadf450b0f8de6c74e98f7ae6c53
-  data.tar.gz: dda253ade62ff24990d5354699ab06efd9d2fc84b4df9a1b4f8aade16c19812b426166513a11fc592751509c5f474e898c8861b60529fe4fa34088b012c6ffb1
+  metadata.gz: 68a23b438ab3d47ddca8fc0089b222835603eebf31f0efc353c59e7819b9f45317a038d6705757ab37f7cbc3233ab7a8ae0ba575b36d2a7ee720d63dd9ca11cc
+  data.tar.gz: 920eec7e77c27079ddc348ec16fa6686e6c77be9d652b97ee5a09cfabdb239218ccb2b12e06ec846d2872b67cc5a57da71dddf95618b126edc1b6057378eb991

data/README.md

@@ -1,6 +1,6 @@
 # BaiduApi::Geocoding
 
-A ruby version [Baidu API Geocoder](http://developer.baidu.com/map/index.php?title=webapi/guide/webservice-geocoding) client.
+A ruby version of [Baidu API Geocoder](http://developer.baidu.com/map/index.php?title=webapi/guide/webservice-geocoding) client.
 
 ## Installation
 
@@ -37,13 +37,27 @@ BaiduApi::Geocoding.setup do |config|
 end
 ```
 
-then
+To geocode an address:
 
 ```ruby
-BaiduApi::Geocoding.geocode('百度大厦')
-=> {"status"=>0, "result"=>{"location"=>{"lng"=>116.30814954222, "lat"=>40.056885091681}, "precise"=>1, "confidence"=>80, "level"=>"商务大厦"}
+
+BaiduApi::Geocoding.geocode(address: '百度大厦')
+=> {"status"=>0, "result"=>{"location"=>{"lng"=>116.30814954222, "lat"=>40.056885091681}, "precise"=>1, "confidence"=>80, "level"=>"商务大厦"}}
+
+BaiduApi::Geocoding.geocode(location: '40.056885091681,116.30814954222')
+=> {"status"=>0,
+ "result"=>
+  {"location"=>{"lng"=>116.30814954222, "lat"=>40.056885160713},
+   "formatted_address"=>"北京市海淀区上地十街10",
+   "business"=>"西二旗,龙泽,回龙观",
+   "addressComponent"=>{"city"=>"北京市", "direction"=>"附近", "distance"=>"1", "district"=>"海淀区", "province"=>"北京市", "street"=>"上地十街", "street_number"=>"10"},
+   "poiRegions"=>[{"direction_desc"=>"内", "name"=>"百度大厦"}],
+   "cityCode"=>131}}
 ```
 
+More options for parameter of BaiduApi::Geocoding.geocode, please see http://developer.baidu.com/map/index.php?title=webapi/guide/webservice-geocoding
+
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/baidu_api-geocoding/fork )

data/baidu_api-geocoding.gemspec

@@ -8,8 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = BaiduApi::Geocoding::VERSION
   spec.authors       = ["xiaohui"]
   spec.email         = ["xiaohui@zhangxh.net"]
-  spec.summary       = %q{A ruby version [Baidu API Geocoder](http://developer.baidu.com/map/index.php?title=webapi/guide/webservice-geocoding) client.
-}
+  spec.summary       = %q{A ruby version of Baidu API Geocoder client.}
   spec.homepage      = "http://github.com/xiaohui-zhangxh/baidu_api-geocoding"
   spec.license       = "MIT"
 

data/lib/baidu_api/geocoding/v2/geocoder.rb

@@ -13,14 +13,10 @@ module BaiduApi
         API_HOST = 'http://api.map.baidu.com'
         GEOCODER_PATH = '/geocoder/v2/'
 
-        def geocode(address, options)
-          queries = [
-            [:address, address],
-            [:output, 'json'],
-            [:ak, options[:ak]]
-          ]
+        def geocode(data)
+          queries = fetch_query_params(data) + [[:output, 'json']]
           url = "#{API_HOST}#{GEOCODER_PATH}?#{to_query(queries)}"
-          url << "&sn=#{calculate_ak_sn(queries, options[:sk])}" if options[:sk]
+          url << "&sn=#{calculate_ak_sn(queries, data[:sk])}" if data[:sk]
           debug('url', url)
           open(url) do |http|
             ret = JSON.parse(http.read)
@@ -37,12 +33,18 @@ module BaiduApi
 
         def to_query(arr)
           query_str = arr.map do |k, v|
-            "#{CGI.escape(k.to_s)}=#{CGI.escape(v)}"
-          end.join('&')
+            v && "#{CGI.escape(k.to_s)}=#{CGI.escape(v)}"
+          end.compact.join('&')
           debug('query_str', query_str)
           query_str
         end
 
+        def fetch_query_params(data)
+          %w(output ak address city coordtype location pois).map do |k|
+            [k.intern, data[k.intern]]
+          end.compact
+        end
+
         def debug(subject, msg)
           puts "#{subject}: #{msg}" if BaiduApi::Geocoding.config.debug
         end

data/lib/baidu_api/geocoding/version.rb

@@ -1,5 +1,5 @@
 module BaiduApi
   module Geocoding
-    VERSION = "0.0.1"
+    VERSION = "1.0.0"
   end
 end

data/lib/baidu_api/geocoding.rb

@@ -20,22 +20,22 @@ module BaiduApi
       @@config || fail(ArgumentError, 'Please setup API with BaiduApi::Geocoding.setup(options) before starting!')
     end
 
-    def geocode(address, options = {})
-      options = fetch_options(options)
-      version = options.delete(:version).upcase
+    def geocode(data = {})
+      data = fetch_accepted_data(data)
+      version = data.delete(:version).upcase
       geocoder = Object.const_get("BaiduApi::Geocoding::#{version}::Geocoder") rescue fail(ArgumentError, "API version #{version} doesn't exist!")
-      geocoder.geocode(address, options)
+      geocoder.geocode(data)
     end
 
-    def fetch_options(options)
-      %w(ak sk version).inject({}) do |ret, item|
-        ret[item.intern] = fetch_option(options, item)
+    def fetch_accepted_data(data)
+      %w(ak sk version address city coordtype location pois).inject({}) do |ret, item|
+        ret[item.intern] = fetch_data(data, item)
         ret
       end
     end
 
-    def fetch_option(options, key)
-      options.fetch(key.intern) { options.fetch(key.to_s, config[key]) }
+    def fetch_data(data, key)
+      data.fetch(key.intern) { data.fetch(key.to_s, config[key]) }
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baidu_api-geocoding
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - xiaohui
@@ -78,6 +78,5 @@ rubyforge_project:
 rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
-summary: A ruby version [Baidu API Geocoder](http://developer.baidu.com/map/index.php?title=webapi/guide/webservice-geocoding)
-  client.
+summary: A ruby version of Baidu API Geocoder client.
 test_files: []