Commit from GitHub Actions (OSM2GTFS for Addis Ababa)

AddisMap · Jan 24, 2024 · e3d5f53 · e3d5f53
1 parent be1ff56
commit e3d5f53
Show file tree

Hide file tree

Showing 18 changed files with 9,364 additions and 8,773 deletions.
diff --git a/agency.txt b/agency.txt
@@ -1,2 +1,2 @@
-agency_timezone,agency_id,agency_name,agency_url,agency_lang
-Africa/Addis_Ababa,AA,Addis Ababa Transport (all),https://addismaptransit.com/,en
+agency_lang,agency_id,agency_name,agency_url,agency_timezone
+en,AA,Addis Ababa Transport (all),https://addismaptransit.com/,Africa/Addis_Ababa
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_contact_email,feed_publisher_name,feed_end_date,feed_version,feed_start_date,feed_lang,feed_publisher_url
-https://addismaptransit.com/support/,[email protected],AddisMap + DT4A,20991231,1.0,20191201,en,https://addismaptransit.com/
+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
diff --git a/frequencies.txt b/frequencies.txt
@@ -643,10 +643,10 @@ trip_id,start_time,end_time,headway_secs,exact_times
 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,3000,0
-645,05:00:00,22:00:00,3000,0
-646,05:00:00,22:00:00,1200,0
-647,05:00:00,22:00:00,1200,0
+644,05:00:00,22:00:00,1200,0
+645,05:00:00,22:00:00,1200,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
 649,05:00:00,22:00:00,3000,0
 650,05:00:00,22:00:00,3000,0
@@ -687,8 +687,8 @@ trip_id,start_time,end_time,headway_secs,exact_times
 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
-688,05:00:00,22:00:00,3000,0
-689,05:00:00,22:00:00,3000,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
 691,05:00:00,22:00:00,1200,0
 692,05:00:00,22:00:00,1200,0
@@ -868,3 +868,5 @@ trip_id,start_time,end_time,headway_secs,exact_times
 866,05:00:00,22:00:00,1200,0
 867,05:00:00,22:00:00,1200,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
diff --git a/generation-bus-ab.log b/generation-bus-ab.log
@@ -238,8 +238,8 @@ INFO:root:Added stop: Sheged Hotel - https://osm.org/node/7041052938
 INFO:root:Added stop: Jemo Michael - https://osm.org/node/7041052939
 INFO:root:Added stop: Jemo Michael - https://osm.org/node/7041052940
 INFO:root:Added stop: Jemo YBP (All Mart) - https://osm.org/node/7041052942
-INFO:root:Added stop: Jemo 1 - https://osm.org/node/7041052944
-INFO:root:Added stop: Jemo 1 - https://osm.org/node/7041052945
+INFO:root:Added stop: Jemmo 1 - https://osm.org/node/7041052944
+INFO:root:Added stop: Jemmo 1 - https://osm.org/node/7041052945
 INFO:root:Added stop: Mestawet Fabrica - https://osm.org/node/7041052946
 INFO:root:Added stop: Mestawet Fabrica - https://osm.org/node/7041052948
 INFO:root:Added stop: Jemo 3 - https://osm.org/node/7041052949
@@ -251,7 +251,6 @@ INFO:root:Added stop: Gerar - https://osm.org/node/7041052954
 INFO:root:Added stop: Repi (Gerar) - https://osm.org/node/7041052955
 INFO:root:Added stop: Gebre Kirstos - https://osm.org/node/7041052957
 INFO:root:Added stop: Bisrate Gebrael - https://osm.org/node/7041052958
-INFO:root:Added stop: MOHA (Pepsi Factory) - https://osm.org/node/7041052965
 INFO:root:Added stop: Gotera (Oilibiya) - https://osm.org/node/7041052969
 INFO:root:Added stop: Gotera (Oilibiya) - https://osm.org/node/7041052970
 INFO:root:Added stop: St. Joseph Church - https://osm.org/node/7041052975
@@ -267,7 +266,6 @@ INFO:root:Added stop: Abo Junction - https://osm.org/node/7041071290
 INFO:root:Added stop: Customs (Train Station) - https://osm.org/node/7041071291
 INFO:root:Added stop: Kality Maseltegna - https://osm.org/node/7041071295
 INFO:root:Added stop: Wehalemat - https://osm.org/node/7041071296
