Browse Source

ios crash

Viktoriia 1 month ago
parent
commit
c0f45fdca1

+ 15 - 15
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 ['boolean', false];
+    return ['==', ['get', 'id'], -1];
   }
   }
   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(['boolean', false]);
+      setRegionsVisitedFilter(['==', ['get', 'id'], -1]);
     }
     }
   }, [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(['boolean', false]);
+      setCountriesVisitedFilter(['==', ['get', 'id'], -1]);
     }
     }
   }, [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(['boolean', false]);
+      setDareVisitedFilter(['==', ['get', 'id'], -1]);
     }
     }
   }, [dareVisited]);
   }, [dareVisited]);
 
 
@@ -1210,7 +1210,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
         setRenderCamera(true);
         setRenderCamera(true);
 
 
         requestAnimationFrame(() => {
         requestAnimationFrame(() => {
-          cameraRef.current?.flyTo({center: coordinates as [number, number], duration});
+          cameraRef.current?.flyTo({ center: coordinates as [number, number], duration });
         });
         });
 
 
         animationTimeoutRef.current = setTimeout(() => {
         animationTimeoutRef.current = setTimeout(() => {
@@ -1218,7 +1218,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
           setRenderCamera(false);
           setRenderCamera(false);
         }, duration + 200);
         }, duration + 200);
       } else {
       } else {
-        cameraRef.current?.flyTo({center: coordinates as [number, number], duration});
+        cameraRef.current?.flyTo({ center: coordinates as [number, number], duration });
 
 
         animationTimeoutRef.current = setTimeout(() => {
         animationTimeoutRef.current = setTimeout(() => {
           isAnimatingRef.current = false;
           isAnimatingRef.current = false;
@@ -1240,9 +1240,9 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
 
 
         requestAnimationFrame(() => {
         requestAnimationFrame(() => {
           if (duration > 0) {
           if (duration > 0) {
-            cameraRef.current?.easeTo({center, duration});
+            cameraRef.current?.easeTo({ center, duration });
           } else {
           } else {
-            cameraRef.current?.jumpTo({center});
+            cameraRef.current?.jumpTo({ center });
           }
           }
         });
         });
 
 
@@ -1252,9 +1252,9 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
         }, (duration || 100) + 200);
         }, (duration || 100) + 200);
       } else {
       } else {
         if (duration > 0) {
         if (duration > 0) {
-          cameraRef.current?.easeTo({center, duration});
+          cameraRef.current?.easeTo({ center, duration });
         } else {
         } else {
-          cameraRef.current?.jumpTo({center});
+          cameraRef.current?.jumpTo({ center });
         }
         }
 
 
         animationTimeoutRef.current = setTimeout(() => {
         animationTimeoutRef.current = setTimeout(() => {
@@ -1274,7 +1274,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
         setRenderCamera(true);
         setRenderCamera(true);
 
 
         requestAnimationFrame(() => {
         requestAnimationFrame(() => {
-          cameraRef.current?.zoomTo(zoomLevel, {duration});
+          cameraRef.current?.zoomTo(zoomLevel, { duration });
         });
         });
 
 
         animationTimeoutRef.current = setTimeout(() => {
         animationTimeoutRef.current = setTimeout(() => {
@@ -1282,7 +1282,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
           setRenderCamera(false);
           setRenderCamera(false);
         }, duration + 200);
         }, duration + 200);
       } else {
       } else {
-        cameraRef.current?.zoomTo(zoomLevel, {duration});
+        cameraRef.current?.zoomTo(zoomLevel, { duration });
 
 
         animationTimeoutRef.current = setTimeout(() => {
         animationTimeoutRef.current = setTimeout(() => {
           isAnimatingRef.current = false;
           isAnimatingRef.current = false;
@@ -2029,10 +2029,10 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
   const handleUserPress = (event: any) => {
   const handleUserPress = (event: any) => {
     const selectedFeature = event?.features?.[0] || event?.nativeEvent?.features?.[0];
     const selectedFeature = event?.features?.[0] || event?.nativeEvent?.features?.[0];
     if (!selectedFeature) return;
     if (!selectedFeature) return;
-    
+
     const { coordinates } = selectedFeature.geometry;
     const { coordinates } = selectedFeature.geometry;
     const { avatar, first_name, last_name, flag, id, last_seen } = selectedFeature.properties;
     const { avatar, first_name, last_name, flag, id, last_seen } = selectedFeature.properties;
-    
+
     setSelectedUser({
     setSelectedUser({
       coordinates,
       coordinates,
       avatar: avatar ? { uri: API_HOST + avatar } : logo,
       avatar: avatar ? { uri: API_HOST + avatar } : logo,
@@ -2905,7 +2905,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
         message={
         message={
           'This feature is available to Premium users. Premium account settings can be managed on our website.'
           'This feature is available to Premium users. Premium account settings can be managed on our website.'
         }
         }
-        action={() => {}}
+        action={() => { }}
         onClose={() => setPremiumModalVisible(false)}
         onClose={() => setPremiumModalVisible(false)}
         title={'Premium Feature'}
         title={'Premium Feature'}
       />
       />

+ 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 ['boolean', false];
+  if (!ids || ids.length === 0) return ['==', ['get', 'id'], -1];
   return ['in', ['get', 'id'], ['literal', ids]];
   return ['in', ['get', 'id'], ['literal', ids]];
 };
 };