From c460d31522840e2ac09131fa5150b46f32be857d Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Wed, 22 Feb 2023 17:32:59 +0100 Subject: [PATCH] Update open layers --- package-lock.json | 125 +++++++++++++++++++++++++++++----------------- package.json | 4 +- 2 files changed, 80 insertions(+), 49 deletions(-) diff --git a/package-lock.json b/package-lock.json index 96df357..3712e5d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "farmmaps-lib-app", - "version": "3.0.0", + "version": "3.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "farmmaps-lib-app", - "version": "3.0.0", + "version": "3.0.1", "dependencies": { "@angular/animations": "^14.1.3", "@angular/common": "^14.1.3", @@ -40,7 +40,7 @@ "ngx-image-cropper": "^3.3.5", "ngx-openlayers": "1.0.0-next.19", "ngx-uploadx": "^5.2.0", - "ol": "6.14.1", + "ol": "7.2.2", "olcs": "^2.13.1", "resumablejs": "^1.1.0", "rxjs": "^6.6.7", @@ -79,18 +79,59 @@ } }, "dist/common": { + "name": "@farmmaps/common", + "version": "2.0.0", "dependencies": { "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/common": ">=14.0.0", + "@angular/core": ">=14.0.0", + "@angular/forms": ">=14.0.0", + "@microsoft/signalr": ">=3.1.3", + "@ng-bootstrap/ng-bootstrap": ">=10.0.0", + "@ngrx/effects": ">=14.0.0", + "@ngrx/router-store": ">=14.0.0", + "@ngrx/store": ">=14.0.0", + "angular-oauth2-oidc": ">=13.0.0", + "bootstrap": ">=4.4.1", + "moment": ">=2.27.0", + "ngx-avatar": ">=4.1.0", + "ngx-clipboard": ">=14.0.1", + "ngx-image-cropper": ">=3.3.5", + "ngx-uploadx": ">=5.1.0", + "tassign": ">=1.0.0" } }, "dist/common-map": { + "name": "@farmmaps/common-map", + "version": "2.0.0", "dependencies": { "tslib": "^2.0.0" + }, + "peerDependencies": { + "@angular/core": ">=14.0.0", + "@ngrx/effects": ">=14.0.0", + "@ngrx/router-store": ">=14.0.0", + "@ngrx/store": ">=14.0.0", + "ngrx-store-localstorage": ">=14.0.0", + "ngx-openlayers": ">=1.0.0-next.19", + "ol": ">=6.8.1", + "tassign": ">=1.0.0" } }, "dist/common-map3d": { + "name": "@farmmaps/common-map3d", + "version": "2.0.0", "dependencies": { "tslib": "^2.0.0" + }, + "peerDependencies": { + "@angular/common": ">=14.0.0", + "@angular/core": ">=14.0.0", + "cesium": ">=1.82.1", + "ngx-openlayers": "1.0.0-next.19", + "ol-cesium": ">=2.13.0" } }, "node_modules/@adobe/css-tools": { @@ -2866,9 +2907,9 @@ } }, "node_modules/@mapbox/mapbox-gl-style-spec": { - "version": "13.26.0", - "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.26.0.tgz", - "integrity": "sha512-Ya1WiNz1qYau7xPYPQUbionrw9pjgZAIebGQdDXgwJuSAWeVCr02P7rqbYFHbXqX5TeAaq4qVpcaJb9oZtgaVQ==", + "version": "13.28.0", + "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.28.0.tgz", + "integrity": "sha512-B8xM7Fp1nh5kejfIl4SWeY0gtIeewbuRencqO3cJDrCHZpaPg7uY+V8abuR+esMeuOjRl5cLhVTP40v+1ywxbg==", "dependencies": { "@mapbox/jsonlint-lines-primitives": "~2.0.2", "@mapbox/point-geometry": "^0.1.0", @@ -9632,9 +9673,9 @@ } }, "node_modules/mapbox-to-css-font": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/mapbox-to-css-font/-/mapbox-to-css-font-2.4.1.tgz", - "integrity": "sha512-QQ/iKiM43DM9+aujTL45Iz5o7gDeSFmy4LPl3HZmNcwCE++NxGazf+yFpY+wCb+YS23sDa1ghpo3zrNFOcHlow==" + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/mapbox-to-css-font/-/mapbox-to-css-font-2.4.2.tgz", + "integrity": "sha512-f+NBjJJY4T3dHtlEz1wCG7YFlkODEjFIYlxDdLIDMNpkSksqTt+l/d4rjuwItxuzkuMFvPyrjzV2lxRM4ePcIA==" }, "node_modules/media-typer": { "version": "0.3.0", @@ -10604,12 +10645,13 @@ "dev": true }, "node_modules/ol": { - "version": "6.14.1", - "resolved": "https://registry.npmjs.org/ol/-/ol-6.14.1.tgz", - "integrity": "sha512-sIcUWkGud3Y2gT3TJubSHlkyMXiPVh1yxfCPHxmY8+qtm79bB9oRnei9xHVIbRRG0Ro6Ldp5E+BMVSvYCxSpaA==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/ol/-/ol-7.2.2.tgz", + "integrity": "sha512-eqJ1hhVQQ3Ap4OhYq9DRu5pz9RMpLhmoTauDoIqpn7logVi1AJE+lXjEHrPrTSuZYjtFbMgqr07sxoLNR65nrw==", "dependencies": { - "geotiff": "^2.0.2", - "ol-mapbox-style": "^7.1.1", + "earcut": "^2.2.3", + "geotiff": "^2.0.7", + "ol-mapbox-style": "^9.2.0", "pbf": "3.2.1", "rbush": "^3.0.1" }, @@ -10619,13 +10661,12 @@ } }, "node_modules/ol-mapbox-style": { - "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==", + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-9.6.0.tgz", + "integrity": "sha512-5XK1fAikf2q6gFozsdrRUCfRgKeQEj7EORECAb7zzi91MXL97AjSUSaKCMzNXtKhm2yyXx4jQth9KsF5h658Iw==", "dependencies": { - "@mapbox/mapbox-gl-style-spec": "^13.20.1", - "mapbox-to-css-font": "^2.4.1", - "webfont-matcher": "^1.1.0" + "@mapbox/mapbox-gl-style-spec": "^13.23.1", + "mapbox-to-css-font": "^2.4.1" } }, "node_modules/olcs": { @@ -14978,11 +15019,6 @@ "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", @@ -17401,9 +17437,9 @@ "integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==" }, "@mapbox/mapbox-gl-style-spec": { - "version": "13.26.0", - "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.26.0.tgz", - "integrity": "sha512-Ya1WiNz1qYau7xPYPQUbionrw9pjgZAIebGQdDXgwJuSAWeVCr02P7rqbYFHbXqX5TeAaq4qVpcaJb9oZtgaVQ==", + "version": "13.28.0", + "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.28.0.tgz", + "integrity": "sha512-B8xM7Fp1nh5kejfIl4SWeY0gtIeewbuRencqO3cJDrCHZpaPg7uY+V8abuR+esMeuOjRl5cLhVTP40v+1ywxbg==", "requires": { "@mapbox/jsonlint-lines-primitives": "~2.0.2", "@mapbox/point-geometry": "^0.1.0", @@ -22502,9 +22538,9 @@ } }, "mapbox-to-css-font": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/mapbox-to-css-font/-/mapbox-to-css-font-2.4.1.tgz", - "integrity": "sha512-QQ/iKiM43DM9+aujTL45Iz5o7gDeSFmy4LPl3HZmNcwCE++NxGazf+yFpY+wCb+YS23sDa1ghpo3zrNFOcHlow==" + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/mapbox-to-css-font/-/mapbox-to-css-font-2.4.2.tgz", + "integrity": "sha512-f+NBjJJY4T3dHtlEz1wCG7YFlkODEjFIYlxDdLIDMNpkSksqTt+l/d4rjuwItxuzkuMFvPyrjzV2lxRM4ePcIA==" }, "media-typer": { "version": "0.3.0", @@ -23224,24 +23260,24 @@ "dev": true }, "ol": { - "version": "6.14.1", - "resolved": "https://registry.npmjs.org/ol/-/ol-6.14.1.tgz", - "integrity": "sha512-sIcUWkGud3Y2gT3TJubSHlkyMXiPVh1yxfCPHxmY8+qtm79bB9oRnei9xHVIbRRG0Ro6Ldp5E+BMVSvYCxSpaA==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/ol/-/ol-7.2.2.tgz", + "integrity": "sha512-eqJ1hhVQQ3Ap4OhYq9DRu5pz9RMpLhmoTauDoIqpn7logVi1AJE+lXjEHrPrTSuZYjtFbMgqr07sxoLNR65nrw==", "requires": { - "geotiff": "^2.0.2", - "ol-mapbox-style": "^7.1.1", + "earcut": "^2.2.3", + "geotiff": "^2.0.7", + "ol-mapbox-style": "^9.2.0", "pbf": "3.2.1", "rbush": "^3.0.1" } }, "ol-mapbox-style": { - "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==", + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-9.6.0.tgz", + "integrity": "sha512-5XK1fAikf2q6gFozsdrRUCfRgKeQEj7EORECAb7zzi91MXL97AjSUSaKCMzNXtKhm2yyXx4jQth9KsF5h658Iw==", "requires": { - "@mapbox/mapbox-gl-style-spec": "^13.20.1", - "mapbox-to-css-font": "^2.4.1", - "webfont-matcher": "^1.1.0" + "@mapbox/mapbox-gl-style-spec": "^13.23.1", + "mapbox-to-css-font": "^2.4.1" } }, "olcs": { @@ -26434,11 +26470,6 @@ } } }, - "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 1c699af..954603f 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": "6.14.1", + "ol": "7.2.2", "olcs": "^2.13.1", "resumablejs": "^1.1.0", "rxjs": "^6.6.7", @@ -80,4 +80,4 @@ "tslint": "~6.1.0", "typescript": "~4.6.4" } -} +} \ No newline at end of file