-INFO:root:Added stop: Werku Sefer - https://osm.org/node/7041071297
 INFO:root:Added stop: Bulgaria Mazoria - https://osm.org/node/7041071342
 INFO:root:Added stop: Begtera - https://osm.org/node/7041071344
 INFO:root:Added stop: AU (Mikael) Rounrdabout - https://osm.org/node/7041071347
@@ -378,7 +376,7 @@ INFO:root:Added stop: Degu Hotel - https://osm.org/node/7041071609
 INFO:root:Added stop: 18 Mazoria - https://osm.org/node/7041071610
 INFO:root:Added stop: 18 Mazoria - https://osm.org/node/7041071612
 INFO:root:Added stop: Luwkanda - https://osm.org/node/7041071614
-INFO:root:Added stop: Comprensive - https://osm.org/node/7041071615
+INFO:root:Added stop: Kolfe Secondary School - https://osm.org/node/7041071615
 INFO:root:Added stop: Realstate - https://osm.org/node/7041071616
 INFO:root:Added stop: Police Tabiya - https://osm.org/node/7041071619
 INFO:root:Added stop: Feli Doro (1) - https://osm.org/node/7041071620
@@ -751,6 +749,7 @@ INFO:root:Added stop: Eyesus - https://osm.org/node/7113158623
 INFO:root:Added stop: Gurd Shola - https://osm.org/node/7123180297
 INFO:root:Added stop: 4 Kilo Minilik School - https://osm.org/node/7214490240
 INFO:root:Added stop: Kality Menaheriya - https://osm.org/node/7214490241
+INFO:root:Added stop: Holeta - https://osm.org/node/10672522047
 INFO:root:Added stop: Delta Fuel Station - https://osm.org/node/10672721751
 INFO:root:Added stop: Sidama Awash NOC - https://osm.org/node/10672739809
 INFO:root:Added stop: Atlas Resort - https://osm.org/node/10672739811
@@ -841,7 +840,6 @@ 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
@@ -865,10 +863,6 @@ INFO:root:Added stop: Weleta Tele - https://osm.org/node/11035914864
 INFO:root:Added stop: Ayer Tena - https://osm.org/node/11035914865
 INFO:root:Added stop: Ayer Tena - https://osm.org/node/11035914869
 INFO:root:Added stop: Kara - https://osm.org/node/11036026882
-INFO:root:Added stop: Saris Abo - https://osm.org/node/11036079238
-INFO:root:Added stop: Werku Sefer - https://osm.org/node/11036079239
-INFO:root:Added stop: Kera - https://osm.org/node/11036079243
-INFO:root:Added stop: Kera - https://osm.org/node/11036079245
 INFO:root:Added stop: Anfo Meda - https://osm.org/node/11036753217
 INFO:root:Added stop: Tulu Dimtu Adebabay - https://osm.org/node/11036769860
 INFO:root:Added stop: Saris Abo - https://osm.org/node/11036769861
@@ -977,6 +971,7 @@ INFO:root:Added stop: Semen Hotel - https://osm.org/node/11399912953
 INFO:root:Added stop: Raguel Church - https://osm.org/node/11399912962
 INFO:root:Added stop: Raguel Church - https://osm.org/node/11399912963
 INFO:root:Added stop: Jemmo 3 - https://osm.org/node/11400026865
+INFO:root:Added stop: Kela - https://osm.org/node/11401143487
 INFO:root:Added stop: Mexico - https://osm.org/node/11401627123
 INFO:root:Added stop: Arat Kilo - https://osm.org/node/11403841172
 INFO:root:Added stop: Autobis Tera - https://osm.org/node/11405450798
@@ -991,6 +986,22 @@ INFO:root:Added stop: Gelan Condominium - https://osm.org/node/11409931061
 INFO:root:Added stop: Bole Bridge - https://osm.org/node/11414368236
 INFO:root:Added stop: Kidane Mihret - https://osm.org/node/11506737713
 INFO:root:Added stop: Kidane Mihret - https://osm.org/node/11506737714
