|
@@ -376,14 +376,14 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
|
|
|
|
|
|
useEffect(() => {
|
|
useEffect(() => {
|
|
if (usersLocation) {
|
|
if (usersLocation) {
|
|
- const filteredNomads: GeoJSON.FeatureCollection = {
|
|
|
|
- type: 'FeatureCollection',
|
|
|
|
- features: usersLocation.geojson.features.filter(
|
|
|
|
- (feature: GeoJSON.Feature) => feature.properties?.id !== +userId
|
|
|
|
- )
|
|
|
|
- };
|
|
|
|
|
|
+ const filteredNomads: GeoJSON.FeatureCollection = {
|
|
|
|
+ type: 'FeatureCollection',
|
|
|
|
+ features: usersLocation.geojson.features.filter(
|
|
|
|
+ (feature: GeoJSON.Feature) => feature.properties?.id !== +userId
|
|
|
|
+ )
|
|
|
|
+ };
|
|
|
|
|
|
- setNomads(filteredNomads);
|
|
|
|
|
|
+ setNomads(filteredNomads);
|
|
}
|
|
}
|
|
}, [usersLocation]);
|
|
}, [usersLocation]);
|
|
|
|
|
|
@@ -1329,7 +1329,17 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
|
|
filter={['has', 'point_count']}
|
|
filter={['has', 'point_count']}
|
|
aboveLayerID={Platform.OS === 'android' ? 'place-continent' : undefined}
|
|
aboveLayerID={Platform.OS === 'android' ? 'place-continent' : undefined}
|
|
style={{
|
|
style={{
|
|
- circleRadius: ['step', ['get', 'point_count'], 15, 10, 20, 30, 25],
|
|
|
|
|
|
+ circleRadius: [
|
|
|
|
+ 'interpolate',
|
|
|
|
+ ['linear'],
|
|
|
|
+ ['get', 'point_count'],
|
|
|
|
+ 0, 15,
|
|
|
|
+ 10, 17,
|
|
|
|
+ 20, 19,
|
|
|
|
+ 50, 21,
|
|
|
|
+ 75, 23,
|
|
|
|
+ 100, 25
|
|
|
|
+ ],
|
|
circleColor: 'rgba(255, 126, 0, 1)',
|
|
circleColor: 'rgba(255, 126, 0, 1)',
|
|
circleStrokeWidth: 2,
|
|
circleStrokeWidth: 2,
|
|
circleStrokeColor: '#FFFFFF',
|
|
circleStrokeColor: '#FFFFFF',
|
|
@@ -1343,7 +1353,14 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
|
|
style={{
|
|
style={{
|
|
textField: ['get', 'point_count'],
|
|
textField: ['get', 'point_count'],
|
|
textFont: ['Noto Sans Bold'],
|
|
textFont: ['Noto Sans Bold'],
|
|
- textSize: 12,
|
|
|
|
|
|
+ textSize: [
|
|
|
|
+ 'interpolate',
|
|
|
|
+ ['linear'],
|
|
|
|
+ ['get', 'point_count'],
|
|
|
|
+ 0, 13,
|
|
|
|
+ 20, 14,
|
|
|
|
+ 75, 15
|
|
|
|
+ ],
|
|
textColor: '#FFFFFF',
|
|
textColor: '#FFFFFF',
|
|
textHaloColor: '#000000',
|
|
textHaloColor: '#000000',
|
|
textHaloWidth: 1,
|
|
textHaloWidth: 1,
|