terraformer 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 035d25dd66d005eece9a769dd4038e956c2cff60
-  data.tar.gz: 2067cc049ddcd8a068a0e7fa2099131df29f5675
+  metadata.gz: 133b3a2bf058e3848e2d20d733d6e3874a518073
+  data.tar.gz: aea180ce419297a6dac946bb2a34696fa4e8d9b9
 SHA512:
-  metadata.gz: 00c24d8ba4513d9c32221d10951bfed25d3713fec5d1bc253568115d97dd002e99550d585b8c8d75f7a0561d36124a2cd789a9fa8b51f7011d9bdbce9e614172
-  data.tar.gz: 4273e547c6844d4e5901089af25ba87874250bd776b493fd2793ddd6299f49c00c80674920cac641c7714472907e5cdd8f1cd75f507371f4b91a4601589ea10f
+  metadata.gz: 3b92245ec569ec1c43d3a7f9db1e3d743749c4c2f48ec7d200298df745d856350ade2f1155530d9ace206214a2e4c5e016e160b61c8fbaefe5074e40f9a3da6d
+  data.tar.gz: d1adfba18548b2f91b3594b6d7a660e1f4516dc06a40d39ddbaecd09ca7872b73e7bd3d9d08a6038673c50c560cb6e84ae190658b1a4d249b09bf6e206fd92e8

data/lib/ext/big_decimal.rb

@@ -8,5 +8,8 @@ class BigDecimal
     (self * Terraformer::RADIANS_PER_DEGREE).round Terraformer::PRECISION
   end
 
-end
+  def to_json *args
+    finite? ? to_f.to_json : NilClass::AS_JSON
+  end
 
+end

data/lib/terraformer/bounds.rb

@@ -33,8 +33,6 @@ module Terraformer
 
         case format
         when :bbox
-          # yikes!
-          bbox.extend BBox
           bbox
         when :polygon
           Polygon.new [[bbox[0], bbox[1]],
@@ -55,15 +53,13 @@ module Terraformer
         else
           bbox = array.reduce box do |b, lonlat|
             lon, lat = *lonlat
-            set = ->(d, i, t){ b[i] = d if b[i].nil? or d.send(t, b[i]) }
+            set = ->(d, i, t){ b[i] = d if b[i].nil? or d.send(t, b[i])}
             set[lon, X1, :<]
             set[lon, X2, :>]
             set[lat, Y1, :<]
             set[lat, Y2, :>]
             b
           end
-          # yikes!
-          bbox.extend BBox
           bbox
         end
       end

data/lib/terraformer/coordinate.rb

@@ -99,7 +99,7 @@ module Terraformer
     end
 
     def to_json *args
-      [x, y, z].map! {|e| e.to_f if e}.compact.to_json(*args)
+      compact.to_json(*args)
     end
 
     def to_point

data/lib/terraformer/geometry.rb

@@ -22,11 +22,13 @@ module Terraformer
       end
     end
 
-    def to_hash
-      {
+    def to_hash *args
+      h = {
         type: type,
         coordinates: coordinates
       }
+      h[:bbox] = bbox if Hash === args.last and args.last[:include_bbox]
+      h
     end
 
     def to_mercator

data/lib/terraformer/version.rb

@@ -1,3 +1,3 @@
 module Terraformer
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/terraformer.rb

@@ -70,22 +70,13 @@ module Terraformer
     end
 
     def to_json *args
-      h = self.to_hash
-      h[:bbox] = bbox if Hash === args.last and args.pop[:include_bbox]
+      h = self.to_hash *args
+      args.pop if Hash === args.last
       h.to_json *args
     end
 
   end
 
-  # yikes!
-  module BBox
-
-    def to_json *args
-      map {|e| e.to_f if e}.to_json *args
-    end
-
-  end
-
 end
 
 require 'terraformer/coordinate'
@@ -101,3 +92,5 @@ require 'terraformer/polygon'
 require 'terraformer/multi_polygon'
 require 'terraformer/convex_hull'
 require 'terraformer/circle'
+
+require 'terraformer/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraformer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email: