fix: Fix preset filtering

digidem · Oct 2, 2019 · 5bdc42f · 5bdc42f
1 parent a955944
commit 5bdc42f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/MapView/MapView.stories.js b/src/MapView/MapView.stories.js
@@ -20,7 +20,7 @@ export default {
 const filters = {
   All: null,
   Mining: ['all', ['in', '$preset', 'mining']],
-  Fishing: ['all', ['in', '$preset', 'fishing']]
+  Fishing: ['all', ['in', ['$preset'], 'fishing']]
 }
 
 export const defaultStory = () => {

diff --git a/src/MapView/MapViewContent.js b/src/MapView/MapViewContent.js
@@ -87,7 +87,6 @@ const MapViewContent = (
   const intl = useIntl()
   const [hovered, setHovered] = useState<?Observation>(null)
   const [styleLoaded, setStyleLoaded] = useState(false)
-  console.log(observations.length)
 
   useImperativeHandle(ref, () => ({
     fitBounds: (...args: any) => {

diff --git a/src/ViewWrapper.js b/src/ViewWrapper.js
@@ -51,7 +51,10 @@ const createFilter = (filter: Filter | void) => {
   if (!Array.isArray(filter) || filter[0] !== 'all' || filter.length < 2)
     return () => true
   const presetFilter = filter.map(subFilter => {
-    if (!Array.isArray(subFilter) || subFilter[1] !== '$preset')
+    if (
+      !Array.isArray(subFilter) ||
+      (subFilter[1] !== '$preset' && !isEqual(subFilter[1], ['$preset']))
+    )
       return subFilter
     return [subFilter[0], 'categoryId', ...subFilter.slice(2)]
   })