geo_api 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f55ed5220b1ed6a8386182489524d2321644003
-  data.tar.gz: 3ad607c47d03b4e4601a20c6b6add414cc11fafb
+  metadata.gz: 6f8abfda3728b072eeea68219e2ca14c5a8274d9
+  data.tar.gz: 08e5f5418469ff21d5e886d927af3b2fa3f3065c
 SHA512:
-  metadata.gz: 5ad3562bda56c8172cef6ad223a0b2c1cb7f651b7b949558e030570dd03bc7e3fe82c62d19bfd8bb4c0fa0efb52ed37e17fb9e34998f1fe4cc5bb2112131445b
-  data.tar.gz: 86a3f9ca3f6e1b6764e270955f27e969b4679c760357adb90cc506dac4e99d7c545fbe0887fdbc0cb2c50b2a226ab98052c24319351b4eebc187a08ef9329608
+  metadata.gz: 065403e1d2c868ddf516f3e13be19ec0fec298bbe18b32464b47955ad2b4cea13ffb9c4ff40a4de667fb91b57f7076fc4760134eae665c42ab7b2b7cbb5c3bde
+  data.tar.gz: 5e8e7dabe985f8b527f52c521e8a3f592cce73c6d149d8f601e04ad9cfd0fb68aaffe59e21a9c13bdc4e3d4eef336385a647f89a55ebde80b84bd1bad86e9341

data/Gemfile

@@ -2,6 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'mongoid', '~> 4.0.0.beta1', github: 'mongoid/mongoid', ref: 'f9e6fdb'
-gem 'bson_ext'
 gem 'coveralls', require: false

data/README.md

@@ -1,6 +1,6 @@
 # GeoApi
 
