d3js-plugins-rails 0.0.1 → 0.0.2

data/lib/d3js-plugins-rails/version.rb

@@ -1,7 +1,7 @@
 module D3js
   module Plugins
     module Rails
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/vendor/assets/javascripts/d3/plugins/Makefile

@@ -60,6 +60,7 @@ d3.geo.projection.js: \
 	geo/projection/polyconic.js \
 	geo/projection/robinson.js \
 	geo/projection/satellite.js \
+	geo/projection/two-point-equidistant.js \
 	geo/projection/van-der-grinten.js \
 	geo/projection/van-der-grinten4.js \
 	geo/projection/wagner4.js \

data/vendor/assets/javascripts/d3/plugins/geo/projection/two-point-equidistant.js

@@ -0,0 +1,63 @@
+// TODO clip to ellipse
+// TODO expose d3.geo.rotation?
+
+function twoPointEquidistant(z0) {
+  if (!z0) return d3.geo.azimuthalEquidistant.raw;
+  var λa = -z0 / 2,
+      λb = -λa,
+      z02 = z0 * z0;
+  return function(λ, φ) {
+    var za = acos(Math.cos(φ) * Math.cos(λ - λa)),
+        zb = acos(Math.cos(φ) * Math.cos(λ - λb)),
+        ys = φ < 0 ? -1 : 1;
+    za *= za, zb *= zb;
+    return [
+      (za - zb) / (2 * z0),
+      ys * asqrt(4 * z02 * zb - (z02 - za + zb) * (z02 - za + zb)) / (2 * z0)
+    ];
+  };
+}
+
+function twoPointEquidistantProjection() {
+  var points = [[0, 0], [0, 0]],
+      m = projectionMutator(twoPointEquidistant),
+      p = m(0),
+      rotate = p.rotate;
+
+  delete p.rotate;
+
+  p.points = function(_) {
+    if (!arguments.length) return points;
+    points = _;
+
+    // Compute the origin as the midpoint of the two reference points.
+    // Rotate one of the reference points by the origin.
+    // Apply the spherical law of sines to compute γ rotation.
+    var origin = d3.geo.interpolate(_[0], _[1])(.5),
+        p = twoPointEquidistant_rotate(-origin[0] * radians, -origin[1] * radians, _[0][0] * radians, _[0][1] * radians),
+        b = acos(Math.cos(p[1]) * Math.cos(p[0])), // |[0, 0] - p|
+        c = (p[0] < 0 ? -1 : +1) * p[1], // |[p[0], 0] - p|
+        γ = asin(Math.sin(c) / Math.sin(b));
+
+    rotate.call(p, [-origin[0], -origin[1], -γ * degrees]);
+
+    return m(b * 2);
+  };
+
+  return p
+}
+
+function twoPointEquidistant_rotate(δλ, δφ, λ, φ) {
+  var cosδφ = Math.cos(δφ),
+      sinδφ = Math.sin(δφ),
+      cosφ = Math.cos(φ),
+      x = Math.cos(λ += δλ) * cosφ,
+      y = Math.sin(λ) * cosφ,
+      z = Math.sin(φ);
+  return [
+    Math.atan2(y, x * cosδφ - z * sinδφ),
+    asin(z * cosδφ + x * sinδφ)
+  ];
+}
+
+(d3.geo.twoPointEquidistant = twoPointEquidistantProjection).raw = twoPointEquidistant;

data/vendor/assets/javascripts/d3/plugins/hexbin/hexbin.js

@@ -37,6 +37,18 @@ d3.hexbin = function() {
     return d3.values(binsById);
   }
 
+  function hexagon(radius) {
+    var x0 = 0, y0 = 0;
+    return d3_hexbinAngles.map(function(angle) {
+      var x1 = Math.sin(angle) * radius,
+          y1 = -Math.cos(angle) * radius,
+          dx = x1 - x0,
+          dy = y1 - y0;
+      x0 = x1, y0 = y1;
+      return [dx, dy];
+    });
+  }
+
   hexbin.x = function(_) {
     if (!arguments.length) return x;
     x = _;
@@ -50,20 +62,12 @@ d3.hexbin = function() {
   };
 
   hexbin.hexagon = function(radius) {
-    var x0 = 0, y0 = 0;
     if (arguments.length < 1) radius = r;
-    return "m" + d3_hexbinAngles.map(function(angle) {
-      var x1 = Math.sin(angle) * radius,
-          y1 = -Math.cos(angle) * radius,
-          dx = x1 - x0,
-          dy = y1 - y0;
-      x0 = x1, y0 = y1;
-      return [dx, dy];
-    }).join("l") + "z";
+    return "m" + hexagon(radius).join("l") + "z";
   };
 
   hexbin.mesh = function() {
-    var path = [], mesh = hexbin.hexagon().slice(0, 4).join("l");
+    var path = [], mesh = hexagon(r).slice(0, 4).join("l");
     for (var y = 0, odd = false; y < height + r; y += dy, odd = !odd) {
       for (var x = odd ? dx / 2 : 0; x < width; x += dx) {
         path.push("M", x, ",", y, "m", mesh);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: d3js-plugins-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -145,6 +145,7 @@ files:
 - vendor/assets/javascripts/d3/plugins/geo/projection/test/robinson-test.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/test/wagner6-test.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/test/winkel3-test.js
+- vendor/assets/javascripts/d3/plugins/geo/projection/two-point-equidistant.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/van-der-grinten.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/van-der-grinten4.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/wagner4.js
@@ -211,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Gemified d3js-plugins asset for Rails