|
|
@@ -1645,98 +1645,115 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
|
|
|
</MapLibreRN.PointAnnotation>
|
|
|
)}
|
|
|
|
|
|
- {type === 'regions' && (
|
|
|
- <>
|
|
|
- <MapLibreRN.LineLayer
|
|
|
- id="nm-regions-line-layer"
|
|
|
- sourceID={regions.source}
|
|
|
- sourceLayerID={regions['source-layer']}
|
|
|
- filter={regions.filter as any}
|
|
|
- maxZoomLevel={regions.maxzoom}
|
|
|
- style={{
|
|
|
- lineColor: 'rgba(14, 80, 109, 1)',
|
|
|
- lineWidth: ['interpolate', ['linear'], ['zoom'], 0, 0.2, 4, 1, 5, 1.5, 12, 3],
|
|
|
- lineWidthTransition: { duration: 300, delay: 0 }
|
|
|
- }}
|
|
|
- belowLayerID="waterway-name"
|
|
|
- />
|
|
|
- <MapLibreRN.FillLayer
|
|
|
- id={regions.id}
|
|
|
- sourceID={regions.source}
|
|
|
- sourceLayerID={regions['source-layer']}
|
|
|
- filter={regions.filter as any}
|
|
|
- style={regions.style}
|
|
|
- maxZoomLevel={regions.maxzoom}
|
|
|
- belowLayerID={regions_visited.id}
|
|
|
- />
|
|
|
- <MapLibreRN.FillLayer
|
|
|
- id={regions_visited.id}
|
|
|
- sourceID={regions_visited.source}
|
|
|
- sourceLayerID={regions_visited['source-layer']}
|
|
|
- filter={regionsVisitedFilter as any}
|
|
|
- style={regions_visited.style}
|
|
|
- maxZoomLevel={regions_visited.maxzoom}
|
|
|
- belowLayerID="waterway-name"
|
|
|
- />
|
|
|
- </>
|
|
|
- )}
|
|
|
- {type === 'countries' && (
|
|
|
- <>
|
|
|
- <MapLibreRN.LineLayer
|
|
|
- id="countries-line-layer"
|
|
|
- sourceID={countries.source}
|
|
|
- sourceLayerID={countries['source-layer']}
|
|
|
- filter={countries.filter as any}
|
|
|
- maxZoomLevel={countries.maxzoom}
|
|
|
- style={{
|
|
|
- lineColor: 'rgba(14, 80, 109, 1)',
|
|
|
- lineWidth: ['interpolate', ['linear'], ['zoom'], 0, 0.2, 4, 1, 5, 1.5, 12, 3],
|
|
|
- lineWidthTransition: { duration: 300, delay: 0 }
|
|
|
- }}
|
|
|
- belowLayerID="waterway-name"
|
|
|
- />
|
|
|
- <MapLibreRN.FillLayer
|
|
|
- id={countries.id}
|
|
|
- sourceID={countries.source}
|
|
|
- sourceLayerID={countries['source-layer']}
|
|
|
- filter={countries.filter as any}
|
|
|
- style={countries.style}
|
|
|
- maxZoomLevel={countries.maxzoom}
|
|
|
- belowLayerID={countries_visited.id}
|
|
|
- />
|
|
|
- <MapLibreRN.FillLayer
|
|
|
- id={countries_visited.id}
|
|
|
- sourceID={countries_visited.source}
|
|
|
- sourceLayerID={countries_visited['source-layer']}
|
|
|
- filter={countriesVisitedFilter as any}
|
|
|
- style={countries_visited.style}
|
|
|
- maxZoomLevel={countries_visited.maxzoom}
|
|
|
- belowLayerID="waterway-name"
|
|
|
- />
|
|
|
- </>
|
|
|
- )}
|
|
|
- {type === 'dare' && (
|
|
|
- <>
|
|
|
- <MapLibreRN.FillLayer
|
|
|
- id={dare.id}
|
|
|
- sourceID={dare.source}
|
|
|
- sourceLayerID={dare['source-layer']}
|
|
|
- filter={dare.filter as any}
|
|
|
- style={dare.style}
|
|
|
- maxZoomLevel={dare.maxzoom}
|
|
|
- belowLayerID={dare_visited.id}
|
|
|
- />
|
|
|
- <MapLibreRN.FillLayer
|
|
|
- id={dare_visited.id}
|
|
|
- sourceID={dare_visited.source}
|
|
|
- sourceLayerID={dare_visited['source-layer']}
|
|
|
- filter={dareVisitedFilter as any}
|
|
|
- style={dare_visited.style}
|
|
|
- maxZoomLevel={dare_visited.maxzoom}
|
|
|
- belowLayerID="waterway-name"
|
|
|
- />
|
|
|
- </>
|
|
|
- )}
|
|
|
+ <>
|
|
|
+ <MapLibreRN.LineLayer
|
|
|
+ id="nm-regions-line-layer"
|
|
|
+ sourceID={regions.source}
|
|
|
+ sourceLayerID={regions['source-layer']}
|
|
|
+ filter={regions.filter as any}
|
|
|
+ maxZoomLevel={regions.maxzoom}
|
|
|
+ style={{
|
|
|
+ lineColor: 'rgba(14, 80, 109, 1)',
|
|
|
+ lineWidth: ['interpolate', ['linear'], ['zoom'], 0, 0.2, 4, 1, 5, 1.5, 12, 3],
|
|
|
+ lineWidthTransition: { duration: 300, delay: 0 },
|
|
|
+ visibility: type === 'regions' ? 'visible' : 'none'
|
|
|
+ }}
|
|
|
+ belowLayerID="waterway-name"
|
|
|
+ />
|
|
|
+ <MapLibreRN.FillLayer
|
|
|
+ id={regions.id}
|
|
|
+ sourceID={regions.source}
|
|
|
+ sourceLayerID={regions['source-layer']}
|
|
|
+ filter={regions.filter as any}
|
|
|
+ style={{
|
|
|
+ ...regions.style,
|
|
|
+ visibility: type === 'regions' ? 'visible' : 'none'
|
|
|
+ }}
|
|
|
+ maxZoomLevel={regions.maxzoom}
|
|
|
+ belowLayerID={regions_visited.id}
|
|
|
+ />
|
|
|
+ <MapLibreRN.FillLayer
|
|
|
+ id={regions_visited.id}
|
|
|
+ sourceID={regions_visited.source}
|
|
|
+ sourceLayerID={regions_visited['source-layer']}
|
|
|
+ filter={regionsVisitedFilter as any}
|
|
|
+ style={{
|
|
|
+ ...regions_visited.style,
|
|
|
+ visibility: type === 'regions' ? 'visible' : 'none'
|
|
|
+ }}
|
|
|
+ maxZoomLevel={regions_visited.maxzoom}
|
|
|
+ belowLayerID="waterway-name"
|
|
|
+ />
|
|
|
+ </>
|
|
|
+
|
|
|
+ <>
|
|
|
+ <MapLibreRN.LineLayer
|
|
|
+ id="countries-line-layer"
|
|
|
+ sourceID={countries.source}
|
|
|
+ sourceLayerID={countries['source-layer']}
|
|
|
+ filter={countries.filter as any}
|
|
|
+ maxZoomLevel={countries.maxzoom}
|
|
|
+ style={{
|
|
|
+ lineColor: 'rgba(14, 80, 109, 1)',
|
|
|
+ lineWidth: ['interpolate', ['linear'], ['zoom'], 0, 0.2, 4, 1, 5, 1.5, 12, 3],
|
|
|
+ lineWidthTransition: { duration: 300, delay: 0 },
|
|
|
+ visibility: type === 'countries' ? 'visible' : 'none'
|
|
|
+ }}
|
|
|
+ belowLayerID="waterway-name"
|
|
|
+ />
|
|
|
+ <MapLibreRN.FillLayer
|
|
|
+ id={countries.id}
|
|
|
+ sourceID={countries.source}
|
|
|
+ sourceLayerID={countries['source-layer']}
|
|
|
+ filter={countries.filter as any}
|
|
|
+ style={{
|
|
|
+ ...countries.style,
|
|
|
+ visibility: type === 'countries' ? 'visible' : 'none'
|
|
|
+ }}
|
|
|
+ maxZoomLevel={countries.maxzoom}
|
|
|
+ belowLayerID={countries_visited.id}
|
|
|
+ />
|
|
|
+ <MapLibreRN.FillLayer
|
|
|
+ id={countries_visited.id}
|
|
|
+ sourceID={countries_visited.source}
|
|
|
+ sourceLayerID={countries_visited['source-layer']}
|
|
|
+ filter={countriesVisitedFilter as any}
|
|
|
+ style={{
|
|
|
+ ...countries_visited.style,
|
|
|
+ visibility: type === 'countries' ? 'visible' : 'none'
|
|
|
+ }}
|
|
|
+ maxZoomLevel={countries_visited.maxzoom}
|
|
|
+ belowLayerID="waterway-name"
|
|
|
+ />
|
|
|
+ </>
|
|
|
+
|
|
|
+ <>
|
|
|
+ <MapLibreRN.FillLayer
|
|
|
+ id={dare.id}
|
|
|
+ sourceID={dare.source}
|
|
|
+ sourceLayerID={dare['source-layer']}
|
|
|
+ filter={dare.filter as any}
|
|
|
+ style={{
|
|
|
+ ...dare.style,
|
|
|
+ visibility: type === 'dare' ? 'visible' : 'none'
|
|
|
+ }}
|
|
|
+ maxZoomLevel={dare.maxzoom}
|
|
|
+ belowLayerID={dare_visited.id}
|
|
|
+ />
|
|
|
+ <MapLibreRN.FillLayer
|
|
|
+ id={dare_visited.id}
|
|
|
+ sourceID={dare_visited.source}
|
|
|
+ sourceLayerID={dare_visited['source-layer']}
|
|
|
+ filter={dareVisitedFilter as any}
|
|
|
+ style={{
|
|
|
+ ...dare_visited.style,
|
|
|
+ visibility: type === 'dare' ? 'visible' : 'none'
|
|
|
+ }}
|
|
|
+ maxZoomLevel={dare_visited.maxzoom}
|
|
|
+ belowLayerID="waterway-name"
|
|
|
+ />
|
|
|
+ </>
|
|
|
+
|
|
|
{selectedRegion && type && (
|
|
|
<>
|
|
|
<MapLibreRN.FillLayer
|