diff --git a/package-lock.json b/package-lock.json index c4b9362a08..5e77e60b5c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1431,33 +1431,6 @@ "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz", "integrity": "sha1-ioP5M1x4YO/6Lu7KJUMyqgru2PI=" }, - "@mapbox/togeojson": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@mapbox/togeojson/-/togeojson-0.16.0.tgz", - "integrity": "sha1-WygwAQeEMYIdx04oesr1ahHOs3w=", - "requires": { - "concat-stream": "~1.5.1", - "minimist": "1.2.0", - "xmldom": "~0.1.19" - }, - "dependencies": { - "concat-stream": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz", - "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=", - "requires": { - "inherits": "~2.0.1", - "readable-stream": "~2.0.0", - "typedarray": "~0.0.5" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - } - } - }, "@mapbox/unitbezier": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz", @@ -1555,6 +1528,11 @@ "defer-to-connect": "^1.0.1" } }, + "@tmcw/togeojson": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@tmcw/togeojson/-/togeojson-4.0.0.tgz", + "integrity": "sha512-JZXGC1myBPPYb/moq03cYPtErqZKzVR74Cv9C85IuqATHCxHCNOxw4D45vVcYHQnnxG2TQTIR+igzpbFiu/O6Q==" + }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -8808,7 +8786,7 @@ }, "readable-stream": { "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, "requires": { @@ -12323,7 +12301,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { @@ -12504,7 +12482,8 @@ "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", + "dev": true }, "typedarray-to-buffer": { "version": "3.1.5", @@ -13677,11 +13656,6 @@ "integrity": "sha512-HgS+X6zAztGa9zIK3Y3LXuJes33Lz9x+YyTxgrkIdabu2vqcGOWwdfCpf1hWLRrd553wd4QCDf6BBO6FfdsRiQ==", "dev": true }, - "xmldom": { - "version": "0.1.27", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz", - "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=" - }, "xtend": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", diff --git a/package.json b/package.json index beb7f396dc..510adfc636 100644 --- a/package.json +++ b/package.json @@ -47,8 +47,8 @@ "@babel/polyfill": "^7.8.7", "@babel/runtime": "^7.9.6", "@mapbox/mapbox-gl-style-spec": "^13.14.0", - "@mapbox/togeojson": "^0.16.0", "@mapbox/vector-tile": "^1.3.1", + "@tmcw/togeojson": "^4.0.0", "@tweenjs/tween.js": "^18.5.0", "earcut": "^2.2.2", "js-priority-queue": "^0.1.5", diff --git a/src/Parser/GpxParser.js b/src/Parser/GpxParser.js index 85ac380f3a..40e067d061 100644 --- a/src/Parser/GpxParser.js +++ b/src/Parser/GpxParser.js @@ -1,4 +1,4 @@ -import togeojson from '@mapbox/togeojson'; +import { gpx } from '@tmcw/togeojson'; import GeoJsonParser from 'Parser/GeoJsonParser'; /** @@ -13,13 +13,13 @@ export default { * Parse a GPX file content and return a [FeatureCollection]{@link * module:GeoJsonParser~FeatureCollection}. * - * @param {XMLDocument} gpx - The GPX file content to parse. + * @param {XMLDocument} gpxFile - The GPX file content to parse. * @param {GeoJsonParser~GeoJsonParserOptions} options - Options controlling the parsing. * * @return {Promise} A promise resolving with a [FeatureCollection]{@link * module:GeoJsonParser~FeatureCollection}. */ - parse(gpx, options) { - return GeoJsonParser.parse(togeojson.gpx(gpx), options); + parse(gpxFile, options) { + return GeoJsonParser.parse(gpx(gpxFile), options); }, }; diff --git a/src/Parser/KMLParser.js b/src/Parser/KMLParser.js index c9f2077295..7e25f63592 100644 --- a/src/Parser/KMLParser.js +++ b/src/Parser/KMLParser.js @@ -1,4 +1,4 @@ -import togeojson from '@mapbox/togeojson'; +import { kml } from '@tmcw/togeojson'; import GeoJsonParser from 'Parser/GeoJsonParser'; /** @@ -13,13 +13,13 @@ export default { * Parse a KML file content and return a [FeatureCollection]{@link * module:GeoJsonParser~FeatureCollection}. * - * @param {XMLDocument} kml - The KML file content to parse. + * @param {XMLDocument} kmlFile - The KML file content to parse. * @param {GeoJsonParser~GeoJsonParserOptions} options - Options controlling the parsing. * * @return {Promise} A promise resolving with a [FeatureCollection]{@link * module:GeoJsonParser~FeatureCollection}. */ - parse(kml, options) { - return GeoJsonParser.parse(togeojson.kml(kml), options); + parse(kmlFile, options) { + return GeoJsonParser.parse(kml(kmlFile), options); }, };