geocoder-olleh 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed01b74f0efb1a3f47426fbc509646a9b1821ef
-  data.tar.gz: bb6cfdb3a02f16861511d4c338343753d2d7c20d
+  metadata.gz: 4e450c609793d078954606f921497f207ac57529
+  data.tar.gz: 774bc01a02e7149fc896b4307bd712c248a235d6
 SHA512:
-  metadata.gz: 88759345df8cf55c2b24766fc94d1484d49aaefb92f06395f6d2cfe75bdca16b1b2b6b61dbbfb860410061cc82a807e6c37fbda21f05c612131af4a67b5f91d8
-  data.tar.gz: d29fc39a1d7b99d5b7f1f38d57e8c43567b0101972a5b6afc611e89c4c9c72a293438a970a4b79e6cac843a1da5912f4645d911a19ce7c08890ed3db63f43866
+  metadata.gz: 4a58523125d3daf120d9a3347be033a9759bfb7f47329cb225d55416c7516087eb0b57002f1a847ba5d3b2903302cf592f38f49da7dba7079ff1f94c69d78f37
+  data.tar.gz: 8999a16b53c4d87cb06d454b5faee72c25140f5c5bc758b24cf6b149029f9b8b4dc8e56e631924b300f65f5647d882e362e4cc2b4d766c612b7f12a0a4ead3bf

data/lib/geocoder/lookups/olleh.rb

@@ -140,6 +140,7 @@ module Geocoder::Lookup
     def results(query)
       data = fetch_data(query)
       return [] unless data
+      return [] if data["payload"].empty?
       return [] if data["error"]
       doc = JSON.parse(URI.decode(data["payload"]))
       if doc['ERRCD'] != nil && doc['ERRCD'] != 0
@@ -173,7 +174,15 @@ module Geocoder::Lookup
     end
 
     def local_search_result(result_data)
-      result_data["place"]["Data"] || result_data["New_addrs"]["Data"]
+      if result_data["addr"] && !result_data["addr"]["Data"].empty?
+        result_data["addr"]["Data"]
+      elsif result_data["New_addrs"] && !result_data["New_addrs"]["Data"].empty?
+        result_data["New_addrs"]["Data"]
+      elsif result_data["place"] && !result_data["place"]["Data"].empty?
+        result_data["place"]["Data"]
+      else
+        nil
+      end
     end
 
     def base_url(query)
@@ -198,13 +207,24 @@ module Geocoder::Lookup
     def query_url_params(query)
       case Olleh.check_query_type(query)
       when "addr_local_search"
-        # option 2 is for sorting results. we are using default.
-        # places is for number of results
+        # option 2 is for sorting based on location of user.
+        # we are using default. "1"
+        #
+        # we can add UTMK X, Y coordinates for that.
+        # but i am not using it. it's optional.
+        # isarea = 1 should be used in this case.
+        # r is for setting radius. (300, 500, 1000, 2000, 40000)
+        #
+        # places is for number of results. 100 is the maximum.
+        #
         # sr is for
         # isaddr for searching address only. excluding building name, etc.
+        # s: "AN" means it will return old / new style addresses.
+        #
         hash = {
           query: URI.encode(query.text),
           option: "1",
+          s: "AN",
           places: query.options[:places],
           sr: query.options[:sr],
           isaddr: Olleh.new_addr_search_options[query.options[:isaddr]] || "1"

data/lib/geocoder/olleh/version.rb

@@ -1,5 +1,5 @@
 module Geocoder
   module Olleh
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/geocoder/results/olleh.rb

@@ -131,7 +131,7 @@ module Geocoder::Result
     ##
     # 법정동 - 시군구
     def addr_step_sigungu
-      @data["SIGUNGU"].gsub("+"," ")
+      sanitize_addr(@data["SIGUNGU"])
     end
 
     def addr_step_dong
@@ -169,12 +169,13 @@ module Geocoder::Result
     # using old address system
     def old_addr
       if @data["ADDR"]
-        @data["ADDR"].gsub("+", " ")
-      elsif data["M_ADDR1"]
-        @data["M_ADDR1"].gsub("+", " ").gsub("  ", " ") + " " +
-          @data["M_ADDR2"].gsub("+", " ").gsub("  ", " ")
+        sanitize_addr(@data["ADDR"])
+      elsif @data["ADDRESS"]
+        sanitize_addr(@data["ADDRESS"])
+      elsif @data["M_ADDR1"]
+        sanitize_addr(@data["M_ADDR1"]) + " " + sanitize_addr(@data["M_ADDR2"])
       else
-        @data["NEW_ADDR"].gsub("+", " ")
+        ""
       end
     end
 
@@ -183,9 +184,11 @@ module Geocoder::Result
     # using new address system
     def new_addr
       if @data["NEW_ADDR"]
-        @data["NEW_ADDR"].gsub("+", " ").gsub("  ", " ")
+        sanitize_addr(@data["NEW_ADDR"])
+      elsif @data["M_NEWADDR1"] && @data["M_NEWADDR2"]
+        sanitize_addr(@data["M_NEWADDR1"]) + " " + sanitize_addr(@data["M_NEWADDR2"])
       else
-        @data["ADDR"]
+        ""
       end
     end
 
@@ -207,6 +210,11 @@ module Geocoder::Result
       @data["Y"]
     end
 
+    def sanitize_addr(text)
+      return unless text
+      text.gsub("++", " ").gsub("+", " ")
+    end
+
     response_attributes.each do |a|
       define_method a do
         @data[a]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder-olleh
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jaigouk Kim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler