fix: reset projection result to initial state to handle unchanged loc…

…ations
geops · Jun 15, 2020 · 8287c0f · 8287c0f
1 parent d3e8df9
commit 8287c0f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/components/ProjectionResult.js b/src/components/ProjectionResult.js
@@ -92,10 +92,7 @@ function ProjectionResult() {
     const form = projectionResult.form.projections.slice(-1)[0] || {};
     panes.push(getPane('today', location, i18n.language, t));
     panes.push(getPane('form', form, i18n.language, t));
-  } else if (
-    projectionResult.moderate.projections ||
-    projectionResult.extreme.projections
-  ) {
+  } else {
     const moderateLoc = projectionResult.moderate.projections
       ? projectionResult.moderate.projections.slice(-1)[0] || {}
       : {};

diff --git a/src/components/Recommendation.js b/src/components/Recommendation.js
@@ -30,7 +30,7 @@ function Recommendation({ sameAltitudinalZone }) {
     let result;
 
     if (projectionMode === 'f') {
-      projections = projectionResult.form.projections.slice(-1) || [];
+      projections = projectionResult.form.projections?.slice(-1) || [];
     } else {
       const { moderate, extreme } = projectionResult;
       projections = [

diff --git a/src/store/enhancers/projection.js b/src/store/enhancers/projection.js
@@ -11,6 +11,7 @@ import {
   setLocationResult,
   setProjectionResult,
 } from '../actions';
+import { initialState } from '../reducers';
 
 const projectionActionTypes = [
   SET_FORM_LOCATION,
@@ -57,7 +58,7 @@ const projection = (store) => (next) => (action) => {
     }
 
     try {
-      const projectionResult = { extreme: {}, moderate: {}, form: {} };
+      const projectionResult = { ...initialState.projectionResult };
       if (projectionMode === 'm') {
         const {
           targetAltitudinalZoneModerate: targetAZModerate,