d3js-plugins-rails 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d21d9eec5f27fbb276f57e53cdaf0fa10d61fa49
-  data.tar.gz: 617d3178f43e5574b4ae0469c2a92ce781179e8b
+  metadata.gz: e01f5b6f83287492b9f81ae4857a2f30fffff20e
+  data.tar.gz: c5bd529307c3c163f761097655e900c2e6f1cb66
 SHA512:
-  metadata.gz: 67f172fb7f739f52c76795e98cdf2496ff97efa0ef36b2e754827d18c873d929b75cd684e11ab75ab0b00919f56b5166b50b7d850953d19b4c679106b9cf1709
-  data.tar.gz: d8e21bba6f71a6199c890cf4bdce955b9f229c42751bdfdffc4c988791b3e3e7a1a29f280f3ea0dde99a2070150416ec676fd2785d3297592bb9d41557e82cb7
+  metadata.gz: 8a7b3894a68fc08512e09a59671eb33bfb000e95c1b8ef14be165544f02b5d5b41756def0f3756e42ac6122166207bc0a6faca9a3aa04dfae442caf6e94889c0
+  data.tar.gz: 393da2cb39599c594090a70320ece141421fc25b9bdcd9d5347f7f913e55d0d828fc326d2830391058d578a9e6670aa308f888f4cc016307f9577375007670e9

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

@@ -1,8 +1,8 @@
 module D3js
   module Plugins
     module Rails
-      VERSION = "0.0.5"
-      D3_PLUGINS_VERSION = "639c06c61d02d35028749c12b61c3f6c84b17409"
+      VERSION = "0.0.6"
+      D3_PLUGINS_VERSION = "37388598a7fd9865f6ffddeefcad16a5d039b4bb"
     end
   end
 end

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

@@ -4,9 +4,7 @@ all: \
 
 d3.geo.projection.js: $(shell node_modules/.bin/smash --list geo/projection/index.js)
 	@rm -f $@
-	node_modules/.bin/smash geo/projection/index.js > $@.tmp
-	node_modules/.bin/uglifyjs $@.tmp -b indent-level=2 -o $@
-	@rm $@.tmp
+	node_modules/.bin/smash geo/projection/index.js | node_modules/.bin/uglifyjs - -b indent-level=2 -o $@
 	@chmod a-w $@
 
 d3.geo.projection.min.js: d3.geo.projection.js

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

@@ -187,8 +187,8 @@ d3.box = function() {
       boxTick.enter().append("text")
           .attr("class", "box")
           .attr("dy", ".3em")
-          .attr("dx", function(d, i) { return i & 1 ? 6 : -6 })
-          .attr("x", function(d, i) { return i & 1 ? width : 0 })
+          .attr("dx", function(d, i) { return i & 1 ? 6 : -6; })
+          .attr("x", function(d, i) { return i & 1 ? width : 0; })
           .attr("y", x0)
           .attr("text-anchor", function(d, i) { return i & 1 ? "start" : "end"; })
           .text(format)

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

@@ -1,56 +1,57 @@
 (function() {
   d3.force_labels = function force_labels() {    
-    var labels = d3.layout.force()
+    var labels = d3.layout.force();
       
     // Update the position of the anchor based on the center of bounding box
     function updateAnchor() {
-      if (!labels.selection) return
+      if (!labels.selection) return;
       labels.selection.each(function(d) {
         var bbox = this.getBBox(),
-            x=bbox.x+bbox.width/2,
-            y=bbox.y+bbox.height/2
+            x = bbox.x + bbox.width / 2,
+            y = bbox.y + bbox.height / 2;
 
-        d.anchorPos.x=x
-        d.anchorPos.y=y
+        d.anchorPos.x = x;
+        d.anchorPos.y = y;
        
         // If a label position does not exist, set it to be the anchor position 
-        if (d.labelPos.x==null) {
-          d.labelPos.x=x
-          d.labelPos.y=y
+        if (d.labelPos.x == null) {
+          d.labelPos.x = x;
+          d.labelPos.y = y;
         }
-      })
+      });
     }
     
     //The anchor position should be updated on each tick
-    labels.on("tick.labels",updateAnchor)
+    labels.on("tick.labels", updateAnchor);
     
     // This updates all nodes/links - retaining any previous labelPos on updated nodes
     labels.update = function(selection) {
-      labels.selection = selection
-      var nodes=[],links=[];
+      labels.selection = selection;
+      var nodes = [], links = [];
       selection[0].forEach(function(d) {    
         if(d && d.__data__) {
-          var data = d.__data__
+          var data = d.__data__;
           
-          if (!d.labelPos) d.labelPos =  {fixed:false}
-          if (!d.anchorPos) d.anchorPos = {fixed:true}
+          if (!d.labelPos) d.labelPos = {fixed: false};
+          if (!d.anchorPos) d.anchorPos = {fixed: true};
           
           // Place position objects in __data__ to make them available through 
           // d.labelPos/d.anchorPos for different elements
-          data.labelPos = d.labelPos
-          data.anchorPos = d.anchorPos
+          data.labelPos = d.labelPos;
+          data.anchorPos = d.anchorPos;
           
-          links.push({target:d.anchorPos,source:d.labelPos})
-          nodes.push(d.anchorPos)
-          nodes.push(d.labelPos)
+          links.push({target: d.anchorPos, source: d.labelPos});
+          nodes.push(d.anchorPos);
+          nodes.push(d.labelPos);
         }
-      })
-      labels.stop()
-        .nodes(nodes)
-        .links(links)
-      updateAnchor()
-      labels.start()
-    }
-    return labels
-  }
-})()
+      });
+      labels
+          .stop()
+          .nodes(nodes)
+          .links(links);
+      updateAnchor();
+      labels.start();
+    };
+    return labels;
+  };
+})();

data/vendor/assets/javascripts/d3/plugins/geo/projection/README.md

