geocoder-olleh 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e596f1a0805cfe1fc9ffad2b98d31693c6205ba
-  data.tar.gz: 6acdf55e19dffe26ce29d6a342950e8db5ce307c
+  metadata.gz: f2154ddf53b0d61be0c86b044d3a896a0c597dcc
+  data.tar.gz: ce0c3c8f77e3eeff1ac2dfeaf4f5fe1a9a1854e3
 SHA512:
-  metadata.gz: 0a15ff93b1961338481600f3ed5a3ef3000b7a3c9ad0c1bb2162cef2742f32fabd644820e450ad66ed978dee8d6e88e034be776308cc39dc47c05fc5ba69dd53
-  data.tar.gz: c171b5992c2c78c9bdd5b34e186ce3601f5fe885f231178e1962705ca30cb7f2edddecbf325e0960995d30e0161ecd3dc1248f64f2746b9f0aa263640236fda8
+  metadata.gz: d532ae2d59e4b6b3ff055a198be6f514fd69e7fe9329e0c92d8ca9fba468a109cad1265ae0f0eb46b6c2d3e9b5045fcdb5dfd11ee639194edb67d91f382c09f6
+  data.tar.gz: b5190f571557579777b4a300a6135204842b8cce73adcc6047892900cddd6228b8c8e31fcfd8cea6d7e7a75321cf881efcc7bfc250dbf5d669afcabc7b226e44

data/README.md

@@ -6,7 +6,7 @@ that adds support for Olleh.
 
 #### Olleh (`:olleh`)
 
-* **API key**: Basic auth (set `Geocoder.configure(:basic_auth => {:user => app_id, :password => app_key})`)
+* **API key**: API Key
 * **Quota**: Dependant on service plan
 * **Region**: South Korea
 * **SSL support**: no

data/geocoder-olleh.gemspec

@@ -7,8 +7,8 @@ require 'geocoder/olleh/version'
 Gem::Specification.new do |spec|
   spec.name          = "geocoder-olleh"
   spec.version       = Geocoder::Olleh::VERSION
-  spec.authors       = ["Jaigouk Kim"]
-  spec.email         = ["ping@jaigouk.kim"]
+  spec.authors       = ["Jaigouk Kim", "Matthew Rudy Jacobs", "Peter Wong"]
+  spec.email         = ["ping@jaigouk.kim", "matthewrudyjacobs@gmail.com", "luiges90@gmail.com"]
 
   spec.summary       = %q{geocoding with Olleh map api}
   spec.description   = %q{Provides object geocoding}

data/lib/geocoder/lookups/olleh.rb

@@ -139,9 +139,7 @@ module Geocoder::Lookup
     def results(query)
       data = fetch_data(query)
       return [] unless data
-      return [] if blank?(data["payload"])
-      return [] if data["error"]
-      doc = JSON.parse(URI.decode(data["payload"]))
+      doc = data
       if doc['ERRCD'] != nil && doc['ERRCD'] != 0
         Geocoder.log(:warn, "Olleh API error: #{doc['ERRCD']} (#{doc['ERRMS'] if doc['ERRMS']}).")
         return []
@@ -189,23 +187,23 @@ module Geocoder::Lookup
     end
 
     def base_url(query)
-      host = "#{protocol}://openapi.kt.com"
+      host = "#{protocol}://api.ollehmap.com:10082"
       path =
         case Olleh.check_query_type(query)
         when "addr_local_search"
-          "/maps/search/km2_LocalSearch?params="
+          "/ocsp/v2/search/km2_LocalSearch.json?"
         when "route_search"
-          "/maps/etc/RouteSearch?params="
+          "/giop/rest/etc/RouteSearch.json?"
         when "reverse_geocoding"
-          "/maps/geocode/GetAddrByGeocode?params="
+          "/giop/rest/geocode/Rgeocode.json?"
         when "convert_coord"
-          "/maps/etc/ConvertCoord?params="
+          "/giop/rest/etc/ConvertCoord.json?"
         when "addr_step_search"
-          "/maps/search/AddrStepSearch?params="
+          "/ocsp/v1/search/AddrStepSearch.json?"
         when "addr_nearest_position_search"
-          "/maps/search/AddrNearestPosSearch?params="
+          "/ocsp/v2/search/km2_AddrNearestPosSearch.json?"
         else #geocoding
-          "/maps/geocode/GetGeocodeByAddr?params="
+          "/giop/rest/geocode/Geocode.json?"
         end
       host + path
     end
@@ -228,7 +226,7 @@ module Geocoder::Lookup
         # s: "AN" means it will return old / new style addresses.
         #
         hash = {
-          query: URI.encode(query.text),
+          query: query.sanitized_text,
           option: "1",
           s: "AN",
           places: query.options[:places],
@@ -270,36 +268,27 @@ module Geocoder::Lookup
         }
       when "addr_nearest_position_search"
         hash = {
-          px: query.options[:px],
-          py: query.options[:py],
-          radius: query.options[:radius]
+          PX: query.options[:px],
+          PY: query.options[:py],
+          RADIUS: query.options[:radius]
         }
       else # geocoding
         hash = {
-          addr: URI.encode(query.sanitized_text),
-          addrcdtype: Olleh.addrcdtype[query.options[:addrcdtype]]
+          addr: query.sanitized_text,
+          addrcdtype: Olleh.addrcdtype[query.options[:addrcdtype]] || 0
         }
       end
 
-      hash.merge!(timestamp: now)
-      JSON.generate(hash)
-    end
-
-    def now
-      Time.now.strftime("%Y%m%d%H%M%S%L")
+      hash.merge!(key: configuration.api_key)
+      hash
     end
 
     def url_query_string(query)
-      URI.encode(
-        query_url_params(query)
-      ).gsub(':','%3A').gsub(',','%2C').gsub('https%3A', 'https:')
+      URI.encode_www_form(query_url_params(query))
     end
 
-    ##
-    # Need to delete timestamp from cache_key to hit cache
-    #
     def cache_key(query)
-      Geocoder.config[:cache_prefix] + query_url(query).split('timestamp')[0]
+      Geocoder.config[:cache_prefix] + query_url(query)
     end
   end
 end

data/lib/geocoder/olleh/version.rb

@@ -1,5 +1,5 @@
 module Geocoder
   module Olleh
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: geocoder-olleh
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jaigouk Kim
+- Matthew Rudy Jacobs
+- Peter Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geocoder
@@ -55,6 +57,8 @@ dependencies:
 description: Provides object geocoding
 email:
 - ping@jaigouk.kim
+- matthewrudyjacobs@gmail.com
+- luiges90@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -96,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: geocoding with Olleh map api