topojson-rails 0.0.32.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eeac3be0d7af4b57ed7752d50de692d3c11ece75
-  data.tar.gz: 5577016bb8c49e18cfdba932911f655173320be0
+  metadata.gz: f5f156ff2241c767b01dde4aa993ce33432bc156
+  data.tar.gz: e9df9b46d28f924c49c06de3aedd4b7fdf392dca
 SHA512:
-  metadata.gz: 5934138c0912a0b0911a67a96998bc64ef74ee60f25c55b3b7d5ff819d8f05028ff9f7265a5f324d0daba253bd19f8a0660d42a1379c5c341c427326abea2e1b
-  data.tar.gz: df85baa5577d3f718168efbcfd9497574cff440d3e76a5cf17d10fbd6c07e36972aad833686dd3235fcf6b0e2e250b87cc990c2f3c2574bbaa281289c208243e
+  metadata.gz: aea24cceeee16640b66898109d681bea1126f74b65a79010878a4dadd969cca8d21b85cc2a28a77eb5786c5217aaab2be2ad8de2a39a2d381fbf81741554dc18
+  data.tar.gz: 5f4bf9e50a878d9282c86187ed019add381a33600d7150e2657d0c0242c1f3c9ee6771c3fd7a9ddc54e5b05a656cb31b09bc59b7b0cd98eb5ff2872861483f49

data/certs/bai.pem

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
 MIIDSDCCAjCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA1MQowCAYDVQQDDAF2MRMw
-EQYKCZImiZPyLGQBGRYDZ29yMRIwEAYKCZImiZPyLGQBGRYCaW8wHhcNMTMwMzEz
-MDczNzI0WhcNMTQwMzEzMDczNzI0WjA1MQowCAYDVQQDDAF2MRMwEQYKCZImiZPy
+EQYKCZImiZPyLGQBGRYDZ29yMRIwEAYKCZImiZPyLGQBGRYCaW8wHhcNMTMwNTIz
+MjA0MTI3WhcNMTQwNTIzMjA0MTI3WjA1MQowCAYDVQQDDAF2MRMwEQYKCZImiZPy
 LGQBGRYDZ29yMRIwEAYKCZImiZPyLGQBGRYCaW8wggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCnr70Rfpsp1mlp4dV3AdM0FamdBlZTjIg+Rye8soDEpmtp
-UODBWiBfQ0LVwEGH2I1hyVBHkmWvz8EOKSYw++HAsEt3WgSKDV8Gmn+o9NIR3pJq
-Zwk880MxuCHYnwnk5zo+sM4KhlbCEKI8wIebOH5vAA4bwvZ7T/0IJyBYUGjy6zw5
-cZHCibjAPJBHbls8M9FAAa7/n7AwRvJJtwtaCUAIU1W29dJkI1xBcoHL9Td5Brxz
-absm8Y8YUArA6dbM4Rt5W4KBuo2U3wSVauEyb6ypwNzG0gnqAXqt+M0y52X106jf
-iD3eGcheae2B0lZ8keU5agsAP2pt0AekikxweXstAgMBAAGjYzBhMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSNYpI9iA+mmZNI9Sbi8rRD6SBpnjAT
+A4IBDwAwggEKAoIBAQCtb8+GfjqcYl6M4IhIGomKsGgWEC4mwTXIq/Yl+jJAdP7s
+bdV3lWnZybUPKtdHSQIJcxbm8GZspTqSqDgsECI/laTyLj7Srqcbyivf/ov50Tg1
+CxMtt8STA6wNmY0ljO4SK72Pr8uQwFZIgNHBB9LcvrpmRn/TWDXlcqaq0db6QJKk
+jGOv74ukiQun+saqthpxwNN6wm0rj1GDulrDuMeeMj/XDgu0piNHhBtsgQ6KrN94
+cs0XGgwKihL0LdqWiOG9L8tZKeksKk72EcTpvaw1EYUfJ/rAcC8l6SluN2+BDMA0
+/4LU70O+wTwHcHv2HimtKdlcpS936qOez3lXUD+3AgMBAAGjYzBhMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSRvHatldjBIKT5agA2bnkfm4KUxTAT
 BgNVHREEDDAKgQh2QGdvci5pbzATBgNVHRIEDDAKgQh2QGdvci5pbzANBgkqhkiG