@@ -28,6 +28,7 @@ Projections:
 * d3.geo.eisenlohr - [Eisenlohr conformal](http://bl.ocks.org/mbostock/3797585)
 * d3.geo.equirectangular - [Equirectangular (Plate Carrée)](http://bl.ocks.org/mbostock/3757119)
 * d3.geo.fahey - [Fahey](http://bl.ocks.org/mbostock/4731228)
+* d3.geo.gallStereographic - [Gall’s stereographic](http://bl.ocks.org/mbostock/5234763)
 * d3.geo.gnomonic - [gnomonic](http://bl.ocks.org/mbostock/3757349)
 * d3.geo.gringorten - [Gringorten](http://bl.ocks.org/mbostock/4362031)
 * d3.geo.guyou - [Guyou hemisphere-in-a-square](http://bl.ocks.org/mbostock/3763867)
@@ -44,7 +45,7 @@ Projections:
 * d3.geo.loximuthal - [loximuthal](http://bl.ocks.org/mbostock/3867220)
 * d3.geo.mercator - [Mercator](http://bl.ocks.org/mbostock/3757132)
 * d3.geo.miller - [Miller](http://bl.ocks.org/mbostock/3734333)
-* d3.geo.modifiedStereographic - Modified Stereographic
+* d3.geo.modifiedStereographic - [modified stereographic](http://www.jasondavies.com/maps/modified-stereographic/)
 * d3.geo.mollweide - [Mollweide](http://bl.ocks.org/mbostock/3734336), [Atlantis](http://bl.ocks.org/mbostock/4519975)
 * d3.geo.mtFlatPolarParabolic - [McBryde–Thomas flat-polar parabolic](http://bl.ocks.org/mbostock/4465130)
 * d3.geo.mtFlatPolarQuartic - [McBryde–Thomas flat-polar quartic](http://bl.ocks.org/mbostock/4465137)
@@ -53,26 +54,26 @@ Projections:
 * d3.geo.nellHammer - [Nell–Hammer](http://bl.ocks.org/mbostock/3734342)
 * d3.geo.orthographic - [orthographic](http://bl.ocks.org/mbostock/3757125)
 * d3.geo.peirceQuincuncial - [Pierce quincuncial](http://bl.ocks.org/mbostock/4310087)
-* d3.geo.polyconic - [Polyconic](http://bl.ocks.org/mbostock/3734343)
-* d3.geo.rectangularPolyconic - Rectangular Polyconic
+* d3.geo.polyconic - [polyconic](http://bl.ocks.org/mbostock/3734343)
+* d3.geo.rectangularPolyconic - [rectangular polyconic](http://bl.ocks.org/mbostock/5230202)
 * d3.geo.robinson - [Robinson](http://bl.ocks.org/mbostock/3710566)
 * d3.geo.satellite - [satellite (tilted perpsective)](http://bl.ocks.org/mbostock/3790444)
 * d3.geo.sinusoidal - [sinusoidal](http://bl.ocks.org/mbostock/3712399)
 * d3.geo.sinuMollweide - [Sinu-Mollweide](http://bl.ocks.org/mbostock/4319903)
 * d3.geo.stereographic - [stereographic](http://bl.ocks.org/mbostock/3757137)
-* d3.geo.times - Times
-* d3.geo.transverseMercator - Transverse Mercator
-* d3.geo.twoPointAzimuthal - Two-Point Azimuthal
-* d3.geo.twoPointEquidistant - Two-Point Equidistant
+* d3.geo.times - [Times](http://bl.ocks.org/mbostock/5230564)
+* d3.geo.transverseMercator - [transverse Mercator](http://bl.ocks.org/mbostock/5126418)
+* d3.geo.twoPointAzimuthal - [two-point azimuthal](https://www.jasondavies.com/maps/two-point-azimuthal/)
+* d3.geo.twoPointEquidistant - [two-point equidistant](https://www.jasondavies.com/maps/two-point-equidistant/)
 * d3.geo.vanDerGrinten - [Van der Grinten](http://bl.ocks.org/mbostock/3796831)
-* d3.geo.vanDerGrinten2 - Van der Grinten II
-* d3.geo.vanDerGrinten3 - Van der Grinten III
+* d3.geo.vanDerGrinten2 - [Van der Grinten II](http://bl.ocks.org/mbostock/5230571)
+* d3.geo.vanDerGrinten3 - [Van der Grinten III](http://bl.ocks.org/mbostock/5230580)
 * d3.geo.vanDerGrinten4 - [Van der Grinten IV](http://bl.ocks.org/mbostock/4489365)
 * d3.geo.wagner4 - [Wagner IV, Putniṇš P2´](http://bl.ocks.org/mbostock/4487674)
 * d3.geo.wagner6 - [Wagner VI](http://bl.ocks.org/mbostock/3710148)
 * d3.geo.wagner7 - [Wagner VII](http://bl.ocks.org/mbostock/4465109)
 * d3.geo.wiechel - [Wiechel](http://bl.ocks.org/mbostock/4463155)
-* d3.geo.winkel3 - [Winkel Tripel](http://bl.ocks.org/mbostock/3682676)
+* d3.geo.winkel3 - [Winkel tripel](http://bl.ocks.org/mbostock/3682676)
 
 This plugin also provides d3.geo.interrupt, which can be used to create arbitrary interrupted projections from a given raw projection. For example, see [Philbrick’s interrupted Sinu-Mollweide](http://bl.ocks.org/4481520).
 

data/vendor/assets/javascripts/d3/plugins/geo/projection/berghaus.js

@@ -25,7 +25,7 @@ function berghaus(n) {
       var θ = Math.atan2(y, x),
           θ0 = k * Math.round((θ - π / 2) / k) + π / 2,
           s = θ > θ0 ? -1 : 1,
-          A = r * Math.cos(θ0 - θ)
+          A = r * Math.cos(θ0 - θ),
           cotα = 1 / Math.tan(s * Math.acos((A - π) / Math.sqrt(π * (π - 2 * A) + r * r)));
       θ = θ0 + 2 * Math.atan((cotα + s * Math.sqrt(cotα * cotα - 3)) / 3);
       x = r * Math.cos(θ), y = r * Math.sin(θ);
@@ -54,7 +54,7 @@ function berghausProjection() {
     p.rotate(rotate);
     rotateStream.sphere = function() {
       sphereStream.polygonStart(), sphereStream.lineStart();
-      var ε = 1e-4;
+      var ε = 1e-2;
       for (var i = 0, δ = 360 / n, φ = 90 - 180 / n; i < n; ++i, φ -= δ) {
         sphereStream.point(180, 0);
         if (φ < -90) {

data/vendor/assets/javascripts/d3/plugins/geo/projection/gall-stereographic.js

@@ -0,0 +1,19 @@
+import "projection";
+
+function gallStereographic(λ, φ) {
+  return [
+    λ * Math.SQRT1_2,
+    (1 + Math.SQRT1_2) * Math.tan(φ / 2)
+  ];
+}
+
+gallStereographic.invert = function(x, y) {
+  return [
+    x * Math.SQRT2,
+    Math.atan(y / (1 + Math.SQRT1_2)) * 2
+  ];
+};
+
+(d3.geo.gallStereographic = function() {
+  return projection(gallStereographic);
+}).raw = gallStereographic;

data/vendor/assets/javascripts/d3/plugins/geo/projection/gringorten.js

@@ -38,7 +38,7 @@ gringorten.invert = function(x, y) {
       z = Math.sin(φ);
 
   return [sx * (Math.atan2(y, -z) + π), sy * asin(x)];
-}
+};
 
 function gringortenHexadecant(λ, φ) {
   if (φ === π / 2) return [0, 0];

data/vendor/assets/javascripts/d3/plugins/geo/projection/index.js

@@ -9,9 +9,6 @@ import "boggs";
 import "bonne";
 import "bromley";
 import "collignon";
-import "conic-conformal";
-import "conic-equal-area";
-import "conic-equidistant";
 import "craig";
 import "craster";
 import "cylindrical-equal-area";
@@ -23,6 +20,7 @@ import "eckert5";
 import "eckert6";
 import "eisenlohr";
 import "fahey";
+import "gall-stereographic";
 import "gringorten";
 import "guyou";
 import "hammer-retroazimuthal";
@@ -53,7 +51,6 @@ import "satellite";
 import "sinusoidal";
 import "sinu-mollweide";
 import "times";
-import "transverse-mercator";
 import "two-point-azimuthal";
 import "two-point-equidistant";
 import "van-der-grinten";

data/vendor/assets/javascripts/d3/plugins/geo/projection/interrupt.js

@@ -32,7 +32,7 @@ d3.geo.interrupt = function(project) {
         return [
           [lobe[0][0] * 180 / π, lobe[0][1] * 180 / π],
           [lobe[1][0] * 180 / π, lobe[1][1] * 180 / π],
-          [lobe[2][0] * 180 / π, lobe[2][1] * 180 / π],
+          [lobe[2][0] * 180 / π, lobe[2][1] * 180 / π]
         ];
       });
     });

data/vendor/assets/javascripts/d3/plugins/interpolate-zoom/README.md

@@ -4,8 +4,8 @@ An interpolator for zooming and panning between two views of a two-dimensional p
 
 Demo: <http://bl.ocks.org/3828981>
 
-<a name="interpolateZoom" href="#interpolateZoom">#</a> d3.**interpolateZoom**(*start*, *end*)
+<a name="interpolateZoom" href="#interpolateZoom">#</a> d3.<b>interpolateZoom</b>(<i>start</i>, <i>end</i>)
 
 Returns an [interpolator](https://github.com/mbostock/d3/wiki/Transitions#wiki-_interpolate) between the two points *start* and *end*. Each point should be defined as an array of three numbers in world coordinates: *ux*, *uy* and *w*. The first two coordinates *ux*, *uy* are the center of the viewport. The last coordinate *w* is the size of the viewport.
 
-The returned interpolator also has a *duration* property which encodes the recommended transition duration in milliseconds. This duration is based on the path length of the curved trajectory through *u,w* space. If you want to a slower or faster transition, feel free to multiply this by an arbitrary scale factor (*V* as described in the original paper).
+The returned interpolator also has a *duration* property which encodes the recommended transition duration in milliseconds. This duration is based on the path length of the curved trajectory through *u,w* space. If you want to a slower or faster transition, feel free to multiply this by an arbitrary scale factor (<i>V</i> as described in the original paper).

data/vendor/assets/javascripts/d3/plugins/package.json

@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "smash": "~0.0.8",
-    "uglify-js": "2.2.x",
+    "uglify-js": "git://github.com/mishoo/UglifyJS2.git#3bd7ca9961125b39dcd54d2182cb72bd1ca6006e",
     "vows": "0.7.x"
   },
   "scripts": {

data/vendor/assets/javascripts/d3/plugins/simplify/README.md

@@ -1,6 +1,3 @@
 # Line Simplification
 
-Demos:
-
-* <http://bost.ocks.org/mike/simplify/>
-* <http://www.jasondavies.com/maps/simplify/>
+Deprecated; replaced with [TopoJSON](https://github.com/mbostock/topojson).

data/vendor/assets/javascripts/d3/plugins/urlencode/urlencode-test.js

@@ -24,7 +24,7 @@ suite.addBatch({
     "can be modified via array methods, albeit unsafely": function(urlencode) {
       var u = urlencode("foo", 1).and("bar", 2).and("baz", 3);
       u.splice(1, 1);
-      u.push("unsafe=true")
+      u.push("unsafe=true");
       u.sort();
       assert.strictEqual(u + "", "baz=3&foo=1&unsafe=true");
     },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: d3js-plugins-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Vlad Gorodetsky
@@ -29,7 +29,7 @@ cert_chain:
   huM3+aQFhf3ji44P0XipQ3GsiF39ZRDA3MUe8jeuiHoq1vbmLrw0muYOH9jlTmCN
   soY91zInZJIkyNXJub8NKDuoUBKLvE5Ij89OFA==
   -----END CERTIFICATE-----
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -94,9 +94,6 @@ files:
 - vendor/assets/javascripts/d3/plugins/geo/projection/bonne.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/bromley.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/collignon.js
-- vendor/assets/javascripts/d3/plugins/geo/projection/conic-conformal.js
-- vendor/assets/javascripts/d3/plugins/geo/projection/conic-equal-area.js
-- vendor/assets/javascripts/d3/plugins/geo/projection/conic-equidistant.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/craig.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/craster.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/cylindrical-equal-area.js
@@ -110,6 +107,7 @@ files:
 - vendor/assets/javascripts/d3/plugins/geo/projection/elliptic.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/end.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/fahey.js
+- vendor/assets/javascripts/d3/plugins/geo/projection/gall-stereographic.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/gringorten.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/guyou.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/hammer-retroazimuthal.js
@@ -186,7 +184,6 @@ files:
 - vendor/assets/javascripts/d3/plugins/geo/projection/test/rectangular-polyconic-test.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/test/robinson-test.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/test/times-test.js
-- vendor/assets/javascripts/d3/plugins/geo/projection/test/transverse-mercator-test.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/test/two-point-azimuthal-test.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/test/two-point-equidistant-test.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/test/van-der-grinten2-test.js
@@ -196,7 +193,6 @@ files:
 - vendor/assets/javascripts/d3/plugins/geo/projection/test/wiechel-test.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/test/winkel3-test.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/times.js
-- vendor/assets/javascripts/d3/plugins/geo/projection/transverse-mercator.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/two-point-azimuthal.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/two-point-equidistant.js
 - vendor/assets/javascripts/d3/plugins/geo/projection/van-der-grinten.js
@@ -242,8 +238,6 @@ files:
 - vendor/assets/javascripts/d3/plugins/sankey/README.md
 - vendor/assets/javascripts/d3/plugins/sankey/sankey.js
 - vendor/assets/javascripts/d3/plugins/simplify/README.md
-- vendor/assets/javascripts/d3/plugins/simplify/simplify-test.js
-- vendor/assets/javascripts/d3/plugins/simplify/simplify.js
 - vendor/assets/javascripts/d3/plugins/superformula/superformula.js
 - vendor/assets/javascripts/d3/plugins/urlencode/urlencode-test.js
 - vendor/assets/javascripts/d3/plugins/urlencode/urlencode.js

data/vendor/assets/javascripts/d3/plugins/geo/projection/conic-conformal.js

@@ -1,40 +0,0 @@
-import "projection";
-import "parallel2";
-
-function conicConformal(φ0, φ1) {
-  var cosφ0 = Math.cos(φ0),
-      t = function(φ) { return Math.tan(π / 4 + φ / 2); },
-      n = φ0 === φ1 ? Math.sin(φ0) : Math.log(cosφ0 / Math.cos(φ1)) / Math.log(t(φ1) / t(φ0)),
-      F = cosφ0 * Math.pow(t(φ0), n) / n;
-
-  if (!n) return conicConformalMercator;
-
-  function forward(λ, φ) {
-    var ρ = Math.abs(Math.abs(φ) - π / 2) < ε ? 0 : F / Math.pow(t(φ), n);
-    return [
-      ρ * Math.sin(n * λ),
-      F - ρ * Math.cos(n * λ)
-    ];
-  }
-
-  forward.invert = function(x, y) {
-    var ρ0_y = F - y,
-        ρ = sgn(n) * Math.sqrt(x * x + ρ0_y * ρ0_y);
-    return [
-      Math.atan2(x, ρ0_y) / n,
-      2 * Math.atan(Math.pow(F / ρ, 1 / n)) - π / 2
-    ];
-  };
-
-  return forward;
-}
-
-function conicConformalMercator(λ, φ) {
-  return [λ, Math.log(Math.tan(π / 4 + φ / 2))];
-}
-
-conicConformalMercator.invert = function(x, y) {
-  return [x, 2 * Math.atan(Math.exp(y)) - π / 2];
-};
-
-(d3.geo.conicConformal = function() { return parallel2Projection(conicConformal); }).raw = conicConformal;

data/vendor/assets/javascripts/d3/plugins/geo/projection/conic-equal-area.js

@@ -1,29 +0,0 @@
-import "projection";
-import "parallel2";
-
-function conicEqualArea(φ0, φ1) {
-  var sinφ0 = Math.sin(φ0),
-      n = (sinφ0 + Math.sin(φ1)) / 2,
-      C = 1 + sinφ0 * (2 * n - sinφ0),
-      ρ0 = Math.sqrt(C) / n;
-
-  function conicEqualArea(λ, φ) {
-    var ρ = Math.sqrt(C - 2 * n * Math.sin(φ)) / n;
-    return [
-      ρ * Math.sin(λ *= n),
-      ρ0 - ρ * Math.cos(λ)
-    ];
-  }
-
-  conicEqualArea.invert = function(x, y) {
-    var ρ0_y = ρ0 - y;
-    return [
-      Math.atan2(x, ρ0_y) / n,
-      Math.asin((C - (x * x + ρ0_y * ρ0_y) * n * n) / (2 * n))
-    ];
-  };
-
-  return albers;
-}
-
-(d3.geo.conicEqualArea = function() { return parallel2Projection(conicEqualArea); }).raw = conicEqualArea;

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

@@ -1,30 +0,0 @@
-import "projection";
-import "parallel2";
-
-function conicEquidistant(φ0, φ1) {
-  var cosφ0 = Math.cos(φ0),
-      n = φ0 === φ1 ? Math.sin(φ0) : (cosφ0 - Math.cos(φ1)) / (φ1 - φ0),
-      G = cosφ0 / n + φ0;
-
-  if (Math.abs(n) < ε) return d3.geo.equirectangular.raw;
-
-  function forward(λ, φ) {
-    var ρ = G - φ;
-    return [
-      ρ * Math.sin(n * λ),
-      G - ρ * Math.cos(n * λ)
-    ];
-  }
-
-  forward.invert = function(x, y) {
-    var ρ0_y = G - y;
-    return [
-      Math.atan2(x, ρ0_y) / n,
-      G - sgn(n) * Math.sqrt(x * x + ρ0_y * ρ0_y)
-    ];
-  };
-
-  return forward;
-}
-
-(d3.geo.conicEquidistant = function() { return parallel2Projection(conicEquidistant); }).raw = conicEquidistant;

data/vendor/assets/javascripts/d3/plugins/geo/projection/test/transverse-mercator-test.js

@@ -1,29 +0,0 @@
-var vows = require("vows"),
-    assert = require("./assert"),
-    load = require("./load");
-
-var suite = vows.describe("d3.geo.transverseMercator");
-
-suite.addBatch({
-  "transverseMercator": {
-    topic: load("transverse-mercator"),
-    "default": {
-      topic: function(geo) { return geo.transverseMercator(); },
-      "projections and inverse projections": function(transverseMercator) {
-        assert.equalInverse(transverseMercator, [  0,   0], [480,        250]);
-        assert.equalInverse(transverseMercator, [  0, -45], [480,        367.809724]);
-        assert.equalInverse(transverseMercator, [  0,  45], [480,        132.190275]);
-        assert.equalInverse(transverseMercator, [-90,   0], [-Infinity,  250]);
-        assert.equalInverse(transverseMercator, [ 90,   0], [ Infinity,  250]);
-        assert.equalInverse(transverseMercator, [-80,  15], [203.284019, 100.632486]);
-        assert.equalInverse(transverseMercator, [  1,   1], [482.617727, 247.381607]);
-        assert.equalInverse(transverseMercator, [ 15,  45], [507.764703, 129.590678]);
-        assert.equalInverse(transverseMercator, [  0,  90], [480,         14.380550]);
-        assert.equalInverse(transverseMercator, [  0, -90], [480,        485.619449]);
-        assert.equalInverse(transverseMercator, [180,   0], [480,       -221.238898]);
-      }
-    }
-  }
-});
-
-suite.export(module);

data/vendor/assets/javascripts/d3/plugins/geo/projection/transverse-mercator.js

@@ -1,19 +0,0 @@
-import "projection";
-import "hyperbolic";
-
-function transverseMercator(λ, φ) {
-  var B = Math.cos(φ) * Math.sin(λ);
-  return [
-    .5 * Math.log((1 + B) / (1 - B)),
-    Math.atan2(Math.tan(φ), Math.cos(λ))
-  ];
-}
-
-transverseMercator.invert = function(x, y) {
-  return [
-    Math.atan2(sinh(x), Math.cos(y)),
-    asin(Math.sin(y) / cosh(x))
-  ];
-};
-
-(d3.geo.transverseMercator = function() { return projection(transverseMercator); }).raw = transverseMercator;

data/vendor/assets/javascripts/d3/plugins/simplify/simplify-test.js

@@ -1,193 +0,0 @@
-global.d3 = require("d3");
-require("./simplify");
-
-var vows = require("vows"),
-    assert = require("assert");
-
-var suite = vows.describe("d3.simplify");
-
-suite.addBatch({
-  "d3.simplify": {
-    "area(0)": {
-      topic: function() {
-        var simplify = d3.simplify().area(0).projection(d3.geo.equirectangular());
-        return function(d) { return simplify(simplify.project(d)); };
-      },
-      "LineString": {
-        "2 points": function(simplify) {
-          var p = {type: "LineString", coordinates: [[0, 0], [1, 1]]};
-          assert.deepEqual(simplify(p), p);
-        },
-        "9 points": function(simplify) {
-          var p = {type: "LineString", coordinates: [[0, 0], [0, 5], [0, 10], [5, 10], [10, 10], [10, 5], [10, 0], [5, 0], [0, 0]]};
-          assert.deepEqual(simplify(p), p);
-        }
-      },
-      "FeatureCollection": {
-        "preserves properties": function(simplify) {
-          var p = {type: "FeatureCollection", features: [], id: "test"};
-          assert.deepEqual(simplify(p), p);
-        }
-      },
-      "Feature": {
-        "preserves properties": function(simplify) {
-          var p = {type: "Feature", geometry: {type: "GeometryCollection", geometries: []}, properties: {name: "test"}, id: "test"};
-          assert.deepEqual(simplify(p), p);
-        }
-      },
-      "GeometryCollection": {
-        "preserves properties": function(simplify) {
-          var p = {type: "GeometryCollection", geometries: [], id: "test"};
-          assert.deepEqual(simplify(p), p);
-        }
-      }
-    },
-    "area(10)": {
-      topic: function() {
-        var simplify = d3.simplify().area(10).projection(d3.geo.equirectangular());
-        return function(d) { return simplify(simplify.project(d)); };
-      },
-      "LineString": {
-        "2 points": function(simplify) {
-          var p = {type: "LineString", coordinates: [[0, 0], [1, 1]]};
-          assert.deepEqual(simplify(p).coordinates, []);
-        },
-        "3 collinear points": function(simplify) {
-          var p = {type: "LineString", coordinates: [[0, 0], [1, 1], [45, 45]]};
-          assert.deepEqual(simplify(p).coordinates, []);
-        },
-        "3 points": function(simplify) {
-          var p = {type: "LineString", coordinates: [[0, 0], [10, 10], [0, 20]]};
-          assert.deepEqual(simplify(p), p);
-        }
-      },
-      "MultiLineString": {
-        "1 line": {
-          "3 collinear points": function(simplify) {
-            var p = {type: "MultiLineString", coordinates: [[[0, 0], [1, 1], [2, 2]]]};
-            assert.deepEqual(simplify(p).coordinates, []);
-          }
-        },
-        "2 lines": function(simplify) {
-          var p = {type: "MultiLineString", coordinates: [[[0, 0], [1, 1], [0, 2]], [[10, 0], [15, 15], [20, 0]]]};
-          assert.deepEqual(simplify(p).coordinates, [p.coordinates[1]]);
-        }
-      },
-      "Polygon": {
-        "empty result": function(simplify) {
-          var p = {type: "Polygon", coordinates: [[[0, 0], [1, 1], [1, 0], [0, 0]]]};
-          assert.deepEqual(simplify(p).coordinates, []);
-        },
-        "1 ring": function(simplify) {
-          // TODO verify that LinearRings all have >= 4 points?
-          var p = {type: "Polygon", coordinates: [[[0, 0], [10, 10], [10, 0], [0, 0]]]};
-          assert.deepEqual(simplify(p), p);
-        }
-      },
-      "MultiPolygon": {
-        "empty result": function(simplify) {
-          var p = {type: "MultiPolygon", coordinates: [[[[0, 0], [1, 1], [1, 0], [0, 0]]]]};
-          assert.deepEqual(simplify(p).coordinates, []);
-        },
-        "1 polygon": function(simplify) {
-          var p = {type: "MultiPolygon", coordinates: [[[[0, 0], [10, 10], [10, 0], [0, 0]]]]};
-          assert.deepEqual(simplify(p), p);
-        }
-      },
-      "GeometryCollection": {
-        "empty result": function(simplify) {
-          var p = {type: "GeometryCollection", geometries: [{type: "Polygon", coordinates: [[[0, 0], [1, 1], [1, 0], [0, 0]]]}]};
-          assert.deepEqual(simplify(p).geometries, []);
-        },
-        "1 polygon": function(simplify) {
-          var p = {type: "GeometryCollection", geometries: [{type: "MultiPolygon", coordinates: [[[[0, 0], [10, 10], [10, 0], [0, 0]]]]}]};
-          assert.deepEqual(simplify(p), p);
-        }
-      },
-      "FeatureCollection": {
-        "empty result": function(simplify) {
-          var p = {type: "FeatureCollection", features: [{type: "Feature", geometry: {type: "Polygon", coordinates: [[[0, 0], [1, 1], [1, 0], [0, 0]]]}}]};
-          assert.deepEqual(simplify(p).features, []);
-        },
-        "1 polygon": function(simplify) {
-          var p = {type: "FeatureCollection", features: [{type: "Feature", geometry: {type: "MultiPolygon", coordinates: [[[[0, 0], [10, 10], [10, 0], [0, 0]]]]}}]};
-          assert.deepEqual(simplify(p), p);
-        }
-      }
-    },
-    "topology": {
-      topic: function() {
-        var simplify = d3.simplify().topology(true).area(10).projection(d3.geo.equirectangular());
-        return function(d) { return simplify(simplify.project(d)); };
-      },
-      "Polygon": {
-        "preserves topology": function(simplify) {
-          assert.inDelta(simplify({
-              type: "GeometryCollection",
-              geometries: [
-                {type: "Polygon", coordinates: [octagon(-2)]},
-                {type: "Polygon", coordinates: [octagon(2)]}
-              ]
-            }).geometries.map(function(d) { return d.coordinates; }), [[[
-                [474.444444, 250,        19.290123],
-                [475.833333, 247.222222, 13.503086],
-                [480,        248.611111, 19.290123],
-                [480,        250,        19.290123],
-                [480,        251.388888, 19.290123],
-                [475.833333, 252.777777, 13.503086],
-                [474.444444, 250,        19.290123]]], [[
-                [480,        250,        19.290123],
-                [480,        248.611111, 19.290123],
-                [485.555555, 248.611111, 19.290123],
-                [484.166666, 252.777777, 19.290123],
-                [480,        251.388888, 19.290123],
-                [480,        250,        19.290123]]]
-            ], 1e-6);
-        },
-        "doesn't increase effective area of endpoints unless they touch another line": function(simplify) {
-          assert.inDelta(simplify({type: "Polygon", coordinates: [octagon()]}).coordinates, [[
-            [477.222222, 250,        21.219135],
-            [478.611111, 247.222222, 13.503086],
-            [482.777777, 248.611111, 21.219135],
-            [481.388888, 252.777777, 21.219135],
-            [477.222222, 250,        21.219135]
-          ]], 1e-6);
-        }
-      }
-    }
-  }
-});
-
-suite.export(module);
-
-assert.inDelta = function(actual, expected, delta, message) {
-  if (!inDelta(actual, expected, delta)) {
-    assert.fail(actual, expected, message || "expected {actual} to be in within *" + delta + "* of {expected}", null, assert.inDelta);
-  }
-};
-
-function inDelta(actual, expected, delta) {
-  return (Array.isArray(expected) ? inDeltaArray : inDeltaNumber)(actual, expected, delta);
-}
-
-function inDeltaArray(actual, expected, delta) {
-  var n = expected.length, i = -1;
-  if (actual.length !== n) return false;
-  while (++i < n) if (!inDelta(actual[i], expected[i], delta)) return false;
-  return true;
-}
-
-function inDeltaNumber(actual, expected, delta) {
-  return actual >= expected - delta && actual <= expected + delta;
-}
-
-function octagon(dx) {
-  dx = dx || 0;
-  return [
-    [-2, 0], [-2,  1], [-1,  2], [0,  2], [ 1,  2], [ 2,  1],
-    [ 2, 0], [ 2, -1], [ 1, -2], [0, -2], [-1, -2], [-2, -1],
-    [-2, 0]
-  ].map(function(point) {
-    return [point[0] + dx, point[1]];
-  });
-}

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

@@ -1,446 +0,0 @@
-(function() {
-
-d3.simplify = function() {
-  var projection = d3.geo.albers(),
-      triangulateLineString = triangulateLineStringSimple,
-      heap,
-      minArea = 3,
-      topology = false,
-      ringId,
-      id,
-      idByRings,
-      idByPoint,
-      ringsByPoint,
-      sharedPoints,
-      lastRingByPoint,
-      isShared,
-      graph;
-
-  var projectCoordinates = {
-    MultiPolygon: projectMultiPolygon,
-    Polygon: projectPolygon,
-    MultiLineString: projectPolygon,
-    LineString: projectLineString
-  };
-
-  var triangulateCoordinates = {
-    MultiPolygon: triangulateMultiPolygon,
-    Polygon: triangulatePolygon,
-    MultiLineString: triangulatePolygon,
-    LineString: triangulateLineString
-  };
-
-  var simplifyCoordinates = {
-    MultiPolygon: simplifyMultiPolygon,
-    Polygon: simplifyPolygon,
-    MultiLineString: simplifyPolygon,
-    LineString: simplifyLineString
-  };
-
-  function simplify(object) {
-    var type = object.type;
-    if (type === "FeatureCollection") {
-      object = copy(object);
-      object.features = object.features.map(simplifyFeature).filter(nonemptyFeature);
-      return object;
-    }
-    return (type === "Feature" ? simplifyFeature : simplifyGeometry)(object);
-  }
-
-  simplify.project = function(feature) {
-    var maxArea = 0,
-        maxAreas = {},
-        triangle;
-
-    heap = minHeap();
-
-    if (topology) {
-      id = 0;
-      idByRings = {};
-      ringsByPoint = {};
-      idByPoint = {};
-      sharedPoints = {};
-      lastRingByPoint = {};
-      isShared = {};
-      graph = {};
-      triangulateTopology(feature);
-    } else {
-      triangulateSimple(feature);
-    }
-
-    while (triangle = heap.pop()) {
-      // 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 (triangle.previous) {
-        triangle.previous.next = triangle.next;
-        triangle.previous[2] = triangle[2];
-        update(triangle.previous);
-      } else if (topology) {
-        maxAreas[triangle.ring] = triangle[1][2];
-      } else {
-        triangle[0][2] = triangle[1][2];
-      }
-
-      if (triangle.next) {
-        triangle.next.previous = triangle.previous;
-        triangle.next[0] = triangle[0];
-        update(triangle.next);
-      } else if (topology) {
-        maxAreas[triangle.ring] = triangle[1][2];
-      } else {
-        triangle[2][2] = triangle[1][2];
-      }
-    }
-
-    function update(triangle) {
-      heap.remove(triangle);
-      triangle[1][2] = area(triangle);
-      heap.push(triangle);
-    }
-
-    if (topology) {
-      var seen = {},
-          max,
-          m,
-          c;
-      for (var key in graph) {
-        if (seen.hasOwnProperty(key)) continue;
-        max = 0;
-        for (var k in (c = components(graph, key))) if ((m = maxAreas[k]) > max) max = m;
-        for (var k in c) maxAreas[k] = max, seen[k] = 1;
-      }
-
-      for (var key in sharedPoints) {
-        maxArea = maxAreas[ringsByPoint[key][0]];
-        sharedPoints[key].forEach(function(point) { point[2] = maxArea; });
-      }
-      idByPoint = idByRings = ringsByPoint = sharedPoints = isShared = lastRingByPoint = graph = null;
-    }
-
-    heap = null;
-    return feature;
-  };
-
-  function components(graph, source) {
-    var seen = {},
-        nextLevel = {},
-        thisLevel,
-        empty;
-    nextLevel[source] = 1;
-    while (1) {
-      empty = true;
-      for (var k in nextLevel) empty = false;
-      if (empty) break;
-      thisLevel = nextLevel;
-      nextLevel = {};
-      for (var v in thisLevel) {
-        if (seen.hasOwnProperty(v)) continue;
-        seen[v] = 1;
-        var neighbors = graph[v];
-        for (var k in neighbors) nextLevel[k] = neighbors[k];
-      }
-    }
-    return seen;
-  }
-
-  function projectFeature(feature) {
-    projectGeometry(feature.geometry);
-  }
-
-  function projectGeometry(geometry) {
-    var type = geometry.type;
-    if (type === "GeometryCollection") geometry.geometries.forEach(projectGeometry);
-    else geometry.coordinates = projectCoordinates[type](geometry.coordinates);
-  }
-
-  function projectMultiPolygon(multiPolygon) {
-    return multiPolygon.map(projectPolygon);
-  }
-
-  function projectPolygon(polygon) {
-    return polygon.map(projectLineString);
-  }
-
-  function projectLineString(lineString) {
-    ++ringId;
-    return lineString.map(projectPoint);
-  }
-
-  function projectPoint(point) {
-    var pointKey = (point = projection(point))[0] + "," + point[1],
-        key = (idByPoint.hasOwnProperty(pointKey) ? idByPoint[pointKey] + ":" : "") + ringId;
-    idByPoint[pointKey] = idByRings.hasOwnProperty(key)
-        ? idByRings[key]
-        : idByRings[key] = ++id;
-    if (lastRingByPoint.hasOwnProperty(pointKey) && lastRingByPoint[pointKey] !== ringId) {
-      isShared[pointKey] = 1;
-    }
-    lastRingByPoint[pointKey] = ringId;
-    return point;
-  }
-
-  function triangulateLineStringTopology(lineString) {
-    ++ringId;
-    var n = lineString.length - 1,
-        triangle0,
-        triangle,
-        a = lineString[0],
-        b = lineString[1],
-        c,
-        key0,
-        key,
-        idA = idByPoint[a[0] + "," + a[1]],
-        idB = idByPoint[key0 = b[0] + "," + b[1]],
-        idC;
-
-    lineString[0][2] = lineString[n][2] = 0;
-    if (n < 2) return lineString;
-
-    graph[ringId] = {};
-
-    addSharedPoint(a);
-    for (var i = 2; i <= n; ++i, a = b, b = c, idA = idB, idB = idC, key0 = key) {
-      c = lineString[i];
-      idC = idByPoint[key = c[0] + "," + c[1]];
-      if (idA === idB && idB === idC || !isShared.hasOwnProperty(key0)) {
-        triangle = [a, b, c];
-        triangle.ring = ringId;
-        b[2] = area(triangle);
-        heap.push(triangle);
-        if (triangle0) (triangle.previous = triangle0).next = triangle;
-        triangle0 = triangle;
-      } else {
-        addSharedPoint(b);
-        triangle0 = null;
-      }
-    }
-    addSharedPoint(b);
-
-    function addSharedPoint(point) {
-      var key = point[0] + "," + point[1],
-          rings = ringsByPoint.hasOwnProperty(key) ? ringsByPoint[key] : (ringsByPoint[key] = []);
-      rings.forEach(function(ring) {
-        graph[ring][ringId] = graph[ringId][ring] = 1;
-      });
-      rings.push(ringId);
-      if (sharedPoints.hasOwnProperty(key)) sharedPoints[key].push(point);
-      else sharedPoints[key] = [point];
-    }
-
-    return lineString;
-  }
-
-  // Project and triangulate.
-  function triangulateLineStringSimple(lineString) {
-    var points = lineString.map(projection),
-        n = points.length - 1,
-        triangle0,
-        triangle,
-        a = points[0],
-        b = points[1],
-        c;
-
-    points[0][2] = points[n][2] = 0;
-
-    for (var i = 2; i <= n; ++i) {
-      triangle = [a, b, c = points[i]];
-      b[2] = area(triangle);
-      heap.push(triangle);
-      if (triangle0) (triangle.previous = triangle0).next = triangle;
-      triangle0 = triangle;
-      a = b;
-      b = c;
-    }
-
-    return points;
-  }
-
-  function triangulateSimple(object) {
-    var type = object.type;
-    if (type === "FeatureCollection") object.features.forEach(triangulateFeature);
-    else (type === "Feature" ? triangulateFeature : triangulateGeometry)(object);
-  }
-
-  function triangulateTopology(object) {
-    var type = object.type;
-    ringId = 0;
-    if (type === "FeatureCollection") {
-      object.features.forEach(projectFeature);
-      ringId = 0;
-      object.features.forEach(triangulateFeature);
-    } else if (type === "Feature") {
-      projectFeature(object);
-      ringId = 0;
-      triangulateFeature(object);
-    } else {
-      projectGeometry(object);
-      ringId = 0;
-      triangulateGeometry(object);
-    }
-  }
-
-  function triangulateFeature(feature) {
-    triangulateGeometry(feature.geometry);
-  }
-
-  function triangulateGeometry(geometry) {
-    var type = geometry.type;
-    if (type === "GeometryCollection") geometry.geometries.forEach(triangulateGeometry);
-    else geometry.coordinates = triangulateCoordinates[type](geometry.coordinates);
-  }
-
-  function triangulateMultiPolygon(multiPolygon) {
-    return multiPolygon.map(triangulatePolygon);
-  }
-
-  function triangulatePolygon(polygon) {
-    return polygon.map(triangulateLineString);
-  }
-
-  function simplifyFeature(feature) {
-    feature = copy(feature);
-    feature.geometry = simplifyGeometry(feature.geometry);
-    return feature;
-  }
-
-  function simplifyGeometry(geometry) {
-    var type = geometry.type;
-    geometry = copy(geometry);
-    if (type === "GeometryCollection") {
-      geometry.geometries = geometry.geometries.map(simplifyGeometry).filter(nonemptyGeometry);
-    } else {
-      geometry.coordinates = simplifyCoordinates[type](geometry.coordinates);
-    }
-    return geometry;
-  }
-
-  function simplifyMultiPolygon(multiPolygon) {
-    return multiPolygon.map(simplifyPolygon).filter(length);
-  }
-
-  function simplifyPolygon(polygon) {
-    return polygon.map(simplifyLineString).filter(length);
-  }
-
-  function simplifyLineString(lineString) {
-    return lineString.filter(filterLineString);
-  }
-
-  function filterLineString(point) {
-    return point[2] >= minArea;
-  }
-
-  simplify.projection = function(_) {
-    if (!arguments.length) return projection;
-    projection = _;
-    return simplify;
-  };
-
-  simplify.area = function(_) {
-    if (!arguments.length) return minArea;
-    minArea = +_;
-    return simplify;
-  };
-
-  simplify.topology = function(_) {
-    if (!arguments.length) return topology;
-    triangulateCoordinates.LineString =
-    triangulateLineString = (topology = !!_)
-        ? triangulateLineStringTopology
-        : triangulateLineStringSimple;
-    return simplify;
-  };
-
-  return simplify;
-};
-
-function compare(a, b) {
-  return a[1][2] - b[1][2] || a[1][1] - b[1][1] || a[1][0] - b[1][0];
-}
-
-function area(t) {
-  return Math.abs((t[0][0] - t[2][0]) * (t[1][1] - t[0][1]) - (t[0][0] - t[1][0]) * (t[2][1] - t[0][1]));
-}
-
-function minHeap() {
-  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 nonemptyFeature(d) { return nonemptyGeometry(d.geometry); }
-
-function nonemptyGeometry(d) {
-  return length(d.type === "GeometryCollection"
-      ? d.geometries : d.coordinates);
-}
-
-function length(d) { return d.length; }
-
-function copy(object) {
-  var o = {};
-  for (var key in object) o[key] = object[key];
-  return o;
-}
-
-})();