fix: group only by main and other

geops · Apr 28, 2020 · 247880e · 247880e
1 parent 444a489
commit 247880e
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/lib/src/locate.js b/lib/src/locate.js
@@ -133,24 +133,21 @@ function locate(location = {}) {
       (ft) => intersection(ft.slope, location.slopes).length > 0,
     );
   }
+  if (location.groups) {
+    forestTypes = forestTypes.filter((ft) =>
+      location.groups.some((g) => ft.group[g]),
+    );
+  }
   const allForestTypes = forestTypes.map((ft) => ft.code);
   const byForestTypes = (item) =>
     intersection(item.forestTypes, allForestTypes).length > 0;
 
   options.indicator = types.indicator.filter(byForestTypes).map((i) => i.code);
   options.treeType = types.treeType.filter(byForestTypes).map((tt) => tt.code);
 
-  const forestTypesByGroup = (group) =>
-    !location.groups || location.groups.includes(group)
-      ? forestTypes.filter((ft) => ft.group[group]).map((ft) => ft.code)
-      : [];
-
   forestTypes = {
-    main: forestTypesByGroup('main'),
-    pioneer: forestTypesByGroup('pioneer'),
-    special: forestTypesByGroup('special'),
-    volatile: forestTypesByGroup('volatile'),
-    riverside: forestTypesByGroup('riverside'),
+    main: forestTypes.filter((ft) => ft.group.main).map((ft) => ft.code),
+    other: forestTypes.filter((ft) => !ft.group.main).map((ft) => ft.code),
   };
   if (ecogram && (!location.groups || location.groups.includes('main'))) {
     ecogram = ecogram.map((e) => {