Commit from GitHub Actions (OSM2GTFS for Addis Ababa)

AddisMap · Jan 25, 2024 · dc3b22c · dc3b22c
1 parent e3d5f53
commit dc3b22c
Show file tree

Hide file tree

Showing 16 changed files with 7,603 additions and 6,814 deletions.
diff --git a/agency.txt b/agency.txt
@@ -1,2 +1,2 @@
-agency_lang,agency_id,agency_name,agency_url,agency_timezone
-en,AA,Addis Ababa Transport (all),https://addismaptransit.com/,Africa/Addis_Ababa
+agency_lang,agency_name,agency_timezone,agency_id,agency_url
+en,Addis Ababa Transport (all),Africa/Addis_Ababa,AA,https://addismaptransit.com/
diff --git a/et-addisababa-bus-ab.zip b/et-addisababa-bus-ab.zip
diff --git a/et-addisababa-bus-sh.zip b/et-addisababa-bus-sh.zip
diff --git a/et-addisababa-bus.zip b/et-addisababa-bus.zip
diff --git a/et-addisababa-minibus.zip b/et-addisababa-minibus.zip
diff --git a/et-addisababa.zip b/et-addisababa.zip
diff --git a/feed_info.txt b/feed_info.txt
@@ -1,2 +1,2 @@
-feed_contact_url,feed_start_date,feed_version,feed_publisher_url,feed_lang,feed_contact_email,feed_end_date,feed_publisher_name
-https://addismaptransit.com/support/,20191201,1.0,https://addismaptransit.com/,en,[email protected],20991231,AddisMap + DT4A
+feed_publisher_name,feed_lang,feed_version,feed_publisher_url,feed_start_date,feed_end_date,feed_contact_email,feed_contact_url
+AddisMap + DT4A,en,1.0,https://addismaptransit.com/,20191201,20991231,[email protected],https://addismaptransit.com/support/
diff --git a/frequencies.txt b/frequencies.txt
@@ -641,10 +641,10 @@ trip_id,start_time,end_time,headway_secs,exact_times
 639,05:00:00,22:00:00,3000,0
 640,05:00:00,22:00:00,3000,0
 641,05:00:00,22:00:00,3000,0
-642,05:00:00,22:00:00,3000,0
-643,05:00:00,22:00:00,3000,0
-644,05:00:00,22:00:00,1200,0
-645,05:00:00,22:00:00,1200,0
+642,05:00:00,22:00:00,1200,0
+643,05:00:00,22:00:00,1200,0
+644,05:00:00,22:00:00,3000,0
+645,05:00:00,22:00:00,3000,0
 646,05:00:00,22:00:00,3000,0
 647,05:00:00,22:00:00,3000,0
 648,05:00:00,22:00:00,3000,0
@@ -685,8 +685,8 @@ trip_id,start_time,end_time,headway_secs,exact_times
 683,05:00:00,22:00:00,3000,0
 684,05:00:00,22:00:00,3000,0
 685,05:00:00,22:00:00,3000,0
-686,05:00:00,22:00:00,3000,0
-687,05:00:00,22:00:00,3000,0
+686,05:00:00,22:00:00,1200,0
+687,05:00:00,22:00:00,1200,0
 688,05:00:00,22:00:00,1200,0
 689,05:00:00,22:00:00,1200,0
 690,05:00:00,22:00:00,1200,0
@@ -771,8 +771,8 @@ trip_id,start_time,end_time,headway_secs,exact_times
 769,05:00:00,22:00:00,1200,0
 770,05:00:00,22:00:00,1200,0
 771,05:00:00,22:00:00,1200,0
-772,05:00:00,22:00:00,1200,0
-773,05:00:00,22:00:00,1200,0
+772,05:00:00,22:00:00,3000,0
+773,05:00:00,22:00:00,3000,0
 774,05:00:00,22:00:00,3000,0
 775,05:00:00,22:00:00,3000,0
 776,05:00:00,22:00:00,3000,0
@@ -785,24 +785,24 @@ trip_id,start_time,end_time,headway_secs,exact_times
 783,05:00:00,22:00:00,3000,0
 784,05:00:00,22:00:00,3000,0
 785,05:00:00,22:00:00,3000,0
-786,05:00:00,22:00:00,3000,0
+786,05:00:00,22:00:00,1200,0
 787,05:00:00,22:00:00,3000,0
-788,05:00:00,22:00:00,1200,0
+788,05:00:00,22:00:00,3000,0
 789,05:00:00,22:00:00,3000,0