-9w0BAQUFAAOCAQEAcgfuY83VQ5AX7rHOkjdAPE/KsPNEH1zs5yJWDJ9b4RsVYD48
-iRxu9K6FkiPil4caYVa5poK6Tenj8aO/lqWl98eguKzR0plvmCi0SL9y8N0+7Jyd
-R7Rwt2gNKZ9wLP7HCDiSGICJHfZKVq5QrAVV6b8jkWUUHCpXnf+gISi1PP0JkHfa
-osJU57Mjij2bfkXpXLAHY1inEss8Cn4M8IFcnPS2tN9f69V7fbPUUwyVaey2fDQj
-huM3+aQFhf3ji44P0XipQ3GsiF39ZRDA3MUe8jeuiHoq1vbmLrw0muYOH9jlTmCN
-soY91zInZJIkyNXJub8NKDuoUBKLvE5Ij89OFA==
+9w0BAQUFAAOCAQEAmyGZCL6ISHS6UCkPAie1LZgyc+yS4ckMPtzBJtjODr5kfRTC
+tLb9W4epJ9Aa2aGkKy/NL8MFS0BwTJmjSfufFDwFZlw0kI9aAvL4Nx9OHWNen9Dm
+GtEWXXKpB0du12DBjfavJYl0QLcz18M0mtvug634t40H06GussO83uu7wHEvIPBP
+Z5VMAbKvOmDgaP2I9XxZ2/lDmBKDZkVNqmqYiScw2CWsKxVPx3vhMGprTIz4O8y/
+JCf887eMZl/8mEIeCLb+gH5sh5yJJpti2HTLnR4Q1QKWR/0T9tASoQPF3kL62n9+
+m1B90+fEzJsBDQIAsnLPqxjivWbIIfZ7GeGZyA==
 -----END CERTIFICATE-----

data/lib/topojson-rails/version.rb

@@ -1,5 +1,5 @@
 module Topojson
   module Rails
-    VERSION = "0.0.32.2"
+    VERSION = "1.3.0"
   end
 end

data/vendor/assets/javascripts/topojson.js

