feat: preselect and fall back to normal location altitudinal zone for…

… transition
geops · May 6, 2020 · b444cde · b444cde
1 parent b0515e6
commit b444cde
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/lib/src/project.js b/lib/src/project.js
@@ -112,7 +112,7 @@ function project(location = {}, targetAltitude, previousResult) {
   if (location.transitionForestType) {
     const { transitionForestType, transitionAltitudinalZone, ...tl } = location;
     tl.forestType = transitionForestType;
-    tl.altitudinalZone = transitionAltitudinalZone;
+    tl.altitudinalZone = transitionAltitudinalZone || tl.altitudinalZone;
     const transition = project(tl, targetAltitude);
     const tp = transition.projections || [];
     Object.entries(transition.options).forEach(([k, v]) => {

diff --git a/lib/test/project.test.js b/lib/test/project.test.js
@@ -176,6 +176,21 @@ describe('valid projections', () => {
     });
   });
 
+  test('projection with valid transitionForestType but missing transitionAltitudinalZone', () => {
+    expect(
+      project(
+        {
+          forestEcoregion: '1',
+          forestType: '19f',
+          transitionForestType: '46',
+          altitudinalZone: '60',
+          slope: '<20',
+        },
+        '50',
+      ).projections[0].transitionForestType,
+    ).toBe('8*');
+  });
+
   test('projection with transitionForestType not found', () => {
     expect(
       project(

diff --git a/src/components/ProjectionForm.js b/src/components/ProjectionForm.js
@@ -182,7 +182,10 @@ function ProjectionForm() {
             }}
             onBlur={deactivateField}
             onFocus={() => activateField('transitionAltitudinalZone')}
-            value={getValue('altitudinalZone', { transition: true })}
+            value={
+              getValue('altitudinalZone', { transition: true }) ||
+              getValue('altitudinalZone')
+            }
           />
         </Segment>
       )}