geocoder-olleh 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc501f797e1cb573750e39461008492c5f2e6ede
-  data.tar.gz: 546d18fc3a065185883e83d35495d2ea2173d2e9
+  metadata.gz: 9bff207aab53ada46cdd496289ced480643fe8cc
+  data.tar.gz: 77cc01c199ef17debc4f4eb0b40e2f09a92eded0
 SHA512:
-  metadata.gz: a2a873ddadab1d82938c17205ab800753909788a2eed6bc641cd5860198d7e9d363394c674906e10d9ac7896f02035cc0fa5451b3503fc94d607bfbf99ac4f85
-  data.tar.gz: d9c6ffee022e9492b8d27bdb55b44bbf74d1955ff6e376fa315cb923c47a819010d0ef4ab51890fe8844a152d429f85994161dde8670a25ceccadbc97ab778ac
+  metadata.gz: d07fb1b4ccee97e4d86ec72ad09793718bf1526542192abe0c913cf24679986a2938b8f6bd0c8a9ac21225a14236f8a344cf43116576062b7603e1d15f5a947c
+  data.tar.gz: f3623860e2fa5ead550fb48d281c96e52891d79b28c20b464ccf2e8060b55aaad4848f3eaac52cd558b4a9bb0af8b1fc8dec0764674adbe941aa3f22b6d52a80

data/lib/geocoder/olleh/lookups/olleh.rb

@@ -107,6 +107,22 @@ module Geocoder::Lookup
       token
     end
 
+    def self.check_query_type(query)
+      if !query.options.empty? && query.options.include?(:priority)
+        query.options[:query_type] || query.options[:query_type] = "route_search"
+      elsif query.reverse_geocode? && query.options.include?(:include_jibun)
+        query.options[:query_type] || query.options[:query_type] = "reverse_geocoding"
+      elsif !query.options.empty? && query.options.include?(:coord_in)
+        query.options[:query_type] || query.options[:query_type] = "convert_coord"
+      elsif !query.options.empty? && query.options.include?(:l_code)
+        query.options[:query_type] || query.options[:query_type] = "addr_step_search"
+      elsif !query.options.empty? && query.options.include?(:radius)
+        query.options[:query_type] || query.options[:query_type] = "addr_nearest_position_search"
+      else
+        query.options[:query_type] || query.options[:query_type] = "geocoding"
+      end
+    end
+
 
     private # ----------------------------------------------
 
@@ -115,22 +131,24 @@ module Geocoder::Lookup
       data = fetch_data(query)
       return [] unless data
       doc = JSON.parse(URI.decode(data["payload"]))
-      if doc['ERRCD'] != 0
-        Geocoder.log(:warn, "Olleh API error: #{doc['ERRCD']} (#{doc['ERRMS'].gsub('+', ' ')}).")
+      if doc['ERRCD'] != nil && doc['ERRCD'] != 0
+        Geocoder.log(:warn, "Olleh API error: #{doc['ERRCD']} (#{doc['ERRMS'] if doc['ERRMS']}).")
         return []
       end
-      # GEOCODING / REVERSE GECOCODING
-      if doc['RESDATA']['COUNT']
+
+      case Olleh.check_query_type(query)
+      when "geocoding" || "reverse_geocoding"
         return [] if doc['RESDATA']['COUNT'] == 0
         return doc['RESDATA']["ADDRS"]
-      # ROUTE SEARCH
-      elsif doc['RESDATA']['SROUTE'] && doc['RESDATA']['SROUTE']['isRoute']
-        return [] if doc['RESDATA']['SROUTE']['isRoute'] == 'false'
-        return doc['RESDATA']
-      # CONVERT COORDINATES
-      elsif doc['RESDATA']['COORD'] && doc['RESDATA']['COORD']['COORDTYPE']
-        return [] if doc['RESDATA']['COORD']['X'] == ''
+      when "route_search"
+        return [] if doc["RESDATA"]["SROUTE"]["isRoute"] == "false"
+        return doc["RESDATA"]
+      when "convert_coord"
         return doc['RESDATA']
+      when "addr_step_search"
+        return doc['RESULTDATA']
+      when "addr_nearest_position_search"
+        return doc['RESULTDATA']
       else
         []
       end
@@ -140,34 +158,25 @@ module Geocoder::Lookup
       timeout(configuration.timeout) do
         uri = URI.parse(query_url(query))
         Geocoder.log(:debug, "Geocoder: HTTP request being made for #{uri.to_s}")
-        http_client.start(uri.host, uri.port, use_ssl: use_ssl?) do |client|
+        http_client.start(uri.host, uri.port, :use_ssl => true) do |client|
           req = Net::HTTP::Get.new(uri.request_uri, configuration.http_headers)
-
           client.request(req)
         end
       end
     end
 
-    def token
-      if a = configuration.api_key
-        if a.is_a?(Array)
-          return  Base64.encode64("#{a.first}:#{a.last}").strip
-        end
-      end
-    end
-
-    def now
-      Time.now.strftime("%Y%m%d%H%M%S%L")
-    end
-
     def base_url(query)
-      case check_query_type(query)
+      case Olleh.check_query_type(query)
       when "route_search"
         "https://openapi.kt.com/maps/etc/RouteSearch?params="
       when "reverse_geocoding"
         "https://openapi.kt.com/maps/geocode/GetAddrByGeocode?params="
       when "convert_coord"
         "https://openapi.kt.com/maps/etc/ConvertCoord?params="
+      when "addr_step_search"
+        "https://openapi.kt.com/maps/search/AddrStepSearch?params="
+      when "addr_nearest_position_search"
+        "https://openapi.kt.com/maps/search/AddrNearestPosSearch?params="
       else
         "https://openapi.kt.com/maps/geocode/GetGeocodeByAddr?params="
       end