-790,05:00:00,22:00:00,3000,0
-791,05:00:00,22:00:00,3000,0
-792,05:00:00,22:00:00,1200,0
-793,05:00:00,22:00:00,1200,0
-794,05:00:00,22:00:00,3000,0
-795,05:00:00,22:00:00,3000,0
+790,05:00:00,22:00:00,1200,0
+791,05:00:00,22:00:00,1200,0
+792,05:00:00,22:00:00,3000,0
+793,05:00:00,22:00:00,3000,0
+794,05:00:00,22:00:00,1200,0
+795,05:00:00,22:00:00,1200,0
 796,05:00:00,22:00:00,1200,0
 797,05:00:00,22:00:00,1200,0
-798,05:00:00,22:00:00,1200,0
-799,05:00:00,22:00:00,1200,0
+798,05:00:00,22:00:00,3000,0
+799,05:00:00,22:00:00,3000,0
 800,05:00:00,22:00:00,3000,0
 801,05:00:00,22:00:00,3000,0
-802,05:00:00,22:00:00,3000,0
-803,05:00:00,22:00:00,3000,0
+802,05:00:00,22:00:00,1200,0
+803,05:00:00,22:00:00,1200,0
 804,05:00:00,22:00:00,1200,0
 805,05:00:00,22:00:00,1200,0
 806,05:00:00,22:00:00,1200,0
@@ -857,16 +857,18 @@ trip_id,start_time,end_time,headway_secs,exact_times
 855,05:00:00,22:00:00,1200,0
 856,05:00:00,22:00:00,1200,0
 857,05:00:00,22:00:00,1200,0
-858,05:00:00,22:00:00,1200,0
-859,05:00:00,22:00:00,1200,0
-860,05:00:00,22:00:00,120,0
-861,05:00:00,22:00:00,120,0
+858,05:00:00,22:00:00,120,0
+859,05:00:00,22:00:00,120,0
+860,05:00:00,22:00:00,1200,0
+861,05:00:00,22:00:00,1200,0
 862,05:00:00,22:00:00,1200,0
 863,05:00:00,22:00:00,1200,0
 864,05:00:00,22:00:00,1200,0
 865,05:00:00,22:00:00,1200,0
-866,05:00:00,22:00:00,1200,0
-867,05:00:00,22:00:00,1200,0
+866,05:00:00,22:00:00,3000,0
+867,05:00:00,22:00:00,3000,0
 868,05:00:00,22:00:00,1200,0
 869,05:00:00,22:00:00,1200,0
 870,05:00:00,22:00:00,1200,0
+871,05:00:00,22:00:00,1200,0
+872,05:00:00,22:00:00,1200,0
diff --git a/generation-bus-ab.log b/generation-bus-ab.log
@@ -366,7 +366,6 @@ INFO:root:Added stop: Gojam Berenda - https://osm.org/node/7041071598
 INFO:root:Added stop: Autobis Tera (3) - https://osm.org/node/7041071599
 INFO:root:Added stop: Autobus Tera - https://osm.org/node/7041071600
 INFO:root:Added stop: Darsema Grosery - https://osm.org/node/7041071601
-INFO:root:Added stop: Millenium School - https://osm.org/node/7041071602
 INFO:root:Added stop: Girum Hospital - https://osm.org/node/7041071604
 INFO:root:Added stop: Woreda 7 TVET - https://osm.org/node/7041071605
 INFO:root:Added stop: Sefere Salam - https://osm.org/node/7041071606
@@ -618,6 +617,7 @@ INFO:root:Added stop: Ayer Tena - https://osm.org/node/7084932741
 INFO:root:Added stop: Kidane Mihret (Roundabout) - https://osm.org/node/7084932742
 INFO:root:Added stop: Kidane Mihret (2) - https://osm.org/node/7084932743
 INFO:root:Added stop: Augusta Bridge (Tor Hailoch) - https://osm.org/node/7084932745
+INFO:root:Added stop: Mexico - https://osm.org/node/7084932747
 INFO:root:Added stop: Kilinto Right (Heniken) - https://osm.org/node/7098810335
 INFO:root:Added stop: kilinto (Heniken Brewery) - https://osm.org/node/7098810345
 INFO:root:Added stop: Gurd-shola - https://osm.org/node/7098833728
@@ -839,10 +839,6 @@ INFO:root:Added stop: Saris - https://osm.org/node/11034511606
 INFO:root:Added stop: Autobis Tera - https://osm.org/node/11034611751
 INFO:root:Added stop: Megenagna - https://osm.org/node/11034647605
 INFO:root:Added stop: Torhailoch - https://osm.org/node/11035234709
