From 200cd1fc2ba14f9dff369f2bf2dbf9feeb20563b Mon Sep 17 00:00:00 2001 From: Simon <94762919+simonpct@users.noreply.github.com> Date: Wed, 8 Oct 2025 08:20:42 +0200 Subject: [PATCH 1/6] Update public transport tags and mapping in analyser --- .../analyser_merge_public_transport_FR_stan.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/analysers/analyser_merge_public_transport_FR_stan.py b/analysers/analyser_merge_public_transport_FR_stan.py index 92ba05ada..736edf071 100644 --- a/analysers/analyser_merge_public_transport_FR_stan.py +++ b/analysers/analyser_merge_public_transport_FR_stan.py @@ -42,19 +42,23 @@ def __init__(self, config, logger = None): Conflate( select = Select( types = ["nodes", "ways"], - tags = [{"highway": "bus_stop"}, {"public_transport": "stop_position"}]), + tags = [{"public_transport": "platform"}]), conflationDistance = 2, - osmRef = "ref:FR:STAN", + osmRef = "ref", mapping = Mapping( static1 = { - "highway": "bus_stop", - "public_transport": "stop_position", - "bus": "yes"}, + "public_transport": "platform", + "gtfs:location_type:FR-GES-STAN": "0", + "bus": "yes", + }, static2 = {"source": self.source}, mapping1 = { - "ref:FR:STAN": "stop_code", + "gtfs:stop_code:FR-GES-STAN": "stop_code", + "gtfs:stop_id:FR-GES-STAN": "stop_id", + "gtfs:stop_name:FR-GES-STAN": "stop_name", + "gtfs:stop_id:FR-GES-STAN": "stop_code", "wheelchair": lambda fields: self.wheelchair_boarding[fields.get("wheelchair_boarding")]}, - mapping2 = {"name": "stop_name"}, + mapping2 = {"name": "stop_name", ref: "stop_id"}, text = lambda tags, fields: T_("{0} stop of {1}", place, fields["stop_name"]) ))) wheelchair_boarding = { From 3be075bf3e60fdd0c79d797aa2db72bdd4f92652 Mon Sep 17 00:00:00 2001 From: Simon <94762919+simonpct@users.noreply.github.com> Date: Wed, 8 Oct 2025 23:40:56 +0200 Subject: [PATCH 2/6] Fix duplicate key in mapping1 and correct mapping2 syntax --- analysers/analyser_merge_public_transport_FR_stan.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/analysers/analyser_merge_public_transport_FR_stan.py b/analysers/analyser_merge_public_transport_FR_stan.py index 736edf071..2247a6783 100644 --- a/analysers/analyser_merge_public_transport_FR_stan.py +++ b/analysers/analyser_merge_public_transport_FR_stan.py @@ -56,9 +56,8 @@ def __init__(self, config, logger = None): "gtfs:stop_code:FR-GES-STAN": "stop_code", "gtfs:stop_id:FR-GES-STAN": "stop_id", "gtfs:stop_name:FR-GES-STAN": "stop_name", - "gtfs:stop_id:FR-GES-STAN": "stop_code", "wheelchair": lambda fields: self.wheelchair_boarding[fields.get("wheelchair_boarding")]}, - mapping2 = {"name": "stop_name", ref: "stop_id"}, + mapping2 = {"name": "stop_name", "ref": "stop_id"}, text = lambda tags, fields: T_("{0} stop of {1}", place, fields["stop_name"]) ))) wheelchair_boarding = { From 1f9e0d825446997079b53b80de8b0e140be144d8 Mon Sep 17 00:00:00 2001 From: Simon <94762919+simonpct@users.noreply.github.com> Date: Thu, 30 Oct 2025 16:19:43 +0100 Subject: [PATCH 3/6] Update mapping reference for public transport stops --- analysers/analyser_merge_public_transport_FR_stan.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/analysers/analyser_merge_public_transport_FR_stan.py b/analysers/analyser_merge_public_transport_FR_stan.py index 2247a6783..7dad08f45 100644 --- a/analysers/analyser_merge_public_transport_FR_stan.py +++ b/analysers/analyser_merge_public_transport_FR_stan.py @@ -48,7 +48,6 @@ def __init__(self, config, logger = None): mapping = Mapping( static1 = { "public_transport": "platform", - "gtfs:location_type:FR-GES-STAN": "0", "bus": "yes", }, static2 = {"source": self.source}, @@ -57,7 +56,7 @@ def __init__(self, config, logger = None): "gtfs:stop_id:FR-GES-STAN": "stop_id", "gtfs:stop_name:FR-GES-STAN": "stop_name", "wheelchair": lambda fields: self.wheelchair_boarding[fields.get("wheelchair_boarding")]}, - mapping2 = {"name": "stop_name", "ref": "stop_id"}, + mapping2 = {"name": "stop_name", "ref": "stop_code"}, text = lambda tags, fields: T_("{0} stop of {1}", place, fields["stop_name"]) ))) wheelchair_boarding = { From f60b5ed57bb5194bf6edd573b8f973c847a2d42b Mon Sep 17 00:00:00 2001 From: Simon <94762919+simonpct@users.noreply.github.com> Date: Fri, 31 Oct 2025 10:34:34 +0100 Subject: [PATCH 4/6] Update conflationRef + add highway=platform --- analysers/analyser_merge_public_transport_FR_stan.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/analysers/analyser_merge_public_transport_FR_stan.py b/analysers/analyser_merge_public_transport_FR_stan.py index 7dad08f45..b1150fd63 100644 --- a/analysers/analyser_merge_public_transport_FR_stan.py +++ b/analysers/analyser_merge_public_transport_FR_stan.py @@ -44,10 +44,11 @@ def __init__(self, config, logger = None): types = ["nodes", "ways"], tags = [{"public_transport": "platform"}]), conflationDistance = 2, - osmRef = "ref", + osmRef = "gtfs:stop_id:FR-GES-STAN", mapping = Mapping( static1 = { "public_transport": "platform", + "highway": "platform", "bus": "yes", }, static2 = {"source": self.source}, From 0ab8b8ea4f96eea5dd69ae15ffa93c65c0a17621 Mon Sep 17 00:00:00 2001 From: Simon <94762919+simonpct@users.noreply.github.com> Date: Fri, 14 Nov 2025 14:20:46 +0100 Subject: [PATCH 5/6] Add highway tag to public transport platform selection --- analysers/analyser_merge_public_transport_FR_stan.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analysers/analyser_merge_public_transport_FR_stan.py b/analysers/analyser_merge_public_transport_FR_stan.py index b1150fd63..c42a9ace5 100644 --- a/analysers/analyser_merge_public_transport_FR_stan.py +++ b/analysers/analyser_merge_public_transport_FR_stan.py @@ -42,7 +42,7 @@ def __init__(self, config, logger = None): Conflate( select = Select( types = ["nodes", "ways"], - tags = [{"public_transport": "platform"}]), + tags = [{"highway": "platform", "public_transport": "platform"}]), conflationDistance = 2, osmRef = "gtfs:stop_id:FR-GES-STAN", mapping = Mapping( From ec4c6d716aab1b8c4cffa2d08e0066a19996b908 Mon Sep 17 00:00:00 2001 From: Simon <94762919+simonpct@users.noreply.github.com> Date: Mon, 17 Nov 2025 13:14:17 +0000 Subject: [PATCH 6/6] Update public transport tags to use bus_stop for platform selection --- analysers/analyser_merge_public_transport_FR_stan.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/analysers/analyser_merge_public_transport_FR_stan.py b/analysers/analyser_merge_public_transport_FR_stan.py index c42a9ace5..c46631bfe 100644 --- a/analysers/analyser_merge_public_transport_FR_stan.py +++ b/analysers/analyser_merge_public_transport_FR_stan.py @@ -42,13 +42,13 @@ def __init__(self, config, logger = None): Conflate( select = Select( types = ["nodes", "ways"], - tags = [{"highway": "platform", "public_transport": "platform"}]), + tags = [{"highway": "bus_stop", "public_transport": "platform"}]), conflationDistance = 2, osmRef = "gtfs:stop_id:FR-GES-STAN", mapping = Mapping( static1 = { "public_transport": "platform", - "highway": "platform", + "highway": "bus_stop", "bus": "yes", }, static2 = {"source": self.source}, @@ -57,7 +57,10 @@ def __init__(self, config, logger = None): "gtfs:stop_id:FR-GES-STAN": "stop_id", "gtfs:stop_name:FR-GES-STAN": "stop_name", "wheelchair": lambda fields: self.wheelchair_boarding[fields.get("wheelchair_boarding")]}, - mapping2 = {"name": "stop_name", "ref": "stop_code"}, + mapping2 = { + "name": "stop_name", + "ref": "stop_code" + }, text = lambda tags, fields: T_("{0} stop of {1}", place, fields["stop_name"]) ))) wheelchair_boarding = {