Cleaned up a little conditional logic

sdl60660 · Dec 28, 2021 · 1595586 · 1595586 · vercel · Dec 28, 2021
1 parent 09cc2f9
commit 1595586
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/src/components/utils/geoUtils.js b/src/components/utils/geoUtils.js
@@ -137,21 +137,19 @@ export const assignParentFeatureNames = (flowlines, nameOverrides, inlandFeature
  const { nameid, levelpathi } = feature.properties;
 
  if (nameid === "unknown") {
- const overrideEntry = nameOverrides[levelpathi];
-
- if (overrideEntry) {
- feature.properties.feature_name = overrideEntry.feature_name;
- feature.properties.feature_id = overrideEntry.feature_name; 
- }
- else {
- feature.properties.feature_name = `Unidentified River ${feature.properties.levelpathi}`;
- feature.properties.feature_id = levelpathi;
- }
+ feature.properties.feature_name = `Unidentified River ${feature.properties.levelpathi}`;
+ feature.properties.feature_id = levelpathi;
  }
  else {
  feature.properties.feature_name = nameid
  feature.properties.feature_id = nameid;
  }
+
+ const overrideEntry = nameOverrides[levelpathi];
+ if (overrideEntry) {
+ feature.properties.feature_name = overrideEntry.feature_name;
+ feature.properties.feature_id = overrideEntry.feature_name; 
+ }
  });
 
  const mappedFlowlines = Object.fromEntries(flowlines.map(d => [d.properties.comid, d]));