From c9ebe3ed5c8fb866c26a8d931a050e1ba39851eb Mon Sep 17 00:00:00 2001 From: colin Date: Wed, 9 Oct 2024 07:43:38 -0700 Subject: [PATCH 1/2] replace polygon-clipping with polyclip-ts --- packages/turf-difference/index.ts | 8 +- packages/turf-difference/package.json | 2 +- .../test/out/issue-#721-inverse.geojson | 36 ++ .../test/out/issue-#721.geojson | 18 +- packages/turf-dissolve/index.ts | 10 +- packages/turf-dissolve/package.json | 2 +- .../test/out/hexagons-issue#742.geojson | 416 +++++++++--------- .../test/out/polysWithoutProperty.geojson | 2 +- .../test/out/simplified-issue.geojson | 119 ++--- packages/turf-intersect/index.ts | 11 +- packages/turf-intersect/package.json | 2 +- .../test/out/Intersect2.geojson | 2 +- .../test/out/issue-1004.geojson | 8 +- .../turf-intersect/test/out/issue-412.geojson | 7 +- .../test/out/multipolygon-input.geojson | 6 +- packages/turf-mask/index.ts | 18 +- packages/turf-mask/package.json | 2 +- packages/turf-union/index.ts | 8 +- packages/turf-union/package.json | 2 +- packages/turf-union/test/out/union2.geojson | 12 +- 20 files changed, 370 insertions(+), 321 deletions(-) diff --git a/packages/turf-difference/index.ts b/packages/turf-difference/index.ts index 8629db4b0e..79dc2de101 100644 --- a/packages/turf-difference/index.ts +++ b/packages/turf-difference/index.ts @@ -1,5 +1,5 @@ import { Polygon, MultiPolygon, Feature, FeatureCollection } from "geojson"; -import polygonClipping, { Geom } from "polygon-clipping"; +import * as polyclip from "polyclip-ts"; import { polygon, multiPolygon } from "@turf/helpers"; import { geomEach } from "@turf/meta"; @@ -39,10 +39,10 @@ import { geomEach } from "@turf/meta"; function difference( features: FeatureCollection ): Feature | null { - const geoms: Array = []; + const geoms: Array = []; geomEach(features, (geom) => { - geoms.push(geom.coordinates as Geom); + geoms.push(geom.coordinates as polyclip.Geom); }); if (geoms.length < 2) { @@ -51,7 +51,7 @@ function difference( const properties = features.features[0].properties || {}; - const differenced = polygonClipping.difference(geoms[0], ...geoms.slice(1)); + const differenced = polyclip.difference(geoms[0], ...geoms.slice(1)); if (differenced.length === 0) return null; if (differenced.length === 1) return polygon(differenced[0], properties); return multiPolygon(differenced, properties); diff --git a/packages/turf-difference/package.json b/packages/turf-difference/package.json index 321ee633f2..ca83158326 100644 --- a/packages/turf-difference/package.json +++ b/packages/turf-difference/package.json @@ -65,7 +65,7 @@ "@turf/helpers": "workspace:^", "@turf/meta": "workspace:^", "@types/geojson": "^7946.0.10", - "polygon-clipping": "^0.15.3", + "polyclip-ts": "^0.16.5", "tslib": "^2.6.2" } } diff --git a/packages/turf-difference/test/out/issue-#721-inverse.geojson b/packages/turf-difference/test/out/issue-#721-inverse.geojson index 477c618427..9bacfc3c01 100644 --- a/packages/turf-difference/test/out/issue-#721-inverse.geojson +++ b/packages/turf-difference/test/out/issue-#721-inverse.geojson @@ -92,6 +92,42 @@ ] ] } + }, + { + "type": "Feature", + "properties": { + "fill-opacity": 1, + "fill": "#0F0" + }, + "geometry": { + "type": "MultiPolygon", + "coordinates": [ + [ + [ + [-0.6462588068806041, 44.80608667910215], + [-0.6462588068796641, 44.80608667910137], + [-0.6461987, 44.8060367], + [-0.6462588068806041, 44.80608667910215] + ] + ], + [ + [ + [-0.6461042, 44.8059451], + [-0.6461041344154723, 44.805944903377586], + [-0.6461041344154722, 44.805944903377586], + [-0.6461042, 44.8059451] + ] + ], + [ + [ + [-0.6460471709105139, 44.80564743856641], + [-0.6460421, 44.8056729], + [-0.6460471709104708, 44.80564743856663], + [-0.6460471709105139, 44.80564743856641] + ] + ] + ] + } } ] } diff --git a/packages/turf-difference/test/out/issue-#721.geojson b/packages/turf-difference/test/out/issue-#721.geojson index f9e4aad75b..08606ca524 100644 --- a/packages/turf-difference/test/out/issue-#721.geojson +++ b/packages/turf-difference/test/out/issue-#721.geojson @@ -113,17 +113,16 @@ [-0.6460168, 44.8047948], [-0.6460827, 44.8050017], [-0.6461218, 44.8051741], - [-0.6461158838109077, 44.80524109574131], - [-0.646107941865921, 44.80533857879061], - [-0.646093673696575, 44.80541109474097], + [-0.6461073, 44.8053383], [-0.6460848, 44.8054585], - [-0.6460471709105139, 44.80564743856641], + [-0.6460471709104708, 44.80564743856663], [-0.6460422277450562, 44.805672561504906], [-0.6460542976856232, 44.80579530680288], [-0.646069093721612, 44.80583985137739], - [-0.6461041344154722, 44.805944903377586], + [-0.6460542, 44.8057952], + [-0.6461041344154723, 44.805944903377586], [-0.6461991369724274, 44.80603699057963], - [-0.6462588068806041, 44.80608667910215], + [-0.6462588068796641, 44.80608667910137], [-0.6463809, 44.8061882], [-0.646437, 44.806159], [-0.64649, 44.80611], @@ -138,6 +137,13 @@ [-0.6465049, 44.8055554], [-0.6471907, 44.8053946], [-0.6474134, 44.805326] + ], + [ + [-0.6461073, 44.8053383], + [-0.6461158838109077, 44.80524109574131], + [-0.646107941865921, 44.80533857879061], + [-0.646093673696575, 44.80541109474097], + [-0.6461073, 44.8053383] ] ] } diff --git a/packages/turf-dissolve/index.ts b/packages/turf-dissolve/index.ts index fd5a5eb2df..2090cf6ce6 100644 --- a/packages/turf-dissolve/index.ts +++ b/packages/turf-dissolve/index.ts @@ -3,7 +3,7 @@ import { featureCollection, isObject, multiPolygon } from "@turf/helpers"; import { collectionOf } from "@turf/invariant"; import { featureEach } from "@turf/meta"; import { flatten } from "@turf/flatten"; -import polygonClipping, { Geom } from "polygon-clipping"; +import * as polyclip from "polyclip-ts"; /** * Dissolves a FeatureCollection of {@link polygon} features, filtered by an optional property name:value. @@ -45,12 +45,12 @@ function dissolve( if (!propertyName) { return flatten( multiPolygon( - polygonClipping.union.apply( + polyclip.union.apply( null, // List of polygons expressed as Position[][][] a.k.a. Geom[] fc.features.map(function (f) { return f.geometry.coordinates; - }) as [Geom, ...Geom[]] + }) as [polyclip.Geom, ...polyclip.Geom[]] ) ) ); @@ -76,12 +76,12 @@ function dissolve( // Export each group of polygons as a separate feature. for (let i = 0; i < vals.length; i++) { const mp = multiPolygon( - polygonClipping.union.apply( + polyclip.union.apply( null, // List of polygons expressed as Position[][][] a.k.a. Geom[] (uniquePropertyVals[vals[i]] as Feature[]).map(function (f) { return f.geometry.coordinates; - }) as [Geom, ...Geom[]] + }) as [polyclip.Geom, ...polyclip.Geom[]] ) ); if (mp && mp.properties) { diff --git a/packages/turf-dissolve/package.json b/packages/turf-dissolve/package.json index 48e4c90c7e..37d81e274b 100644 --- a/packages/turf-dissolve/package.json +++ b/packages/turf-dissolve/package.json @@ -69,7 +69,7 @@ "@turf/invariant": "workspace:^", "@turf/meta": "workspace:^", "@types/geojson": "^7946.0.10", - "polygon-clipping": "^0.15.3", + "polyclip-ts": "^0.16.5", "tslib": "^2.6.2" } } diff --git a/packages/turf-dissolve/test/out/hexagons-issue#742.geojson b/packages/turf-dissolve/test/out/hexagons-issue#742.geojson index fe6d3c9972..6090be9980 100644 --- a/packages/turf-dissolve/test/out/hexagons-issue#742.geojson +++ b/packages/turf-dissolve/test/out/hexagons-issue#742.geojson @@ -22,21 +22,21 @@ [-76.663, 45.456], [-76.659, 45.462], [-76.6606, 45.4648], - [-76.65799999999996, 45.46566666666668], + [-76.658, 45.465666666666664], [-76.652, 45.467], - [-76.64964705882352, 45.471117647058826], + [-76.64964705882353, 45.471117647058826], [-76.644, 45.473], [-76.64, 45.479], [-76.644, 45.485], [-76.653, 45.488], [-76.662, 45.485], - [-76.66400000000002, 45.482], + [-76.664, 45.482], [-76.666, 45.48133333333333], [-76.672, 45.48], - [-76.67392, 45.476639999999996], - [-76.67542857142858, 45.47714285714286], + [-76.67392, 45.47664], + [-76.67542857142857, 45.47714285714286], [-76.678, 45.481], - [-76.68639999999999, 45.4838], + [-76.6864, 45.4838], [-76.687, 45.485], [-76.6921724137931, 45.48655172413793], [-76.693, 45.488], @@ -100,16 +100,16 @@ [-76.5, 45.592], [-76.49523529411765, 45.590411764705884], [-76.495, 45.59], - [-76.49200000000002, 45.58933333333334], + [-76.492, 45.589333333333336], [-76.491, 45.589], [-76.4908, 45.58906666666667], [-76.486, 45.588], [-76.477, 45.59], [-76.473, 45.597], [-76.477, 45.603], - [-76.48176470588236, 45.60458823529412], + [-76.48176470588236, 45.604588235294116], [-76.482, 45.605], - [-76.48481249999999, 45.605624999999996], + [-76.4848125, 45.605625], [-76.485, 45.606], [-76.494, 45.609], [-76.503, 45.606], @@ -175,9 +175,9 @@ [-76.35857142857142, 45.41914285714286], [-76.356, 45.42], [-76.353, 45.426], - [-76.35331249999999, 45.426624999999994], - [-76.34899999999996, 45.42566666666665], - [-76.34657142857144, 45.42485714285714], + [-76.3533125, 45.426625], + [-76.349, 45.425666666666665], + [-76.34657142857142, 45.42485714285714], [-76.346, 45.424], [-76.337, 45.421], [-76.328, 45.424], @@ -185,16 +185,16 @@ [-76.328, 45.437], [-76.33405454545455, 45.438345454545455], [-76.335, 45.44], - [-76.34100000000004, 45.44133333333334], + [-76.341, 45.44133333333333], [-76.346, 45.443], [-76.355, 45.44], [-76.359, 45.434], [-76.35829411764706, 45.432764705882356], [-76.365, 45.435], [-76.374, 45.432], - [-76.37457142857143, 45.43114285714285], + [-76.37457142857143, 45.43114285714286], [-76.378, 45.43], - [-76.3797142857143, 45.427428571428564], + [-76.37971428571429, 45.42742857142857], [-76.387, 45.425], [-76.39, 45.419] ] @@ -259,7 +259,7 @@ [-76.291, 45.343], [-76.3, 45.34], [-76.303, 45.334], - [-76.3027857142857, 45.3335], + [-76.30278571428572, 45.3335], [-76.303, 45.333] ] ] @@ -304,12 +304,12 @@ [-76.232, 44.886], [-76.228, 44.892], [-76.232, 44.899], - [-76.24012903225805, 44.90080645161291], + [-76.24012903225807, 44.9008064516129], [-76.24, 44.901], [-76.244, 44.907], - [-76.24571428571427, 44.90757142857142], + [-76.24571428571429, 44.90757142857143], [-76.246, 44.908], - [-76.25164000000001, 44.90988], + [-76.25164, 44.90988], [-76.251, 44.911], [-76.255, 44.917], [-76.264, 44.92], @@ -389,7 +389,7 @@ [-76.217, 45.221], [-76.214, 45.214], [-76.205, 45.212], - [-76.19717391304349, 45.21373913043478], + [-76.19717391304347, 45.21373913043478], [-76.201, 45.208], [-76.197, 45.201], [-76.188, 45.199], @@ -397,8 +397,8 @@ [-76.175, 45.208], [-76.179, 45.214], [-76.188, 45.217], - [-76.19576470588235, 45.214411764705886], - [-76.19435294117646, 45.21688235294118], + [-76.19576470588235, 45.21441176470588], + [-76.19435294117648, 45.21688235294118], [-76.188, 45.219], [-76.184, 45.225], [-76.18422535211268, 45.225394366197186], @@ -409,10 +409,10 @@ [-76.17, 45.243], [-76.179, 45.246], [-76.188, 45.243], - [-76.18857142857144, 45.24214285714286], + [-76.18857142857142, 45.24214285714286], [-76.195, 45.24], [-76.198, 45.234], - [-76.19791304347825, 45.23379710144928], + [-76.19791304347827, 45.23379710144928], [-76.206, 45.232], [-76.20764705882353, 45.22911764705882], [-76.214, 45.227], @@ -457,15 +457,15 @@ [-76.133, 45.123], [-76.124, 45.121], [-76.115, 45.123], - [-76.11358823529412, 45.12547058823529], + [-76.11358823529412, 45.125470588235295], [-76.112, 45.126], [-76.108, 45.132], [-76.112, 45.139], - [-76.1151304347826, 45.13969565217391], + [-76.11513043478261, 45.13969565217391], [-76.115, 45.14], [-76.118, 45.146], [-76.127, 45.149], - [-76.13, 45.147999999999996], + [-76.13, 45.148], [-76.129, 45.15], [-76.132, 45.157], [-76.141, 45.159], @@ -609,7 +609,7 @@ [-76.046, 44.889], [-76.042, 44.883], [-76.033, 44.88], - [-76.02780000000001, 44.88173333333334], + [-76.0278, 44.88173333333334], [-76.02, 44.88], [-76.011, 44.882], [-76.007, 44.889], @@ -627,7 +627,7 @@ [-76.045, 44.906], [-76.041, 44.9], [-76.038, 44.899], - [-76.04028571428572, 44.89557142857144], + [-76.04028571428572, 44.89557142857143], [-76.042, 44.895], [-76.046, 44.889] ] @@ -684,15 +684,15 @@ [-75.968, 45.279], [-75.9652, 45.2748], [-75.964, 45.272], - [-75.96023636363635, 45.27116363636364], + [-75.96023636363637, 45.27116363636364], [-75.959, 45.269], - [-75.95039130434782, 45.26708695652174], + [-75.95039130434783, 45.26708695652174], [-75.947, 45.262], [-75.938, 45.259], [-75.929, 45.262], - [-75.92757142857143, 45.26414285714285], + [-75.92757142857143, 45.26414285714286], [-75.922, 45.266], - [-75.92085714285714, 45.26771428571429], + [-75.92085714285714, 45.267714285714284], [-75.914, 45.27], [-75.91356521739131, 45.27065217391304], [-75.912, 45.271], @@ -700,14 +700,14 @@ [-75.912, 45.284], [-75.921, 45.287], [-75.93, 45.284], - [-75.9304347826087, 45.28334782608695], + [-75.9304347826087, 45.28334782608696], [-75.932, 45.283], - [-75.93216666666667, 45.2826111111111], + [-75.93216666666666, 45.28261111111111], [-75.934, 45.282], [-75.93530434782609, 45.28004347826087], [-75.93912903225807, 45.2791935483871], [-75.941, 45.282], - [-75.94435294117646, 45.28311764705882], + [-75.94435294117648, 45.28311764705882], [-75.946, 45.286], [-75.955, 45.288], [-75.964, 45.286], @@ -788,14 +788,14 @@ [-75.928, 45.285], [-75.919, 45.288], [-75.915, 45.294], - [-75.91829411764705, 45.29976470588235], + [-75.91829411764706, 45.29976470588235], [-75.916, 45.299], - [-75.91257142857143, 45.30014285714285], + [-75.91257142857143, 45.30014285714286], [-75.914, 45.298], [-75.91, 45.291], - [-75.90700000000004, 45.29033333333334], + [-75.907, 45.290333333333336], [-75.9, 45.288], - [-75.895, 45.28966666666666], + [-75.895, 45.28966666666667], [-75.89, 45.288], [-75.88268, 45.29044], [-75.88161538461539, 45.288576923076924], @@ -817,20 +817,20 @@ [-75.895, 45.313], [-75.892, 45.307], [-75.8914, 45.3068], - [-75.89085714285714, 45.30571428571428], - [-75.89399999999996, 45.304666666666655], + [-75.89085714285714, 45.30571428571429], + [-75.894, 45.30466666666667], [-75.901, 45.307], - [-75.90442857142857, 45.30585714285715], + [-75.90442857142857, 45.30585714285714], [-75.903, 45.308], [-75.907, 45.315], - [-75.90880000000001, 45.3156], + [-75.9088, 45.3156], [-75.909, 45.316], [-75.918, 45.319], [-75.927, 45.316], [-75.931, 45.31], [-75.927, 45.304], [-75.92594117647059, 45.30364705882353], - [-75.92521818181818, 45.302381818181814], + [-75.92521818181818, 45.30238181818182], [-75.928, 45.303], [-75.937, 45.301], [-75.941, 45.294] @@ -847,7 +847,7 @@ [ [-75.94, 45.351], [-75.936, 45.345], - [-75.92952000000001, 45.342839999999995], + [-75.92952, 45.34284], [-75.93, 45.342], [-75.926, 45.336], [-75.92211764705883, 45.33470588235294], @@ -904,7 +904,7 @@ [-75.84590909090909, 45.39336363636364], [-75.843, 45.389], [-75.834, 45.386], - [-75.8305, 45.38716666666667], + [-75.8305, 45.387166666666666], [-75.83, 45.387], [-75.821, 45.39], [-75.817, 45.396], @@ -922,7 +922,7 @@ [ [-75.84164705882353, 45.40288235294118], [-75.8406, 45.40253333333333], - [-75.84135211267605, 45.4023661971831], + [-75.84135211267606, 45.4023661971831], [-75.84164705882353, 45.40288235294118] ] ] @@ -939,9 +939,9 @@ [-75.85, 45.187], [-75.841, 45.184], [-75.832, 45.187], - [-75.82860869565218, 45.192086956521734], + [-75.82860869565218, 45.19208695652174], [-75.82, 45.194], - [-75.81873684210525, 45.19694736842105], + [-75.81873684210527, 45.19694736842105], [-75.814, 45.198], [-75.81, 45.205], [-75.814, 45.211], @@ -949,7 +949,7 @@ [-75.832, 45.211], [-75.83371428571428, 45.20842857142857], [-75.838, 45.207], - [-75.84142857142858, 45.201857142857136], + [-75.84142857142857, 45.20185714285714], [-75.85, 45.199], [-75.854, 45.193] ] @@ -1008,6 +1008,7 @@ [-75.836, 45.312], [-75.821, 45.317], [-75.82042857142856, 45.31785714285714], + [-75.82, 45.318], [-75.811, 45.321], [-75.807, 45.327], [-75.811, 45.334], @@ -1017,7 +1018,7 @@ [-75.83, 45.334], [-75.83094117647059, 45.332352941176474], [-75.832, 45.332], - [-75.83234782608695, 45.33147826086957], + [-75.83234782608696, 45.33147826086957], [-75.839, 45.33], [-75.83931578947369, 45.32926315789474], [-75.845, 45.328], @@ -1097,7 +1098,7 @@ [-75.818, 45.347], [-75.809, 45.345], [-75.80038028169014, 45.34691549295775], - [-75.799, 45.344500000000004], + [-75.799, 45.3445], [-75.801, 45.341], [-75.797, 45.335], [-75.788, 45.332], @@ -1106,7 +1107,7 @@ [-75.777, 45.336], [-75.77558064516128, 45.33812903225807], [-75.775, 45.338], - [-75.76714084507043, 45.339746478873245], + [-75.76714084507043, 45.33974647887324], [-75.765, 45.336], [-75.76398591549295, 45.33577464788733], [-75.765, 45.334], @@ -1119,21 +1120,21 @@ [-75.744, 45.343], [-75.747, 45.349], [-75.756, 45.352], - [-75.76363636363637, 45.34945454545454], + [-75.76363636363637, 45.34945454545455], [-75.766, 45.353], [-75.775, 45.356], - [-75.78020000000001, 45.35426666666667], + [-75.7802, 45.35426666666667], [-75.7835, 45.355], [-75.779, 45.356], [-75.77629577464789, 45.360732394366195], [-75.773, 45.36], [-75.764, 45.362], - [-75.76067605633803, 45.367816901408446], + [-75.76067605633803, 45.36781690140845], [-75.757, 45.367], - [-75.75474999999999, 45.3675], + [-75.75475, 45.3675], [-75.74901408450704, 45.36622535211268], [-75.752, 45.361], - [-75.74823076923077, 45.35534615384615], + [-75.74823076923077, 45.355346153846156], [-75.749, 45.354], [-75.745, 45.348], [-75.743, 45.344], @@ -1142,7 +1143,7 @@ [-75.739, 45.337], [-75.735625, 45.335875], [-75.736, 45.335], - [-75.73371428571429, 45.33042857142856], + [-75.73371428571429, 45.33042857142857], [-75.734, 45.33], [-75.73261538461539, 45.327576923076926], [-75.733, 45.327], @@ -1155,7 +1156,7 @@ [-75.694, 45.325], [-75.685, 45.327], [-75.681, 45.334], - [-75.68227272727272, 45.33590909090909], + [-75.68227272727273, 45.33590909090909], [-75.682, 45.336], [-75.68016666666666, 45.33875], [-75.679, 45.337], @@ -1176,14 +1177,14 @@ [-75.616, 45.342], [-75.612, 45.348], [-75.616, 45.354], - [-75.6195, 45.35516666666666], + [-75.6195, 45.35516666666667], [-75.611, 45.358], [-75.607, 45.364], [-75.611, 45.371], [-75.61274193548387, 45.37138709677419], [-75.611, 45.374], [-75.615, 45.38], - [-75.6165, 45.380500000000005], + [-75.6165, 45.3805], [-75.61390909090909, 45.38136363636364], [-75.611, 45.377], [-75.60909090909091, 45.376363636363635], @@ -1193,36 +1194,36 @@ [-75.588, 45.368], [-75.584, 45.375], [-75.588, 45.381], - [-75.58990909090909, 45.38163636363637], + [-75.58990909090909, 45.38163636363636], [-75.589, 45.383], [-75.593, 45.389], [-75.602, 45.392], - [-75.60671428571428, 45.39042857142857], + [-75.60671428571429, 45.39042857142857], [-75.609, 45.395], - [-75.60906122448979, 45.39514285714287], + [-75.60906122448979, 45.39514285714286], [-75.608, 45.397], [-75.61018181818181, 45.40027272727273], [-75.608, 45.401], [-75.60495652173913, 45.405565217391306], [-75.603, 45.406], - [-75.60252941176469, 45.40682352941177], + [-75.6025294117647, 45.40682352941177], [-75.596, 45.409], - [-75.59527272727273, 45.410090909090904], + [-75.59527272727273, 45.41009090909091], [-75.595, 45.41], [-75.586, 45.413], [-75.582, 45.419], [-75.586, 45.425], - [-75.58666666666667, 45.42522222222222], + [-75.58666666666667, 45.425222222222224], [-75.587, 45.426], - [-75.59300000000003, 45.42733333333334], + [-75.593, 45.42733333333333], [-75.595, 45.428], [-75.5954, 45.42786666666667], [-75.596, 45.428], [-75.605, 45.426], - [-75.60520000000001, 45.42593333333333], - [-75.60640000000001, 45.4262], + [-75.6052, 45.42593333333333], + [-75.6064, 45.4262], [-75.604, 45.427], - [-75.60371428571429, 45.427428571428564], + [-75.60371428571429, 45.42742857142857], [-75.596, 45.43], [-75.592, 45.436], [-75.59374647887324, 45.439056338028166], @@ -1238,42 +1239,42 @@ [-75.595, 45.457], [-75.604, 45.454], [-75.608, 45.448], - [-75.60624, 45.444919999999996], - [-75.60799999999998, 45.44433333333334], + [-75.60624, 45.44492], + [-75.608, 45.44433333333333], [-75.614, 45.443], [-75.61433333333333, 45.44222222222222], [-75.615, 45.442], - [-75.61524999999999, 45.4415], - [-75.61965217391305, 45.44052173913043], + [-75.61525, 45.4415], + [-75.61965217391304, 45.44052173913043], [-75.616, 45.446], [-75.62, 45.453], [-75.629, 45.455], [-75.638, 45.453], [-75.6388, 45.4516], [-75.64, 45.452], - [-75.64084000000001, 45.451719999999995], + [-75.64084, 45.45172], [-75.641, 45.452], [-75.65, 45.454], [-75.659, 45.452], - [-75.66030434782608, 45.448956521739134], + [-75.66030434782608, 45.44895652173913], [-75.661, 45.45], [-75.67, 45.452], [-75.679, 45.45], - [-75.68091304347827, 45.44713043478261], + [-75.68091304347826, 45.44713043478261], [-75.686, 45.446], [-75.689, 45.439], [-75.68857142857142, 45.43814285714286], [-75.689, 45.438], - [-75.68979999999999, 45.436400000000006], + [-75.6898, 45.4364], [-75.694, 45.435], [-75.698, 45.429], - [-75.69683636363636, 45.42696363636363], + [-75.69683636363636, 45.42696363636364], [-75.697, 45.427], [-75.706, 45.425], - [-75.70952941176469, 45.41882352941177], + [-75.7095294117647, 45.41882352941177], [-75.715, 45.417], [-75.719, 45.411], - [-75.7166923076923, 45.407538461538465], + [-75.71669230769231, 45.407538461538465], [-75.717, 45.407], [-75.7159090909091, 45.40536363636364], [-75.717, 45.405], @@ -1282,28 +1283,29 @@ [-75.739, 45.412], [-75.7424909090909, 45.40589090909091], [-75.751, 45.404], - [-75.75136363636365, 45.403363636363636], + [-75.75136363636364, 45.403363636363636], [-75.753, 45.403], - [-75.75370588235293, 45.40176470588236], + [-75.75370588235295, 45.40176470588235], + [-75.759, 45.4], [-75.762, 45.399], [-75.766, 45.393], [-75.762, 45.386], - [-75.758, 45.385111111111115], + [-75.758, 45.38511111111111], [-75.763, 45.384], - [-75.76321818181819, 45.383618181818186], + [-75.76321818181817, 45.38361818181818], [-75.766, 45.383], [-75.76952, 45.37684], [-75.773, 45.378], - [-75.77449999999999, 45.377500000000005], + [-75.7745, 45.3775], [-75.782, 45.38], [-75.791, 45.377], [-75.79265217391304, 45.37452173913044], [-75.795, 45.374], [-75.799, 45.367], - [-75.79866666666668, 45.366499999999995], + [-75.79866666666666, 45.3665], [-75.801, 45.363], [-75.797, 45.356], - [-75.79249999999999, 45.355], + [-75.7925, 45.355], [-75.79612903225807, 45.354193548387094], [-75.8, 45.36], [-75.809, 45.363], @@ -1312,21 +1314,21 @@ ], [ [-75.74034375, 45.38853125], - [-75.74033333333333, 45.388555555555556], + [-75.74033333333334, 45.388555555555556], [-75.738, 45.38933333333333], [-75.735, 45.39], - [-75.73493548387097, 45.390096774193545], + [-75.73493548387097, 45.39009677419355], [-75.73378947368421, 45.389842105263156], [-75.74034375, 45.38853125] ], [ - [-75.7371090909091, 45.37130909090909], + [-75.73710909090909, 45.371309090909094], [-75.73617073170732, 45.372951219512196], [-75.733, 45.372], [-75.724, 45.375], [-75.721, 45.381], [-75.724, 45.388], - [-75.72925000000001, 45.38916666666667], + [-75.72925, 45.38916666666667], [-75.721, 45.391], [-75.71904081632653, 45.39557142857143], [-75.717, 45.392], @@ -1338,18 +1340,18 @@ [-75.683, 45.403], [-75.68, 45.41], [-75.683, 45.416], - [-75.68385714285714, 45.416285714285706], - [-75.6845, 45.417249999999996], + [-75.68385714285715, 45.41628571428571], + [-75.6845, 45.41725], [-75.684, 45.418], [-75.68516363636364, 45.42003636363636], [-75.685, 45.42], [-75.676, 45.422], - [-75.67510526315789, 45.42408771929825], + [-75.67510526315789, 45.42408771929824], [-75.6722, 45.424733333333336], [-75.67, 45.424], - [-75.669, 45.42433333333333], + [-75.669, 45.42433333333334], [-75.668, 45.424], - [-75.65972000000001, 45.42676], + [-75.65972, 45.42676], [-75.657, 45.422], [-75.648, 45.42], [-75.64683870967743, 45.420258064516126], @@ -1359,7 +1361,7 @@ [-75.654, 45.411], [-75.65, 45.405], [-75.641, 45.402], - [-75.63854545454546, 45.40281818181818], + [-75.63854545454545, 45.40281818181818], [-75.636, 45.399], [-75.63327272727273, 45.39809090909091], [-75.634, 45.397], @@ -1374,7 +1376,7 @@ [-75.6359090909091, 45.37236363636364], [-75.63335294117647, 45.368529411764705], [-75.641, 45.367], - [-75.64273913043479, 45.36294202898551], + [-75.64273913043478, 45.36294202898551], [-75.643, 45.363], [-75.6448, 45.3626], [-75.646, 45.363], @@ -1385,7 +1387,7 @@ [-75.679, 45.357], [-75.683, 45.351], [-75.68033333333334, 45.347], - [-75.6806153846154, 45.346576923076924], + [-75.68061538461538, 45.346576923076924], [-75.682, 45.349], [-75.691, 45.351], [-75.69373913043478, 45.35039130434782], @@ -1401,7 +1403,7 @@ [-75.713, 45.377], [-75.717, 45.37], [-75.713, 45.364], - [-75.71166666666666, 45.36355555555556], + [-75.71166666666667, 45.36355555555556], [-75.711, 45.362], [-75.708, 45.361333333333334], [-75.714, 45.36], @@ -1409,28 +1411,30 @@ [-75.714, 45.347], [-75.71244, 45.34648], [-75.71342253521127, 45.344760563380284], - [-75.71867272727272, 45.34592727272727], + [-75.71867272727273, 45.34592727272727], + [-75.721, 45.35], [-75.72315384615385, 45.35376923076923], [-75.723, 45.354], - [-75.72330769230769, 45.35453846153846], + [-75.7233076923077, 45.35453846153846], [-75.723, 45.355], - [-75.72466666666666, 45.357499999999995], + [-75.72466666666666, 45.3575], + [-75.723, 45.36], [-75.721, 45.363], [-75.725, 45.37], [-75.734, 45.372], - [-75.7371090909091, 45.37130909090909] + [-75.73710909090909, 45.371309090909094] ], [ - [-75.63419999999999, 45.43593333333334], + [-75.6342, 45.43593333333333], [-75.631, 45.437], - [-75.63071428571429, 45.437571428571424], + [-75.63071428571429, 45.43757142857143], [-75.629, 45.437], [-75.62233333333333, 45.43922222222222], [-75.62482608695652, 45.43340579710145], - [-75.629, 45.43433333333334], - [-75.62976470588235, 45.43458823529412], + [-75.629, 45.434333333333335], + [-75.62976470588235, 45.434588235294115], [-75.63, 45.435], - [-75.63419999999999, 45.43593333333334] + [-75.6342, 45.43593333333333] ] ] } @@ -1449,7 +1453,7 @@ [-75.796, 45.413], [-75.79633333333334, 45.4135], [-75.796, 45.414], - [-75.79626666666667, 45.41446666666666], + [-75.79626666666667, 45.41446666666667], [-75.795, 45.417], [-75.798, 45.423], [-75.807, 45.426], @@ -1478,7 +1482,7 @@ [-75.795, 45.386], [-75.798, 45.392], [-75.807, 45.395], - [-75.8075, 45.39483333333334], + [-75.8075, 45.39483333333333], [-75.808, 45.395], [-75.817, 45.392], [-75.821, 45.386] @@ -1497,7 +1501,7 @@ [-75.811, 45.263], [-75.802, 45.26], [-75.793, 45.263], - [-75.79265217391304, 45.26352173913044], + [-75.79265217391304, 45.26352173913043], [-75.792, 45.262], [-75.782, 45.26], [-75.773, 45.262], @@ -1505,7 +1509,7 @@ [-75.773, 45.275], [-75.782, 45.278], [-75.792, 45.275], - [-75.79220000000001, 45.2746], + [-75.7922, 45.2746], [-75.793, 45.276], [-75.802, 45.278], [-75.811, 45.276], @@ -1526,7 +1530,7 @@ [-75.786, 45.435], [-75.77863636363637, 45.43663636363636], [-75.779, 45.436], - [-75.77553846153846, 45.43080769230769], + [-75.77553846153846, 45.430807692307695], [-75.776, 45.43], [-75.77, 45.421], [-75.761, 45.418], @@ -1535,7 +1539,7 @@ [-75.746, 45.413], [-75.737, 45.416], [-75.733, 45.422], - [-75.73328571428573, 45.422428571428576], + [-75.73328571428571, 45.42242857142857], [-75.726, 45.42], [-75.717, 45.423], [-75.71534782608695, 45.42547826086957], @@ -1549,18 +1553,18 @@ [-75.722, 45.453], [-75.7225, 45.452125], [-75.723, 45.453], - [-75.72398181818181, 45.45321818181819], + [-75.72398181818181, 45.45321818181818], [-75.725, 45.455], - [-75.72964516129032, 45.45603225806451], + [-75.72964516129032, 45.45603225806452], [-75.729, 45.457], - [-75.72935714285714, 45.45762499999999], + [-75.72935714285714, 45.457625], [-75.728, 45.46], - [-75.72927272727273, 45.461909090909096], + [-75.72927272727273, 45.46190909090909], [-75.729, 45.462], [-75.725, 45.468], [-75.7251690140845, 45.468295774647885], [-75.722, 45.469], - [-75.71969230769231, 45.47303846153846], + [-75.71969230769231, 45.473038461538465], [-75.717, 45.469], [-75.71281690140844, 45.46807042253521], [-75.714, 45.466], @@ -1572,22 +1576,22 @@ [-75.69, 45.455], [-75.6882, 45.4592], [-75.687, 45.461], - [-75.68724489795918, 45.46142857142857], + [-75.68724489795919, 45.46142857142857], [-75.687, 45.462], [-75.68857142857142, 45.46514285714286], [-75.688, 45.466], [-75.69173333333333, 45.47253333333333], [-75.689, 45.478], - [-75.68985714285714, 45.479714285714294], + [-75.68985714285714, 45.47971428571429], [-75.68954545454545, 45.48018181818182], [-75.689, 45.48], - [-75.68709090909091, 45.48063636363636], + [-75.68709090909091, 45.480636363636364], [-75.684, 45.476], [-75.675, 45.473], [-75.666, 45.476], [-75.66587096774194, 45.476193548387094], [-75.665, 45.476], - [-75.6584, 45.47746666666667], + [-75.6584, 45.477466666666665], [-75.651, 45.475], [-75.648, 45.476], [-75.645, 45.475], @@ -1595,7 +1599,7 @@ [-75.639, 45.475], [-75.63, 45.478], [-75.626, 45.484], - [-75.62969230769231, 45.490461538461545], + [-75.62969230769231, 45.49046153846154], [-75.628, 45.493], [-75.63092307692308, 45.49811538461538], [-75.629, 45.501], @@ -1605,9 +1609,9 @@ [-75.655, 45.501], [-75.65442857142857, 45.500142857142855], [-75.657, 45.501], - [-75.66557142857144, 45.49814285714285], + [-75.66557142857143, 45.49814285714286], [-75.663, 45.502], - [-75.66392307692307, 45.50361538461539], + [-75.66392307692308, 45.50361538461539], [-75.663, 45.505], [-75.667, 45.512], [-75.676, 45.514], @@ -1618,7 +1622,7 @@ [-75.68586956521739, 45.49730434782609], [-75.689, 45.498], [-75.698, 45.496], - [-75.70128571428572, 45.490249999999996], + [-75.70128571428572, 45.49025], [-75.704, 45.495], [-75.713, 45.497], [-75.7148, 45.4966], @@ -1626,19 +1630,19 @@ [-75.72, 45.49766666666667], [-75.724, 45.499], [-75.733, 45.496], - [-75.73557142857143, 45.492142857142866], + [-75.73557142857143, 45.49214285714286], [-75.737, 45.495], [-75.747, 45.498], [-75.756, 45.495], [-75.76, 45.488], [-75.756, 45.482], - [-75.74915999999999, 45.47972], + [-75.74916, 45.47972], [-75.753, 45.473], [-75.75119354838709, 45.470290322580645], [-75.757, 45.469], - [-75.75791836734695, 45.46685714285715], + [-75.75791836734695, 45.466857142857144], [-75.758, 45.467], - [-75.76294366197183, 45.4680985915493], + [-75.76294366197183, 45.46809859154929], [-75.759, 45.475], [-75.763, 45.481], [-75.772, 45.484], @@ -1651,18 +1655,18 @@ [-75.767, 45.451], [-75.76372727272727, 45.452090909090906], [-75.761, 45.448], - [-75.7567142857143, 45.44657142857143], + [-75.75671428571428, 45.44657142857143], [-75.753, 45.441], [-75.744, 45.438], - [-75.74040000000001, 45.4392], + [-75.7404, 45.4392], [-75.738, 45.435], [-75.73538709677419, 45.43441935483871], [-75.739, 45.429], - [-75.7387142857143, 45.42857142857143], + [-75.73871428571428, 45.42857142857143], [-75.746, 45.431], - [-75.75028571428572, 45.42957142857142], + [-75.75028571428571, 45.42957142857143], [-75.75, 45.43], - [-75.75323076923077, 45.43565384615384], + [-75.75323076923077, 45.43565384615385], [-75.753, 45.436], [-75.757, 45.443], [-75.766, 45.445], @@ -1674,18 +1678,18 @@ [-75.799, 45.444] ], [ - [-75.73649999999999, 45.48316666666667], - [-75.73519999999999, 45.486200000000004], - [-75.735, 45.48649999999999], - [-75.73364000000001, 45.48412], - [-75.73649999999999, 45.48316666666667] + [-75.7365, 45.48316666666667], + [-75.7352, 45.4862], + [-75.735, 45.4865], + [-75.73364, 45.48412], + [-75.7365, 45.48316666666667] ], [ - [-75.72095652173913, 45.48043478260869], + [-75.72095652173913, 45.4804347826087], [-75.719, 45.48], [-75.71801818181818, 45.48021818181818], [-75.7193076923077, 45.477961538461535], - [-75.72095652173913, 45.48043478260869] + [-75.72095652173913, 45.4804347826087] ] ] } @@ -1742,15 +1746,16 @@ [-75.76560869565218, 45.28091304347826], [-75.765, 45.28], [-75.7570909090909, 45.27736363636364], - [-75.75857142857143, 45.27514285714285], + [-75.75857142857143, 45.27514285714286], [-75.759, 45.275], [-75.763, 45.269], [-75.759, 45.262], [-75.75, 45.26], [-75.741, 45.262], [-75.73942105263158, 45.26568421052632], + [-75.738, 45.266], [-75.729, 45.268], - [-75.72788, 45.269960000000005], + [-75.72788, 45.26996], [-75.719, 45.267], [-75.71168, 45.26944], [-75.708, 45.263], @@ -1758,7 +1763,7 @@ [-75.69, 45.263], [-75.686, 45.27], [-75.69, 45.276], - [-75.69879999999998, 45.278933333333335], + [-75.6988, 45.278933333333335], [-75.694, 45.28], [-75.69, 45.287], [-75.694, 45.293], @@ -1766,7 +1771,7 @@ [-75.712, 45.293], [-75.71366666666667, 45.2905], [-75.714, 45.291], - [-75.71523529411765, 45.29141176470588], + [-75.71523529411765, 45.291411764705884], [-75.719, 45.298], [-75.723, 45.304], [-75.732, 45.307], @@ -1780,21 +1785,21 @@ [-75.77, 45.287] ], [ - [-75.74614285714286, 45.28171428571428], + [-75.74614285714286, 45.28171428571429], [-75.7454, 45.2832], [-75.743, 45.284], [-75.73966666666666, 45.289], [-75.737, 45.285], - [-75.73576470588236, 45.284588235294116], + [-75.73576470588235, 45.284588235294116], [-75.73482352941177, 45.28294117647059], [-75.738, 45.284], - [-75.74549999999999, 45.281499999999994], - [-75.74614285714286, 45.28171428571428] + [-75.7455, 45.2815], + [-75.74614285714286, 45.28171428571429] ], [ [-75.70808695652174, 45.27913043478261], [-75.703, 45.278], - [-75.7, 45.27866666666666], + [-75.7, 45.278666666666666], [-75.70636363636363, 45.276545454545456], [-75.70808695652174, 45.27913043478261] ] @@ -1929,12 +1934,12 @@ [-75.654, 45.364], [-75.65, 45.37], [-75.654, 45.376], - [-75.65454545454546, 45.37618181818181], + [-75.65454545454546, 45.37618181818182], [-75.654, 45.377], - [-75.65564285714285, 45.379875000000006], + [-75.65564285714285, 45.379875], [-75.655, 45.381], [-75.659, 45.387], - [-75.66416000000001, 45.38872], + [-75.66416, 45.38872], [-75.664, 45.389], [-75.668, 45.395], [-75.677, 45.398], @@ -1978,7 +1983,7 @@ [-75.651, 45.011], [-75.642, 45.013], [-75.638, 45.02], - [-75.63825806451614, 45.02038709677419], + [-75.63825806451612, 45.02038709677419], [-75.631, 45.022], [-75.63078181818182, 45.02238181818182], [-75.628, 45.023], @@ -1986,7 +1991,7 @@ [-75.628, 45.036], [-75.637, 45.039], [-75.649, 45.035], - [-75.65157142857143, 45.031142857142854], + [-75.65157142857143, 45.03114285714286], [-75.658, 45.029], [-75.65857142857143, 45.02814285714286], [-75.662, 45.027], @@ -2066,7 +2071,7 @@ [-75.619, 45.138], [-75.61, 45.135], [-75.601, 45.138], - [-75.60073913043477, 45.13839130434783], + [-75.60073913043479, 45.13839130434783], [-75.598, 45.139], [-75.594, 45.146], [-75.598, 45.152], @@ -2141,7 +2146,7 @@ [-75.594, 45.311], [-75.585, 45.313], [-75.581, 45.32], - [-75.58361538461538, 45.32392307692307], + [-75.58361538461538, 45.32392307692308], [-75.583, 45.325], [-75.587, 45.331], [-75.591, 45.338], @@ -2262,7 +2267,7 @@ [-75.561, 45.462], [-75.558, 45.455], [-75.548, 45.453], - [-75.54575, 45.453500000000005], + [-75.54575, 45.4535], [-75.548, 45.449], [-75.545, 45.442], [-75.536, 45.44], @@ -2273,40 +2278,41 @@ [-75.512, 45.444], [-75.509, 45.445], [-75.5, 45.447], - [-75.49952941176471, 45.44782352941176], + [-75.49952941176471, 45.447823529411764], [-75.496, 45.449], - [-75.49582608695651, 45.449260869565215], + [-75.49582608695653, 45.449260869565215], [-75.49439130434783, 45.449579710144924], [-75.492, 45.444], [-75.483, 45.442], [-75.474, 45.444], [-75.47, 45.451], [-75.474, 45.457], - [-75.47657142857142, 45.45785714285714], + [-75.47657142857143, 45.457857142857144], [-75.475, 45.461], [-75.478, 45.468], [-75.47865454545455, 45.46814545454546], [-75.482, 45.474], - [-75.48500000000001, 45.47466666666667], + [-75.485, 45.474666666666664], [-75.492, 45.477], [-75.501, 45.474], [-75.504, 45.468], - [-75.50373333333334, 45.46746666666667], + [-75.50373333333333, 45.46746666666667], [-75.504, 45.467], - [-75.50272727272727, 45.465090909090904], + [-75.50272727272727, 45.46509090909091], [-75.506, 45.464], [-75.506125, 45.46375], [-75.514, 45.462], - [-75.51447058823528, 45.46117647058824], + [-75.5144705882353, 45.461176470588235], + [-75.518, 45.46], [-75.521, 45.459], - [-75.52372727272727, 45.4549090909091], + [-75.52372727272727, 45.45490909090909], [-75.527, 45.456], - [-75.52850000000001, 45.4555], + [-75.5285, 45.4555], [-75.5322, 45.45673333333333], [-75.531, 45.457], - [-75.53066666666668, 45.45777777777777], + [-75.53066666666666, 45.45777777777778], [-75.53, 45.458], - [-75.52947826086957, 45.45878260869566], + [-75.52947826086957, 45.45878260869565], [-75.524, 45.46], [-75.52268421052632, 45.463070175438595], [-75.514, 45.465], @@ -2318,15 +2324,15 @@ [-75.503, 45.485], [-75.513, 45.487], [-75.522, 45.485], - [-75.52288524590165, 45.482934426229505], + [-75.52288524590163, 45.482934426229505], [-75.526, 45.482], - [-75.52615384615385, 45.4816923076923], + [-75.52615384615385, 45.481692307692306], [-75.528, 45.486], [-75.537, 45.488], [-75.547, 45.486], [-75.55, 45.479], [-75.547, 45.473], - [-75.54359574468084, 45.471978723404256], + [-75.54359574468086, 45.471978723404256], [-75.548, 45.471], [-75.558, 45.468], [-75.561, 45.462] @@ -2443,13 +2449,13 @@ [ [-75.494, 45.492], [-75.49, 45.486], - [-75.48957142857144, 45.48585714285714], + [-75.48957142857142, 45.48585714285714], [-75.489, 45.485], [-75.48, 45.482], [-75.471, 45.485], [-75.467, 45.491], [-75.471, 45.497], - [-75.47142857142856, 45.497142857142855], + [-75.47142857142858, 45.497142857142855], [-75.472, 45.498], [-75.481, 45.501], [-75.49, 45.498], @@ -2547,7 +2553,7 @@ [ [-75.456, 45.345], [-75.453, 45.339], - [-75.45214285714286, 45.33871428571428], + [-75.45214285714286, 45.33871428571429], [-75.449, 45.334], [-75.44, 45.331], [-75.431, 45.334], @@ -2577,15 +2583,15 @@ [-75.431, 45.533], [-75.421, 45.536], [-75.418, 45.542], - [-75.42016666666667, 45.54705555555555], + [-75.42016666666666, 45.54705555555555], [-75.42, 45.547], [-75.411, 45.55], [-75.407, 45.556], [-75.411, 45.562], [-75.41276470588235, 45.562588235294115], [-75.413, 45.563], - [-75.41600000000003, 45.56366666666668], - [-75.41614285714286, 45.56371428571429], + [-75.416, 45.56366666666667], + [-75.41614285714286, 45.56371428571428], [-75.419, 45.568], [-75.428, 45.571], [-75.437, 45.568], @@ -2658,7 +2664,7 @@ [-75.391, 45.582], [-75.401, 45.585], [-75.403, 45.588], - [-75.41058823529413, 45.590529411764706], + [-75.41058823529411, 45.590529411764706], [-75.412, 45.593], [-75.421, 45.595], [-75.43, 45.593], @@ -2702,7 +2708,7 @@ [-75.401, 45.51], [-75.397, 45.517], [-75.401, 45.523], - [-75.40142857142858, 45.523142857142865], + [-75.40142857142857, 45.52314285714286], [-75.402, 45.524], [-75.411, 45.527], [-75.42, 45.524], @@ -2780,9 +2786,9 @@ [ [-75.359, 45.331], [-75.356, 45.325], - [-75.3554705882353, 45.32482352941177], + [-75.35547058823529, 45.324823529411766], [-75.355, 45.324], - [-75.34899999999996, 45.322666666666656], + [-75.349, 45.32266666666667], [-75.347, 45.322], [-75.3466, 45.32213333333333], [-75.346, 45.322], @@ -2871,12 +2877,12 @@ "coordinates": [ [ [-75.316, 45.546], - [-75.3133846153846, 45.54207692307692], + [-75.31338461538462, 45.54207692307692], [-75.314, 45.541], [-75.31, 45.535], [-75.301, 45.532], [-75.292, 45.535], - [-75.29, 45.538000000000004], + [-75.29, 45.538], [-75.287, 45.539], [-75.283, 45.545], [-75.2846, 45.5478], @@ -2884,7 +2890,7 @@ [-75.286, 45.558], [-75.296, 45.56], [-75.305, 45.558], - [-75.30663157894737, 45.55419298245614], + [-75.30663157894737, 45.554192982456144], [-75.312, 45.553], [-75.316, 45.546] ] @@ -3029,13 +3035,13 @@ [-75.241, 45.588], [-75.232, 45.591], [-75.228, 45.597], - [-75.2282857142857, 45.5975], + [-75.22828571428572, 45.5975], [-75.228, 45.598], [-75.232, 45.604], [-75.241, 45.607], [-75.25, 45.604], [-75.254, 45.598], - [-75.2537142857143, 45.5975], + [-75.25371428571428, 45.5975], [-75.254, 45.597] ] ] @@ -3075,15 +3081,15 @@ [-75.242, 45.29], [-75.238, 45.284], [-75.229, 45.281], - [-75.22200000000001, 45.283333333333324], + [-75.222, 45.28333333333333], [-75.219, 45.284], - [-75.21719999999999, 45.28820000000001], + [-75.2172, 45.2882], [-75.216, 45.29], - [-75.21624489795917, 45.29042857142857], + [-75.21624489795919, 45.29042857142857], [-75.216, 45.291], [-75.219, 45.297], [-75.228, 45.3], - [-75.235, 45.29766666666667], + [-75.235, 45.297666666666665], [-75.238, 45.297], [-75.242, 45.29] ] @@ -3202,7 +3208,7 @@ [-75.09447826086956, 45.30721739130435], [-75.095, 45.306], [-75.092, 45.3], - [-75.09152, 45.299839999999996], + [-75.09152, 45.29984], [-75.092, 45.299], [-75.088, 45.293], [-75.079, 45.29], @@ -3211,7 +3217,7 @@ [-75.06907692307692, 45.30438461538461], [-75.068, 45.306], [-75.072, 45.313], - [-75.07643478260869, 45.31398550724637], + [-75.0764347826087, 45.31398550724638], [-75.076, 45.315], [-75.079, 45.321], [-75.089, 45.324], @@ -3298,7 +3304,7 @@ [-74.9975, 45.52616666666667], [-74.997, 45.526], [-74.988, 45.529], - [-74.98514285714285, 45.53328571428571], + [-74.98514285714286, 45.53328571428571], [-74.98, 45.535], [-74.977, 45.541], [-74.98, 45.547], @@ -3306,7 +3312,7 @@ [-74.998, 45.547], [-75.00052173913043, 45.543217391304346], [-75.006, 45.542], - [-75.0064705882353, 45.54117647058823], + [-75.00647058823529, 45.54117647058823], [-75.007, 45.541], [-75.011, 45.535] ] @@ -3404,12 +3410,12 @@ [-74.921, 45.543], [-74.912, 45.541], [-74.902, 45.543], - [-74.90178947368422, 45.543491228070174], + [-74.9017894736842, 45.543491228070174], [-74.895, 45.545], [-74.891, 45.552], [-74.895, 45.558], [-74.904, 45.561], - [-74.91094736842106, 45.558684210526316], + [-74.91094736842105, 45.558684210526316], [-74.912, 45.559], [-74.921, 45.556], [-74.924, 45.55] @@ -3446,7 +3452,7 @@ [ [-74.913, 45.347], [-74.909, 45.341], - [-74.90852000000001, 45.34084], + [-74.90852, 45.34084], [-74.909, 45.34], [-74.905, 45.334], [-74.896, 45.331], diff --git a/packages/turf-dissolve/test/out/polysWithoutProperty.geojson b/packages/turf-dissolve/test/out/polysWithoutProperty.geojson index 4c40c01c90..a25a350805 100644 --- a/packages/turf-dissolve/test/out/polysWithoutProperty.geojson +++ b/packages/turf-dissolve/test/out/polysWithoutProperty.geojson @@ -42,7 +42,7 @@ ], [ [0.7659179283564485, 0.10986321392741416], - [0.851440429687502, 0.2524007161458367], + [0.851440429687502, 0.25240071614583665], [0.851440429687502, 0.10986321392741416], [0.7659179283564485, 0.10986321392741416] ] diff --git a/packages/turf-dissolve/test/out/simplified-issue.geojson b/packages/turf-dissolve/test/out/simplified-issue.geojson index ba38ca1aae..bc18e1fe07 100644 --- a/packages/turf-dissolve/test/out/simplified-issue.geojson +++ b/packages/turf-dissolve/test/out/simplified-issue.geojson @@ -12,7 +12,7 @@ [-75.818, 45.347], [-75.809, 45.345], [-75.80038028169014, 45.34691549295775], - [-75.799, 45.344500000000004], + [-75.799, 45.3445], [-75.801, 45.341], [-75.797, 45.335], [-75.788, 45.332], @@ -21,7 +21,7 @@ [-75.777, 45.336], [-75.77558064516128, 45.33812903225807], [-75.775, 45.338], - [-75.76714084507043, 45.339746478873245], + [-75.76714084507043, 45.33974647887324], [-75.765, 45.336], [-75.76398591549295, 45.33577464788733], [-75.765, 45.334], @@ -34,21 +34,21 @@ [-75.744, 45.343], [-75.747, 45.349], [-75.756, 45.352], - [-75.76363636363637, 45.34945454545454], + [-75.76363636363637, 45.34945454545455], [-75.766, 45.353], [-75.775, 45.356], - [-75.78020000000001, 45.35426666666667], + [-75.7802, 45.35426666666667], [-75.7835, 45.355], [-75.779, 45.356], [-75.77629577464789, 45.360732394366195], [-75.773, 45.36], [-75.764, 45.362], - [-75.76067605633803, 45.367816901408446], + [-75.76067605633803, 45.36781690140845], [-75.757, 45.367], - [-75.75474999999999, 45.3675], + [-75.75475, 45.3675], [-75.74901408450704, 45.36622535211268], [-75.752, 45.361], - [-75.74823076923077, 45.35534615384615], + [-75.74823076923077, 45.355346153846156], [-75.749, 45.354], [-75.745, 45.348], [-75.743, 45.344], @@ -57,7 +57,7 @@ [-75.739, 45.337], [-75.735625, 45.335875], [-75.736, 45.335], - [-75.73371428571429, 45.33042857142856], + [-75.73371428571429, 45.33042857142857], [-75.734, 45.33], [-75.73261538461539, 45.327576923076926], [-75.733, 45.327], @@ -70,7 +70,7 @@ [-75.694, 45.325], [-75.685, 45.327], [-75.681, 45.334], - [-75.68227272727272, 45.33590909090909], + [-75.68227272727273, 45.33590909090909], [-75.682, 45.336], [-75.68016666666666, 45.33875], [-75.679, 45.337], @@ -91,14 +91,14 @@ [-75.616, 45.342], [-75.612, 45.348], [-75.616, 45.354], - [-75.6195, 45.35516666666666], + [-75.6195, 45.35516666666667], [-75.611, 45.358], [-75.607, 45.364], [-75.611, 45.371], [-75.61274193548387, 45.37138709677419], [-75.611, 45.374], [-75.615, 45.38], - [-75.6165, 45.380500000000005], + [-75.6165, 45.3805], [-75.61390909090909, 45.38136363636364], [-75.611, 45.377], [-75.60909090909091, 45.376363636363635], @@ -108,34 +108,34 @@ [-75.588, 45.368], [-75.584, 45.375], [-75.588, 45.381], - [-75.58990909090909, 45.38163636363637], + [-75.58990909090909, 45.38163636363636], [-75.589, 45.383], [-75.593, 45.389], [-75.602, 45.392], - [-75.60671428571428, 45.39042857142857], + [-75.60671428571429, 45.39042857142857], [-75.609, 45.395], - [-75.60906122448979, 45.39514285714287], + [-75.60906122448979, 45.39514285714286], [-75.608, 45.397], [-75.61018181818181, 45.40027272727273], [-75.608, 45.401], [-75.60495652173913, 45.405565217391306], [-75.603, 45.406], - [-75.60252941176469, 45.40682352941177], + [-75.6025294117647, 45.40682352941177], [-75.596, 45.409], [-75.59527272727273, 45.41009090909091], [-75.595, 45.41], [-75.586, 45.413], [-75.582, 45.419], [-75.586, 45.425], - [-75.58666666666667, 45.42522222222222], + [-75.58666666666667, 45.425222222222224], [-75.587, 45.426], - [-75.59300000000003, 45.42733333333334], + [-75.593, 45.42733333333333], [-75.595, 45.428], [-75.5954, 45.42786666666667], [-75.596, 45.428], [-75.605, 45.426], - [-75.60520000000001, 45.42593333333333], - [-75.60640000000001, 45.4262], + [-75.6052, 45.42593333333333], + [-75.6064, 45.4262], [-75.604, 45.427], [-75.60371428571429, 45.42742857142857], [-75.596, 45.43], @@ -153,42 +153,42 @@ [-75.595, 45.457], [-75.604, 45.454], [-75.608, 45.448], - [-75.60624, 45.444919999999996], - [-75.60799999999998, 45.44433333333334], + [-75.60624, 45.44492], + [-75.608, 45.44433333333333], [-75.614, 45.443], [-75.61433333333333, 45.44222222222222], [-75.615, 45.442], - [-75.61524999999999, 45.4415], - [-75.61965217391305, 45.44052173913043], + [-75.61525, 45.4415], + [-75.61965217391304, 45.44052173913043], [-75.616, 45.446], [-75.62, 45.453], [-75.629, 45.455], [-75.638, 45.453], [-75.6388, 45.4516], [-75.64, 45.452], - [-75.64084000000001, 45.451719999999995], + [-75.64084, 45.45172], [-75.641, 45.452], [-75.65, 45.454], [-75.659, 45.452], - [-75.66030434782608, 45.448956521739134], + [-75.66030434782608, 45.44895652173913], [-75.661, 45.45], [-75.67, 45.452], [-75.679, 45.45], - [-75.68091304347827, 45.44713043478261], + [-75.68091304347826, 45.44713043478261], [-75.686, 45.446], [-75.689, 45.439], [-75.68857142857142, 45.43814285714286], [-75.689, 45.438], - [-75.68979999999999, 45.436400000000006], + [-75.6898, 45.4364], [-75.694, 45.435], [-75.698, 45.429], - [-75.69683636363636, 45.42696363636363], + [-75.69683636363636, 45.42696363636364], [-75.697, 45.427], [-75.706, 45.425], - [-75.70952941176469, 45.41882352941177], + [-75.7095294117647, 45.41882352941177], [-75.715, 45.417], [-75.719, 45.411], - [-75.7166923076923, 45.407538461538465], + [-75.71669230769231, 45.407538461538465], [-75.717, 45.407], [-75.7159090909091, 45.40536363636364], [-75.717, 45.405], @@ -197,28 +197,29 @@ [-75.739, 45.412], [-75.7424909090909, 45.40589090909091], [-75.751, 45.404], - [-75.75136363636365, 45.403363636363636], + [-75.75136363636364, 45.403363636363636], [-75.753, 45.403], - [-75.75370588235293, 45.40176470588236], + [-75.75370588235295, 45.40176470588235], + [-75.759, 45.4], [-75.762, 45.399], [-75.766, 45.393], [-75.762, 45.386], - [-75.75800000000001, 45.385111111111115], + [-75.758, 45.38511111111111], [-75.763, 45.384], - [-75.76321818181819, 45.383618181818186], + [-75.76321818181817, 45.38361818181818], [-75.766, 45.383], [-75.76952, 45.37684], [-75.773, 45.378], - [-75.77449999999999, 45.377500000000005], + [-75.7745, 45.3775], [-75.782, 45.38], [-75.791, 45.377], [-75.79265217391304, 45.37452173913044], [-75.795, 45.374], [-75.799, 45.367], - [-75.79866666666668, 45.366499999999995], + [-75.79866666666666, 45.3665], [-75.801, 45.363], [-75.797, 45.356], - [-75.79249999999999, 45.355], + [-75.7925, 45.355], [-75.79612903225807, 45.354193548387094], [-75.8, 45.36], [-75.809, 45.363], @@ -227,21 +228,21 @@ ], [ [-75.74034375, 45.38853125], - [-75.74033333333333, 45.388555555555556], + [-75.74033333333334, 45.388555555555556], [-75.738, 45.38933333333333], [-75.735, 45.39], - [-75.73493548387097, 45.390096774193545], + [-75.73493548387097, 45.39009677419355], [-75.73378947368421, 45.389842105263156], [-75.74034375, 45.38853125] ], [ - [-75.7371090909091, 45.37130909090909], + [-75.73710909090909, 45.371309090909094], [-75.73617073170732, 45.372951219512196], [-75.733, 45.372], [-75.724, 45.375], [-75.721, 45.381], [-75.724, 45.388], - [-75.72925000000001, 45.38916666666667], + [-75.72925, 45.38916666666667], [-75.721, 45.391], [-75.71904081632653, 45.39557142857143], [-75.717, 45.392], @@ -253,18 +254,18 @@ [-75.683, 45.403], [-75.68, 45.41], [-75.683, 45.416], - [-75.68385714285714, 45.416285714285706], - [-75.6845, 45.417249999999996], + [-75.68385714285715, 45.41628571428571], + [-75.6845, 45.41725], [-75.684, 45.418], [-75.68516363636364, 45.42003636363636], [-75.685, 45.42], [-75.676, 45.422], - [-75.67510526315789, 45.42408771929825], + [-75.67510526315789, 45.42408771929824], [-75.6722, 45.424733333333336], [-75.67, 45.424], - [-75.66900000000001, 45.42433333333333], + [-75.669, 45.42433333333334], [-75.668, 45.424], - [-75.65972000000001, 45.42676], + [-75.65972, 45.42676], [-75.657, 45.422], [-75.648, 45.42], [-75.64683870967743, 45.420258064516126], @@ -289,7 +290,7 @@ [-75.6359090909091, 45.37236363636364], [-75.63335294117647, 45.368529411764705], [-75.641, 45.367], - [-75.64273913043479, 45.36294202898551], + [-75.64273913043478, 45.36294202898551], [-75.643, 45.363], [-75.6448, 45.3626], [-75.646, 45.363], @@ -300,7 +301,7 @@ [-75.679, 45.357], [-75.683, 45.351], [-75.68033333333334, 45.347], - [-75.6806153846154, 45.346576923076924], + [-75.68061538461538, 45.346576923076924], [-75.682, 45.349], [-75.691, 45.351], [-75.69373913043478, 45.35039130434782], @@ -316,7 +317,7 @@ [-75.713, 45.377], [-75.717, 45.37], [-75.713, 45.364], - [-75.71166666666666, 45.36355555555556], + [-75.71166666666667, 45.36355555555556], [-75.711, 45.362], [-75.708, 45.361333333333334], [-75.714, 45.36], @@ -324,28 +325,30 @@ [-75.714, 45.347], [-75.71244, 45.34648], [-75.71342253521127, 45.344760563380284], - [-75.71867272727272, 45.34592727272727], + [-75.71867272727273, 45.34592727272727], + [-75.721, 45.35], [-75.72315384615385, 45.35376923076923], [-75.723, 45.354], - [-75.72330769230769, 45.35453846153846], + [-75.7233076923077, 45.35453846153846], [-75.723, 45.355], - [-75.72466666666666, 45.357499999999995], + [-75.72466666666666, 45.3575], + [-75.723, 45.36], [-75.721, 45.363], [-75.725, 45.37], [-75.734, 45.372], - [-75.7371090909091, 45.37130909090909] + [-75.73710909090909, 45.371309090909094] ], [ - [-75.63419999999999, 45.43593333333334], + [-75.6342, 45.43593333333333], [-75.631, 45.437], - [-75.63071428571429, 45.437571428571424], + [-75.63071428571429, 45.43757142857143], [-75.629, 45.437], [-75.62233333333333, 45.43922222222222], [-75.62482608695652, 45.43340579710145], - [-75.629, 45.43433333333334], - [-75.62976470588235, 45.43458823529412], + [-75.629, 45.434333333333335], + [-75.62976470588235, 45.434588235294115], [-75.63, 45.435], - [-75.63419999999999, 45.43593333333334] + [-75.6342, 45.43593333333333] ] ] } diff --git a/packages/turf-intersect/index.ts b/packages/turf-intersect/index.ts index f8f3e80500..05b1454dfe 100644 --- a/packages/turf-intersect/index.ts +++ b/packages/turf-intersect/index.ts @@ -7,7 +7,7 @@ import { } from "geojson"; import { multiPolygon, polygon } from "@turf/helpers"; import { geomEach } from "@turf/meta"; -import polygonClipping from "polygon-clipping"; +import * as polyclip from "polyclip-ts"; /** * Takes {@link Polygon|polygon} or {@link MultiPolygon|multi-polygon} geometries and @@ -50,19 +50,16 @@ function intersect

