estimate_distance 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c29fcfa84063eda01dc19e71679145585f36be3
-  data.tar.gz: bf14caf7bc36ae6a977bf0fdb445009a340bdb43
+  metadata.gz: 6f74141bc92c0aa24bc970e2c1661e9d8aaed3e4
+  data.tar.gz: 1e6c4beda3d571837e5549c4b418780c39127da7
 SHA512:
-  metadata.gz: 1fe13591a668247b33c127e4e6954f60f1fe437f7a9a8964a3cfb8dbcf5c2cc22742de005621a2a369c631957144ce1f6436143ddfe254b09d300c0b0b5ea06b
-  data.tar.gz: 5280c777a85ae29ed65f76c818c6968ab3a2d95593be364f68bd52c9d26f1c75c78a1f3078798f338c7a16c44b1aeac7fcdb54f781f3ff5bf8948d05f827d91e
+  metadata.gz: 0cbec2a0790329d7c3f6de543920a9a77558e8744a65c66aad11bf747a3ad8c01c8aa2c8c6d4f2df47041b2efdbc100bf58c0b86ef81d16e1deba8c6d453a3f4
+  data.tar.gz: ec6f421cb8774c25d107f858c4aadf29dd0ee14462948af9a46c52d826ac72bca39e36580d62030845eeb58d2430734a83a9545764244bcbe50f96e35bb3ea87

data/lib/estimate_distance.rb

@@ -10,13 +10,22 @@ module EstimateDistance
   #   [real_address.city.try(:name), real_address.district.try(:name), real_address.address].compact.join
   # end
 
-  def self.location_address_info(address)
-    params = {address: address, output: 'json', ak: 'dAYeNt1licEwUDKoyeNBskBQjHRKDDmb'}
-    result = RestClient.get('http://api.map.baidu.com/geocoder/v2/', params: params)
-    data = JSON(result)
-    data['result']['location']
-  rescue
-    {}
+  def self.location_address_info(address, ak)
+    if ak == ''
+      params = {address: address, output: 'json', ak: 'dAYeNt1licEwUDKoyeNBskBQjHRKDDmb'}
+    else
+      params = {address: address, output: 'json', ak: ak}
+    end
+    request_info(params)
+  end
+
+  def self.request_info(params)
+    begin
+      result = RestClient.get('http://api.map.baidu.com/geocoder/v2/', params: params)
+      JSON(result)
+    rescue Exception=> e
+      return false
+    end
   end
 
   def self.get_rad(d)
@@ -34,27 +43,20 @@ module EstimateDistance
     return (s/1000).round(2)
   end
 
-  # def self.calculate_distance(former_address, latter_address)
-  #   shop_detail_address = real_address(former_address)
-  #   shop_result = location_address_info(shop_detail_address)
-  #   puts shop_result
-  #   lat1 = shop_result['lat']
-  #   lng1 = shop_result['lng']
-  #   user_result = location_address_info(latter_address)
-  #   lat2 = user_result['lat']
-  #   lng2 = user_result['lng']
-  #   distance = get_great_circle_distance(lat1, lng1, lat2, lng2)
-  #   distance
-  # end
+  def self.direct_calculate_distance(former_address, latter_address, ak='')
+    former_result = location_address_info(former_address, ak)
+    latter_result = location_address_info(latter_address, ak)
 
-  def self.direct_calculate_distance(former_address, latter_address)
-    former_result = location_address_info(former_address)
-    lat1 = former_result['lat']
-    lng1 = former_result['lng']
-    latter_result = location_address_info(latter_address)
-    lat2 = latter_result['lat']
-    lng2 = latter_result['lng']
-    distance = circle_distance(lat1, lng1, lat2, lng2)
-    distance
+    if former_result['status'] == 0 && latter_result['status'] == 0
+      lat1 = former_result['result']['location']['lat']
+      lng1 = former_result['result']['location']['lng']
+
+      lat2 = latter_result['result']['location']['lat']
+      lng2 = latter_result['result']['location']['lng']
+      circle_distance(lat1, lng1, lat2, lng2)
+    else
+      return { status: -1 ,message: 'ak有误或超出调用次数'}
+    end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: estimate_distance
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - ZouJun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: estimate distance