diff --git a/package-lock.json b/package-lock.json index 9ba8265..20deb3b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,9 +13,9 @@ "@vueup/vue-quill": "^1.0.0-beta.7", "axios": "^0.21.1", "cesium": "^1.105.0", - "cesium_dev_kit": "^1.0.51", + "cesium_dev_kit": "^1.0.76", "cesium-navigation-es6": "^3.0.9", - "concaveman": "^1.1.1", + "concaveman": "^1.2.1", "dat.gui": "^0.7.9", "echarts": "4.2.1", "element-plus": "^1.0.2-beta.41", @@ -3091,9 +3091,9 @@ } }, "node_modules/cesium_dev_kit": { - "version": "1.0.51", - "resolved": "https://registry.npmjs.org/cesium_dev_kit/-/cesium_dev_kit-1.0.51.tgz", - "integrity": "sha512-sGIkqRqmgG8r2t4k1NazcoTh33/DJ43fuAp0/lG+OfnPu7BQ2Bv5lQsUPvwPYXVlItf4mMG69vqTBsXaAcILZw==", + "version": "1.0.80", + "resolved": "https://registry.npmjs.org/cesium_dev_kit/-/cesium_dev_kit-1.0.80.tgz", + "integrity": "sha512-eDgwztYwP+BVba6j1ePmmYpy4t9VvHbFIuB66XYmU4V5PlKmBiBWXYZ36Qt9YrWImlqVSu8OJtXhOggUSkfwnw==", "dependencies": { "@turf/turf": "^6.5.0", "concaveman": "^1.1.1", @@ -3277,28 +3277,14 @@ "dev": true }, "node_modules/concaveman": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/concaveman/-/concaveman-1.1.1.tgz", - "integrity": "sha512-JaPfD7sXF5ztt3ETOVFu+mL/yID9TqwjWs+C/ue//aiLwI0HrNZ3rvO7omKd+9UUESW5JBKJCTw9oEJVfhAM0Q==", - "dependencies": { - "monotone-convex-hull-2d": "^1.0.1", - "point-in-polygon": "^1.0.1", - "rbush": "^2.0.1", - "robust-orientation": "^1.1.3", - "tinyqueue": "^1.1.0" - } - }, - "node_modules/concaveman/node_modules/quickselect": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-1.1.1.tgz", - "integrity": "sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ==" - }, - "node_modules/concaveman/node_modules/rbush": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/rbush/-/rbush-2.0.2.tgz", - "integrity": "sha512-XBOuALcTm+O/H8G90b6pzu6nX6v2zCKiFG4BJho8a+bY6AER6t8uQUZdi5bomQc0AprCWhEGa7ncAbbRap0bRA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/concaveman/-/concaveman-1.2.1.tgz", + "integrity": "sha512-PwZYKaM/ckQSa8peP5JpVr7IMJ4Nn/MHIaWUjP4be+KoZ7Botgs8seAZGpmaOM+UZXawcdYRao/px9ycrCihHw==", "dependencies": { - "quickselect": "^1.0.1" + "point-in-polygon": "^1.1.0", + "rbush": "^3.0.1", + "robust-predicates": "^2.0.4", + "tinyqueue": "^2.0.3" } }, "node_modules/connect": { @@ -5399,14 +5385,6 @@ "random": "bin/random" } }, - "node_modules/monotone-convex-hull-2d": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/monotone-convex-hull-2d/-/monotone-convex-hull-2d-1.0.1.tgz", - "integrity": "sha512-ixQ3qdXTVHvR7eAoOjKY8kGxl9YjOFtzi7qOjwmFFPfBqZHVOjUFOBy/Dk9dusamRSPJe9ggyfSypRbs0Bl8BA==", - "dependencies": { - "robust-orientation": "^1.1.3" - } - }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -6243,35 +6221,10 @@ "rimraf": "bin.js" } }, - "node_modules/robust-orientation": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/robust-orientation/-/robust-orientation-1.2.1.tgz", - "integrity": "sha512-FuTptgKwY6iNuU15nrIJDLjXzCChWB+T4AvksRtwPS/WZ3HuP1CElCm1t+OBfgQKfWbtZIawip+61k7+buRKAg==", - "dependencies": { - "robust-scale": "^1.0.2", - "robust-subtract": "^1.0.0", - "robust-sum": "^1.0.0", - "two-product": "^1.0.2" - } - }, - "node_modules/robust-scale": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/robust-scale/-/robust-scale-1.0.2.tgz", - "integrity": "sha512-jBR91a/vomMAzazwpsPTPeuTPPmWBacwA+WYGNKcRGSh6xweuQ2ZbjRZ4v792/bZOhRKXRiQH0F48AvuajY0tQ==", - "dependencies": { - "two-product": "^1.0.2", - "two-sum": "^1.0.0" - } - }, - "node_modules/robust-subtract": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/robust-subtract/-/robust-subtract-1.0.0.tgz", - "integrity": "sha512-xhKUno+Rl+trmxAIVwjQMiVdpF5llxytozXJOdoT4eTIqmqsndQqFb1A0oiW3sZGlhMRhOi6pAD4MF1YYW6o/A==" - }, - "node_modules/robust-sum": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/robust-sum/-/robust-sum-1.0.0.tgz", - "integrity": "sha512-AvLExwpaqUqD1uwLU6MwzzfRdaI6VEZsyvQ3IAQ0ZJ08v1H+DTyqskrf2ZJyh0BDduFVLN7H04Zmc+qTiahhAw==" + "node_modules/robust-predicates": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-2.0.4.tgz", + "integrity": "sha512-l4NwboJM74Ilm4VKfbAtFeGq7aEjWL+5kVFcmgFA2MrdnQWx9iE/tUGvxY5HyMI7o/WpSIUFLbC5fbeaHgSCYg==" }, "node_modules/rollup": { "version": "2.58.0", @@ -7047,9 +7000,9 @@ } }, "node_modules/tinyqueue": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-1.2.3.tgz", - "integrity": "sha512-Qz9RgWuO9l8lT+Y9xvbzhPT2efIUIFd69N7eF7tJ9lnQl0iLj1M7peK7IoUGZL9DJHw9XftqLreccfxcQgYLxA==" + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz", + "integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==" }, "node_modules/to-fast-properties": { "version": "2.0.0", @@ -7256,16 +7209,6 @@ "resolved": "https://registry.npmjs.org/turf-jsts/-/turf-jsts-1.2.3.tgz", "integrity": "sha512-Ja03QIJlPuHt4IQ2FfGex4F4JAr8m3jpaHbFbQrgwr7s7L6U8ocrHiF3J1+wf9jzhGKxvDeaCAnGDot8OjGFyA==" }, - "node_modules/two-product": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/two-product/-/two-product-1.0.2.tgz", - "integrity": "sha512-vOyrqmeYvzjToVM08iU52OFocWT6eB/I5LUWYnxeAPGXAhAxXYU/Yr/R2uY5/5n4bvJQL9AQulIuxpIsMoT8XQ==" - }, - "node_modules/two-sum": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/two-sum/-/two-sum-1.0.0.tgz", - "integrity": "sha512-phP48e8AawgsNUjEY2WvoIWqdie8PoiDZGxTDv70LDr01uX5wLEQbOgSP7Z/B6+SW5oLtbe8qaYX2fKJs3CGTw==" - }, "node_modules/typescript": { "version": "5.4.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", @@ -10380,9 +10323,9 @@ } }, "cesium_dev_kit": { - "version": "1.0.51", - "resolved": "https://registry.npmjs.org/cesium_dev_kit/-/cesium_dev_kit-1.0.51.tgz", - "integrity": "sha512-sGIkqRqmgG8r2t4k1NazcoTh33/DJ43fuAp0/lG+OfnPu7BQ2Bv5lQsUPvwPYXVlItf4mMG69vqTBsXaAcILZw==", + "version": "1.0.80", + "resolved": "https://registry.npmjs.org/cesium_dev_kit/-/cesium_dev_kit-1.0.80.tgz", + "integrity": "sha512-eDgwztYwP+BVba6j1ePmmYpy4t9VvHbFIuB66XYmU4V5PlKmBiBWXYZ36Qt9YrWImlqVSu8OJtXhOggUSkfwnw==", "requires": { "@turf/turf": "^6.5.0", "concaveman": "^1.1.1", @@ -10539,30 +10482,14 @@ "dev": true }, "concaveman": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/concaveman/-/concaveman-1.1.1.tgz", - "integrity": "sha512-JaPfD7sXF5ztt3ETOVFu+mL/yID9TqwjWs+C/ue//aiLwI0HrNZ3rvO7omKd+9UUESW5JBKJCTw9oEJVfhAM0Q==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/concaveman/-/concaveman-1.2.1.tgz", + "integrity": "sha512-PwZYKaM/ckQSa8peP5JpVr7IMJ4Nn/MHIaWUjP4be+KoZ7Botgs8seAZGpmaOM+UZXawcdYRao/px9ycrCihHw==", "requires": { - "monotone-convex-hull-2d": "^1.0.1", - "point-in-polygon": "^1.0.1", - "rbush": "^2.0.1", - "robust-orientation": "^1.1.3", - "tinyqueue": "^1.1.0" - }, - "dependencies": { - "quickselect": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-1.1.1.tgz", - "integrity": "sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ==" - }, - "rbush": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/rbush/-/rbush-2.0.2.tgz", - "integrity": "sha512-XBOuALcTm+O/H8G90b6pzu6nX6v2zCKiFG4BJho8a+bY6AER6t8uQUZdi5bomQc0AprCWhEGa7ncAbbRap0bRA==", - "requires": { - "quickselect": "^1.0.1" - } - } + "point-in-polygon": "^1.1.0", + "rbush": "^3.0.1", + "robust-predicates": "^2.0.4", + "tinyqueue": "^2.0.3" } }, "connect": { @@ -12260,14 +12187,6 @@ "commander": "*" } }, - "monotone-convex-hull-2d": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/monotone-convex-hull-2d/-/monotone-convex-hull-2d-1.0.1.tgz", - "integrity": "sha512-ixQ3qdXTVHvR7eAoOjKY8kGxl9YjOFtzi7qOjwmFFPfBqZHVOjUFOBy/Dk9dusamRSPJe9ggyfSypRbs0Bl8BA==", - "requires": { - "robust-orientation": "^1.1.3" - } - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -12949,35 +12868,10 @@ "glob": "^7.1.3" } }, - "robust-orientation": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/robust-orientation/-/robust-orientation-1.2.1.tgz", - "integrity": "sha512-FuTptgKwY6iNuU15nrIJDLjXzCChWB+T4AvksRtwPS/WZ3HuP1CElCm1t+OBfgQKfWbtZIawip+61k7+buRKAg==", - "requires": { - "robust-scale": "^1.0.2", - "robust-subtract": "^1.0.0", - "robust-sum": "^1.0.0", - "two-product": "^1.0.2" - } - }, - "robust-scale": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/robust-scale/-/robust-scale-1.0.2.tgz", - "integrity": "sha512-jBR91a/vomMAzazwpsPTPeuTPPmWBacwA+WYGNKcRGSh6xweuQ2ZbjRZ4v792/bZOhRKXRiQH0F48AvuajY0tQ==", - "requires": { - "two-product": "^1.0.2", - "two-sum": "^1.0.0" - } - }, - "robust-subtract": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/robust-subtract/-/robust-subtract-1.0.0.tgz", - "integrity": "sha512-xhKUno+Rl+trmxAIVwjQMiVdpF5llxytozXJOdoT4eTIqmqsndQqFb1A0oiW3sZGlhMRhOi6pAD4MF1YYW6o/A==" - }, - "robust-sum": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/robust-sum/-/robust-sum-1.0.0.tgz", - "integrity": "sha512-AvLExwpaqUqD1uwLU6MwzzfRdaI6VEZsyvQ3IAQ0ZJ08v1H+DTyqskrf2ZJyh0BDduFVLN7H04Zmc+qTiahhAw==" + "robust-predicates": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-2.0.4.tgz", + "integrity": "sha512-l4NwboJM74Ilm4VKfbAtFeGq7aEjWL+5kVFcmgFA2MrdnQWx9iE/tUGvxY5HyMI7o/WpSIUFLbC5fbeaHgSCYg==" }, "rollup": { "version": "2.58.0", @@ -13636,9 +13530,9 @@ } }, "tinyqueue": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-1.2.3.tgz", - "integrity": "sha512-Qz9RgWuO9l8lT+Y9xvbzhPT2efIUIFd69N7eF7tJ9lnQl0iLj1M7peK7IoUGZL9DJHw9XftqLreccfxcQgYLxA==" + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz", + "integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==" }, "to-fast-properties": { "version": "2.0.0", @@ -13806,16 +13700,6 @@ "resolved": "https://registry.npmjs.org/turf-jsts/-/turf-jsts-1.2.3.tgz", "integrity": "sha512-Ja03QIJlPuHt4IQ2FfGex4F4JAr8m3jpaHbFbQrgwr7s7L6U8ocrHiF3J1+wf9jzhGKxvDeaCAnGDot8OjGFyA==" }, - "two-product": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/two-product/-/two-product-1.0.2.tgz", - "integrity": "sha512-vOyrqmeYvzjToVM08iU52OFocWT6eB/I5LUWYnxeAPGXAhAxXYU/Yr/R2uY5/5n4bvJQL9AQulIuxpIsMoT8XQ==" - }, - "two-sum": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/two-sum/-/two-sum-1.0.0.tgz", - "integrity": "sha512-phP48e8AawgsNUjEY2WvoIWqdie8PoiDZGxTDv70LDr01uX5wLEQbOgSP7Z/B6+SW5oLtbe8qaYX2fKJs3CGTw==" - }, "typescript": { "version": "5.4.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", diff --git a/package.json b/package.json index 66bd41c..aa30a8e 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "cesium": "^1.105.0", "cesium_dev_kit": "^1.0.76", "cesium-navigation-es6": "^3.0.9", - "concaveman": "^1.1.1", + "concaveman": "^1.2.1", "dat.gui": "^0.7.9", "echarts": "4.2.1", "element-plus": "^1.0.2-beta.41", diff --git a/yarn.lock b/yarn.lock index 755fd2a..db8fc33 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1850,9 +1850,9 @@ cesium@^1.105.0, cesium@^1.88: "@cesium/engine" "2.3.0" "@cesium/widgets" "2.2.0" -cesium_dev_kit@^1.0.51: - version "1.0.51" - resolved "https://registry.npmjs.org/cesium_dev_kit/-/cesium_dev_kit-1.0.51.tgz" +cesium_dev_kit@^1.0.76: + version "1.0.80" + resolved "https://registry.yarnpkg.com/cesium_dev_kit/-/cesium_dev_kit-1.0.80.tgz#24a7b80d606a15c60b8be397acb9c57bc1b5b19f" dependencies: "@turf/turf" "^6.5.0" concaveman "^1.1.1" @@ -1992,15 +1992,14 @@ concat-map@0.0.1: version "0.0.1" resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" -concaveman@*, concaveman@^1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/concaveman/-/concaveman-1.1.1.tgz" +concaveman@*, concaveman@^1.1.1, concaveman@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/concaveman/-/concaveman-1.2.1.tgz#47d20b4521125c15fabf453653c2696d9ee41e0b" dependencies: - monotone-convex-hull-2d "^1.0.1" - point-in-polygon "^1.0.1" - rbush "^2.0.1" - robust-orientation "^1.1.3" - tinyqueue "^1.1.0" + point-in-polygon "^1.1.0" + rbush "^3.0.1" + robust-predicates "^2.0.4" + tinyqueue "^2.0.3" connect@^3.7.0: version "3.7.0" @@ -3191,12 +3190,6 @@ mockjs@^1.1.0: dependencies: commander "*" -monotone-convex-hull-2d@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/monotone-convex-hull-2d/-/monotone-convex-hull-2d-1.0.1.tgz" - dependencies: - robust-orientation "^1.1.3" - ms@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" @@ -3406,7 +3399,7 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3: version "2.2.3" resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz" -point-in-polygon@^1.0.1: +point-in-polygon@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/point-in-polygon/-/point-in-polygon-1.1.0.tgz" @@ -3646,29 +3639,9 @@ rimraf@2: dependencies: glob "^7.1.3" -robust-orientation@^1.1.3: - version "1.2.1" - resolved "https://registry.npmjs.org/robust-orientation/-/robust-orientation-1.2.1.tgz" - dependencies: - robust-scale "^1.0.2" - robust-subtract "^1.0.0" - robust-sum "^1.0.0" - two-product "^1.0.2" - -robust-scale@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/robust-scale/-/robust-scale-1.0.2.tgz" - dependencies: - two-product "^1.0.2" - two-sum "^1.0.0" - -robust-subtract@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/robust-subtract/-/robust-subtract-1.0.0.tgz" - -robust-sum@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/robust-sum/-/robust-sum-1.0.0.tgz" +robust-predicates@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-2.0.4.tgz#0a2367a93abd99676d075981707f29cfb402248b" rollup-plugin-external-globals@^0.6.1: version "0.6.1" @@ -3985,9 +3958,9 @@ three@^0.163.0: dependencies: esm "^3.2.25" -tinyqueue@^1.1.0: - version "1.2.3" - resolved "https://registry.npmjs.org/tinyqueue/-/tinyqueue-1.2.3.tgz" +tinyqueue@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-2.0.3.tgz#64d8492ebf39e7801d7bd34062e29b45b2035f08" to-fast-properties@^2.0.0: version "2.0.0" @@ -4057,14 +4030,6 @@ turf-jsts@*: version "1.2.3" resolved "https://registry.npmjs.org/turf-jsts/-/turf-jsts-1.2.3.tgz" -two-product@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/two-product/-/two-product-1.0.2.tgz" - -two-sum@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/two-sum/-/two-sum-1.0.0.tgz" - typescript@^5.4.5: version "5.4.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"