( properties?: P; } = {} ): Feature | null { - const geoms: polygonClipping.Geom[] = []; + const geoms: polyclip.Geom[] = []; geomEach(features, (geom) => { - geoms.push(geom.coordinates as polygonClipping.Geom); + geoms.push(geom.coordinates as polyclip.Geom); }); if (geoms.length < 2) { throw new Error("Must specify at least 2 geometries"); } - const intersection = polygonClipping.intersection( - geoms[0], - ...geoms.slice(1) - ); + const intersection = polyclip.intersection(geoms[0], ...geoms.slice(1)); if (intersection.length === 0) return null; if (intersection.length === 1) return polygon(intersection[0], options.properties); diff --git a/packages/turf-intersect/package.json b/packages/turf-intersect/package.json index 6c2a042fde..297fb0b940 100644 --- a/packages/turf-intersect/package.json +++ b/packages/turf-intersect/package.json @@ -67,7 +67,7 @@ "@turf/helpers": "workspace:^", "@turf/meta": "workspace:^", "@types/geojson": "^7946.0.10", - "polygon-clipping": "^0.15.3", + "polyclip-ts": "^0.16.5", "tslib": "^2.6.2" } } diff --git a/packages/turf-intersect/test/out/Intersect2.geojson b/packages/turf-intersect/test/out/Intersect2.geojson index b3cb280f26..8755e4c990 100644 --- a/packages/turf-intersect/test/out/Intersect2.geojson +++ b/packages/turf-intersect/test/out/Intersect2.geojson @@ -59,7 +59,7 @@ [-80.0066252126598, 32.84617770697059], [-79.99351501464844, 32.84440429734253], [-79.98184204101562, 32.90495631913751], - [-80.0050160405751, 32.91295307720083], + [-80.00501604057509, 32.91295307720083], [-80.068359375, 32.88189375925038] ] ] diff --git a/packages/turf-intersect/test/out/issue-1004.geojson b/packages/turf-intersect/test/out/issue-1004.geojson index 08be624347..45a42a10e7 100644 --- a/packages/turf-intersect/test/out/issue-1004.geojson +++ b/packages/turf-intersect/test/out/issue-1004.geojson @@ -132,12 +132,12 @@ "type": "Polygon", "coordinates": [ [ - [-114.757217, 32.619867791666415], - [-114.757213, 32.61975337499965], - [-114.757213, 32.61992600000001], + [-114.757217, 32.619867791666664], + [-114.757213, 32.619753375], + [-114.757213, 32.619926], [-114.757215, 32.619925], [-114.757217, 32.619925], - [-114.757217, 32.619867791666415] + [-114.757217, 32.619867791666664] ] ] } diff --git a/packages/turf-intersect/test/out/issue-412.geojson b/packages/turf-intersect/test/out/issue-412.geojson index c2a5ecd533..aa52f6dec6 100644 --- a/packages/turf-intersect/test/out/issue-412.geojson +++ b/packages/turf-intersect/test/out/issue-412.geojson @@ -48,9 +48,10 @@ "coordinates": [ [ [11.076136797048882, 9.856269774244707], - [11.102599853580067, 9.85386305739084], - [11.167525294018606, 9.85386305739084], - [11.1687361088318, 9.855073034114678], + [11.076136797048889, 9.856269774244705], + [11.102599853580049, 9.85386305739084], + [11.167525294018608, 9.85386305739084], + [11.168736108831801, 9.855073034114678], [11.076136797048882, 9.856269774244707] ] ] diff --git a/packages/turf-intersect/test/out/multipolygon-input.geojson b/packages/turf-intersect/test/out/multipolygon-input.geojson index a5929c6765..971c29d010 100644 --- a/packages/turf-intersect/test/out/multipolygon-input.geojson +++ b/packages/turf-intersect/test/out/multipolygon-input.geojson @@ -79,7 +79,7 @@ [2.3500442504882812, 48.85613168160397], [2.3500442504882812, 48.8615527456014], [2.3273849487304688, 48.87148983809234], - [2.3247093480083025, 48.87186313938144], + [2.324709348008303, 48.87186313938144], [2.3239517211914062, 48.86787657822752] ] ], @@ -87,8 +87,8 @@ [ [2.3363113403320312, 48.87690923865779], [2.3514175415039062, 48.86516646209463], - [2.353365325175929, 48.86714166070064], - [2.3444407066054653, 48.87804332946407], + [2.353365325175928, 48.86714166070064], + [2.3444407066054644, 48.87804332946407], [2.3363113403320312, 48.87690923865779] ] ] diff --git a/packages/turf-mask/index.ts b/packages/turf-mask/index.ts index 43abb63043..ea11683c66 100644 --- a/packages/turf-mask/index.ts +++ b/packages/turf-mask/index.ts @@ -6,7 +6,7 @@ import { MultiPolygon, } from "geojson"; import { polygon as createPolygon, multiPolygon } from "@turf/helpers"; -import polygonClipping, { Geom } from "polygon-clipping"; +import * as polyclip from "polyclip-ts"; import { clone } from "@turf/clone"; /** @@ -51,14 +51,14 @@ function mask( // Need to cast below as Position[][] isn't quite as strict as Geom, even // though they should be equivalent. polygonOuters = createGeomFromPolygonClippingOutput( - polygonClipping.union(polygon.geometry.coordinates as Geom) + polyclip.union(polygon.geometry.coordinates as polyclip.Geom) ); } else { // Geometry // Need to cast below as Position[][] isn't quite as strict as Geom, even // though they should be equivalent. polygonOuters = createGeomFromPolygonClippingOutput( - polygonClipping.union(polygon.coordinates as Geom) + polyclip.union(polygon.coordinates as polyclip.Geom) ); } @@ -78,15 +78,15 @@ function unionFc(fc: FeatureCollection) { /* eslint-disable prefer-spread */ const unioned = fc.features.length === 2 - ? polygonClipping.union( - fc.features[0].geometry.coordinates as Geom, - fc.features[1].geometry.coordinates as Geom + ? polyclip.union( + fc.features[0].geometry.coordinates as polyclip.Geom, + fc.features[1].geometry.coordinates as polyclip.Geom ) - : polygonClipping.union.apply( - polygonClipping, + : polyclip.union.apply( + polyclip, fc.features.map(function (f) { return f.geometry.coordinates; - }) as [Geom, ...Geom[]] + }) as [polyclip.Geom, ...polyclip.Geom[]] ); /* eslint-enable */ return createGeomFromPolygonClippingOutput(unioned); diff --git a/packages/turf-mask/package.json b/packages/turf-mask/package.json index 43f37ab543..f72c0b9db6 100644 --- a/packages/turf-mask/package.json +++ b/packages/turf-mask/package.json @@ -67,7 +67,7 @@ "@turf/clone": "workspace:^", "@turf/helpers": "workspace:^", "@types/geojson": "^7946.0.10", - "polygon-clipping": "^0.15.3", + "polyclip-ts": "^0.16.5", "tslib": "^2.6.2" } } diff --git a/packages/turf-union/index.ts b/packages/turf-union/index.ts index 9db47ad207..c55d71af68 100644 --- a/packages/turf-union/index.ts +++ b/packages/turf-union/index.ts @@ -1,4 +1,4 @@ -import polygonClipping from "polygon-clipping"; +import * as polyclip from "polyclip-ts"; import { multiPolygon, polygon } from "@turf/helpers"; import { geomEach } from "@turf/meta"; import { @@ -42,16 +42,16 @@ function union

( features: FeatureCollection, options: { properties?: P } = {} ): Feature | null { - const geoms: polygonClipping.Geom[] = []; + const geoms: polyclip.Geom[] = []; geomEach(features, (geom) => { - geoms.push(geom.coordinates as polygonClipping.Geom); + geoms.push(geom.coordinates as polyclip.Geom); }); if (geoms.length < 2) { throw new Error("Must have at least 2 geometries"); } - const unioned = polygonClipping.union(geoms[0], ...geoms.slice(1)); + const unioned = polyclip.union(geoms[0], ...geoms.slice(1)); if (unioned.length === 0) return null; if (unioned.length === 1) return polygon(unioned[0], options.properties); else return multiPolygon(unioned, options.properties); diff --git a/packages/turf-union/package.json b/packages/turf-union/package.json index 790c6a6fb0..4fb9ec13d8 100644 --- a/packages/turf-union/package.json +++ b/packages/turf-union/package.json @@ -66,7 +66,7 @@ "@turf/helpers": "workspace:^", "@turf/meta": "workspace:^", "@types/geojson": "^7946.0.10", - "polygon-clipping": "^0.15.3", + "polyclip-ts": "^0.16.5", "tslib": "^2.6.2" } } diff --git a/packages/turf-union/test/out/union2.geojson b/packages/turf-union/test/out/union2.geojson index aa9b85893e..f064ff9c8a 100644 --- a/packages/turf-union/test/out/union2.geojson +++ b/packages/turf-union/test/out/union2.geojson @@ -7,17 +7,17 @@ [ [-80.14389038085938, 32.8149783969858], [-80.07453918457031, 32.85536439443039], - [-80.00867471875296, 32.846454942587876], - [-79.99171138057724, 32.77876713098757], + [-80.00867471875296, 32.84645494258788], + [-79.99171138057724, 32.77876713098755], [-80.00175476074217, 32.732418508353746], - [-79.93763756501369, 32.741047214297545], + [-79.9376375650137, 32.741047214297545], [-79.80537414550781, 32.7231762754146], [-79.81773376464844, 32.923402043498875], - [-79.91098503795921, 32.95087128128811], + [-79.91098503795921, 32.950871281288116], [-79.95025634765625, 32.97007559940924], - [-79.95741485597671, 32.93704020740794], + [-79.95741485597672, 32.93704020740794], [-80.03128051757812, 32.936657533381286], - [-80.02726389659408, 32.92063024667495], + [-80.02726389659406, 32.92063024667495], [-80.10543823242188, 32.94760622243483], [-80.14389038085938, 32.8149783969858] ] From 2536f61e6f2e18455d2856fff0a937f1a90231de Mon Sep 17 00:00:00 2001 From: colin Date: Tue, 15 Oct 2024 12:06:15 -0700 Subject: [PATCH 2/2] upgrade to polyclip-ts 0.16.6 --- packages/turf-difference/package.json | 2 +- packages/turf-dissolve/package.json | 2 +- packages/turf-intersect/package.json | 2 +- packages/turf-mask/package.json | 2 +- packages/turf-union/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/turf-difference/package.json b/packages/turf-difference/package.json index ca83158326..46582e7377 100644 --- a/packages/turf-difference/package.json +++ b/packages/turf-difference/package.json @@ -65,7 +65,7 @@ "@turf/helpers": "workspace:^", "@turf/meta": "workspace:^", "@types/geojson": "^7946.0.10", - "polyclip-ts": "^0.16.5", + "polyclip-ts": "^0.16.6", "tslib": "^2.6.2" } } diff --git a/packages/turf-dissolve/package.json b/packages/turf-dissolve/package.json index 37d81e274b..a9b41b81af 100644 --- a/packages/turf-dissolve/package.json +++ b/packages/turf-dissolve/package.json @@ -69,7 +69,7 @@ "@turf/invariant": "workspace:^", "@turf/meta": "workspace:^", "@types/geojson": "^7946.0.10", - "polyclip-ts": "^0.16.5", + "polyclip-ts": "^0.16.6", "tslib": "^2.6.2" } } diff --git a/packages/turf-intersect/package.json b/packages/turf-intersect/package.json index 297fb0b940..0d924fcae1 100644 --- a/packages/turf-intersect/package.json +++ b/packages/turf-intersect/package.json @@ -67,7 +67,7 @@ "@turf/helpers": "workspace:^", "@turf/meta": "workspace:^", "@types/geojson": "^7946.0.10", - "polyclip-ts": "^0.16.5", + "polyclip-ts": "^0.16.6", "tslib": "^2.6.2" } } diff --git a/packages/turf-mask/package.json b/packages/turf-mask/package.json index f72c0b9db6..5bb53b3016 100644 --- a/packages/turf-mask/package.json +++ b/packages/turf-mask/package.json @@ -67,7 +67,7 @@ "@turf/clone": "workspace:^", "@turf/helpers": "workspace:^", "@types/geojson": "^7946.0.10", - "polyclip-ts": "^0.16.5", + "polyclip-ts": "^0.16.6", "tslib": "^2.6.2" } } diff --git a/packages/turf-union/package.json b/packages/turf-union/package.json index 4fb9ec13d8..9543355ff7 100644 --- a/packages/turf-union/package.json +++ b/packages/turf-union/package.json @@ -66,7 +66,7 @@ "@turf/helpers": "workspace:^", "@turf/meta": "workspace:^", "@types/geojson": "^7946.0.10", - "polyclip-ts": "^0.16.5", + "polyclip-ts": "^0.16.6", "tslib": "^2.6.2" } }