topojson-rails 1.3.0 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5f156ff2241c767b01dde4aa993ce33432bc156
-  data.tar.gz: e9df9b46d28f924c49c06de3aedd4b7fdf392dca
+  metadata.gz: a795dc2e5d01d77f078d0b9a13d53992960dab8a
+  data.tar.gz: 596c535dd0758a0dcdbe24e104846191459b23f4
 SHA512:
-  metadata.gz: aea24cceeee16640b66898109d681bea1126f74b65a79010878a4dadd969cca8d21b85cc2a28a77eb5786c5217aaab2be2ad8de2a39a2d381fbf81741554dc18
-  data.tar.gz: 5f4bf9e50a878d9282c86187ed019add381a33600d7150e2657d0c0242c1f3c9ee6771c3fd7a9ddc54e5b05a656cb31b09bc59b7b0cd98eb5ff2872861483f49
+  metadata.gz: 725b6a823c859d16e184507171bd6a64044956ffb6392c2c037c66d174659b13d0f4f426f437f5b3080c099970241c094d9ca7561e3076f2854ed55db6fb2f22
+  data.tar.gz: e54aa26bbd6e40efd5422a318a9b9c5de9af231721d94d587ae08dc8e07ff8b2f55e778600255a848c0fe8ddc0a3dae6a41f37267caf6510c3d2e8aae80de55e

data/lib/topojson-rails/version.rb

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

data/vendor/assets/javascripts/topojson.js

@@ -157,27 +157,21 @@ topojson = (function() {
   }
 
   function object(topology, o) {
-    var tf = topology.transform,
-        kx = tf.scale[0],
-        ky = tf.scale[1],
-        dx = tf.translate[0],
-        dy = tf.translate[1],
+    var absolute = transformAbsolute(topology.transform),
         arcs = topology.arcs;
 
     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) {
+      for (var a = arcs[i < 0 ? ~i : i], k = 0, n = a.length, p; k < n; ++k) {
         points.push(p = a[k].slice());
-        p[0] = (x += p[0]) * kx + dx;
-        p[1] = (y += p[1]) * ky + dy;
+        absolute(p, k);
       }
       if (i < 0) reverse(points, n);
     }
 
     function point(p) {
       p = p.slice();
-      p[0] = p[0] * kx + dx;
-      p[1] = p[1] * ky + dy;
+      absolute(p, 0);
       return p;
     }
 
@@ -276,7 +270,9 @@ topojson = (function() {
   }
 
   function presimplify(topology, triangleArea) {
-    var heap = minHeap(compareArea),
+    var absolute = transformAbsolute(topology.transform),
+        relative = transformRelative(topology.transform),
+        heap = minHeap(compareArea),
         maxArea = 0,
         triangle;
 
@@ -285,7 +281,7 @@ topojson = (function() {
     topology.arcs.forEach(function(arc) {
       var triangles = [];
 
-      arc.forEach(transformAbsolute(topology.transform));
+      arc.forEach(absolute);
 
       for (var i = 1, n = arc.length - 1; i < n; ++i) {
         triangle = arc.slice(i - 1, i + 2);
@@ -329,7 +325,7 @@ topojson = (function() {
     }
 
     topology.arcs.forEach(function(arc) {
-      arc.forEach(transformRelative(topology.transform));
+      arc.forEach(relative);
     });
 
     function update(triangle) {
@@ -414,26 +410,30 @@ topojson = (function() {
   }
 
   function transformAbsolute(transform) {
-    var x0 = 0,
-        y0 = 0,
+    if (!transform) return noop;
+    var x0,
+        y0,
         kx = transform.scale[0],
         ky = transform.scale[1],
         dx = transform.translate[0],
         dy = transform.translate[1];
-    return function(point) {
+    return function(point, i) {
+      if (!i) x0 = y0 = 0;
       point[0] = (x0 += point[0]) * kx + dx;
       point[1] = (y0 += point[1]) * ky + dy;
     };
   }
 
   function transformRelative(transform) {
-    var x0 = 0,
-        y0 = 0,
+    if (!transform) return noop;
+    var x0,
+        y0,
         kx = transform.scale[0],
         ky = transform.scale[1],
         dx = transform.translate[0],
         dy = transform.translate[1];
-    return function(point) {
+    return function(point, i) {
+      if (!i) x0 = y0 = 0;
       var x1 = (point[0] - dx) / kx | 0,
           y1 = (point[1] - dy) / ky | 0;
       point[0] = x1 - x0;
@@ -443,8 +443,10 @@ topojson = (function() {
     };
   }
 
+  function noop() {}
+
   return {
-    version: "1.3.0",
+    version: "1.4.5",
     mesh: mesh,
     feature: featureOrCollection,
     neighbors: neighbors,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: topojson-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.5
 platform: ruby
 authors:
 - Vlad Gorodetsky
@@ -29,26 +29,26 @@ cert_chain:
   JCf887eMZl/8mEIeCLb+gH5sh5yJJpti2HTLnR4Q1QKWR/0T9tASoQPF3kL62n9+
   m1B90+fEzJsBDQIAsnLPqxjivWbIIfZ7GeGZyA==
   -----END CERTIFICATE-----
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 description: An extension of GeoJSON that encodes topology.
@@ -58,7 +58,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -78,17 +78,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Gemified topojson.js asset for Rails

metadata.gz.sig

@@ -1 +1,2 @@
-��|�_�=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�?�#
+O�bdb�h	<�Sz;��051�2s0�W$N�M�i�+�b�.m�q��UJ�V���Y����p��"F��LQڐ%ү���}��y�wg�`���$���0V�d�=~�
+�w=0���+��֙
ò�r7�w>��_�9y���50�� �����M&��*�9/ �����S���*���g�iNk]͊�Bʇ���g֭���7��,_W�Hq�cY���rq5F���1����p��KԿOg�i����φi�
�o�]R�W@