Fix loading of carrier colors after data import

bodastage · Oct 15, 2019 · f439913 · f439913
1 parent 0819fc0
commit f439913
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/modules/gis/GISMap.js b/src/modules/gis/GISMap.js
@@ -334,7 +334,7 @@ class GISMap extends React.Component{
 
 				ipcRenderer.removeListener("parse-cm-request", this.importFileBGJobListener);
 				//Reload the carrier colors
-				if(this.props.carrierColors.length === 0) this.props.dispatch(gisFetchPlanFrequencies());
+				this.props.dispatch(gisFetchPlanFrequencies());
 
 				this.refreshMap();
 			}

diff --git a/src/modules/gis/gis-reducer.js b/src/modules/gis/gis-reducer.js
@@ -77,7 +77,7 @@ function gis(state = initialState, action) {
 		case GIS_UPDATE_PLAN_CARRIERS:
 			var colorMap = {};
 			action.frequencies.forEach((f, i) => {
-				colorMap[f] = state.carrierColors[i];
+				colorMap[f] = state.carrierColorMap[f] || state.carrierColors[i];
 			});
 			return {
 				...state,