Skip to content

Commit

Permalink
Use exact paths in imports. d3/d3#3265
Browse files Browse the repository at this point in the history
  • Loading branch information
mbostock committed Aug 9, 2019
1 parent 4866ec5 commit a5558b8
Show file tree
Hide file tree
Showing 48 changed files with 163 additions and 163 deletions.
8 changes: 4 additions & 4 deletions src/area.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import adder from "./adder";
import {atan2, cos, quarterPi, radians, sin, tau} from "./math";
import noop from "./noop";
import stream from "./stream";
import adder from "./adder.js";
import {atan2, cos, quarterPi, radians, sin, tau} from "./math.js";
import noop from "./noop.js";
import stream from "./stream.js";

export var areaRingSum = adder();

Expand Down
10 changes: 5 additions & 5 deletions src/bounds.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import adder from "./adder";
import {areaStream, areaRingSum} from "./area";
import {cartesian, cartesianCross, cartesianNormalizeInPlace, spherical} from "./cartesian";
import {abs, degrees, epsilon, radians} from "./math";
import stream from "./stream";
import adder from "./adder.js";
import {areaStream, areaRingSum} from "./area.js";
import {cartesian, cartesianCross, cartesianNormalizeInPlace, spherical} from "./cartesian.js";
import {abs, degrees, epsilon, radians} from "./math.js";
import stream from "./stream.js";

var lambda0, phi0, lambda1, phi1, // bounds
lambda2, // previous lambda-coordinate
Expand Down
2 changes: 1 addition & 1 deletion src/cartesian.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {asin, atan2, cos, sin, sqrt} from "./math";
import {asin, atan2, cos, sin, sqrt} from "./math.js";