@@ -1,16 +1,9 @@
 topojson = (function() {
 
   function merge(topology, arcs) {
-    var arcsByEnd = {},
-        fragmentByStart = {},
+    var fragmentByStart = {},
         fragmentByEnd = {};
 
-    arcs.forEach(function(i) {
-      var e = ends(i);
-      (arcsByEnd[e[0]] || (arcsByEnd[e[0]] = [])).push(i);
-      (arcsByEnd[e[1]] || (arcsByEnd[e[1]] = [])).push(~i);
-    });
-
     arcs.forEach(function(i) {
       var e = ends(i),
           start = e[0],
@@ -136,15 +129,33 @@ topojson = (function() {
       geometry(o);
 
       geomsByArc.forEach(arguments.length < 3
-          ? function(geoms, i) { arcs.push([i]); }
-          : function(geoms, i) { if (filter(geoms[0], geoms[geoms.length - 1])) arcs.push([i]); });
+          ? function(geoms, i) { arcs.push(i); }
+          : function(geoms, i) { if (filter(geoms[0], geoms[geoms.length - 1])) arcs.push(i); });
     } else {
-      for (var i = 0, n = topology.arcs.length; i < n; ++i) arcs.push([i]);
+      for (var i = 0, n = topology.arcs.length; i < n; ++i) arcs.push(i);
     }
 
     return object(topology, {type: "MultiLineString", arcs: merge(topology, arcs)});
   }
 
+  function featureOrCollection(topology, o) {
+    return o.type === "GeometryCollection" ? {
+      type: "FeatureCollection",
+      features: o.geometries.map(function(o) { return feature(topology, o); })
+    } : feature(topology, o);
+  }
+
+  function feature(topology, o) {
+    var f = {
+      type: "Feature",
+      id: o.id,
+      properties: o.properties || {},
+      geometry: object(topology, o)
+    };
+    if (o.id == null) delete f.id;
+    return f;
+  }
+
   function object(topology, o) {
     var tf = topology.transform,
         kx = tf.scale[0],
@@ -155,27 +166,31 @@ topojson = (function() {
 
     function arc(i, points) {
       if (points.length) points.pop();
-      for (var a = arcs[i < 0 ? ~i : i], k = 0, n = a.length, x = 0, y = 0, p; k < n; ++k) points.push([
-        (x += (p = a[k])[0]) * kx + dx,
-        (y += p[1]) * ky + dy
-      ]);
+      for (var a = arcs[i < 0 ? ~i : i], k = 0, n = a.length, x = 0, y = 0, p; k < n; ++k) {
+        points.push(p = a[k].slice());
+        p[0] = (x += p[0]) * kx + dx;
+        p[1] = (y += p[1]) * ky + dy;
+      }
       if (i < 0) reverse(points, n);
     }
 
-    function point(coordinates) {
-      return [coordinates[0] * kx + dx, coordinates[1] * ky + dy];
+    function point(p) {
+      p = p.slice();
+      p[0] = p[0] * kx + dx;
+      p[1] = p[1] * ky + dy;
+      return p;
     }
 
     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]);
+      if (points.length < 2) points.push(points[0].slice());
       return points;
     }
 
     function ring(arcs) {
       var points = line(arcs);
-      while (points.length < 4) points.push(points[0]);
+      while (points.length < 4) points.push(points[0].slice());
       return points;
     }
 
@@ -184,12 +199,10 @@ topojson = (function() {
     }
 
     function geometry(o) {
-      var t = o.type, g = t === "GeometryCollection" ? {type: t, geometries: o.geometries.map(geometry)}
+      var t = o.type;
+      return 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;
+          : null;
     }
 
     var geometryType = {
@@ -219,18 +232,15 @@ topojson = (function() {
   }
 
   function neighbors(objects) {
-    var objectsByArc = [],
+    var indexesByArc = {}, // arc index -> array of object indexes
         neighbors = objects.map(function() { return []; });
 
     function line(arcs, i) {
       arcs.forEach(function(a) {
         if (a < 0) a = ~a;
-        var o = objectsByArc[a] || (objectsByArc[a] = []);
-        if (!o[i]) o.forEach(function(j) {
-          var n, k;
-          k = bisect(n = neighbors[i], j); if (n[k] !== j) n.splice(k, 0, j);
-          k = bisect(n = neighbors[j], i); if (n[k] !== i) n.splice(k, 0, i);
-        }), o[i] = i;
+        var o = indexesByArc[a];
+        if (o) o.push(i);
+        else indexesByArc[a] = [i];
       });
     }
 
@@ -251,13 +261,193 @@ topojson = (function() {
     };
 
     objects.forEach(geometry);
+
+    for (var i in indexesByArc) {
+      for (var indexes = indexesByArc[i], m = indexes.length, j = 0; j < m; ++j) {
+        for (var k = j + 1; k < m; ++k) {
+          var ij = indexes[j], ik = indexes[k], n;
+          if ((n = neighbors[ij])[i = bisect(n, ik)] !== ik) n.splice(i, 0, ik);
+          if ((n = neighbors[ik])[i = bisect(n, ij)] !== ij) n.splice(i, 0, ij);
+        }
+      }
+    }
+
     return neighbors;
   }
 
+  function presimplify(topology, triangleArea) {
+    var heap = minHeap(compareArea),
+        maxArea = 0,
+        triangle;
+
+    if (!triangleArea) triangleArea = cartesianArea;
+
+    topology.arcs.forEach(function(arc) {
+      var triangles = [];
+
+      arc.forEach(transformAbsolute(topology.transform));
+
+      for (var i = 1, n = arc.length - 1; i < n; ++i) {
+        triangle = arc.slice(i - 1, i + 2);
+        triangle[1][2] = triangleArea(triangle);
+        triangles.push(triangle);
+        heap.push(triangle);
+      }
+
+      // Always keep the arc endpoints!
+      arc[0][2] = arc[n][2] = Infinity;
+
+      for (var i = 0, n = triangles.length; i < n; ++i) {
+        triangle = triangles[i];
+        triangle.previous = triangles[i - 1];
+        triangle.next = triangles[i + 1];
+      }
+    });
+
+    while (triangle = heap.pop()) {
+      var previous = triangle.previous,
+          next = triangle.next;
+
+      // If the area of the current point is less than that of the previous point
+      // to be eliminated, use the latter's area instead. This ensures that the
+      // current point cannot be eliminated without eliminating previously-
+      // eliminated points.
+      if (triangle[1][2] < maxArea) triangle[1][2] = maxArea;
+      else maxArea = triangle[1][2];
+
+      if (previous) {
+        previous.next = next;
+        previous[2] = triangle[2];
+        update(previous);
+      }
+
+      if (next) {
+        next.previous = previous;
+        next[0] = triangle[0];
+        update(next);
+      }
+    }
+
+    topology.arcs.forEach(function(arc) {
+      arc.forEach(transformRelative(topology.transform));
+    });
+
+    function update(triangle) {
+      heap.remove(triangle);
+      triangle[1][2] = triangleArea(triangle);
+      heap.push(triangle);
+    }
+
+    return topology;
+  };
+
+  function cartesianArea(triangle) {
+    return Math.abs(
+      (triangle[0][0] - triangle[2][0]) * (triangle[1][1] - triangle[0][1])
+      - (triangle[0][0] - triangle[1][0]) * (triangle[2][1] - triangle[0][1])
+    );
+  }
+
+  function compareArea(a, b) {
+    return a[1][2] - b[1][2];
+  }
+
+  function minHeap(compare) {
+    var heap = {},
+        array = [];
+
+    heap.push = function() {
+      for (var i = 0, n = arguments.length; i < n; ++i) {
+        var object = arguments[i];
+        up(object.index = array.push(object) - 1);
+      }
+      return array.length;
+    };
+
+    heap.pop = function() {
+      var removed = array[0],
+          object = array.pop();
+      if (array.length) {
+        array[object.index = 0] = object;
+        down(0);
+      }
+      return removed;
+    };
+
+    heap.remove = function(removed) {
+      var i = removed.index,
+          object = array.pop();
+      if (i !== array.length) {
+        array[object.index = i] = object;
+        (compare(object, removed) < 0 ? up : down)(i);
+      }
+      return i;
+    };
+
+    function up(i) {
+      var object = array[i];
+      while (i > 0) {
+        var up = ((i + 1) >> 1) - 1,
+            parent = array[up];
+        if (compare(object, parent) >= 0) break;
+        array[parent.index = i] = parent;
+        array[object.index = i = up] = object;
+      }
+    }
+
+    function down(i) {
+      var object = array[i];
+      while (true) {
+        var right = (i + 1) << 1,
+            left = right - 1,
+            down = i,
+            child = array[down];
+        if (left < array.length && compare(array[left], child) < 0) child = array[down = left];
+        if (right < array.length && compare(array[right], child) < 0) child = array[down = right];
+        if (down === i) break;
+        array[child.index = i] = child;
+        array[object.index = i = down] = object;
+      }
+    }
+
+    return heap;
+  }
+
+  function transformAbsolute(transform) {
+    var x0 = 0,
+        y0 = 0,
+        kx = transform.scale[0],
+        ky = transform.scale[1],
+        dx = transform.translate[0],
+        dy = transform.translate[1];
+    return function(point) {
+      point[0] = (x0 += point[0]) * kx + dx;
+      point[1] = (y0 += point[1]) * ky + dy;
+    };
+  }
+
+  function transformRelative(transform) {
+    var x0 = 0,
+        y0 = 0,
+        kx = transform.scale[0],
+        ky = transform.scale[1],
+        dx = transform.translate[0],
+        dy = transform.translate[1];
+    return function(point) {
+      var x1 = (point[0] - dx) / kx | 0,
+          y1 = (point[1] - dy) / ky | 0;
+      point[0] = x1 - x0;
+      point[1] = y1 - y0;
+      x0 = x1;
+      y0 = y1;
+    };
+  }
+
   return {
-    version: "0.0.32",
+    version: "1.3.0",
     mesh: mesh,
-    object: object,
-    neighbors: neighbors
+    feature: featureOrCollection,
+    neighbors: neighbors,
+    presimplify: presimplify
   };
 })();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: topojson-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.32.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Vlad Gorodetsky
@@ -11,25 +11,25 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIDSDCCAjCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA1MQowCAYDVQQDDAF2MRMw
-  EQYKCZImiZPyLGQBGRYDZ29yMRIwEAYKCZImiZPyLGQBGRYCaW8wHhcNMTMwMzEz
-  MDczNzI0WhcNMTQwMzEzMDczNzI0WjA1MQowCAYDVQQDDAF2MRMwEQYKCZImiZPy
+  EQYKCZImiZPyLGQBGRYDZ29yMRIwEAYKCZImiZPyLGQBGRYCaW8wHhcNMTMwNTIz
+  MjA0MTI3WhcNMTQwNTIzMjA0MTI3WjA1MQowCAYDVQQDDAF2MRMwEQYKCZImiZPy
   LGQBGRYDZ29yMRIwEAYKCZImiZPyLGQBGRYCaW8wggEiMA0GCSqGSIb3DQEBAQUA
-  A4IBDwAwggEKAoIBAQCnr70Rfpsp1mlp4dV3AdM0FamdBlZTjIg+Rye8soDEpmtp
-  UODBWiBfQ0LVwEGH2I1hyVBHkmWvz8EOKSYw++HAsEt3WgSKDV8Gmn+o9NIR3pJq
-  Zwk880MxuCHYnwnk5zo+sM4KhlbCEKI8wIebOH5vAA4bwvZ7T/0IJyBYUGjy6zw5
-  cZHCibjAPJBHbls8M9FAAa7/n7AwRvJJtwtaCUAIU1W29dJkI1xBcoHL9Td5Brxz
-  absm8Y8YUArA6dbM4Rt5W4KBuo2U3wSVauEyb6ypwNzG0gnqAXqt+M0y52X106jf
-  iD3eGcheae2B0lZ8keU5agsAP2pt0AekikxweXstAgMBAAGjYzBhMAkGA1UdEwQC
-  MAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSNYpI9iA+mmZNI9Sbi8rRD6SBpnjAT
+  A4IBDwAwggEKAoIBAQCtb8+GfjqcYl6M4IhIGomKsGgWEC4mwTXIq/Yl+jJAdP7s
+  bdV3lWnZybUPKtdHSQIJcxbm8GZspTqSqDgsECI/laTyLj7Srqcbyivf/ov50Tg1
+  CxMtt8STA6wNmY0ljO4SK72Pr8uQwFZIgNHBB9LcvrpmRn/TWDXlcqaq0db6QJKk
+  jGOv74ukiQun+saqthpxwNN6wm0rj1GDulrDuMeeMj/XDgu0piNHhBtsgQ6KrN94
+  cs0XGgwKihL0LdqWiOG9L8tZKeksKk72EcTpvaw1EYUfJ/rAcC8l6SluN2+BDMA0
+  /4LU70O+wTwHcHv2HimtKdlcpS936qOez3lXUD+3AgMBAAGjYzBhMAkGA1UdEwQC
+  MAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSRvHatldjBIKT5agA2bnkfm4KUxTAT
   BgNVHREEDDAKgQh2QGdvci5pbzATBgNVHRIEDDAKgQh2QGdvci5pbzANBgkqhkiG
-  9w0BAQUFAAOCAQEAcgfuY83VQ5AX7rHOkjdAPE/KsPNEH1zs5yJWDJ9b4RsVYD48
-  iRxu9K6FkiPil4caYVa5poK6Tenj8aO/lqWl98eguKzR0plvmCi0SL9y8N0+7Jyd
-  R7Rwt2gNKZ9wLP7HCDiSGICJHfZKVq5QrAVV6b8jkWUUHCpXnf+gISi1PP0JkHfa
-  osJU57Mjij2bfkXpXLAHY1inEss8Cn4M8IFcnPS2tN9f69V7fbPUUwyVaey2fDQj
-  huM3+aQFhf3ji44P0XipQ3GsiF39ZRDA3MUe8jeuiHoq1vbmLrw0muYOH9jlTmCN
-  soY91zInZJIkyNXJub8NKDuoUBKLvE5Ij89OFA==
+  9w0BAQUFAAOCAQEAmyGZCL6ISHS6UCkPAie1LZgyc+yS4ckMPtzBJtjODr5kfRTC
+  tLb9W4epJ9Aa2aGkKy/NL8MFS0BwTJmjSfufFDwFZlw0kI9aAvL4Nx9OHWNen9Dm
+  GtEWXXKpB0du12DBjfavJYl0QLcz18M0mtvug634t40H06GussO83uu7wHEvIPBP
+  Z5VMAbKvOmDgaP2I9XxZ2/lDmBKDZkVNqmqYiScw2CWsKxVPx3vhMGprTIz4O8y/
+  JCf887eMZl/8mEIeCLb+gH5sh5yJJpti2HTLnR4Q1QKWR/0T9tASoQPF3kL62n9+
+  m1B90+fEzJsBDQIAsnLPqxjivWbIIfZ7GeGZyA==
   -----END CERTIFICATE-----
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties

metadata.gz.sig

@@ -1,3 +1 @@
-Fh��l�C1�cc�q����Lp L@�L��䕵_��dS���03�ӳ1��>L�Iv;<��4v��D���
����a ���¸�#�JC4�%>
-|��J��4�D�{~�S2��n��M�H�!a������}�K LCc�z���J�������
-�9}��4��S�>g)+�\IS��~�Yc`�5Z���5l�pJT�����e��菪Kߎ��GGw@�u���
��=��D���
+��|�_�=H<�k��N;�€�^�����V|��L�/��h���P2Fм;���*7��	 �@���	�TANҹ�}su^MݷpnѸ��ia�;9զm�"Y�"1���噖&r�*{�N�F^p�t�k&�JU�-��o۔R�K���U/�$Z�Ŏ,���/�]�]VZ)�d�<�Y2�>ɖoos˜��dl�?�#