Browse Source

maplibre update fix

Viktoriia 4 days ago
parent
commit
e12b4e47cd

+ 5 - 5
src/screens/InAppScreens/MapScreen/index.tsx

@@ -129,7 +129,7 @@ const sanitizeNomadsGeoJSON = (
 const generateFilter = (ids: number[]) => {
 const generateFilter = (ids: number[]) => {
   const validIds = ids?.filter(isValidNumber) || [];
   const validIds = ids?.filter(isValidNumber) || [];
   if (validIds.length === 0) {
   if (validIds.length === 0) {
-    return ['==', ['get', 'id'], -1];
+    return ['boolean', false];
   }
   }
   return ['in', ['get', 'id'], ['literal', validIds]];
   return ['in', ['get', 'id'], ['literal', validIds]];
 };
 };
@@ -829,7 +829,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
     if (regionsVisited && regionsVisited.length) {
     if (regionsVisited && regionsVisited.length) {
       setRegionsVisitedFilter(generateFilter(regionsVisited));
       setRegionsVisitedFilter(generateFilter(regionsVisited));
     } else {
     } else {
-      setRegionsVisitedFilter(['==', ['get', 'id'], -1]);
+      setRegionsVisitedFilter(['boolean', false]);
     }
     }
   }, [regionsVisited]);
   }, [regionsVisited]);
 
 
@@ -837,7 +837,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
     if (countriesVisited && countriesVisited.length) {
     if (countriesVisited && countriesVisited.length) {
       setCountriesVisitedFilter(generateFilter(countriesVisited));
       setCountriesVisitedFilter(generateFilter(countriesVisited));
     } else {
     } else {
-      setCountriesVisitedFilter(['==', ['get', 'id'], -1]);
+      setCountriesVisitedFilter(['boolean', false]);
     }
     }
   }, [countriesVisited]);
   }, [countriesVisited]);
 
 
@@ -845,7 +845,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
     if (dareVisited && dareVisited.length) {
     if (dareVisited && dareVisited.length) {
       setDareVisitedFilter(generateFilter(dareVisited));
       setDareVisitedFilter(generateFilter(dareVisited));
     } else {
     } else {
-      setDareVisitedFilter(['==', ['get', 'id'], -1]);
+      setDareVisitedFilter(['boolean', false]);
     }
     }
   }, [dareVisited]);
   }, [dareVisited]);
 
 
@@ -963,7 +963,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
       );
       );
       setSeriesNotVisitedFilter(
       setSeriesNotVisitedFilter(
         seriesVisited.length
         seriesVisited.length
-          ? ['all', ...seriesVisited.filter(isValidNumber).map((id) => ['!=', 'id', id])]
+          ? ['all', ...seriesVisited.filter(isValidNumber).map((id) => ['!=', ['get', 'id'], id])]
           : ['all']
           : ['all']
       );
       );
     }
     }

+ 1 - 1
src/screens/OfflineMapsScreen/SelectRegionsScreen/index.tsx

@@ -32,7 +32,7 @@ import { offlineMapManager } from '../OfflineMapManager';
 import LocationIcon from 'assets/icons/location.svg';
 import LocationIcon from 'assets/icons/location.svg';
 
 
 const generateFilter = (ids: number[]) => {
 const generateFilter = (ids: number[]) => {
-  if (!ids || ids.length === 0) return ['==', ['get', 'id'], -1];
+  if (!ids || ids.length === 0) return ['boolean', false];
   return ['in', ['get', 'id'], ['literal', ids]];
   return ['in', ['get', 'id'], ['literal', ids]];
 };
 };