diff --git a/modules/core/LocationManager.js b/modules/core/LocationManager.js index 9fabc2590..7940265b4 100644 --- a/modules/core/LocationManager.js +++ b/modules/core/LocationManager.js @@ -1,4 +1,4 @@ -import LocationConflation from '@rapideditor/location-conflation'; +import { LocationConflation } from '@rapideditor/location-conflation'; import whichPolygon from 'which-polygon'; import calcArea from '@mapbox/geojson-area'; diff --git a/package-lock.json b/package-lock.json index ea936bb16..3dbe5fa4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@mapbox/sexagesimal": "1.2.0", "@mapbox/vector-tile": "^1.3.1", "@rapideditor/country-coder": "~5.2.2", - "@rapideditor/location-conflation": "~1.2.1", + "@rapideditor/location-conflation": "~1.3.0", "@tmcw/togeojson": "^5.8.1", "@turf/bbox": "^6.0.0", "@turf/bbox-clip": "^6.0.0", @@ -89,7 +89,7 @@ "vparse": "~1.1.0" }, "engines": { - "node": ">=16.14" + "node": ">=18" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -1337,19 +1337,19 @@ } }, "node_modules/@rapideditor/location-conflation": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@rapideditor/location-conflation/-/location-conflation-1.2.1.tgz", - "integrity": "sha512-s28bvOWgIWUT8Y25PoVzPDDn4TZtJM2elKwYRhhYGCQa7YbKEezd4Xbv3TTib3tLwKYyvXZxvrcMS9Rwm976mQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@rapideditor/location-conflation/-/location-conflation-1.3.0.tgz", + "integrity": "sha512-h4FAeKNxuqmO7OGTkXN5CS8gbP+/sCyrQdgSMhtjGYwnGaNQoEIypQNRYAqQJxJjgNISvVvunRTvSOOJfSWxSw==", "dependencies": { "@aitodotai/json-stringify-pretty-compact": "^1.3.0", "@mapbox/geojson-area": "^0.2.2", "@rapideditor/country-coder": "^5.2.1", "circle-to-polygon": "^2.2.0", "geojson-precision": "^1.0.0", - "polygon-clipping": "~0.15.3" + "polyclip-ts": "~0.16.3" }, "engines": { - "node": ">=16.14.0" + "node": ">=18" } }, "node_modules/@rapideditor/temaki": { @@ -1925,6 +1925,14 @@ "node": ">=0.10.0" } }, + "node_modules/bignumber.js": { + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz", + "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==", + "engines": { + "node": "*" + } + }, "node_modules/binary-extensions": { "version": "2.2.0", "dev": true, @@ -7528,6 +7536,15 @@ "node": ">=0.10.0" } }, + "node_modules/polyclip-ts": { + "version": "0.16.3", + "resolved": "https://registry.npmjs.org/polyclip-ts/-/polyclip-ts-0.16.3.tgz", + "integrity": "sha512-qvmV7qhaP5P+OnFqBe+gQDPCQx/PuhfITQOIX9cEtgiyLRfgrXrCLi3SOg71UEQCeuVDaMYJ/08xvFTNneYxiA==", + "dependencies": { + "bignumber.js": "^9.1.0", + "splaytree-ts": "^1.0.1" + } + }, "node_modules/polygon-clipping": { "version": "0.15.3", "license": "MIT", @@ -8651,6 +8668,11 @@ "dev": true, "license": "MIT" }, + "node_modules/splaytree-ts": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/splaytree-ts/-/splaytree-ts-1.0.1.tgz", + "integrity": "sha512-B+VzCm33/KEchi/fzT6/3NRHm8k5+Kf37SBQO3meHHS/tK2xBnIm4ZvusQ1wUpHgKMCCqEWgXnwFXAa1nD289g==" + }, "node_modules/sprintf-js": { "version": "1.0.3", "dev": true, @@ -11028,16 +11050,16 @@ } }, "@rapideditor/location-conflation": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@rapideditor/location-conflation/-/location-conflation-1.2.1.tgz", - "integrity": "sha512-s28bvOWgIWUT8Y25PoVzPDDn4TZtJM2elKwYRhhYGCQa7YbKEezd4Xbv3TTib3tLwKYyvXZxvrcMS9Rwm976mQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@rapideditor/location-conflation/-/location-conflation-1.3.0.tgz", + "integrity": "sha512-h4FAeKNxuqmO7OGTkXN5CS8gbP+/sCyrQdgSMhtjGYwnGaNQoEIypQNRYAqQJxJjgNISvVvunRTvSOOJfSWxSw==", "requires": { "@aitodotai/json-stringify-pretty-compact": "^1.3.0", "@mapbox/geojson-area": "^0.2.2", "@rapideditor/country-coder": "^5.2.1", "circle-to-polygon": "^2.2.0", "geojson-precision": "^1.0.0", - "polygon-clipping": "~0.15.3" + "polyclip-ts": "~0.16.3" } }, "@rapideditor/temaki": { @@ -11413,6 +11435,11 @@ "version": "1.1.1", "dev": true }, + "bignumber.js": { + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz", + "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==" + }, "binary-extensions": { "version": "2.2.0", "dev": true @@ -15260,6 +15287,15 @@ "pinkie": "^2.0.0" } }, + "polyclip-ts": { + "version": "0.16.3", + "resolved": "https://registry.npmjs.org/polyclip-ts/-/polyclip-ts-0.16.3.tgz", + "integrity": "sha512-qvmV7qhaP5P+OnFqBe+gQDPCQx/PuhfITQOIX9cEtgiyLRfgrXrCLi3SOg71UEQCeuVDaMYJ/08xvFTNneYxiA==", + "requires": { + "bignumber.js": "^9.1.0", + "splaytree-ts": "^1.0.1" + } + }, "polygon-clipping": { "version": "0.15.3", "requires": { @@ -16039,6 +16075,11 @@ "version": "0.1.4", "dev": true }, + "splaytree-ts": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/splaytree-ts/-/splaytree-ts-1.0.1.tgz", + "integrity": "sha512-B+VzCm33/KEchi/fzT6/3NRHm8k5+Kf37SBQO3meHHS/tK2xBnIm4ZvusQ1wUpHgKMCCqEWgXnwFXAa1nD289g==" + }, "sprintf-js": { "version": "1.0.3", "dev": true diff --git a/package.json b/package.json index 1839a8d3c..b432f9bc3 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@mapbox/sexagesimal": "1.2.0", "@mapbox/vector-tile": "^1.3.1", "@rapideditor/country-coder": "~5.2.2", - "@rapideditor/location-conflation": "~1.2.1", + "@rapideditor/location-conflation": "~1.3.0", "@tmcw/togeojson": "^5.8.1", "@turf/bbox": "^6.0.0", "@turf/bbox-clip": "^6.0.0",