+INFO:root:Added stop: Merkato - https://osm.org/node/11524560444
+INFO:root:Added stop: Merkato - https://osm.org/node/11524560448
+INFO:root:Added stop: Blu Water Factory - https://osm.org/node/11524560457
+INFO:root:Added stop: Surqa Harbu - https://osm.org/node/11524582070
+INFO:root:Added stop: Blu Water Factory - https://osm.org/node/11524582071
+INFO:root:Added stop: Kolobo - https://osm.org/node/11524582073
+INFO:root:Added stop: Gift Guesthouse - https://osm.org/node/11543153086
+INFO:root:Added stop: Menagesha - https://osm.org/node/11543153087
+INFO:root:Added stop: Gebeya - https://osm.org/node/11543153088
+INFO:root:Added stop: Kolobo 1st School - https://osm.org/node/11543153089
+INFO:root:Added stop: Kolobo - https://osm.org/node/11543153090
+INFO:root:Added stop: Kolobo 1st School - https://osm.org/node/11543153091
+INFO:root:Added stop: Gebeya - https://osm.org/node/11543153092
+INFO:root:Added stop: Menagesha - https://osm.org/node/11543153093
+INFO:root:Added stop: Gift Guesthouse - https://osm.org/node/11543153094
+INFO:root:Added stop: Holeta - https://osm.org/node/11543153095
 INFO:root:Removed 0 unused stops
 INFO:root:Removed 0 unused routes
 Timezone not checked (install pytz package for timezone validation)
@@ -1033,7 +1044,6 @@ Generating schedule for line: 16072018
 Generating schedule for line: 16072169
 Generating schedule for line: 16072247
 Generating schedule for line: 16072458
-Generating schedule for line: 16072500
 Generating schedule for line: 16074160
 Generating schedule for line: 16074208
 Generating schedule for line: 16074342
@@ -1097,6 +1107,11 @@ 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.
+The stops "Holeta" (ID node/10672522047) and "Holeta" (ID node/11543153095)
+are 1.48m apart and probably represent the same location.
 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)

diff --git a/generation-bus-sh.log b/generation-bus-sh.log
@@ -158,8 +158,8 @@ INFO:root:Added stop: Mebrathile (EEPCo) - https://osm.org/node/7041052935
 INFO:root:Added stop: Sheged Hotel - https://osm.org/node/7041052938
 INFO:root:Added stop: Jemo Michael - https://osm.org/node/7041052939
 INFO:root:Added stop: Jemo Michael - https://osm.org/node/7041052940
-INFO:root:Added stop: Jemo 1 - https://osm.org/node/7041052944
-INFO:root:Added stop: Jemo 1 - https://osm.org/node/7041052945
+INFO:root:Added stop: Jemmo 1 - https://osm.org/node/7041052944
+INFO:root:Added stop: Jemmo 1 - https://osm.org/node/7041052945
 INFO:root:Added stop: Jemo 3 - https://osm.org/node/7041052949
 INFO:root:Added stop: Jemmo 3 - https://osm.org/node/7041052950
 INFO:root:Added stop: Zenebework - https://osm.org/node/7041052951

diff --git a/generation-bus.log b/generation-bus.log
@@ -35,9 +35,6 @@ WARNING:root:Itinerary ID doesn't match line ID. Please fix in OSM.
 WARNING:root:https://osm.org/relation/16794104
 WARNING:root:Itinerary ID doesn't match line ID. Please fix in OSM.
 WARNING:root:https://osm.org/relation/16794104
-WARNING:root:'Ref' of route_master already taken
-WARNING:root: https://osm.org/relation/16794104
-WARNING:root: Skipped. Please fix in OpenStreetMap
 WARNING:root:Relation without 'ref'. Please fix in OpenStreetMap
 WARNING:root: https://osm.org/relation/16807587
 WARNING:root:Using 'ref' from member variant instead
@@ -79,6 +76,9 @@ 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
@@ -299,8 +299,8 @@ INFO:root:Added stop: Sheged Hotel - https://osm.org/node/7041052938
 INFO:root:Added stop: Jemo Michael - https://osm.org/node/7041052939
 INFO:root:Added stop: Jemo Michael - https://osm.org/node/7041052940
 INFO:root:Added stop: Jemo YBP (All Mart) - https://osm.org/node/7041052942
