From ed7f7923cab85630f6ccab13a406135c6ebab4b7 Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Wed, 22 Feb 2023 18:38:58 +0100 Subject: [PATCH] revert openlayers --- .gitignore | 3 +++ package-lock.json | 56 ++++++++++++++++++++++++++++------------------- package.json | 2 +- 3 files changed, 37 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 3246a85..2a7ed1b 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,6 @@ Thumbs.db projects/common/node_modules/ projects/common-map/node_modules/ .angular/* +projects/common-map3d/node_modules/ +projects/common-map/node_modules/ +projects/common/node_modules/ diff --git a/package-lock.json b/package-lock.json index 3712e5d..053ccc5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "ngx-image-cropper": "^3.3.5", "ngx-openlayers": "1.0.0-next.19", "ngx-uploadx": "^5.2.0", - "ol": "7.2.2", + "ol": "6.14.1", "olcs": "^2.13.1", "resumablejs": "^1.1.0", "rxjs": "^6.6.7", @@ -10645,13 +10645,12 @@ "dev": true }, "node_modules/ol": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/ol/-/ol-7.2.2.tgz", - "integrity": "sha512-eqJ1hhVQQ3Ap4OhYq9DRu5pz9RMpLhmoTauDoIqpn7logVi1AJE+lXjEHrPrTSuZYjtFbMgqr07sxoLNR65nrw==", + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/ol/-/ol-6.14.1.tgz", + "integrity": "sha512-sIcUWkGud3Y2gT3TJubSHlkyMXiPVh1yxfCPHxmY8+qtm79bB9oRnei9xHVIbRRG0Ro6Ldp5E+BMVSvYCxSpaA==", "dependencies": { - "earcut": "^2.2.3", - "geotiff": "^2.0.7", - "ol-mapbox-style": "^9.2.0", + "geotiff": "^2.0.2", + "ol-mapbox-style": "^7.1.1", "pbf": "3.2.1", "rbush": "^3.0.1" }, @@ -10661,12 +10660,13 @@ } }, "node_modules/ol-mapbox-style": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-9.6.0.tgz", - "integrity": "sha512-5XK1fAikf2q6gFozsdrRUCfRgKeQEj7EORECAb7zzi91MXL97AjSUSaKCMzNXtKhm2yyXx4jQth9KsF5h658Iw==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-7.1.1.tgz", + "integrity": "sha512-GLTEYiH/Ec9Zn1eS4S/zXyR2sierVrUc+OLVP8Ra0FRyqRhoYbXdko0b7OIeSHWdtJfHssWYefDOGxfTRUUZ/A==", "dependencies": { - "@mapbox/mapbox-gl-style-spec": "^13.23.1", - "mapbox-to-css-font": "^2.4.1" + "@mapbox/mapbox-gl-style-spec": "^13.20.1", + "mapbox-to-css-font": "^2.4.1", + "webfont-matcher": "^1.1.0" } }, "node_modules/olcs": { @@ -15019,6 +15019,11 @@ "node": ">=0.8.0" } }, + "node_modules/webfont-matcher": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/webfont-matcher/-/webfont-matcher-1.1.0.tgz", + "integrity": "sha512-ov8lMvF9wi4PD7fK2Axn9PQEpO9cYI0fIoGqErwd+wi8xacFFDmX114D5Q2Lw0Wlgmb+Qw/dKI2KTtimrJf85g==" + }, "node_modules/webpack": { "version": "5.74.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz", @@ -23260,24 +23265,24 @@ "dev": true }, "ol": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/ol/-/ol-7.2.2.tgz", - "integrity": "sha512-eqJ1hhVQQ3Ap4OhYq9DRu5pz9RMpLhmoTauDoIqpn7logVi1AJE+lXjEHrPrTSuZYjtFbMgqr07sxoLNR65nrw==", + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/ol/-/ol-6.14.1.tgz", + "integrity": "sha512-sIcUWkGud3Y2gT3TJubSHlkyMXiPVh1yxfCPHxmY8+qtm79bB9oRnei9xHVIbRRG0Ro6Ldp5E+BMVSvYCxSpaA==", "requires": { - "earcut": "^2.2.3", - "geotiff": "^2.0.7", - "ol-mapbox-style": "^9.2.0", + "geotiff": "^2.0.2", + "ol-mapbox-style": "^7.1.1", "pbf": "3.2.1", "rbush": "^3.0.1" } }, "ol-mapbox-style": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-9.6.0.tgz", - "integrity": "sha512-5XK1fAikf2q6gFozsdrRUCfRgKeQEj7EORECAb7zzi91MXL97AjSUSaKCMzNXtKhm2yyXx4jQth9KsF5h658Iw==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-7.1.1.tgz", + "integrity": "sha512-GLTEYiH/Ec9Zn1eS4S/zXyR2sierVrUc+OLVP8Ra0FRyqRhoYbXdko0b7OIeSHWdtJfHssWYefDOGxfTRUUZ/A==", "requires": { - "@mapbox/mapbox-gl-style-spec": "^13.23.1", - "mapbox-to-css-font": "^2.4.1" + "@mapbox/mapbox-gl-style-spec": "^13.20.1", + "mapbox-to-css-font": "^2.4.1", + "webfont-matcher": "^1.1.0" } }, "olcs": { @@ -26470,6 +26475,11 @@ } } }, + "webfont-matcher": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/webfont-matcher/-/webfont-matcher-1.1.0.tgz", + "integrity": "sha512-ov8lMvF9wi4PD7fK2Axn9PQEpO9cYI0fIoGqErwd+wi8xacFFDmX114D5Q2Lw0Wlgmb+Qw/dKI2KTtimrJf85g==" + }, "webpack": { "version": "5.74.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz", diff --git a/package.json b/package.json index 954603f..3209a97 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "ngx-image-cropper": "^3.3.5", "ngx-openlayers": "1.0.0-next.19", "ngx-uploadx": "^5.2.0", - "ol": "7.2.2", + "ol": "6.14.1", "olcs": "^2.13.1", "resumablejs": "^1.1.0", "rxjs": "^6.6.7",