From f880623337a44c103be351ce3f34bbb47eea5f4f Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Fri, 30 Jul 2021 14:06:31 +0200 Subject: [PATCH] Fix AW-2620 --- package-lock.json | 53 ++++++++++++++----- package.json | 6 +-- .../src/fm-map/effects/map.effects.ts | 2 +- 3 files changed, 45 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8c8b186..750f6b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -705,6 +705,7 @@ "requires": { "boolbase": "^1.0.0", "css-what": "^4.0.0", + "domhandler": "^4.0.0", "domutils": "^2.4.3", "nth-check": "^2.0.0" } @@ -788,6 +789,7 @@ "dev": true, "requires": { "domelementtype": "^2.0.1", + "domhandler": "^4.2.0", "entities": "^2.0.0" } }, @@ -804,7 +806,8 @@ "dev": true, "requires": { "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0" + "domelementtype": "^2.2.0", + "domhandler": "^4.2.0" } }, "enhanced-resolve": { @@ -1917,9 +1920,11 @@ }, "svgo": { "version": "2.3.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.3.0.tgz", + "integrity": "sha512-fz4IKjNO6HDPgIQxu4IxwtubtbSfGEAJUq/IXyTPIkGhWck/faiiwfkvsB8LnBkKLvSoyNNIY6d13lZprJMc9Q==", "dev": true, "requires": { + "@trysound/sax": "0.1.1", "chalk": "^4.1.0", "commander": "^7.1.0", "css-select": "^3.1.2", @@ -4074,25 +4079,25 @@ "dev": true }, "@farmmaps/common": { - "version": "1.1.1-prerelease.2030", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-1.1.1-prerelease.2030.tgz", - "integrity": "sha512-m0QVFx7qWkKHJMIHsGBEYwmOMqa9Ud9D8Wjb/0/+mJE/YQ2mVr++ndQ19PHFHjfPkifnibHovnuajWf27paBXg==", + "version": "1.1.1-prerelease.2031", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-1.1.1-prerelease.2031.tgz", + "integrity": "sha512-lSmTd2D1/PqzaXBjjY4X6UTYA5joZndXyZpUkFNm/Z0TTFmzFKmiIyGRA9AHX4StdQXC7QsCNfalYN31tnwtuQ==", "requires": { "tslib": "^2.0.0" } }, "@farmmaps/common-map": { - "version": "1.1.1-prerelease.2030", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-1.1.1-prerelease.2030.tgz", - "integrity": "sha512-TiaAxN7EAtMdquIiFEY/2XWUDHxDRVCVkjzX8Z0xlwxM5KIy1PFR+TEGa4qnYnRzFX0ZrdZef0Uf6rIKPVAc2g==", + "version": "1.1.1-prerelease.2031", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-1.1.1-prerelease.2031.tgz", + "integrity": "sha512-BQ2bvNohPth0+oxoSoh+WWLJ/mP2CGW4Qf4xqgC3tgfW+UZfD0dBPl7IT2piuvOuUQzlSVloinCJ4ciZGyZRXg==", "requires": { "tslib": "^2.0.0" } }, "@farmmaps/common-map3d": { - "version": "1.1.1-prerelease.2030", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-1.1.1-prerelease.2030.tgz", - "integrity": "sha512-igMJAeyCs4Vm1FVUSqZHZAztIqUgYY4+Cl5PW6fcUiqVVyQfU50uZYTVPkVhLYxfoJbvP7TSRnPjIqa9yEB8ZQ==", + "version": "1.1.1-prerelease.2031", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-1.1.1-prerelease.2031.tgz", + "integrity": "sha512-2M5wv5sFwlVwPGlN1b1AGM3Dh/DJFS7+L3b6e6ir2+ASoyy7xhZ67IWS2du8B7y7/xVsgxCJcJp1EJezbSCMAA==", "requires": { "tslib": "^2.0.0" } @@ -4583,6 +4588,12 @@ "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "dev": true }, + "@trysound/sax": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz", + "integrity": "sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow==", + "dev": true + }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", @@ -7175,6 +7186,23 @@ "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", "dev": true }, + "domhandler": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz", + "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==", + "dev": true, + "requires": { + "domelementtype": "^2.2.0" + }, + "dependencies": { + "domelementtype": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", + "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", + "dev": true + } + } + }, "domutils": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", @@ -8799,7 +8827,8 @@ }, "ini": { "version": "1.3.5", - "resolved": "", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true }, "injection-js": { diff --git a/package.json b/package.json index 4e66aed..03332bc 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,9 @@ "@angular/platform-browser": "~11.2.14", "@angular/platform-browser-dynamic": "~11.2.14", "@angular/router": "~11.2.14", - "@farmmaps/common": "1.1.1-prerelease.2030", - "@farmmaps/common-map": "1.1.1-prerelease.2030", - "@farmmaps/common-map3d": "1.1.1-prerelease.2030", + "@farmmaps/common": "1.1.1-prerelease.2031", + "@farmmaps/common-map": "1.1.1-prerelease.2031", + "@farmmaps/common-map3d": "1.1.1-prerelease.2031", "@microsoft/signalr": "^3.1.16", "@ng-bootstrap/ng-bootstrap": "^9.0", "@ngrx/effects": "^11.0", diff --git a/projects/common-map/src/fm-map/effects/map.effects.ts b/projects/common-map/src/fm-map/effects/map.effects.ts index 9e1ed4a..5d0d03f 100644 --- a/projects/common-map/src/fm-map/effects/map.effects.ts +++ b/projects/common-map/src/fm-map/effects/map.effects.ts @@ -332,7 +332,7 @@ export class MapEffects { ))); updateLayerValuesOnLayerAddedOrRemoved$ = createEffect(() => this.actions$.pipe( - ofType(mapActions.ADDLAYER,mapActions.REMOVELAYER,mapActions.SELECTITEM,mapActions.NEXTTEMPORAL,mapActions.PREVIOUSTEMPORAL,mapActions.TOGGLELAYERVALUESENABLED), + ofType(mapActions.ADDLAYER,mapActions.REMOVELAYER,mapActions.SELECTITEMSUCCESS,mapActions.SELECTTEMPORALITEMSSUCCESS, mapActions.NEXTTEMPORAL,mapActions.PREVIOUSTEMPORAL,mapActions.TOGGLELAYERVALUESENABLED,mapActions.SETLAYERINDEX,mapActions.SETSELECTEDITEMLAYER), withLatestFrom(this.store$.select(mapReducers.selectGetLayerValuesX)), withLatestFrom(this.store$.select(mapReducers.selectGetLayerValuesY)), map(([[action,x],y]) => new mapActions.SetLayerValuesLocation(x,y))