@@ -175,7 +184,7 @@ module Geocoder::Lookup
 
 
     def query_url_params(query)
-      case check_query_type(query)
+      case Olleh.check_query_type(query)
       when "route_search"
         JSON.generate({
           SX: query.options[:start_x],
@@ -197,8 +206,8 @@ module Geocoder::Lookup
         JSON.generate({
           x: query.text.first,
           y: query.text.last,
-          inCoordType: self.coord_types[options[:coord_in]],
-          outCoordType: self.coord_types[options[:coord_out]],
+          inCoordType: Olleh.coord_types[query.options[:coord_in]],
+          outCoordType: Olleh.coord_types[query.options[:coord_out]],
           timestamp: now
        })
       when "reverse_geocoding"
@@ -210,6 +219,18 @@ module Geocoder::Lookup
           isJibun: Olleh.include_jibun[query.options[:include_jibun]] || 0,
           timestamp: now
        })
+      when "addr_step_search"
+        JSON.generate({
+          l_Code: query.options[:l_code],
+          timestamp: now
+        })
+      when "addr_nearest_position_search"
+        JSON.generate({
+          px: query.options[:px],
+          py: query.options[:py],
+          radius: query.options[:radius],
+          timestamp: now
+        })
       else # geocoding
         JSON.generate({
           addr: URI.encode(query.sanitized_text),
@@ -219,25 +240,29 @@ module Geocoder::Lookup
       end
     end
 
+    def token
+      if a = configuration.api_key
+        if a.is_a?(Array)
+          return  Base64.encode64("#{a.first}:#{a.last}").strip
+        end
+      end
+    end
+
+    def now
+      Time.now.strftime("%Y%m%d%H%M%S%L")
+    end
+
     def url_query_string(query)
       URI.encode(
         query_url_params(query)
       ).gsub(':','%3A').gsub(',','%2C').gsub('https%3A', 'https:')
     end
 
-    def check_query_type(query)
-      if !query.options.empty? && query.options.include?(:priority)
-        "route_search"
-      elsif query.reverse_geocode?
-        "reverse_geocoding"
-      elsif !query.options.empty? && query.options.include?(:coord_in)
-        "convert_coord"
-      else
-        "geocoding"
-      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]
     end
-
-
-
   end
 end

data/lib/geocoder/olleh/results/olleh.rb

@@ -1,11 +1,8 @@
-require 'geocoder'
-require_relative "../../olleh"
+require 'geocoder/results/base'
 
 module Geocoder::Result
   class Olleh < Base
 
-    # NEED TO CHECK COORD SYSTEM
-    #
     def latitude
       coordinates[0].to_f
     end
@@ -56,6 +53,22 @@ module Geocoder::Result
       [@data['X'], @data['Y']]
     end
 
+    #########
+    # methods for returning wgs coordiates from
+    #
+    def wgs_coordinates
+      return @data["WGS_COORDINATES"] if @data["WGS_COORDINATES"]
+      query = Geocoder::Query.new(
+        coordinates, {
+        coord_in: 'utmk',
+        coord_out: 'wgs84'
+      })
+      lookup = Geocoder::Lookup::Olleh.new
+      wgs = lookup.search(query).first.converted_coord
+      @data["WGS_COORDINATES"] = wgs
+      wgs
+    end
+
     def address_data
       @data['ADDRESS']
     end
@@ -64,18 +77,22 @@ module Geocoder::Result
       %w[bbox name confidence entityType]
     end
 
-    #########
-    # CONVERTED COORD TYPE
-    def converted_coord_type
+    ##
+    # methods for converting coord system
+    #
+    def coord_type
       @data[1]['COORDTYPE']
     end
 
-    def converted_coordinates
-      [@data[1]['X'], @data[1]['Y']]
+    def converted_coord
+      [@data[1]["X"], @data[1]["Y"]]
     end
 
-    #########
+    ##
     # methods for route search results
+    # total_time : minutes
+    # total_dist : meter
+    #
     def total_time
       @data[1]['ROUTE']['total_time']
     end
@@ -92,6 +109,60 @@ module Geocoder::Result
       @data[1]['ROUTE']['rg']
     end
 
+    ##
+    # methods for converting coord system
+    #
+    def coord_type
+      @data[1]['COORDTYPE']
+    end
+
+    def converted_coord
+      [@data[1]["X"], @data[1]["Y"]]
+    end
+
+    ##
+    # methods for parsing adress step search
+    #
+    # 법정동 - 시도
+    def addr_step_sido
+      @data["SIDO"]
+    end
+
+    ##
+    # 법정동 - 시군구
+    def addr_step_sigungu
+      @data["SIGUNGU"].gsub("+"," ")
+    end
+
+    def addr_step_dong
+      @data["DONG"]
+    end
+
+    def addr_step_li
+      @data["LI"]
+    end
+    ##
+    # 법정동코드
+    def addr_step_l_code
+      @data["L_CODE"]
+    end
+    ##
+    # 행정동코드
+    def addr_step_h_code
+      @data["H_CODE"]
+    end
+    ##
+    # 파란코드
+    def addr_step_p_code
+      @data["P_CODE"]
+    end
+
+    ##
+    # methods for parsing nearest position search
+    #
+    def position_address
+      "#{@data['SIDO']} #{@data['L_SIGUN_GU']} #{@data['L_DONG']} #{@data['GIBUN']}"
+    end
 
     response_attributes.each do |a|
       define_method a do

data/lib/geocoder/olleh/version.rb

@@ -1,5 +1,5 @@
 module Geocoder
   module Olleh
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder-olleh
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Jaigouk Kim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-23 00:00:00.000000000 Z
+date: 2015-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler