topojson-rails 0.0.15 → 0.0.21

data/lib/topojson-rails/version.rb

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

data/vendor/assets/javascripts/topojson.js

@@ -119,8 +119,10 @@ topojson = (function() {
       }
 
       function geometry(o) {
-        geom = o;
-        geometryType[o.type](o.arcs);
+        if (o.type in geometryType) {
+          geom = o;
+          geometryType[o.type](o.arcs);
+        }
       }
 
       var geometryType = {
@@ -168,6 +170,7 @@ topojson = (function() {
     function line(arcs) {
       var points = [];
       for (var i = 0, n = arcs.length; i < n; ++i) arc(arcs[i], points);
+      if (points.length < 2) points.push(points[0]);
       return points;
     }
 
@@ -182,9 +185,12 @@ topojson = (function() {
     }
 
     function geometry(o) {
-      o = Object.create(o);
-      o.coordinates = geometryType[o.type](o);
-      return o;
+      var t = o.type, g = t === "GeometryCollection" ? {type: t, geometries: o.geometries.map(geometry)}
+          : t in geometryType ? {type: t, coordinates: geometryType[t](o)}
+          : {type: null};
+      if ("id" in o) g.id = o.id;
+      if ("properties" in o) g.properties = o.properties;
+      return g;
     }
 
     var geometryType = {
@@ -196,9 +202,7 @@ topojson = (function() {
       MultiPolygon: function(o) { return o.arcs.map(polygon); }
     };
 
-    return o.type === "GeometryCollection"
-        ? (o = Object.create(o), o.geometries = o.geometries.map(geometry), o)
-        : geometry(o);
+    return geometry(o);
   }
 
   function reverse(array, n) {
@@ -215,7 +219,7 @@ topojson = (function() {
     return lo;
   }
 
-  function neighbors(topology, objects) {
+  function neighbors(objects) {
     var objectsByArc = [],
         neighbors = objects.map(function() { return []; });
 
@@ -236,7 +240,7 @@ topojson = (function() {
     }
 
     function geometry(o, i) {
-      geometryType[o.type](o.arcs, i);
+      if (o.type in geometryType) geometryType[o.type](o.arcs, i);
     }
 
     var geometryType = {
@@ -251,7 +255,7 @@ topojson = (function() {
   }
 
   return {
-    version: "0.0.15",
+    version: "0.0.21",
     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.15
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Gemified topojson.js asset for Rails