|
@@ -49,27 +49,26 @@ import {
|
|
|
MapScreenProps,
|
|
|
FeatureCollection
|
|
|
} from '../../../types/map';
|
|
|
+const MAP_HOST ='https://maps.nomadmania.eu';
|
|
|
|
|
|
-let userId: string | null = '';
|
|
|
-let token: string | null = '';
|
|
|
-storageGet('id').then((data) => (userId = data));
|
|
|
-storageGet('token').then((data) => (token = data));
|
|
|
-
|
|
|
-const tilesBaseURL = 'https://maps.nomadmania.com/tiles_osm';
|
|
|
+const tilesBaseURL = `${MAP_HOST}/tiles_osm`;
|
|
|
const localTileDir = `${FileSystem.cacheDirectory}tiles`;
|
|
|
|
|
|
-const gridUrl = 'https://maps.nomadmania.com/tiles_nm/grid';
|
|
|
+const gridUrl = `${MAP_HOST}/tiles_nm/grid`;
|
|
|
const localGridDir = `${FileSystem.cacheDirectory}tiles/grid`;
|
|
|
|
|
|
-const visitedTiles = `https://maps.nomadmania.com/tiles_nm/user_visited/${userId}`;
|
|
|
const localVisitedDir = `${FileSystem.cacheDirectory}tiles/user_visited`;
|
|
|
|
|
|
-const dareTiles = 'https://maps.nomadmania.com/tiles_nm/regions_mqp';
|
|
|
+const dareTiles = `${MAP_HOST}/tiles_nm/regions_mqp`;
|
|
|
const localDareDir = `${FileSystem.cacheDirectory}tiles/regions_mqp`;
|
|
|
|
|
|
const AnimatedMarker = Animated.createAnimatedComponent(Marker);
|
|
|
|
|
|
const MapScreen: React.FC<MapScreenProps> = ({ navigation }) => {
|
|
|
+ const [userId, setUserId] = useState<string | null>('');
|
|
|
+ const [token, setToken] = useState<string | null>('');
|
|
|
+ const visitedTiles = `${MAP_HOST}/tiles_nm/user_visited/${userId}`;
|
|
|
+
|
|
|
const mapRef = useRef<MapView>(null);
|
|
|
|
|
|
const [isConnected, setIsConnected] = useState<boolean | null>(true);
|
|
@@ -88,9 +87,20 @@ const MapScreen: React.FC<MapScreenProps> = ({ navigation }) => {
|
|
|
|
|
|
const cancelTokenRef = useRef(false);
|
|
|
const currentTokenRef = useRef(0);
|
|
|
-
|
|
|
const strokeWidthAnim = useRef(new Animated.Value(2)).current;
|
|
|
|
|
|
+ useEffect(() => {
|
|
|
+ const fetchData = async () => {
|
|
|
+ const fetchedUserId = await storageGet('uid');
|
|
|
+ const fetchedToken = await storageGet('token');
|
|
|
+
|
|
|
+ setUserId(fetchedUserId);
|
|
|
+ setToken(fetchedToken);
|
|
|
+ };
|
|
|
+
|
|
|
+ fetchData();
|
|
|
+ }, []);
|
|
|
+
|
|
|
useEffect(() => {
|
|
|
Animated.loop(
|
|
|
Animated.sequence([
|