edward/agenda
1
0
Fork 0
Code Issues 27 Pull requests Packages Projects Releases Wiki Activity

Show venue pins on the map

Browse source 
Closes: #108
This commit is contained in:
Edward Betts 2024-01-14 21:43:10 +00:00
parent f8658a7850
commit e6cffdd3d5
2 changed files with 25 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
agenda/trip.py
View file

@ -104,38 +104,33 @@ def collect_trip_coordinates(trip: Trip) -> list[StrDict]:
continue continue
stations[s["uic"]] = s stations[s["uic"]] = s
accommodation_coordinates = [ coords = []
{
"name": accommodation["name"],
"type": "accommodation",
"latitude": accommodation["latitude"],
"longitude": accommodation["longitude"],
}
for accommodation in trip.accommodation
if "latitude" in accommodation and "longitude" in accommodation
]
station_coordinates = [ src = [("accommodation", trip.accommodation), ("conference", trip.conferences)]
{ for coord_type, item_list in src:
"name": s["name"], coords += [
"type": "station", {
"latitude": s["latitude"], "name": item["name"],
"longitude": s["longitude"], "type": coord_type,
} "latitude": item["latitude"],
for s in stations.values() "longitude": item["longitude"],
] }
for item in item_list
if "latitude" in item and "longitude" in item
]
airport_coordinates = [ for coord_type, coord_dict in ("station", stations), ("airport", airports):
{ coords += [
"name": s["name"], {
"type": "airport", "name": s["name"],
"latitude": s["latitude"], "type": coord_type,
"longitude": s["longitude"], "latitude": s["latitude"],
} "longitude": s["longitude"],
for s in airports.values() }
] for s in coord_dict.values()
]
return accommodation_coordinates + station_coordinates + airport_coordinates return coords
def latlon_tuple(stop: StrDict) -> tuple[float, float]: def latlon_tuple(stop: StrDict) -> tuple[float, float]:

1
static/js/map.js
View file

@ -13,6 +13,7 @@ var icons = {
"station": emoji_icon("🚉"), "station": emoji_icon("🚉"),
"airport": emoji_icon("✈️"), "airport": emoji_icon("✈️"),
"accommodation": emoji_icon("🏨"), "accommodation": emoji_icon("🏨"),
"conference": emoji_icon("🎤"),
} }
function build_map(map_id, coordinates, routes) { function build_map(map_id, coordinates, routes) {