Viktoriia 7 月之前
父节点
当前提交
2647ea7d90

+ 1 - 0
app.config.ts

@@ -36,6 +36,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
     MAP_HOST: MAP_HOST,
     MAP_HOST: MAP_HOST,
     GOOGLE_MAP_PLACES_APIKEY: GOOGLE_MAP_PLACES_APIKEY,
     GOOGLE_MAP_PLACES_APIKEY: GOOGLE_MAP_PLACES_APIKEY,
     WEBSOCKET_URL: WEBSOCKET_URL,
     WEBSOCKET_URL: WEBSOCKET_URL,
+    VECTOR_MAP_HOST: env.VECTOR_MAP_HOST,
     eas: {
     eas: {
       projectId: env.EAS_PROJECT_ID
       projectId: env.EAS_PROJECT_ID
     }
     }

+ 1 - 0
src/constants/secrets.ts

@@ -4,6 +4,7 @@ const { extra } = Constants.manifest2 || Constants.manifest;
 
 
 export const API_HOST = extra?.API_HOST || Constants?.expoConfig?.extra?.API_HOST;
 export const API_HOST = extra?.API_HOST || Constants?.expoConfig?.extra?.API_HOST;
 export const MAP_HOST = extra?.MAP_HOST || Constants?.expoConfig?.extra?.MAP_HOST;
 export const MAP_HOST = extra?.MAP_HOST || Constants?.expoConfig?.extra?.MAP_HOST;
+export const VECTOR_MAP_HOST = extra?.VECTOR_MAP_HOST || Constants?.expoConfig?.extra?.VECTOR_MAP_HOST;
 
 
 export const API_URL = `${API_HOST}/webapi`;
 export const API_URL = `${API_HOST}/webapi`;
 
 

+ 1 - 0
src/database/tilesService/index.ts

@@ -4,6 +4,7 @@ import MapLibreGL from '@maplibre/maplibre-react-native';
 import { API_HOST, FASTEST_MAP_HOST } from 'src/constants';
 import { API_HOST, FASTEST_MAP_HOST } from 'src/constants';
 
 
 const baseTilesDir = `${FileSystem.cacheDirectory}tiles/`;
 const baseTilesDir = `${FileSystem.cacheDirectory}tiles/`;
+// TO DO VECTOR_MAP_HOST
 const STYLE_URL = `${API_HOST}/omt/app.json`;
 const STYLE_URL = `${API_HOST}/omt/app.json`;
 const PACK_NAME = 'global-map-pack';
 const PACK_NAME = 'global-map-pack';
 
 

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

@@ -29,7 +29,7 @@ import RegionPopup from 'src/components/RegionPopup';
 import { useRegion } from 'src/contexts/RegionContext';
 import { useRegion } from 'src/contexts/RegionContext';
 import { qualityOptions } from '../TravelsScreen/utils/constants';
 import { qualityOptions } from '../TravelsScreen/utils/constants';
 import { AvatarWithInitials, EditNmModal, WarningModal } from 'src/components';
 import { AvatarWithInitials, EditNmModal, WarningModal } from 'src/components';
-import { API_HOST, MAP_HOST } from 'src/constants';
+import { API_HOST, MAP_HOST, VECTOR_MAP_HOST } from 'src/constants';
 import { NAVIGATION_PAGES } from 'src/types';
 import { NAVIGATION_PAGES } from 'src/types';
 import Animated, {
 import Animated, {
   Easing,
   Easing,
@@ -1003,7 +1003,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
       <MapLibreGL.MapView
       <MapLibreGL.MapView
         ref={mapRef}
         ref={mapRef}
         style={styles.map}
         style={styles.map}
-        styleJSON={API_HOST + '/omt/app.json'}
+        styleJSON={VECTOR_MAP_HOST + '/nomadmania-maps.json'}
         rotateEnabled={false}
         rotateEnabled={false}
         attributionEnabled={false}
         attributionEnabled={false}
         onPress={onMapPress}
         onPress={onMapPress}

+ 2 - 2
src/screens/InAppScreens/ProfileScreen/UsersMap/index.tsx

@@ -17,7 +17,7 @@ import Animated, {
 } from 'react-native-reanimated';
 } from 'react-native-reanimated';
 
 
 import { styles } from './styles';
 import { styles } from './styles';
-import { API_HOST, FASTEST_MAP_HOST } from 'src/constants';
+import { API_HOST, FASTEST_MAP_HOST, VECTOR_MAP_HOST } from 'src/constants';
 import { CommonActions, NavigationProp } from '@react-navigation/native';
 import { CommonActions, NavigationProp } from '@react-navigation/native';
 import { AvatarWithInitials, LocationPopup } from 'src/components';
 import { AvatarWithInitials, LocationPopup } from 'src/components';
 import { Colors } from 'src/theme';
 import { Colors } from 'src/theme';
@@ -305,7 +305,7 @@ const UsersMapScreen: FC<Props> = ({ navigation, route }) => {
       <MapLibreGL.MapView
       <MapLibreGL.MapView
         ref={mapRef}
         ref={mapRef}
         style={styles.map}
         style={styles.map}
-        styleJSON={API_HOST + '/omt/app.json'}
+        styleJSON={VECTOR_MAP_HOST + '/nomadmania-maps.json'}
         rotateEnabled={false}
         rotateEnabled={false}
         attributionEnabled={false}
         attributionEnabled={false}
       >
       >