-位置接口,目前调用百度地理位置api获取格式化的地理位置数据.
+位置接口,目前调用百度或者高德地理位置api获取格式化的地理位置数据.
 
 [![Travis](https://travis-ci.org/liuzelei/geo_api.svg?branch=master)](https://travis-ci.org/liuzelei/geo_api)
 [![Code Climate](https://codeclimate.com/github/liuzelei/geo_api.png)](https://codeclimate.com/github/liuzelei/geo_api)
@@ -10,28 +10,29 @@
 
 添加以下代码到Gemfile:
 
-    gem 'geo_api', git: 'git@github.com:liuzelei/geo_api.git', tag: 'v0.0.5'
+  gem 'geo_api', git: 'git@github.com:liuzelei/geo_api.git', tag: 'v1.0.0'
 
 配置代码:
-	
-	GeoApi.setup do |config|
-  		config.server = "http://api.map.baidu.com/geocoder/v2/"
-  		config.key = "" #百度api的key
-	end
+
+  GeoApi.setup do |config|
+    config.server = "http://api.map.baidu.com/geocoder/v2/"
+    config.key = "" #地主api的key
+    config.vendor = 'BAIDU|GAODE'
+  end
 
 ## 使用
 
 #### 获取某个字符串的格式化地址信息
 
-	GeoApi.LocationService.instance.get_location_from_string("中山公园上海")
+  GeoApi.LocationService.instance.get_location_from_string("中山公园上海")
 
 #### 获取某个经纬度下的格式化地址信息
-	
-	GeoApi.LocationService.instance.get_location_from_coordinate(12.34, 56.78, "bd09ll")
-	
+
+  GeoApi.LocationService.instance.get_location_from_coordinate(12.34, 56.78, "bd09ll")
+
 地址的格式化结果是
 
-   	databack["province"] = "上海市"
+    databack["province"] = "上海市"
     databack["city"] = "上海市"
     databack["region"] = "浦东新区" 
     databack["detail"] = "灵岩路79弄-1号"

data/geo_api.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'geo_api/version'
@@ -23,7 +22,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
-
-  spec.add_runtime_dependency "bson"
-  spec.add_runtime_dependency "mongoid"
 end

data/lib/generators/geo_api/install_generator.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module GeoApi
   class InstallGenerator < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)

data/lib/generators/geo_api/templates/initializer.rb

@@ -2,4 +2,5 @@
 GeoApi.setup do |config|
   config.server = "http://apis.map.qq.com/ws/geocoder/v1/"
   config.key = ""
+  config.vendor = "GAODE"
 end

data/lib/geo_api.rb

@@ -1,10 +1,8 @@
-# encoding: utf-8
 require "geo_api/version"
 require 'geo_api/configuration'
-require 'geo_api/models/log'
+require "geo_api/baidu"
+require "geo_api/gaode"
 require 'logger'
-require 'net/http'
-require 'json'
 
 module GeoApi
   class << self
@@ -20,8 +18,12 @@ module GeoApi
       @logger ||= Logger.new(STDOUT)
     end
 
+    def proxy
+      @proxy ||= get_proxy
+    end
+
     def get_location_from_string(location)
-      unless location.blank?
+      unless location.nil? || location.length == 0
         formated_address = location.split(/,|-|;|>|:|\+|\^/)
         databack = Hash.new
         databack["province"] = formated_address[0] if formated_address.length > 0
@@ -42,54 +44,23 @@ module GeoApi
       end
     end
 
-    def get_location_from_coordinate(latitude, longitude, coordtype = 5)
-      params = { location: "%s,%s" % [latitude, longitude], coordtype: coordtype, key: GeoApi.config.key }
-      result = send_request(params)
-      if result && result["status"] == 0 && result["result"]
-        databack = Hash.new
-        databack["address"] = result["result"]["address"]
-        databack["province"] = result["result"]["address_component"]["province"]
-        databack["city"] = result["result"]["address_component"]["city"]
-        databack["region"] = result["result"]["address_component"]["district"]
-        databack["detail"] = result["result"]["address_component"]["street"] + result["result"]["address_component"]["street_number"]
-        databack["latitude"] = result["result"]["location"]["lat"].to_s
-        databack["longitude"] = result["result"]["location"]["lng"].to_s
-
-        return databack
-      else
-        return nil
-      end
+    def get_location_from_coordinate(longitude, latitude)
+      proxy.get_location_from_coordinate(longitude, latitude)
     end
 
     def get_coordinate_from_string(location, city = nil)
-      params = { address: location, region: city, key: GeoApi.config.key }
-      result = send_request(params)
-
-      if result["status"] == 0
-        return result["result"]
-      else
-        return nil
-      end
+      proxy.get_coordinate_from_string(location, city = nil)
     end
 
-    private
-    def send_request(params)
-      uri = URI(GeoApi.config.server)
-      params[:output] = 'json'
-      uri.query = URI.encode_www_form(params)
-      res = Net::HTTP.get_response(uri)
-      log = GeoApi::Models::Log.new
-      log.url = uri
-      begin
-        log.request = JSON.parse(params.to_json)
-      rescue
-        log.raw_request = params
+    def get_proxy
+      case config.vendor
+      when 'BAIDU'
+        return GeoApi::Baidu.new(config)
+      when 'GAODE'
+        return GeoApi::Gaode.new(config)
+      else
+        raise '不支持的Vendor'
       end
-      log.response = JSON.parse(res.body) if res.is_a?(Net::HTTPSuccess)# && !res.body.blank?
-      log.save
-      result = JSON.parse(res.body) if res.is_a?(Net::HTTPSuccess)# && !res.body.blank?
-
-      return result
     end
   end
 end

data/lib/geo_api/baidu.rb

@@ -0,0 +1,51 @@
+require 'net/http'
+require 'json'
+
+module GeoApi
+  class Baidu
+    attr_accessor :config
+
+    def initialize(config)
+      @config = config
+    end
+
+    def get_location_from_coordinate(latitude, longitude)
+      params = { location: "%s,%s" % [latitude, longitude], coordtype: 5, key: @config.key }
+      result = send_request(params)
+      if result && result["status"] == 0 && result["result"]
+        databack = Hash.new
+        databack["address"] = result["result"]["address"]
+        databack["province"] = result["result"]["address_component"]["province"]
+        databack["city"] = result["result"]["address_component"]["city"]
+        databack["region"] = result["result"]["address_component"]["district"]
+        databack["detail"] = result["result"]["address_component"]["street"] + result["result"]["address_component"]["street_number"]
+
+        return databack
+      else
+        return nil
+      end
+    end
+
+    def get_coordinate_from_string(location, city = nil)
+      params = { address: location, region: city, key: @config.key }
+      result = send_request(params)
+
+      if result["status"] == 0
+        return { longitude: result["result"]["lng"], latitude: result["result"]["lat"] }
+      else
+        return nil
+      end
+    end
+
+    private
+    def send_request(params)
+      uri = URI(@config.server)
+      params[:output] = 'json'
+      uri.query = URI.encode_www_form(params)
+      res = Net::HTTP.get_response(uri)
+      result = JSON.parse(res.body) if res.is_a?(Net::HTTPSuccess)# && !res.body.blank?
+
+      return result
+    end
+  end
+end

data/lib/geo_api/configuration.rb

@@ -1,8 +1,7 @@
-# encoding: utf-8
 module GeoApi
   class Configuration
     def server
-      @server ||= "http://apis.map.qq.com/ws/geocoder/v1"
+      @server ||= "http://api.map.baidu.com/geocoder/v2/"
     end
 
     def server=(server)
@@ -16,5 +15,13 @@ module GeoApi
     def key=(key)
       @key = key
     end
+
+    def vendor
+      @vendor ||= 'BAIDU'
+    end
+
+    def vendor=(vendor)
+      @vendor = vendor
+    end
   end
 end

data/lib/geo_api/gaode.rb

@@ -0,0 +1,51 @@
+require 'net/http'
+require 'json'
+
+module GeoApi
+  class Gaode
+    attr_accessor :config
+
+    def initialize(config)
+      @config = config
+    end
+
+    def get_location_from_coordinate(longitude, latitude)
+      params = { location: "%s,%s" % [longitude, latitude], key: @config.key }
+      result = send_request('regeo', params)
+      if !result.nil? && result["status"] == "1" && !result["regeocode"].nil?
+        databack = Hash.new
+        databack["address"] = result["regeocode"]["formatted_address"]
+        databack["province"] = result["regeocode"]["addressComponent"]["province"]
+        databack["city"] = result["regeocode"]["addressComponent"]["city"]
+        databack["city"] = databack["province"] if databack["city"].nil? || databack["city"].length == 0
+        databack["region"] = result["regeocode"]["addressComponent"]["district"]
+        databack["detail"] = result["regeocode"]["addressComponent"]["township"]
+
+        return databack
+      else
+        return nil
+      end
+    end
+
+    def get_coordinate_from_string(location, city = nil)
+      params = { address: location, city: city, key: @config.key }
+      result = send_request('geo', params)
+      if !result.nil? && result["status"] == "1" && !result["geocodes"].nil? && result["geocodes"].length > 0
+        location = result["geocodes"][0]["location"].split(',')
+        return { longitude: location[0], latitude: location[1] }
+      else
+        return nil
+      end
+    end
+
+    private
+    def send_request(path, params)
+      uri = URI("#{@config.server}#{path}")
+      params[:output] = 'json'
+      uri.query = URI.encode_www_form(params)
+      res = Net::HTTP.get_response(uri)
+      result = JSON.parse(res.body) if res.is_a?(Net::HTTPSuccess)# && !res.body.blank?
+      return result
+    end
+  end
+end

data/lib/geo_api/version.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module GeoApi
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

data/spec/baidu_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe "test baidu" do
+  let(:config) do
+    config = GeoApi::Configuration.new
+    config.server = "http://api.map.baidu.com/geocoder/v2/"
+    config.key = "m48tmnl9BPwnhNOctmrVKMRa"
+    config.vendor = "BAIDU"
+    config
+  end
+  let(:baidu) { GeoApi::Baidu.new(config) }
+
+  it "get location by coordinate" do
+    latitude = "39.9834"
+    longitude = "116.3229"
+
+    location = baidu.get_location_from_coordinate(longitude, latitude)
+    expect(location["province"]).to eq("北京市")
+    expect(location["city"]).to eq("北京市")
+    expect(location["region"]).to eq("海淀区")
+
+    latitude = "36.66"
+    longitude = "101.76"
+
+    location = baidu.get_location_from_coordinate(longitude, latitude)
+    expect(location["province"]).to eq("青海省")
+    expect(location["city"]).to eq("西宁市")
+    expect(location["region"]).to eq("城北区")
+  end
+
+  it "get coordinate from string" do
+    result = baidu.get_coordinate_from_string("思南路115弄")
+    expect(result[:longitude]).not_to be_empty
+    expect(result[:latitude]).not_to be_empty
+
+    result = baidu.get_coordinate_from_string("思南路115弄", "上海市")
+   
+    expect(result[:longitude]).not_to be_empty
+    expect(result[:latitude]).not_to be_empty
+
+    result = baidu.get_coordinate_from_string("")
+    
+    expect(result).to eq(nil)
+
+  end
+end

data/spec/gaode_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe "test gaode" do
+  let(:config) do
+    config = GeoApi::Configuration.new
+    config.server = 'http://restapi.amap.com/v3/geocode/'
+    config.key = 'fc37e6da72d246a47034e05baa6464c6'
+    config.vendor = 'GAODE'
+    config
+  end
+  let(:gaode) { GeoApi::Gaode.new(config) }
+
+  it "get location by coordinate" do
+    latitude = "39.9834"
+    longitude = "116.3229"
+
+    location = gaode.get_location_from_coordinate(longitude, latitude)
+    expect(location["province"]).to eq("北京市")
+    expect(location["city"]).to eq("北京市")
+    expect(location["region"]).to eq("海淀区")
+
+    latitude = "36.66"
+    longitude = "101.76"
+
+    location = gaode.get_location_from_coordinate(longitude, latitude)
+    expect(location["province"]).to eq("青海省")
+    expect(location["city"]).to eq("西宁市")
+    expect(location["region"]).to eq("城北区")
+  end
+
+  it "get coordinate from string" do
+    result = gaode.get_coordinate_from_string("思南路115弄")
+    expect(result[:longitude]).not_to be_empty
+    expect(result[:latitude]).not_to be_empty
+
+    result = gaode.get_coordinate_from_string("思南路115弄", "上海市")
+   
+    expect(result[:longitude]).not_to be_empty
+    expect(result[:latitude]).not_to be_empty
+
+    result = gaode.get_coordinate_from_string("")
+    
+    expect(result).to eq(nil)
+
+  end
+end

data/spec/location_spec.rb

@@ -1,8 +1,21 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe "test location" do
-  it "should get location by string" do
+  before(:each) do
+    GeoApi.setup do |config|
+    # config.server = "http://api.map.baidu.com/geocoder/v2/"
+    # config.convert_server = "http://api.map.baidu.com/geoconv/v1/"
+    # config.key = "m48tmnl9BPwnhNOctmrVKMRa"
+    config.server = 'http://restapi.amap.com/v3/geocode/'
+    config.key = '54da1e114715acb235ca8d8f1d17d5f9'
+    config.vendor = 'GAODE'
+    # config.server = "http://apis.map.qq.com/ws/geocoder/v1/"
+    # config.key = "NM2BZ-V3HRG-ZHMQO-IPJQD-Q375T-EPFRZ"
+  end
+
+  end
+  it "get location by string" do
+    p GeoApi.proxy
     location = GeoApi.get_location_from_string("上海市-灵岩路-79弄1号")
     expect(location["province"]).to eq("上海市")
     expect(location["city"]).to eq("上海市")
@@ -19,15 +32,12 @@ describe "test location" do
     # location = GeoApi.get_location_from_string("城北区")
     # expect(location["province"]).not_to eq("城北区")
   end
-end
-
-describe "test location form coordinate" do
 
-  it "should get location by coordinate" do
+  it "get location by coordinate" do
     latitude = "39.9834"
     longitude = "116.3229"
 
-    location = GeoApi.get_location_from_coordinate(latitude, longitude, 5)
+    location = GeoApi.get_location_from_coordinate(longitude, latitude)
     expect(location["province"]).to eq("北京市")
     expect(location["city"]).to eq("北京市")
     expect(location["region"]).to eq("海淀区")
@@ -35,26 +45,26 @@ describe "test location form coordinate" do
     latitude = "36.66"
     longitude = "101.76"
 
-    location = GeoApi.get_location_from_coordinate(latitude, longitude, 5)
+    location = GeoApi.get_location_from_coordinate(longitude, latitude)
     expect(location["province"]).to eq("青海省")
     expect(location["city"]).to eq("西宁市")
     expect(location["region"]).to eq("城北区")
   end
 
-  it "should get coordinate from  string" do
+  it "get coordinate from string" do
     result = GeoApi.get_coordinate_from_string("思南路115弄")
-    p result
-    expect(result["location"]).not_to be_empty
+    expect(result[:longitude]).not_to be_empty
+    expect(result[:latitude]).not_to be_empty
 
     result = GeoApi.get_coordinate_from_string("思南路115弄", "上海市")
    
-    expect(result["location"]).not_to be_empty
+    expect(result[:longitude]).not_to be_empty
+    expect(result[:latitude]).not_to be_empty
 
     result = GeoApi.get_coordinate_from_string("")
     
     expect(result).to eq(nil)
 
-
     # 500.times do
     #   result = GeoApi.get_coordinate_from_string("思南路115弄")
     #   if result.nil?

data/spec/spec_helper.rb

@@ -1,50 +1,14 @@
-# encoding utf-8
 require 'coveralls'
 Coveralls.wear!
 
 require 'bundler/setup'
 require 'geo_api'
-require 'mongoid'
 
 Bundler.setup
 
 ENV["RAILS_ENV"] ||= 'test'
-ENV["MONGOID_SPEC_HOST"] ||= "localhost"
-ENV["MONGOID_SPEC_PORT"] ||= "27017"
-
-HOST = ENV["MONGOID_SPEC_HOST"]
-PORT = ENV["MONGOID_SPEC_PORT"].to_i
-
-def database_id
-  "sashimi_test"
-end
-
-
-CONFIG = {
-  sessions: {
-    default: {
-      database: database_id,
-      hosts: [ "#{HOST}:#{PORT}" ]
-    }
-  }
-}
-
-# Set the database that the spec suite connects to.
-Mongoid.configure do |config|
-  config.load_configuration(CONFIG)
-end
-
-GeoApi.setup do |config|
-  # config.server = "http://api.map.baidu.com/geocoder/v2/"
-  # config.convert_server = "http://api.map.baidu.com/geoconv/v1/"
-  # config.key = "m48tmnl9BPwnhNOctmrVKMRa"
-
-  config.server = "http://apis.map.qq.com/ws/geocoder/v1/"
-  config.key = "NM2BZ-V3HRG-ZHMQO-IPJQD-Q375T-EPFRZ"
-end
 
 RSpec.configure do |config|
   config.before(:each) do
-    # Mongoid.purge!
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo_api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - liuzelei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,34 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bson
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: "基础地理位置服务"
 email:
 - liuzelei@gmail.com
@@ -127,9 +99,12 @@ files:
 - lib/generators/geo_api/install_generator.rb
 - lib/generators/geo_api/templates/initializer.rb
 - lib/geo_api.rb
+- lib/geo_api/baidu.rb
 - lib/geo_api/configuration.rb
-- lib/geo_api/models/log.rb
+- lib/geo_api/gaode.rb
 - lib/geo_api/version.rb
+- spec/baidu_spec.rb
+- spec/gaode_spec.rb
 - spec/location_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -152,10 +127,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: "提供字符串解析,经纬度解析映射等"
 test_files:
+- spec/baidu_spec.rb
+- spec/gaode_spec.rb
 - spec/location_spec.rb
 - spec/spec_helper.rb

data/lib/geo_api/models/log.rb

@@ -1,14 +0,0 @@
-require 'mongoid'
-module GeoApi
-  module Models
-    class Log
-      include Mongoid::Document
-
-      field :url, type: String
-      field :request, type: Hash
-      field :raw_request, type: String
-      field :response, type: Hash
-
-    end
-  end
-end