Viktoriia 2 veckor sedan
förälder
incheckning
d35cd386a0

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

@@ -4,7 +4,7 @@ import * as MapLibreRN from '@maplibre/maplibre-react-native';
 import { VECTOR_MAP_HOST } from 'src/constants';
 
 const baseTilesDir = `${FileSystem.cacheDirectory}tiles/`;
-const STYLE_URL = `${VECTOR_MAP_HOST}/nomadmania-maps.json`;
+const STYLE_URL = `${VECTOR_MAP_HOST}/nomadmania-maps2025.json`;
 const PACK_NAME = 'vector-map-pack';
 
 async function deleteCachedTilesIfExist(): Promise<void> {

+ 17 - 20
src/screens/InAppScreens/MapScreen/index.tsx

@@ -1317,8 +1317,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
       <MapLibreRN.MapView
         ref={mapRef}
         style={styles.map}
-        // mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps.json'}
-        mapStyle={'https://nomadmania.eu/omt/style_new.json'}
+        mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps2025.json'}
         rotateEnabled={false}
         attributionEnabled={false}
         onPress={onMapPress}
@@ -1502,7 +1501,6 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
                       style={{
                         symbolSpacing: 1,
                         iconImage: '{series_id}',
-                        // iconSize: 0.51,
                         iconAllowOverlap: true,
                         iconIgnorePlacement: true,
                         visibility: 'visible',
@@ -1536,7 +1534,6 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
                       style={{
                         symbolSpacing: 1,
                         iconImage: '{series_id}v',
-                        // iconSize: 0.51,
                         iconAllowOverlap: true,
                         iconIgnorePlacement: true,
                         visibility: 'visible',
@@ -1658,22 +1655,22 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
               filter={['!', ['has', 'point_count']]}
               aboveLayerID={Platform.OS === 'android' ? 'place-continent' : undefined}
               style={{
-                iconImage: defaultUserAvatar,
-                iconSize: [
-                  'interpolate',
-                  ['linear'],
-                  ['zoom'],
-                  0,
-                  0.24,
-                  5,
-                  0.28,
-                  10,
-                  0.33,
-                  15,
-                  0.38,
-                  20,
-                  0.42
-                ],
+                iconImage: '00',
+                // iconSize: [
+                //   'interpolate',
+                //   ['linear'],
+                //   ['zoom'],
+                //   0,
+                //   0.24,
+                //   5,
+                //   0.28,
+                //   10,
+                //   0.33,
+                //   15,
+                //   0.38,
+                //   20,
+                //   0.42
+                // ],
                 iconAllowOverlap: true
               }}
             ></MapLibreRN.SymbolLayer>

+ 1 - 1
src/screens/InAppScreens/MessagesScreen/Components/MessageLocation.tsx

@@ -32,7 +32,7 @@ const MessageLocation = ({
       <MapLibreRN.MapView
         ref={mapRef}
         style={styles.map}
-        mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps.json'}
+        mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps2025.json'}
         rotateEnabled={false}
         attributionEnabled={false}
         scrollEnabled={false}

+ 6 - 6
src/screens/InAppScreens/MessagesScreen/Components/RouteB.tsx

@@ -108,7 +108,7 @@ const RouteB = () => {
       >
         <MapLibreRN.MapView
           style={{ flex: 1 }}
-          mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps.json'}
+          mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps2025.json'}
           compassEnabled={false}
           rotateEnabled={false}
           attributionEnabled={false}
@@ -142,13 +142,13 @@ const RouteB = () => {
           variant={ButtonVariants.FILL}
           disabled={loading}
         />
-        <Button 
-          children="Send selected location" 
+        <Button
+          children="Send selected location"
           onPress={confirmLocation}
           variant={ButtonVariants.OPACITY}
-          containerStyles={{ backgroundColor: Colors.DARK_BLUE, borderColor: Colors.DARK_BLUE, }}
-          textStyles={{ color: Colors.WHITE }} 
-          />
+          containerStyles={{ backgroundColor: Colors.DARK_BLUE, borderColor: Colors.DARK_BLUE }}
+          textStyles={{ color: Colors.WHITE }}
+        />
         <Button
           children="Close"
           onPress={() => router?.goBack()}

+ 1 - 1
src/screens/InAppScreens/MessagesScreen/FullMapScreen/index.tsx

@@ -144,7 +144,7 @@ const FullMapScreen = ({ route }: { route: any }) => {
       <MapLibreRN.MapView
         ref={mapRef}
         style={styles.map}
-        mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps.json'}
+        mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps2025.json'}
         rotateEnabled={false}
         attributionEnabled={false}
         onRegionDidChange={() => {

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

@@ -366,7 +366,7 @@ const UsersMapScreen: FC<Props> = ({ navigation, route }) => {
       <MapLibreRN.MapView
         ref={mapRef}
         style={styles.map}
-        mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps.json'}
+        mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps2025.json'}
         rotateEnabled={false}
         attributionEnabled={false}
         onRegionDidChange={() => {

+ 1 - 1
src/screens/InAppScreens/TravelsScreen/AddRegionsScreen/index.tsx

@@ -216,7 +216,7 @@ const AddRegionsScreen = ({ route }: { route: any }) => {
         <MapLibreRN.MapView
           ref={mapRef}
           style={styles.map}
-          mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps.json'}
+          mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps2025.json'}
           rotateEnabled={false}
           attributionEnabled={false}
           onPress={handleMapPress}

+ 1 - 1
src/screens/InAppScreens/TravelsScreen/EarthScreen/index.tsx

@@ -193,7 +193,7 @@ const EarthScreen = () => {
         <MapLibreRN.MapView
           ref={mapRef}
           style={styles.map}
-          mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps.json'}
+          mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps2025.json'}
           rotateEnabled={false}
           attributionEnabled={false}
           onPress={onMapPress}

+ 2 - 2
src/screens/OfflineMapsScreen/OfflineMapManager.ts

@@ -282,7 +282,7 @@ const resumePackDownload = async (name: string, progressCallback?: any, errorCal
 
     const options = {
       name,
-      styleURL: mapData.styleURL || `${VECTOR_MAP_HOST}/nomadmania-maps.json`,
+      styleURL: mapData.styleURL || `${VECTOR_MAP_HOST}/nomadmania-maps2025.json`,
       minZoom: mapData.minZoom || 10,
       maxZoom: mapData.maxZoom || 20,
       bounds: [
@@ -395,7 +395,7 @@ const updatePack = async (name, progressCallback, errorCallback) => {
 
     const options = {
       name,
-      styleURL: mapData.styleURL || `${VECTOR_MAP_HOST}/nomadmania-maps.json`,
+      styleURL: mapData.styleURL || `${VECTOR_MAP_HOST}/nomadmania-maps2025.json`,
       minZoom: mapData.minZoom || 10,
       maxZoom: mapData.maxZoom || 14,
       bounds: [

+ 4 - 4
src/screens/OfflineMapsScreen/SelectOwnMapScreen/index.tsx

@@ -198,7 +198,7 @@ export default function SelectOwnMapScreen({ navigation, route }) {
   const calculateEstimatedSizeFromSelector = async (bounds) => {
     try {
       const options = {
-        styleURL: `${VECTOR_MAP_HOST}/nomadmania-maps.json`,
+        styleURL: `${VECTOR_MAP_HOST}/nomadmania-maps2025.json`,
         bounds: [
           [bounds.west, bounds.south],
           [bounds.east, bounds.north]
@@ -311,7 +311,7 @@ export default function SelectOwnMapScreen({ navigation, route }) {
 
       const offlinePackOptions = {
         name: packId,
-        styleURL: `${VECTOR_MAP_HOST}/nomadmania-maps.json`,
+        styleURL: `${VECTOR_MAP_HOST}/nomadmania-maps2025.json`,
         bounds: [
           [selectorBounds.west, selectorBounds.south],
           [selectorBounds.east, selectorBounds.north]
@@ -341,7 +341,7 @@ export default function SelectOwnMapScreen({ navigation, route }) {
         updatedAt: Date.now(),
         status: 'downloading',
         progress: 0,
-        styleURL: `${VECTOR_MAP_HOST}/nomadmania-maps.json`,
+        styleURL: `${VECTOR_MAP_HOST}/nomadmania-maps2025.json`,
         minZoom: 10,
         maxZoom: 20,
         tilesCount: tilesCount
@@ -410,7 +410,7 @@ export default function SelectOwnMapScreen({ navigation, route }) {
           <MapLibreGL.MapView
             ref={map}
             style={styles.map}
-            mapStyle={`${VECTOR_MAP_HOST}/nomadmania-maps.json`}
+            mapStyle={`${VECTOR_MAP_HOST}/nomadmania-maps2025.json`}
             onDidFinishLoadingMap={onMapLoad}
             onRegionDidChange={(feature) => onRegionDidChange(feature)}
           >

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

@@ -210,7 +210,7 @@ export const SelectRegionScreen = ({ navigation }: { navigation: any }) => {
 
           const offlinePackOptions = {
             name: packId,
-            styleURL: `${VECTOR_MAP_HOST}/nomadmania-maps.json`,
+            styleURL: `${VECTOR_MAP_HOST}/nomadmania-maps2025.json`,
             bounds: [
               [west, south],
               [east, north]
@@ -238,7 +238,7 @@ export const SelectRegionScreen = ({ navigation }: { navigation: any }) => {
             updatedAt: Date.now(),
             status: 'downloading',
             progress: 0,
-            styleURL: `${VECTOR_MAP_HOST}/nomadmania-maps.json`,
+            styleURL: `${VECTOR_MAP_HOST}/nomadmania-maps2025.json`,
             minZoom: 10,
             maxZoom: 14
           };
@@ -399,7 +399,7 @@ export const SelectRegionScreen = ({ navigation }: { navigation: any }) => {
         <MapLibreRN.MapView
           ref={mapRef}
           style={styles.map}
-          mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps.json'}
+          mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps2025.json'}
           rotateEnabled={false}
           attributionEnabled={false}
           onPress={handleMapPress}