|
@@ -14,11 +14,9 @@ import * as turf from '@turf/turf';
|
|
|
import * as FileSystem from 'expo-file-system';
|
|
|
import * as Location from 'expo-location';
|
|
|
import { storage, StoreType } from '../../../storage';
|
|
|
-import Modal from 'react-native-modal';
|
|
|
|
|
|
import MenuIcon from '../../../../assets/icons/menu.svg';
|
|
|
import SearchIcon from '../../../../assets/icons/search.svg';
|
|
|
-import RadarIcon from '../../../../assets/icons/radar.svg';
|
|
|
import LocationIcon from '../../../../assets/icons/location.svg';
|
|
|
import CloseSvg from '../../../../assets/icons/close.svg';
|
|
|
import FilterIcon from 'assets/icons/filter.svg';
|
|
@@ -35,7 +33,6 @@ import {
|
|
|
filterCandidates,
|
|
|
filterCandidatesMarkers,
|
|
|
findRegionInDataset,
|
|
|
- processIconUrl,
|
|
|
processMarkerData
|
|
|
} from '../../../utils/mapHelpers';
|
|
|
import { getData } from '../../../modules/map/regionData';
|
|
@@ -43,7 +40,7 @@ import { fetchSeriesData, usePostSetToggleItem } from '@api/series';
|
|
|
import MarkerItem from './MarkerItem';
|
|
|
import ClusterItem from './ClusterItem';
|
|
|
import { FeatureCollection, ItemSeries, MapScreenProps, Region, Series } from '../../../types/map';
|
|
|
-import { FASTEST_MAP_HOST } from 'src/constants';
|
|
|
+import { API_HOST, FASTEST_MAP_HOST } from 'src/constants';
|
|
|
import { useConnection } from 'src/contexts/ConnectionContext';
|
|
|
import ClusteredMapView from 'react-native-map-clustering';
|
|
|
import { fetchUserData, fetchUserDataDare } from '@api/regions';
|
|
@@ -57,10 +54,9 @@ import { useSharedValue, useAnimatedStyle, withTiming } from 'react-native-reani
|
|
|
import { Colors } from 'src/theme';
|
|
|
import { useGetUniversalSearch } from '@api/search';
|
|
|
import SearchModal from './UniversalSearch';
|
|
|
-import { Dropdown } from 'react-native-searchable-dropdown-kj';
|
|
|
-import { ButtonVariants } from 'src/types/components';
|
|
|
-import { ModalStyles } from '../TravellersScreen/Components/styles';
|
|
|
import FilterModal from './FilterModal';
|
|
|
+import InfoIcon from 'assets/icons/info-solid.svg';
|
|
|
+import { NAVIGATION_PAGES } from 'src/types';
|
|
|
|
|
|
const localTileDir = `${FileSystem.cacheDirectory}tiles/background`;
|
|
|
const localGridDir = `${FileSystem.cacheDirectory}tiles/grid`;
|
|
@@ -599,7 +595,7 @@ const MapScreen: React.FC<MapScreenProps> = ({ navigation }) => {
|
|
|
return markers.map((marker, idx) => {
|
|
|
const coordinate = { latitude: marker.pointJSON[0], longitude: marker.pointJSON[1] };
|
|
|
const markerSeries = series?.find((s) => s.id === marker.series_id);
|
|
|
- const iconUrl = markerSeries ? processIconUrl(markerSeries.icon) : 'default_icon_url';
|
|
|
+ const iconUrl = markerSeries ? API_HOST + markerSeries.icon : 'default_icon_url';
|
|
|
const seriesName = markerSeries ? markerSeries.name : 'Unknown';
|
|
|
|
|
|
return (
|
|
@@ -785,6 +781,13 @@ const MapScreen: React.FC<MapScreenProps> = ({ navigation }) => {
|
|
|
</TouchableOpacity>
|
|
|
) : null}
|
|
|
|
|
|
+ <TouchableOpacity
|
|
|
+ style={styles.cornerInfoButton}
|
|
|
+ onPress={() => navigation.navigate(NAVIGATION_PAGES.DISCOVER_INFO)}
|
|
|
+ >
|
|
|
+ <InfoIcon />
|
|
|
+ </TouchableOpacity>
|
|
|
+
|
|
|
<Animated.View
|
|
|
style={[
|
|
|
styles.searchContainer,
|
|
@@ -820,7 +823,9 @@ const MapScreen: React.FC<MapScreenProps> = ({ navigation }) => {
|
|
|
|
|
|
<TouchableOpacity
|
|
|
style={[styles.cornerButton, styles.bottomButton, styles.bottomLeftButton]}
|
|
|
- onPress={() => setIsFilterVisible(true)}
|
|
|
+ onPress={() => {
|
|
|
+ token ? setIsFilterVisible(true) : setIsWarningModalVisible(true);
|
|
|
+ }}
|
|
|
>
|
|
|
<FilterIcon />
|
|
|
</TouchableOpacity>
|
|
@@ -862,7 +867,6 @@ const MapScreen: React.FC<MapScreenProps> = ({ navigation }) => {
|
|
|
setTilesType={setTilesType}
|
|
|
type={type}
|
|
|
setType={setType}
|
|
|
-
|
|
|
/>
|
|
|
</View>
|
|
|
);
|