|
@@ -1317,7 +1317,8 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
|
|
|
<MapLibreRN.MapView
|
|
<MapLibreRN.MapView
|
|
|
ref={mapRef}
|
|
ref={mapRef}
|
|
|
style={styles.map}
|
|
style={styles.map}
|
|
|
- mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps.json'}
|
|
|
|
|
|
|
+ // mapStyle={VECTOR_MAP_HOST + '/nomadmania-maps.json'}
|
|
|
|
|
+ mapStyle={'https://nomadmania.eu/omt/style_new.json'}
|
|
|
rotateEnabled={false}
|
|
rotateEnabled={false}
|
|
|
attributionEnabled={false}
|
|
attributionEnabled={false}
|
|
|
onPress={onMapPress}
|
|
onPress={onMapPress}
|
|
@@ -1326,7 +1327,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
|
|
|
onRegionWillChange={_.debounce(handleMapChange, 200)}
|
|
onRegionWillChange={_.debounce(handleMapChange, 200)}
|
|
|
onDidFinishLoadingStyle={() => setDidFinishLoadingStyle(true)}
|
|
onDidFinishLoadingStyle={() => setDidFinishLoadingStyle(true)}
|
|
|
>
|
|
>
|
|
|
- <MapLibreRN.Images
|
|
|
|
|
|
|
+ {/* <MapLibreRN.Images
|
|
|
images={{
|
|
images={{
|
|
|
...images,
|
|
...images,
|
|
|
'default-series-icon': defaultSeriesIcon
|
|
'default-series-icon': defaultSeriesIcon
|
|
@@ -1349,7 +1350,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
|
|
|
}}
|
|
}}
|
|
|
>
|
|
>
|
|
|
<View />
|
|
<View />
|
|
|
- </MapLibreRN.Images>
|
|
|
|
|
|
|
+ </MapLibreRN.Images> */}
|
|
|
|
|
|
|
|
{markerCoords && (
|
|
{markerCoords && (
|
|
|
<MapLibreRN.PointAnnotation id="marker" coordinate={markerCoords}>
|
|
<MapLibreRN.PointAnnotation id="marker" coordinate={markerCoords}>
|
|
@@ -1486,7 +1487,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
|
|
|
tileUrlTemplates={[VECTOR_MAP_HOST + '/tiles/series/{z}/{x}/{y}.pbf']}
|
|
tileUrlTemplates={[VECTOR_MAP_HOST + '/tiles/series/{z}/{x}/{y}.pbf']}
|
|
|
onPress={handleMarkerPress}
|
|
onPress={handleMarkerPress}
|
|
|
>
|
|
>
|
|
|
- {seriesFilter.status !== 1 && Object.keys(images).length > 0
|
|
|
|
|
|
|
+ {seriesFilter.status !== 1
|
|
|
? (() => {
|
|
? (() => {
|
|
|
try {
|
|
try {
|
|
|
return (
|
|
return (
|
|
@@ -1501,7 +1502,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
|
|
|
style={{
|
|
style={{
|
|
|
symbolSpacing: 1,
|
|
symbolSpacing: 1,
|
|
|
iconImage: '{series_id}',
|
|
iconImage: '{series_id}',
|
|
|
- iconSize: 0.51,
|
|
|
|
|
|
|
+ // iconSize: 0.51,
|
|
|
iconAllowOverlap: true,
|
|
iconAllowOverlap: true,
|
|
|
iconIgnorePlacement: true,
|
|
iconIgnorePlacement: true,
|
|
|
visibility: 'visible',
|
|
visibility: 'visible',
|
|
@@ -1520,7 +1521,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
|
|
|
})()
|
|
})()
|
|
|
: null}
|
|
: null}
|
|
|
|
|
|
|
|
- {seriesFilter.status !== 0 && Object.keys(images).length > 0
|
|
|
|
|
|
|
+ {seriesFilter.status !== 0
|
|
|
? (() => {
|
|
? (() => {
|
|
|
try {
|
|
try {
|
|
|
return (
|
|
return (
|
|
@@ -1535,7 +1536,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
|
|
|
style={{
|
|
style={{
|
|
|
symbolSpacing: 1,
|
|
symbolSpacing: 1,
|
|
|
iconImage: '{series_id}v',
|
|
iconImage: '{series_id}v',
|
|
|
- iconSize: 0.51,
|
|
|
|
|
|
|
+ // iconSize: 0.51,
|
|
|
iconAllowOverlap: true,
|
|
iconAllowOverlap: true,
|
|
|
iconIgnorePlacement: true,
|
|
iconIgnorePlacement: true,
|
|
|
visibility: 'visible',
|
|
visibility: 'visible',
|