-INFO:root:Added stop: Jemo 1 - https://osm.org/node/7041052944
-INFO:root:Added stop: Jemo 1 - https://osm.org/node/7041052945
+INFO:root:Added stop: Jemmo 1 - https://osm.org/node/7041052944
+INFO:root:Added stop: Jemmo 1 - https://osm.org/node/7041052945
 INFO:root:Added stop: Mestawet Fabrica - https://osm.org/node/7041052946
 INFO:root:Added stop: Mestawet Fabrica - https://osm.org/node/7041052948
 INFO:root:Added stop: Jemo 3 - https://osm.org/node/7041052949
@@ -331,7 +331,6 @@ INFO:root:Added stop: Abo Junction - https://osm.org/node/7041071290
 INFO:root:Added stop: Customs (Train Station) - https://osm.org/node/7041071291
 INFO:root:Added stop: Kality Maseltegna - https://osm.org/node/7041071295
 INFO:root:Added stop: Wehalemat - https://osm.org/node/7041071296
-INFO:root:Added stop: Werku Sefer - https://osm.org/node/7041071297
 INFO:root:Added stop: Bulgaria Mazoria - https://osm.org/node/7041071342
 INFO:root:Added stop: Begtera - https://osm.org/node/7041071344
 INFO:root:Added stop: AU (Mikael) Rounrdabout - https://osm.org/node/7041071347
@@ -448,7 +447,7 @@ INFO:root:Added stop: Degu Hotel - https://osm.org/node/7041071609
 INFO:root:Added stop: 18 Mazoria - https://osm.org/node/7041071610
 INFO:root:Added stop: 18 Mazoria - https://osm.org/node/7041071612
 INFO:root:Added stop: Luwkanda - https://osm.org/node/7041071614
-INFO:root:Added stop: Comprensive - https://osm.org/node/7041071615
+INFO:root:Added stop: Kolfe Secondary School - https://osm.org/node/7041071615
 INFO:root:Added stop: Realstate - https://osm.org/node/7041071616
 INFO:root:Added stop: Police Tabiya - https://osm.org/node/7041071619
 INFO:root:Added stop: Feli Doro (1) - https://osm.org/node/7041071620
@@ -1053,9 +1052,6 @@ INFO:root:Added stop: Ayer Tena - https://osm.org/node/11035914865
 INFO:root:Added stop: Ayer Tena - https://osm.org/node/11035914869
 INFO:root:Added stop: Kara - https://osm.org/node/11036026882
 INFO:root:Added stop: Saris Abo - https://osm.org/node/11036079238
-INFO:root:Added stop: Werku Sefer - https://osm.org/node/11036079239
-INFO:root:Added stop: Kera - https://osm.org/node/11036079243
-INFO:root:Added stop: Kera - https://osm.org/node/11036079245
 INFO:root:Added stop: Anfo Meda - https://osm.org/node/11036753217
 INFO:root:Added stop: Tulu Dimtu Adebabay - https://osm.org/node/11036769860
 INFO:root:Added stop: Saris Abo - https://osm.org/node/11036769861
@@ -1402,6 +1398,7 @@ INFO:root:Added stop: Alem Bank Silase - https://osm.org/node/11519562288
 INFO:root:Added stop: Yerer Goro - https://osm.org/node/11521311352
 INFO:root:Added stop: Dire Sololiya - https://osm.org/node/11524560442
 INFO:root:Added stop: Dire Sololiya - https://osm.org/node/11524560443
+INFO:root:Added stop: Merkato - https://osm.org/node/11524560444
 INFO:root:Added stop: Kela Yetebaberut - https://osm.org/node/11524560445
 INFO:root:Added stop: Burayu - https://osm.org/node/11524560446
 INFO:root:Added stop: Merkato - https://osm.org/node/11524560448
@@ -1425,10 +1422,10 @@ INFO:root:Added stop: Maremia Mazoria - https://osm.org/node/11524560466
 INFO:root:Added stop: Addis Alem Coca - https://osm.org/node/11524560467
 INFO:root:Added stop: Addis Alem Total - https://osm.org/node/11524560468
 INFO:root:Added stop: Meskelegna - https://osm.org/node/11524582069
