geocoder-olleh 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d628203c7f2d8c4d9b65024f9c9ead15eb333a30
-  data.tar.gz: 2f84ed69fe48d219042f46e885bae09f45efba1c
+  metadata.gz: 81db180acec343ca4cc12fe807db4b57a1da9563
+  data.tar.gz: 01cff3aecee2aab369956b3be32e82c5582d066d
 SHA512:
-  metadata.gz: f0c52597b0d87e1991f4558acc04596cfc73f3ef698f2acf6b2694c22bc07230f5c6d10d541ff35415e3a8b9603d372754d65698157917d1d955956e80a7367c
-  data.tar.gz: 3ae8d44fcf965b377412f74f8f5f418a6d6efa9e9a2ca66de51392fce620bc8495c0919b55e53cf0a417b1424c5eada8236bad19fa7fed983f9f9dfd973c2f68
+  metadata.gz: e4253cb791f5d80443c2c7ed17085397d233e8f784d41fe78ca7d0bd0566c9fbd214cd32141202d6b4b283d46891750a0c65e07ed4b3424b1fadad5b79258fd0
+  data.tar.gz: c190f4d5184904b8240624dbcda44dc3fe94ab84e84a5924abc2dfda438c6d0c40d458cfd7eae97182a445f7a9740ef8e1b396529a1f43575da407f4e4188889

data/lib/geocoder/lookups/olleh.rb

@@ -182,51 +182,46 @@ module Geocoder::Lookup
           EY: query.options[:end_y],
           RPTYPE: 0,
           COORDTYPE: Olleh.route_coord_types[query.options[:coord_type]] || 7,
-          PRIORITY: Olleh.priority[query.options[:priority]],
-          timestamp:  now
-       }
-       (1..3).each do |x|
+          PRIORITY: Olleh.priority[query.options[:priority]]
+        }
+        (1..3).each do |x|
           s = [query.options[:"vx#{x}"], query.options[:"vy#{x}"]]
           hash.merge!({ "VX#{x}" => s[0], "VY#{x}" => s[1]}) unless s[0].nil? && s[1].nil?
         end
-
-        JSON.generate(hash)
       when "convert_coord"
-        JSON.generate({
+        hash = {
           x: query.text.first,
           y: query.text.last,
           inCoordType: Olleh.coord_types[query.options[:coord_in]],
-          outCoordType: Olleh.coord_types[query.options[:coord_out]],
-          timestamp: now
-       })
+          outCoordType: Olleh.coord_types[query.options[:coord_out]]
+       }
       when "reverse_geocoding"
-        JSON.generate({
+        hash = {
           x: query.text.first,
           y: query.text.last,
           addrcdtype: Olleh.addrcdtype[query.options[:addrcdtype]] || 0,
           newAddr: Olleh.new_addr_types[query.options[:new_addr_type]] || 0,
-          isJibun: Olleh.include_jibun[query.options[:include_jibun]] || 0,
-          timestamp: now
-       })
+          isJibun: Olleh.include_jibun[query.options[:include_jibun]] || 0
+       }
       when "addr_step_search"
-        JSON.generate({
-          l_Code: query.options[:l_code],
-          timestamp: now
-        })
+        hash = {
+          l_Code: query.options[:l_code]
+        }
       when "addr_nearest_position_search"
-        JSON.generate({
+        hash = {
           px: query.options[:px],
           py: query.options[:py],
-          radius: query.options[:radius],
-          timestamp: now
-        })
+          radius: query.options[:radius]
+        }
       else # geocoding
-        JSON.generate({
+        hash = {
           addr: URI.encode(query.sanitized_text),
-          addrcdtype: Olleh.addrcdtype[query.options[:addrcdtype]],
-          timestamp: now
-        })
+          addrcdtype: Olleh.addrcdtype[query.options[:addrcdtype]]
+        }
       end
+
+      hash.merge!(timestamp: now)
+      JSON.generate(hash)
     end
 
     def now

data/lib/geocoder/olleh/version.rb

@@ -1,5 +1,5 @@
 module Geocoder
   module Olleh
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

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