topojson-rails 0.0.21 → 0.0.32

data/lib/topojson-rails/version.rb

@@ -1,5 +1,5 @@
 module Topojson
   module Rails
-    VERSION = "0.0.21"
+    VERSION = "0.0.32"
   end
 end

data/vendor/assets/javascripts/topojson.js

@@ -119,7 +119,8 @@ topojson = (function() {
       }
 
       function geometry(o) {
-        if (o.type in geometryType) {
+        if (o.type === "GeometryCollection") o.geometries.forEach(geometry);
+        else if (o.type in geometryType) {
           geom = o;
           geometryType[o.type](o.arcs);
         }
@@ -132,9 +133,7 @@ topojson = (function() {
         MultiPolygon: function(arcs) { arcs.forEach(polygon); }
       };
 
-      o.type === "GeometryCollection"
-          ? o.geometries.forEach(geometry)
-          : geometry(o);
+      geometry(o);
 
       geomsByArc.forEach(arguments.length < 3
           ? function(geoms, i) { arcs.push([i]); }
@@ -240,7 +239,8 @@ topojson = (function() {
     }
 
     function geometry(o, i) {
-      if (o.type in geometryType) geometryType[o.type](o.arcs, i);
+      if (o.type === "GeometryCollection") o.geometries.forEach(function(o) { geometry(o, i); });
+      else if (o.type in geometryType) geometryType[o.type](o.arcs, i);
     }
 
     var geometryType = {
@@ -255,7 +255,7 @@ topojson = (function() {
   }
 
   return {
-    version: "0.0.21",
+    version: "0.0.32",
     mesh: mesh,
     object: object,
     neighbors: neighbors

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: topojson-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.32
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties