FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix AW-2620
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Willem Dantuma 2021-07-30 14:06:31 +02:00
parent 2da4f88683
commit f880623337
3 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
package-lock.json generated
View File

@ -705,6 +705,7 @@
"requires": { "requires": {
"boolbase": "^1.0.0", "boolbase": "^1.0.0",
"css-what": "^4.0.0", "css-what": "^4.0.0",
"domhandler": "^4.0.0",
"domutils": "^2.4.3", "domutils": "^2.4.3",
"nth-check": "^2.0.0" "nth-check": "^2.0.0"
} }
@ -788,6 +789,7 @@
"dev": true, "dev": true,
"requires": { "requires": {
"domelementtype": "^2.0.1", "domelementtype": "^2.0.1",
"domhandler": "^4.2.0",
"entities": "^2.0.0" "entities": "^2.0.0"
} }
}, },
@ -804,7 +806,8 @@
"dev": true, "dev": true,
"requires": { "requires": {
"dom-serializer": "^1.0.1", "dom-serializer": "^1.0.1",
"domelementtype": "^2.2.0" "domelementtype": "^2.2.0",
"domhandler": "^4.2.0"
} }
}, },
"enhanced-resolve": { "enhanced-resolve": {
@ -1917,9 +1920,11 @@
}, },
"svgo": { "svgo": {
"version": "2.3.0", "version": "2.3.0",
"resolved": "", "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.3.0.tgz",
"integrity": "sha512-fz4IKjNO6HDPgIQxu4IxwtubtbSfGEAJUq/IXyTPIkGhWck/faiiwfkvsB8LnBkKLvSoyNNIY6d13lZprJMc9Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"@trysound/sax": "0.1.1",
"chalk": "^4.1.0", "chalk": "^4.1.0",
"commander": "^7.1.0", "commander": "^7.1.0",
"css-select": "^3.1.2", "css-select": "^3.1.2",
@ -4074,25 +4079,25 @@
"dev": true "dev": true
}, },
"@farmmaps/common": { "@farmmaps/common": {
"version": "1.1.1-prerelease.2030", "version": "1.1.1-prerelease.2031",
"resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-1.1.1-prerelease.2030.tgz", "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-1.1.1-prerelease.2031.tgz",
"integrity": "sha512-m0QVFx7qWkKHJMIHsGBEYwmOMqa9Ud9D8Wjb/0/+mJE/YQ2mVr++ndQ19PHFHjfPkifnibHovnuajWf27paBXg==", "integrity": "sha512-lSmTd2D1/PqzaXBjjY4X6UTYA5joZndXyZpUkFNm/Z0TTFmzFKmiIyGRA9AHX4StdQXC7QsCNfalYN31tnwtuQ==",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@farmmaps/common-map": { "@farmmaps/common-map": {
"version": "1.1.1-prerelease.2030", "version": "1.1.1-prerelease.2031",
"resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-1.1.1-prerelease.2030.tgz", "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-1.1.1-prerelease.2031.tgz",
"integrity": "sha512-TiaAxN7EAtMdquIiFEY/2XWUDHxDRVCVkjzX8Z0xlwxM5KIy1PFR+TEGa4qnYnRzFX0ZrdZef0Uf6rIKPVAc2g==", "integrity": "sha512-BQ2bvNohPth0+oxoSoh+WWLJ/mP2CGW4Qf4xqgC3tgfW+UZfD0dBPl7IT2piuvOuUQzlSVloinCJ4ciZGyZRXg==",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@farmmaps/common-map3d": { "@farmmaps/common-map3d": {
"version": "1.1.1-prerelease.2030", "version": "1.1.1-prerelease.2031",
"resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-1.1.1-prerelease.2030.tgz", "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-1.1.1-prerelease.2031.tgz",
"integrity": "sha512-igMJAeyCs4Vm1FVUSqZHZAztIqUgYY4+Cl5PW6fcUiqVVyQfU50uZYTVPkVhLYxfoJbvP7TSRnPjIqa9yEB8ZQ==", "integrity": "sha512-2M5wv5sFwlVwPGlN1b1AGM3Dh/DJFS7+L3b6e6ir2+ASoyy7xhZ67IWS2du8B7y7/xVsgxCJcJp1EJezbSCMAA==",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
@ -4583,6 +4588,12 @@
"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
"dev": true "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": { "@types/color-name": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
@ -7175,6 +7186,23 @@
"integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
"dev": true "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": { "domutils": {
"version": "1.7.0", "version": "1.7.0",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
@ -8799,7 +8827,8 @@
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
"resolved": "", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
"dev": true "dev": true
}, },
"injection-js": { "injection-js": {

6
package.json
View File

@ -19,9 +19,9 @@
"@angular/platform-browser": "~11.2.14", "@angular/platform-browser": "~11.2.14",
"@angular/platform-browser-dynamic": "~11.2.14", "@angular/platform-browser-dynamic": "~11.2.14",
"@angular/router": "~11.2.14", "@angular/router": "~11.2.14",
"@farmmaps/common": "1.1.1-prerelease.2030", "@farmmaps/common": "1.1.1-prerelease.2031",
"@farmmaps/common-map": "1.1.1-prerelease.2030", "@farmmaps/common-map": "1.1.1-prerelease.2031",
"@farmmaps/common-map3d": "1.1.1-prerelease.2030", "@farmmaps/common-map3d": "1.1.1-prerelease.2031",
"@microsoft/signalr": "^3.1.16", "@microsoft/signalr": "^3.1.16",
"@ng-bootstrap/ng-bootstrap": "^9.0", "@ng-bootstrap/ng-bootstrap": "^9.0",
"@ngrx/effects": "^11.0", "@ngrx/effects": "^11.0",

2
projects/common-map/src/fm-map/effects/map.effects.ts
View File

@ -332,7 +332,7 @@ export class MapEffects {
))); )));
updateLayerValuesOnLayerAddedOrRemoved$ = createEffect(() => this.actions$.pipe( 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.selectGetLayerValuesX)),
withLatestFrom(this.store$.select(mapReducers.selectGetLayerValuesY)), withLatestFrom(this.store$.select(mapReducers.selectGetLayerValuesY)),
map(([[action,x],y]) => new mapActions.SetLayerValuesLocation(x,y)) map(([[action,x],y]) => new mapActions.SetLayerValuesLocation(x,y))