-INFO:root:Added stop: Millenium School - https://osm.org/node/11035240259
-INFO:root:Added stop: Degu Hotel - https://osm.org/node/11035240261
-INFO:root:Added stop: Philiphs (Lomi Meda) - https://osm.org/node/11035240263
-INFO:root:Added stop: Philiphs (Lomi Meda) - https://osm.org/node/11035240264
 INFO:root:Added stop: Ayer Tena - https://osm.org/node/11035502832
 INFO:root:Added stop: Ayer Tena - https://osm.org/node/11035502833
 INFO:root:Added stop: Bisrate Gebrael - https://osm.org/node/11035532608
@@ -1034,7 +1030,6 @@ Generating schedule for line: 16069472
 Generating schedule for line: 16069558
 Generating schedule for line: 16070513
 Generating schedule for line: 16070566
-Generating schedule for line: 16070654
 Generating schedule for line: 16071249
 Generating schedule for line: 16071322
 Generating schedule for line: 16071554
@@ -1076,6 +1071,7 @@ Generating schedule for line: 16810442
 Generating schedule for line: 16816053
 Generating schedule for line: 16822706
 Generating schedule for line: 17011008
+Generating schedule for line: 17073030
 All services are defined on a weekly basis from 2019-12-01 to 2099-12-31 with
 no single day variations. If there are exceptions such as holiday service
 dates please ensure they are listed in calendar_dates.txt
@@ -1105,8 +1101,6 @@ node/11034611751) are 1.78m apart and probably represent the same location.
 The stops "Ras Mekonene Bridge (Seba Dereja)" (ID node/7041071628) and "Ras
 Mekonene Bridge (Seba Dereja)" (ID node/7057002162) are 1.14m apart and
 probably represent the same location.
-The stops "Millenium School" (ID node/7041071602) and "Millenium School" (ID
-node/11035240259) are 1.79m apart and probably represent the same location.
 The stops "Kolobo 1st School" (ID node/11543153089) and "Kolobo 1st School"
 (ID node/11543153091) are 1.50m apart and probably represent the same
 location.
@@ -1116,6 +1110,12 @@ The stops "Sululta" (ID node/11083569808) and "Sululta" (ID node/11083569807)
 are 1.03m apart and probably represent the same location.
 The stops "Aleltu" (ID node/11037676746) and "Aleltu" (ID node/11037676745)
 are 0.16m apart and probably represent the same location.
+ column route_short_name
+Invalid value AB058 (Special) in field route_short_name
+This route_short_name is relatively long, which probably means that it
+contains a place name.  You should only use this field to hold a short code
+that riders use to identify a route.  If this route doesn't have such a code,
+it's OK to leave this field empty.
 High speed travel detected in trip 51: Megenagna to Shola Gebeya. 657 meters
 in 17 seconds. (139 km/h).
 High speed travel detected in trip 51: Shola Gebeya to Abebe Sook. 831 meters

diff --git a/generation-bus.log b/generation-bus.log
@@ -76,9 +76,6 @@ WARNING:root:Itinerary ID doesn't match line ID. Please fix in OSM.
 WARNING:root:https://osm.org/relation/17052323
 WARNING:root:Itinerary ID doesn't match line ID. Please fix in OSM.
 WARNING:root:https://osm.org/relation/17052323
-WARNING:root:'Ref' of route_master already taken
-WARNING:root: https://osm.org/relation/17071085
-WARNING:root: Skipped. Please fix in OpenStreetMap
 WARNING:root:Route (variant) without route_master
 WARNING:root: https://osm.org/relation/17065220
 WARNING:root: Please fix in OpenStreetMap
@@ -437,7 +434,6 @@ INFO:root:Added stop: Gojam Berenda - https://osm.org/node/7041071598
 INFO:root:Added stop: Autobis Tera (3) - https://osm.org/node/7041071599
 INFO:root:Added stop: Autobus Tera - https://osm.org/node/7041071600
 INFO:root:Added stop: Darsema Grosery - https://osm.org/node/7041071601
-INFO:root:Added stop: Millenium School - https://osm.org/node/7041071602
 INFO:root:Added stop: Girum Hospital - https://osm.org/node/7041071604
 INFO:root:Added stop: Woreda 7 TVET - https://osm.org/node/7041071605
 INFO:root:Added stop: Sefere Salam - https://osm.org/node/7041071606
@@ -1026,11 +1022,7 @@ INFO:root:Added stop: Saris - https://osm.org/node/11034511606
 INFO:root:Added stop: Autobis Tera - https://osm.org/node/11034611751
 INFO:root:Added stop: Megenagna - https://osm.org/node/11034647605
 INFO:root:Added stop: Torhailoch - https://osm.org/node/11035234709
