Fix issue #872

bug(manual-image-processing) saving as case not supported

Author: yuvalbl

src/app/app/app-effects/effects/tools.app.effects.spec.ts

@@ -79,9 +79,9 @@ describe('ToolsAppEffects', () => {
 				],
 				activeMapId: 'imagery1'
 			},
-			overlaysManualProcessArgs: new Map<string, Object>([
-				['overlay_123', { Contrast: 50, Brightness: 20 }]
-			])
+			overlaysManualProcessArgs: {
+				'overlay_123': { Contrast: 50, Brightness: 20 }
+			}
 		} as any
 	}];
 	const imapState: any = {

src/app/app/app-effects/effects/tools.app.effects.ts

@@ -151,8 +151,8 @@ export class ToolsAppEffects {
 			let manualProcessArgs = null;
 
 			// action 2: SetMapManualImageProcessing / SetMapAutoImageProcessing (optional)
-			if (selectedCase.state.overlaysManualProcessArgs && selectedCase.state.overlaysManualProcessArgs.get) {
-				manualProcessArgs = selectedCase.state.overlaysManualProcessArgs.get(action.payload.id);
+			if (selectedCase.state.overlaysManualProcessArgs) {
+				manualProcessArgs = selectedCase.state.overlaysManualProcessArgs[action.payload.id];
 			}
 			if (activeMap.data.isAutoImageProcessingActive) {
 				// auto process action
@@ -243,7 +243,7 @@ export class ToolsAppEffects {
 		.filter(([activeMap, overlayId, selectedCase]: [CaseMapState, string, Case]) => {
 			const isAutoProcessOn = activeMap.data.isAutoImageProcessingActive;
 			const ManualProcessArgs = selectedCase.state.overlaysManualProcessArgs;
-			return Boolean(isAutoProcessOn && ManualProcessArgs && ManualProcessArgs.get(overlayId));
+			return Boolean(isAutoProcessOn && ManualProcessArgs && ManualProcessArgs[overlayId]);
 		})
 		.mergeMap(([activeMap, overlayId, selectedCase]: [CaseMapState, string, Case]) => {
 			updateOverlaysManualProcessArgs(selectedCase, overlayId, null);
@@ -389,9 +389,9 @@ function updateOverlaysManualProcessArgs(selectedCase: Case, overlayId: string,
 		processingParams = null;
 	}
 	if (!selectedCase.state.overlaysManualProcessArgs) {
-		selectedCase.state.overlaysManualProcessArgs = new Map<string, Object>();
+		selectedCase.state.overlaysManualProcessArgs = new Object();
 	}
-	selectedCase.state.overlaysManualProcessArgs.set(overlayId, processingParams);
+	selectedCase.state.overlaysManualProcessArgs[overlayId] = processingParams;
 	return selectedCase;
 }
 

src/app/packages/core/models/case.model.ts

@@ -25,7 +25,7 @@ export interface CaseState {
 	orientation: string,
 	geoFilter: string,
 	favoritesOverlays?: string[],
-	overlaysManualProcessArgs: Map<string, Object>
+	overlaysManualProcessArgs: Object,
 	layers?: CaseLayersState
 }
 

src/app/packages/menu-items/cases/components/edit-case/edit-case.component.ts

@@ -105,7 +105,7 @@ export class EditCaseComponent implements OnInit {
 				orientation: selectedCase.state.orientation,
 				geoFilter: selectedCase.state.geoFilter,
 				favoritesOverlays: [],
-				overlaysManualProcessArgs: new Map<string, Object>()
+				overlaysManualProcessArgs: new Object()
 			}
 		};
 	}

src/app/packages/menu-items/tools/components/image-processing-control/image-processing-control.component.ts

@@ -2,6 +2,7 @@ import { Component, HostBinding, Input } from '@angular/core';
 import { IToolsState } from '../../reducers/tools.reducer';
 import { Store } from '@ngrx/store';
 import { SetManualImageProcessing } from '../../actions/tools.actions';
+import { isEqual } from 'lodash';
 
 @Component({
 	selector: 'ansyn-image-processing-control',
@@ -36,7 +37,11 @@ export class ImageProcessingControlComponent {
 	}
 
 	manualImageProcess() {
-		this.store$.dispatch(new SetManualImageProcessing({ processingParams: this.imgProcessParams }));
+		let dispatchValue = this.imgProcessParams;
+		if (isEqual(this.imgProcessParams, this._imgProcessParamDefaults)) {
+			dispatchValue = null;
+		}
+		this.store$.dispatch(new SetManualImageProcessing({ processingParams: dispatchValue }));
 	}
 
 	backToDefault(processParam) {

src/app/packages/open-layers-map/image-processing/open-layers-image-processing.ts

@@ -94,7 +94,7 @@ export class OpenLayersImageProcessing {
 		const operations = new Array<IRasterOperation>();
 		// todo: by order
 		IMG_PROCESS_ORDER.forEach(processKey => {
-			if (operationsArguments.hasOwnProperty(processKey)) {
+			if (operationsArguments && operationsArguments.hasOwnProperty(processKey)) {
 				const operation = this._operations.get(processKey);
 				if (operation) {
 					operations.push(operation);