Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix the integration of Stadia.StamenTerrain map tiles #308

Merged
merged 1 commit into from
Mar 5, 2024
Merged

fix the integration of Stadia.StamenTerrain map tiles #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion airscore/core/console/design_map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,23 @@ def make_map(
location = bbox_centre(bbox)
else:
location = [45, 10]
folium_map = folium.Map(location=location, zoom_start=13, tiles="Stamen Terrain", width='100%', height='75%')

attr = (
'&copy; <a href="https://stadiamaps.com/" target="_blank">Stadia Maps</a>'
'&copy; <a href="https://stamen.com/" target="_blank">Stamen Design</a>'
'&copy; <a href="https://openmaptiles.org/" target="_blank">OpenMapTiles</a>'
'&copy; <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a>'
'integrated by <a href="https://github.com/FAI-CIVL/FAI-Airscore" target="_blank">FAI-Airscore</a>'
)
tiles = "https://tiles.stadiamaps.com/tiles/stamen_terrain/{z}/{x}/{y}{r}.png"
folium_map = folium.Map(
location=location,
zoom_start=13,
tiles=tiles,
width='100%',
height='75%',
attr=attr
)
# folium.LayerControl().add_to(folium_map)
'''Define map borders'''
# at this stage a track (layer_geojason has bbox inside,
Expand Down
15 changes: 14 additions & 1 deletion airscore/core/console/task_map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,21 @@ def dump_flight_to_geojson(flight, geojson_filename_local):

# function to create the map template with optional geojson, circles and points objects
def make_map(layer_geojson=False, circles=False, points=False):
attr = (
'&copy; <a href="https://stadiamaps.com/" target="_blank">Stadia Maps</a>'
'&copy; <a href="https://stamen.com/" target="_blank">Stamen Design</a>'
'&copy; <a href="https://openmaptiles.org/" target="_blank">OpenMapTiles</a>'
'&copy; <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a>'
'integrated by <a href="https://github.com/FAI-CIVL/FAI-Airscore" target="_blank">FAI-Airscore</a>'
)
tiles = "https://tiles.stadiamaps.com/tiles/stamen_terrain/{z}/{x}/{y}{r}.png"
folium_map = folium.Map(
location=[45.922207, 8.673952], zoom_start=13, tiles="Stamen Terrain", width='100%', height='75%'
location=[45.922207, 8.673952],
zoom_start=13,
tiles=tiles,
width='100%',
height='75%',
attr=attr
)

if layer_geojson:
Expand Down
11 changes: 10 additions & 1 deletion airscore/core/map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,23 @@ def make_map(
else:
location = [45, 10]

attr = (
'&copy; <a href="https://stadiamaps.com/" target="_blank">Stadia Maps</a> '
'&copy; <a href="https://stamen.com/" target="_blank">Stamen Design</a> '
'&copy; <a href="https://openmaptiles.org/" target="_blank">OpenMapTiles</a> '
'&copy; <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> '
'integrated by <a href="https://github.com/FAI-CIVL/FAI-Airscore" target="_blank">FAI-Airscore</a>'
)
tiles = "https://tiles.stadiamaps.com/tiles/stamen_terrain/{z}/{x}/{y}{r}.png"
folium_map = folium.Map(
location=location,
position='relative',
zoom_start=13,
tiles="Stamen Terrain",
tiles=tiles,
max_bounds=True,
min_zoom=5,
prefer_canvas=True,
attr=attr
)
# folium.LayerControl().add_to(folium_map)
'''Define map borders'''
Expand Down
Loading