-INFO:root:Added stop: Millenium School - https://osm.org/node/11035240259
 INFO:root:Added stop: Chid Tera - https://osm.org/node/11035240260
-INFO:root:Added stop: Degu Hotel - https://osm.org/node/11035240261
-INFO:root:Added stop: Philiphs (Lomi Meda) - https://osm.org/node/11035240263
-INFO:root:Added stop: Philiphs (Lomi Meda) - https://osm.org/node/11035240264
 INFO:root:Added stop: Ayer Tena - https://osm.org/node/11035502832
 INFO:root:Added stop: Ayer Tena - https://osm.org/node/11035502833
 INFO:root:Added stop: Bisrate Gebrael - https://osm.org/node/11035532608
@@ -1507,7 +1499,6 @@ Generating schedule for line: 16069472
 Generating schedule for line: 16069558
 Generating schedule for line: 16070513
 Generating schedule for line: 16070566
-Generating schedule for line: 16070654
 Generating schedule for line: 16071249
 Generating schedule for line: 16071322
 Generating schedule for line: 16071554
@@ -1642,11 +1633,13 @@ Generating schedule for line: 17032741
 Generating schedule for line: 17032887
 Generating schedule for line: 17033336
 Generating schedule for line: 17034807
+Generating schedule for line: 17039849
 INFO:root:Removed 7 unused stops
 INFO:root:Removed 0 unused routes
-Generating schedule for line: 17039849
 Generating schedule for line: 17052323
+Generating schedule for line: 17071085
 Generating schedule for line: 17071140
+Generating schedule for line: 17073030
 Generating schedule for line: AB053
 All services are defined on a weekly basis from 2019-12-01 to 2099-12-31 with
 no single day variations. If there are exceptions such as holiday service
@@ -1708,8 +1701,6 @@ location.
 The stops "Ras Mekonene Bridge (Seba Dereja)" (ID node/7041071628) and "Ras
 Mekonene Bridge (Seba Dereja)" (ID node/7057002162) are 1.14m apart and
 probably represent the same location.
-The stops "Millenium School" (ID node/7041071602) and "Millenium School" (ID
-node/11035240259) are 1.79m apart and probably represent the same location.
 The stops "Kela" (ID node/7074269464) and "Kela" (ID node/7074269465) are
 0.31m apart and probably represent the same location.
 The stops "Kolobo 1st School" (ID node/11543153089) and "Kolobo 1st School"
@@ -1734,6 +1725,18 @@ The stops "Sululta" (ID node/11083569808) and "Sululta" (ID node/11083569807)
 are 1.03m apart and probably represent the same location.
 The stops "Aleltu" (ID node/11037676746) and "Aleltu" (ID node/11037676745)
 are 0.16m apart and probably represent the same location.
+ column route_short_name
+Invalid value AB036 (Special) in field route_short_name
+This route_short_name is relatively long, which probably means that it
+contains a place name.  You should only use this field to hold a short code
+that riders use to identify a route.  If this route doesn't have such a code,
+it's OK to leave this field empty.
+ column route_short_name
+Invalid value AB058 (Special) in field route_short_name
+This route_short_name is relatively long, which probably means that it
+contains a place name.  You should only use this field to hold a short code
+that riders use to identify a route.  If this route doesn't have such a code,
+it's OK to leave this field empty.
 High speed travel detected in trip 113: Megenagna to Shola Gebeya. 657 meters
 in 17 seconds. (139 km/h).
 High speed travel detected in trip 113: Shola Gebeya to Abebe Sook. 831 meters

diff --git a/generation.log b/generation.log
@@ -142,9 +142,6 @@ WARNING:root:Itinerary ID doesn't match line ID. Please fix in OSM.
 WARNING:root:https://osm.org/relation/17052323
 WARNING:root:Itinerary ID doesn't match line ID. Please fix in OSM.
 WARNING:root:https://osm.org/relation/17052323
-WARNING:root:'Ref' of route_master already taken
-WARNING:root: https://osm.org/relation/17071085
-WARNING:root: Skipped. Please fix in OpenStreetMap
 WARNING:root:Route (variant) without route_master
 WARNING:root: https://osm.org/relation/17065220
 WARNING:root: Please fix in OpenStreetMap