export function spherical(cartesian) {
return [atan2(cartesian[1], cartesian[0]), asin(cartesian[2])];
Expand Down
6 changes: 3 additions & 3 deletions src/centroid.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {asin, atan2, cos, degrees, epsilon, epsilon2, radians, sin, sqrt} from "./math";
import noop from "./noop";
import stream from "./stream";
import {asin, atan2, cos, degrees, epsilon, epsilon2, radians, sin, sqrt} from "./math.js";
import noop from "./noop.js";
import stream from "./stream.js";

var W0, W1,
X0, Y0, Z0,
Expand Down
8 changes: 4 additions & 4 deletions src/circle.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {cartesian, cartesianNormalizeInPlace, spherical} from "./cartesian";
import constant from "./constant";
import {acos, cos, degrees, epsilon, radians, sin, tau} from "./math";
import {rotateRadians} from "./rotation";
import {cartesian, cartesianNormalizeInPlace, spherical} from "./cartesian.js";
import constant from "./constant.js";
import {acos, cos, degrees, epsilon, radians, sin, tau} from "./math.js";
import {rotateRadians} from "./rotation.js";

// Generates a circle centered at [0°, 0°], with a given radius and precision.
export function circleStream(stream, radius, delta, direction, t0, t1) {
Expand Down
4 changes: 2 additions & 2 deletions src/clip/antimeridian.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import clip from "./index";
import {abs, atan, cos, epsilon, halfPi, pi, sin} from "../math";
import clip from "./index.js";
import {abs, atan, cos, epsilon, halfPi, pi, sin} from "../math.js";

export default clip(
function() { return true; },
Expand Down
2 changes: 1 addition & 1 deletion src/clip/buffer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import noop from "../noop";
import noop from "../noop.js";

export default function() {
var lines = [],
Expand Down
10 changes: 5 additions & 5 deletions src/clip/circle.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {cartesian, cartesianAddInPlace, cartesianCross, cartesianDot, cartesianScale, spherical} from "../cartesian";
import {circleStream} from "../circle";
import {abs, cos, epsilon, pi, radians, sqrt} from "../math";
import pointEqual from "../pointEqual";
import clip from "./index";
import {cartesian, cartesianAddInPlace, cartesianCross, cartesianDot, cartesianScale, spherical} from "../cartesian.js";
import {circleStream} from "../circle.js";
import {abs, cos, epsilon, pi, radians, sqrt} from "../math.js";
import pointEqual from "../pointEqual.js";
import clip from "./index.js";

export default function(radius) {
var cr = cos(radius),
Expand Down
2 changes: 1 addition & 1 deletion src/clip/extent.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import clipRectangle from "./rectangle";
import clipRectangle from "./rectangle.js";

export default function() {
var x0 = 0,
Expand Down
8 changes: 4 additions & 4 deletions src/clip/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import clipBuffer from "./buffer";
import clipRejoin from "./rejoin";
import {epsilon, halfPi} from "../math";
import polygonContains from "../polygonContains";
import clipBuffer from "./buffer.js";
import clipRejoin from "./rejoin.js";
import {epsilon, halfPi} from "../math.js";
import polygonContains from "../polygonContains.js";
import {merge} from "d3-array";

export default function(pointVisible, clipLine, interpolate, start) {
Expand Down
8 changes: 4 additions & 4 deletions src/clip/rectangle.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {abs, epsilon} from "../math";
import clipBuffer from "./buffer";
import clipLine from "./line";
import clipRejoin from "./rejoin";
import {abs, epsilon} from "../math.js";
import clipBuffer from "./buffer.js";
import clipLine from "./line.js";
import clipRejoin from "./rejoin.js";
import {merge} from "d3-array";

var clipMax = 1e9, clipMin = -clipMax;
Expand Down
2 changes: 1 addition & 1 deletion src/clip/rejoin.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import pointEqual from "../pointEqual";
import pointEqual from "../pointEqual.js";

function Intersection(point, points, other, entry) {
this.x = point;
Expand Down
6 changes: 3 additions & 3 deletions src/contains.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {default as polygonContains} from "./polygonContains";
import {default as distance} from "./distance";
import {epsilon2, radians} from "./math";
import {default as polygonContains} from "./polygonContains.js";
import {default as distance} from "./distance.js";
import {epsilon2, radians} from "./math.js";

var containsObjectType = {
Feature: function(object, point) {
Expand Down
2 changes: 1 addition & 1 deletion src/distance.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import length from "./length";
import length from "./length.js";

var coordinates = [null, null],
object = {type: "LineString", coordinates: coordinates};
Expand Down
2 changes: 1 addition & 1 deletion src/graticule.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {range} from "d3-array";
import {abs, ceil, epsilon} from "./math";
import {abs, ceil, epsilon} from "./math.js";

function graticuleX(y0, y1, dy) {
var y = range(y0, y1 - epsilon, dy).concat(y1);
Expand Down
68 changes: 34 additions & 34 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
export {default as geoArea} from "./area";
export {default as geoBounds} from "./bounds";
export {default as geoCentroid} from "./centroid";
export {default as geoCircle} from "./circle";
export {default as geoClipAntimeridian} from "./clip/antimeridian";
export {default as geoClipCircle} from "./clip/circle";
export {default as geoClipExtent} from "./clip/extent"; // DEPRECATED! Use d3.geoIdentity().clipExtent(…).
export {default as geoClipRectangle} from "./clip/rectangle";
export {default as geoContains} from "./contains";
export {default as geoDistance} from "./distance";
export {default as geoGraticule, graticule10 as geoGraticule10} from "./graticule";
export {default as geoInterpolate} from "./interpolate";
export {default as geoLength} from "./length";
export {default as geoPath} from "./path/index";
export {default as geoAlbers} from "./projection/albers";
export {default as geoAlbersUsa} from "./projection/albersUsa";
export {default as geoAzimuthalEqualArea, azimuthalEqualAreaRaw as geoAzimuthalEqualAreaRaw} from "./projection/azimuthalEqualArea";
export {default as geoAzimuthalEquidistant, azimuthalEquidistantRaw as geoAzimuthalEquidistantRaw} from "./projection/azimuthalEquidistant";
export {default as geoConicConformal, conicConformalRaw as geoConicConformalRaw} from "./projection/conicConformal";
export {default as geoConicEqualArea, conicEqualAreaRaw as geoConicEqualAreaRaw} from "./projection/conicEqualArea";
export {default as geoConicEquidistant, conicEquidistantRaw as geoConicEquidistantRaw} from "./projection/conicEquidistant";
export {default as geoEqualEarth, equalEarthRaw as geoEqualEarthRaw} from "./projection/equalEarth";
export {default as geoEquirectangular, equirectangularRaw as geoEquirectangularRaw} from "./projection/equirectangular";
export {default as geoGnomonic, gnomonicRaw as geoGnomonicRaw} from "./projection/gnomonic";
export {default as geoIdentity} from "./projection/identity";
export {default as geoProjection, projectionMutator as geoProjectionMutator} from "./projection/index";
export {default as geoMercator, mercatorRaw as geoMercatorRaw} from "./projection/mercator";
export {default as geoNaturalEarth1, naturalEarth1Raw as geoNaturalEarth1Raw} from "./projection/naturalEarth1";
export {default as geoOrthographic, orthographicRaw as geoOrthographicRaw} from "./projection/orthographic";
export {default as geoStereographic, stereographicRaw as geoStereographicRaw} from "./projection/stereographic";
export {default as geoTransverseMercator, transverseMercatorRaw as geoTransverseMercatorRaw} from "./projection/transverseMercator";
export {default as geoRotation} from "./rotation";
export {default as geoStream} from "./stream";
export {default as geoTransform} from "./transform";
export {default as geoArea} from "./area.js";
export {default as geoBounds} from "./bounds.js";
export {default as geoCentroid} from "./centroid.js";
export {default as geoCircle} from "./circle.js";
export {default as geoClipAntimeridian} from "./clip/antimeridian.js";
export {default as geoClipCircle} from "./clip/circle.js";
export {default as geoClipExtent} from "./clip/extent.js"; // DEPRECATED! Use d3.geoIdentity().clipExtent(…).
export {default as geoClipRectangle} from "./clip/rectangle.js";
export {default as geoContains} from "./contains.js";
export {default as geoDistance} from "./distance.js";
export {default as geoGraticule, graticule10 as geoGraticule10} from "./graticule.js";
export {default as geoInterpolate} from "./interpolate.js";
export {default as geoLength} from "./length.js";
export {default as geoPath} from "./path/index.js";
export {default as geoAlbers} from "./projection/albers.js";
export {default as geoAlbersUsa} from "./projection/albersUsa.js";
export {default as geoAzimuthalEqualArea, azimuthalEqualAreaRaw as geoAzimuthalEqualAreaRaw} from "./projection/azimuthalEqualArea.js";
export {default as geoAzimuthalEquidistant, azimuthalEquidistantRaw as geoAzimuthalEquidistantRaw} from "./projection/azimuthalEquidistant.js";
export {default as geoConicConformal, conicConformalRaw as geoConicConformalRaw} from "./projection/conicConformal.js";
export {default as geoConicEqualArea, conicEqualAreaRaw as geoConicEqualAreaRaw} from "./projection/conicEqualArea.js";
export {default as geoConicEquidistant, conicEquidistantRaw as geoConicEquidistantRaw} from "./projection/conicEquidistant.js";
export {default as geoEqualEarth, equalEarthRaw as geoEqualEarthRaw} from "./projection/equalEarth.js";
export {default as geoEquirectangular, equirectangularRaw as geoEquirectangularRaw} from "./projection/equirectangular.js";
export {default as geoGnomonic, gnomonicRaw as geoGnomonicRaw} from "./projection/gnomonic.js";
export {default as geoIdentity} from "./projection/identity.js";
export {default as geoProjection, projectionMutator as geoProjectionMutator} from "./projection/index.js";
export {default as geoMercator, mercatorRaw as geoMercatorRaw} from "./projection/mercator.js";
export {default as geoNaturalEarth1, naturalEarth1Raw as geoNaturalEarth1Raw} from "./projection/naturalEarth1.js";
export {default as geoOrthographic, orthographicRaw as geoOrthographicRaw} from "./projection/orthographic.js";
export {default as geoStereographic, stereographicRaw as geoStereographicRaw} from "./projection/stereographic.js";
export {default as geoTransverseMercator, transverseMercatorRaw as geoTransverseMercatorRaw} from "./projection/transverseMercator.js";
export {default as geoRotation} from "./rotation.js";
export {default as geoStream} from "./stream.js";
export {default as geoTransform} from "./transform.js";
2 changes: 1 addition & 1 deletion src/interpolate.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {asin, atan2, cos, degrees, haversin, radians, sin, sqrt} from "./math";
import {asin, atan2, cos, degrees, haversin, radians, sin, sqrt} from "./math.js";

export default function(a, b) {
var x0 = a[0] * radians,
Expand Down
8 changes: 4 additions & 4 deletions src/length.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import adder from "./adder";
import {abs, atan2, cos, radians, sin, sqrt} from "./math";
import noop from "./noop";
import stream from "./stream";
import adder from "./adder.js";
import {abs, atan2, cos, radians, sin, sqrt} from "./math.js";
import noop from "./noop.js";
import stream from "./stream.js";

var lengthSum = adder(),
lambda0,
Expand Down
6 changes: 3 additions & 3 deletions src/path/area.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import adder from "../adder";
import {abs} from "../math";
import noop from "../noop";
import adder from "../adder.js";
import {abs} from "../math.js";
import noop from "../noop.js";

var areaSum = adder(),
areaRingSum = adder(),
Expand Down
2 changes: 1 addition & 1 deletion src/path/bounds.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import noop from "../noop";
import noop from "../noop.js";

var x0 = Infinity,
y0 = x0,
Expand Down
2 changes: 1 addition & 1 deletion src/path/centroid.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {sqrt} from "../math";
import {sqrt} from "../math.js";

// TODO Enforce positive area for exterior, negative area for interior?

Expand Down
4 changes: 2 additions & 2 deletions src/path/context.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {tau} from "../math";
import noop from "../noop";
import {tau} from "../math.js";
import noop from "../noop.js";

export default function PathContext(context) {
this._context = context;
Expand Down
16 changes: 8 additions & 8 deletions src/path/index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import identity from "../identity";
import stream from "../stream";
import pathArea from "./area";
import pathBounds from "./bounds";
import pathCentroid from "./centroid";
import PathContext from "./context";
import pathMeasure from "./measure";
import PathString from "./string";
import identity from "../identity.js";
import stream from "../stream.js";
import pathArea from "./area.js";
import pathBounds from "./bounds.js";
import pathCentroid from "./centroid.js";
import PathContext from "./context.js";
import pathMeasure from "./measure.js";
import PathString from "./string.js";

export default function(projection, context) {
var pointRadius = 4.5,
Expand Down
6 changes: 3 additions & 3 deletions src/path/measure.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import adder from "../adder";
import {sqrt} from "../math";
import noop from "../noop";
import adder from "../adder.js";
import {sqrt} from "../math.js";
import noop from "../noop.js";

var lengthSum = adder(),
lengthRing,
Expand Down
2 changes: 1 addition & 1 deletion src/pointEqual.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {abs, epsilon} from "./math";
import {abs, epsilon} from "./math.js";

export default function(a, b) {
return abs(a[0] - b[0]) < epsilon && abs(a[1] - b[1]) < epsilon;
Expand Down
6 changes: 3 additions & 3 deletions src/polygonContains.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import adder from "./adder";
import {cartesian, cartesianCross, cartesianNormalizeInPlace} from "./cartesian";
import {abs, asin, atan2, cos, epsilon, halfPi, pi, quarterPi, sign, sin, tau} from "./math";
import adder from "./adder.js";
import {cartesian, cartesianCross, cartesianNormalizeInPlace} from "./cartesian.js";
import {abs, asin, atan2, cos, epsilon, halfPi, pi, quarterPi, sign, sin, tau} from "./math.js";

var sum = adder();

Expand Down
2 changes: 1 addition & 1 deletion src/projection/albers.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import conicEqualArea from "./conicEqualArea";
import conicEqualArea from "./conicEqualArea.js";

export default function() {
return conicEqualArea()
Expand Down
8 changes: 4 additions & 4 deletions src/projection/albersUsa.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {epsilon} from "../math";
import albers from "./albers";
import conicEqualArea from "./conicEqualArea";
import {fitExtent, fitSize, fitWidth, fitHeight} from "./fit";
import {epsilon} from "../math.js";
import albers from "./albers.js";
import conicEqualArea from "./conicEqualArea.js";
import {fitExtent, fitSize, fitWidth, fitHeight} from "./fit.js";

// The projections must have mutually exclusive clip regions on the sphere,
// as this will avoid emitting interleaving lines and polygons.
Expand Down
2 changes: 1 addition & 1 deletion src/projection/azimuthal.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {asin, atan2, cos, sin, sqrt} from "../math";
import {asin, atan2, cos, sin, sqrt} from "../math.js";

export function azimuthalRaw(scale) {
return function(x, y) {
Expand Down
6 changes: 3 additions & 3 deletions src/projection/azimuthalEqualArea.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {asin, sqrt} from "../math";
import {azimuthalRaw, azimuthalInvert} from "./azimuthal";
import projection from "./index";
import {asin, sqrt} from "../math.js";
import {azimuthalRaw, azimuthalInvert} from "./azimuthal.js";
import projection from "./index.js";

export var azimuthalEqualAreaRaw = azimuthalRaw(function(cxcy) {
return sqrt(2 / (1 + cxcy));
Expand Down
6 changes: 3 additions & 3 deletions src/projection/azimuthalEquidistant.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {acos, sin} from "../math";
import {azimuthalRaw, azimuthalInvert} from "./azimuthal";
import projection from "./index";
import {acos, sin} from "../math.js";
import {azimuthalRaw, azimuthalInvert} from "./azimuthal.js";
import projection from "./index.js";

export var azimuthalEquidistantRaw = azimuthalRaw(function(c) {
return (c = acos(c)) && c / sin(c);
Expand Down
4 changes: 2 additions & 2 deletions src/projection/conic.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {degrees, pi, radians} from "../math";
import {projectionMutator} from "./index";
import {degrees, pi, radians} from "../math.js";
import {projectionMutator} from "./index.js";

export function conicProjection(projectAt) {
var phi0 = 0,
Expand Down
6 changes: 3 additions & 3 deletions src/projection/conicConformal.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {abs, atan, atan2, cos, epsilon, halfPi, log, pow, sign, sin, sqrt, tan} from "../math";
import {conicProjection} from "./conic";
import {mercatorRaw} from "./mercator";
import {abs, atan, atan2, cos, epsilon, halfPi, log, pow, sign, sin, sqrt, tan} from "../math.js";
import {conicProjection} from "./conic.js";
import {mercatorRaw} from "./mercator.js";

function tany(y) {
return tan((halfPi + y) / 2);
Expand Down
6 changes: 3 additions & 3 deletions src/projection/conicEqualArea.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {abs, asin, atan2, cos, epsilon, sign, sin, sqrt} from "../math";
import {conicProjection} from "./conic";
import {cylindricalEqualAreaRaw} from "./cylindricalEqualArea";
import {abs, asin, atan2, cos, epsilon, sign, sin, sqrt} from "../math.js";
import {conicProjection} from "./conic.js";
import {cylindricalEqualAreaRaw} from "./cylindricalEqualArea.js";

export function conicEqualAreaRaw(y0, y1) {
var sy0 = sin(y0), n = (sy0 + sin(y1)) / 2;
Expand Down
6 changes: 3 additions & 3 deletions src/projection/conicEquidistant.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {abs, atan2, cos, epsilon, sign, sin, sqrt} from "../math";
import {conicProjection} from "./conic";
import {equirectangularRaw} from "./equirectangular";
import {abs, atan2, cos, epsilon, sign, sin, sqrt} from "../math.js";
import {conicProjection} from "./conic.js";
import {equirectangularRaw} from "./equirectangular.js";

export function conicEquidistantRaw(y0, y1) {
var cy0 = cos(y0),
Expand Down
2 changes: 1 addition & 1 deletion src/projection/cylindricalEqualArea.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {asin, cos, sin} from "../math";
import {asin, cos, sin} from "../math.js";

export function cylindricalEqualAreaRaw(phi0) {
var cosPhi0 = cos(phi0);
Expand Down
2 changes: 1 addition & 1 deletion src/projection/equirectangular.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import projection from "./index";
import projection from "./index.js";

export function equirectangularRaw(lambda, phi) {
return [lambda, phi];
Expand Down
Loading

0 comments on commit a5558b8

Please sign in to comment.