-INFO:root:Added stop: Muger Mazoria - https://osm.org/node/11524582070
+INFO:root:Added stop: Surqa Harbu - https://osm.org/node/11524582070
 INFO:root:Added stop: Blu Water Factory - https://osm.org/node/11524582071
 INFO:root:Added stop: Sademo 2 - https://osm.org/node/11524582072
-INFO:root:Added stop: Menagesha CBE - https://osm.org/node/11524582073
+INFO:root:Added stop: Kolobo - https://osm.org/node/11524582073
 INFO:root:Added stop: Menagesha - https://osm.org/node/11524582074
 INFO:root:Added stop: Kela - https://osm.org/node/11524582075
 INFO:root:Added stop: 6 Kilo - https://osm.org/node/11528917462
@@ -1439,6 +1436,16 @@ INFO:root:Added stop: Andnet Hotel - https://osm.org/node/11531644822
 INFO:root:Added stop: Washington Hospital - https://osm.org/node/11539916206
 INFO:root:Added stop: ICT Park - https://osm.org/node/11539916207
 INFO:root:Added stop: Bole Mikael - https://osm.org/node/11539916209
+INFO:root:Added stop: Gift Guesthouse - https://osm.org/node/11543153086
+INFO:root:Added stop: Menagesha - https://osm.org/node/11543153087
+INFO:root:Added stop: Gebeya - https://osm.org/node/11543153088
+INFO:root:Added stop: Kolobo 1st School - https://osm.org/node/11543153089
+INFO:root:Added stop: Kolobo - https://osm.org/node/11543153090
+INFO:root:Added stop: Kolobo 1st School - https://osm.org/node/11543153091
+INFO:root:Added stop: Gebeya - https://osm.org/node/11543153092
+INFO:root:Added stop: Menagesha - https://osm.org/node/11543153093
+INFO:root:Added stop: Gift Guesthouse - https://osm.org/node/11543153094
+INFO:root:Added stop: Holeta - https://osm.org/node/11543153095
 Timezone not checked (install pytz package for timezone validation)
 Generating schedule for line: 10400029
 Generating schedule for line: 10400258
@@ -1510,7 +1517,6 @@ Generating schedule for line: 16072018
 Generating schedule for line: 16072169
 Generating schedule for line: 16072247
 Generating schedule for line: 16072458
-Generating schedule for line: 16072500
 Generating schedule for line: 16074160
 Generating schedule for line: 16074208
 Generating schedule for line: 16074342
@@ -1560,6 +1566,7 @@ Generating schedule for line: 16765470
 Generating schedule for line: 16765619
 Generating schedule for line: 16765723
 Generating schedule for line: 16793879
+Generating schedule for line: 16794104
 Generating schedule for line: 16794335
 Generating schedule for line: 16794581
 Generating schedule for line: 16794648
@@ -1635,10 +1642,11 @@ Generating schedule for line: 17032741
 Generating schedule for line: 17032887
 Generating schedule for line: 17033336
 Generating schedule for line: 17034807
-INFO:root:Removed 8 unused stops
+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: 17071140
 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
@@ -1663,8 +1671,6 @@ The stops "Tabelew" (ID node/11412604057) and "Tabelew" (ID node/7041052914)
 are 0.13m apart and probably represent the same location.
 The stops "Abo Junction" (ID node/7041071289) and "Saris Abo" (ID
 node/11034015157) are 1.10m apart and probably represent the same location.
-The stops "Kera" (ID node/11036079245) and "Kera (Green Market)" (ID
-node/7084873009) are 0.40m apart and probably represent the same location.
 The stops "Bole Millenium" (ID node/7022397409) and "Bole Bridge" (ID
 node/11412861795) are 0.79m apart and probably represent the same location.
 The stops "Gerji" (ID node/11403841173) and "Gerji" (ID node/11403841174) are
@@ -1706,6 +1712,11 @@ 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"
+(ID node/11543153091) are 1.50m apart and probably represent the same
+location.
+The stops "Holeta" (ID node/10672522047) and "Holeta" (ID node/11543153095)
+are 1.48m apart and probably represent the same location.
 The stops "Shiromeda Selassie" (ID node/7076294515) and "Selassie" (ID
 node/7041071740) are 0.80m apart and probably represent the same location.
 The stops "Kuskoam" (ID node/11034054993) and "Kuskoam" (ID node/7041071742)