@@ -885,7 +882,6 @@ INFO:root:Added stop: Gojam Berenda - https://osm.org/node/7041071598
 INFO:root:Added stop: Autobis Tera (3) - https://osm.org/node/7041071599
 INFO:root:Added stop: Autobus Tera - https://osm.org/node/7041071600
 INFO:root:Added stop: Darsema Grosery - https://osm.org/node/7041071601
-INFO:root:Added stop: Millenium School - https://osm.org/node/7041071602
 INFO:root:Added stop: Girum Hospital - https://osm.org/node/7041071604
 INFO:root:Added stop: Woreda 7 TVET - https://osm.org/node/7041071605
 INFO:root:Added stop: Sefere Salam - https://osm.org/node/7041071606
@@ -2317,11 +2313,7 @@ INFO:root:Added stop: Saris - https://osm.org/node/11034511606
 INFO:root:Added stop: Autobis Tera - https://osm.org/node/11034611751
 INFO:root:Added stop: Megenagna - https://osm.org/node/11034647605
 INFO:root:Added stop: Torhailoch - https://osm.org/node/11035234709
-INFO:root:Added stop: Millenium School - https://osm.org/node/11035240259
 INFO:root:Added stop: Chid Tera - https://osm.org/node/11035240260
-INFO:root:Added stop: Degu Hotel - https://osm.org/node/11035240261
-INFO:root:Added stop: Philiphs (Lomi Meda) - https://osm.org/node/11035240263
-INFO:root:Added stop: Philiphs (Lomi Meda) - https://osm.org/node/11035240264
 INFO:root:Added stop: Ayer Tena - https://osm.org/node/11035502832
 INFO:root:Added stop: Ayer Tena - https://osm.org/node/11035502833
 INFO:root:Added stop: Bisrate Gebrael - https://osm.org/node/11035532608
@@ -3048,7 +3040,6 @@ Generating schedule for line: 16069472
 Generating schedule for line: 16069558
 Generating schedule for line: 16070513
 Generating schedule for line: 16070566
-Generating schedule for line: 16070654
 Generating schedule for line: 16071249
 Generating schedule for line: 16071322
 Generating schedule for line: 16071554
@@ -3144,9 +3135,9 @@ Generating schedule for line: 16814055
 Generating schedule for line: 16814777
 Generating schedule for line: 16814864
 Generating schedule for line: 16815120
+Generating schedule for line: 16815233
 INFO:root:Removed 7 unused stops
 INFO:root:Removed 0 unused routes
-Generating schedule for line: 16815233
 Generating schedule for line: 16815447
 Generating schedule for line: 16815552
 Generating schedule for line: 16815658
@@ -3187,7 +3178,9 @@ Generating schedule for line: 17033336
 Generating schedule for line: 17034807
 Generating schedule for line: 17039849
 Generating schedule for line: 17052323
+Generating schedule for line: 17071085
 Generating schedule for line: 17071140
+Generating schedule for line: 17073030
 Generating schedule for line: 5697658
 Generating schedule for line: 5697659
 Generating schedule for line: AB053
@@ -3466,8 +3459,6 @@ The stops "Kara" (ID node/10931809328) and "Kara" (ID node/11036026882) are
 0.17m apart and probably represent the same location.
 The stops "Kara" (ID node/10781643841) and "Kara" (ID node/11037676705) are
 0.53m apart and probably represent the same location.
-The stops "Millenium School" (ID node/7041071602) and "Millenium School" (ID
-node/11035240259) are 1.79m apart and probably represent the same location.
 The stops "Atena Tera" (ID node/10914784457) and "Atena Tera" (ID
 node/7112280391) are 0.21m apart and probably represent the same location.
 The stops "Atena Tera" (ID node/10989322794) and "Atena Tera" (ID
@@ -4978,6 +4969,18 @@ Invalid value Tx Lafto 007 in field route_short_name
 This route_short_name is relatively long, which probably means that it
 contains a place name.  You should only use this field to hold a short code
 that riders use to identify a route.  If this route doesn't have such a code,
+it's OK to leave this field empty.
+ column route_short_name
+Invalid value AB036 (Special) in field route_short_name
+This route_short_name is relatively long, which probably means that it
+contains a place name.  You should only use this field to hold a short code
+that riders use to identify a route.  If this route doesn't have such a code,
+it's OK to leave this field empty.
+ column route_short_name
+Invalid value AB058 (Special) in field route_short_name
+This route_short_name is relatively long, which probably means that it
+contains a place name.  You should only use this field to hold a short code
+that riders use to identify a route.  If this route doesn't have such a code,
 it's OK to leave this field empty.
 High speed travel detected in trip 605: Megenagna to Shola Gebeya. 657 meters
 in 17 seconds. (139 km/h).