hulthe/jetlag-maps
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Add bus whitelist, route exclusions, crow-fly shape filter, and KML export #2

Open
marvin wants to merge 16 commits from add-kml-export-and-bus-filtering into master
pull from: add-kml-export-and-bus-filtering
merge into: :master
Conversation 0 Commits 16 Files Changed 16
+10 -4
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8ec2eb8d9c - Show all commits
copenhagen/config/styling.yaml
+5 -1
View File
@@ -73,7 +73,11 @@ basemap:
stations: stations:
show: true # draw station markers (symbols without text) show: true # draw station markers (symbols without text)
styles: [metro, s_tog, regional, bus] styles: [metro, s_tog, regional, bus]
stop_cluster_m: 50 # merge same-name stops within this distance (opposite sides of road) stop_cluster_m: # merge same-name stops within this distance (per mode)
metro: 200 # covers platform/entrance spread (~170m max)
s_tog: 400 # covers platform/entrance spread (~380m max)
regional: 500 # covers platform spread (~475m max)
bus: 100 # opposite sides of road, wide boulevards
marker: marker:
shape: circle # circle | square shape: circle # circle | square
fill: white fill: white
copenhagen/scripts/render.py
+5 -3
View File
@@ -196,7 +196,7 @@ def plot_stations(ax, stations, styling, active_styles):
if not cfg.get("show", True): if not cfg.get("show", True):
return return
marker_styles = set(cfg.get("styles", ["metro", "s_tog", "regional"])) marker_styles = set(cfg.get("styles", ["metro", "s_tog", "regional"]))
cluster_m = cfg.get("stop_cluster_m", 50) cluster_cfg = cfg.get("stop_cluster_m", {})
mk = cfg.get("marker", {}) mk = cfg.get("marker", {})
sizes = mk.get("size", {}) sizes = mk.get("size", {})
shape = mk.get("shape", "circle") shape = mk.get("shape", "circle")
@@ -220,11 +220,12 @@ def plot_stations(ax, stations, styling, active_styles):
zord = styling["zorder"] zord = styling["zorder"]
top_z = max(zord.values()) + 1 # all markers above all lines top_z = max(zord.values()) + 1 # all markers above all lines
for s in sorted(pts_by_style, key=lambda k: zord.get(k, 0)): for s in sorted(pts_by_style, key=lambda k: zord.get(k, 0)):
threshold = cluster_cfg.get(s, 50) if isinstance(cluster_cfg, dict) else cluster_cfg
# cluster same-name stations to one marker; keep unnamed as-is # cluster same-name stations to one marker; keep unnamed as-is
centroids = [] centroids = []
for name, coords in names_by_style[s].items(): for name, coords in names_by_style[s].items():
if name and len(coords) > 1: if name and len(coords) > 1:
centroids.extend(cluster_stops(coords, cluster_m)) centroids.extend(cluster_stops(coords, threshold))
else: else:
centroids.extend(coords) centroids.extend(coords)
sz = sizes.get(s, 3.0) sz = sizes.get(s, 3.0)
@@ -244,7 +245,8 @@ def plot_bus_stops(ax, stops, styling, active_styles):
if bus.empty: if bus.empty:
return return
cluster_m = cfg.get("stop_cluster_m", 50) cluster_cfg = cfg.get("stop_cluster_m", {})
cluster_m = cluster_cfg.get("bus", 50) if isinstance(cluster_cfg, dict) else cluster_cfg
mk = cfg.get("marker", {}) mk = cfg.get("marker", {})
sizes = mk.get("size", {}) sizes = mk.get("size", {})
sz = sizes.get("bus", 1.5) sz = sizes.get("bus", 1.5)