From bdd0d9c9fc4dad0131061181b5a87b342aede106 Mon Sep 17 00:00:00 2001 From: pomodoren Date: Sat, 6 Jan 2024 23:52:52 +0100 Subject: [PATCH] Made changes to Durres line of Plepa to merge services in one html page --- README.md | 34 +- data/durres/config/gtfs-to-html.config.json | 10 +- data/durres/frequencies.csv | 6 +- data/durres/timetable.json | 216 +++-- index.html | 18 +- results/durres_extra/timetable_pages.txt | 3 + results/durres_extra/timetables.txt | 5 + results/durres_gtfs.zip | Bin 8671 -> 10659 bytes .../websites/durres/20240101-20241231/1.html | 807 +++++++++++++++++ .../websites/durres/20240101-20241231/2.html | 817 ++++++++++++++++++ .../20240101-20241231/l10000001_l1_sun.html | 636 -------------- .../l11111110_l1_mon-sat.html | 650 -------------- results/websites/durres/index.html | 12 +- results/websites/durres/log.txt | 10 +- scripts/index.ipynb | 19 +- 15 files changed, 1801 insertions(+), 1442 deletions(-) create mode 100644 results/durres_extra/timetable_pages.txt create mode 100644 results/durres_extra/timetables.txt create mode 100644 results/websites/durres/20240101-20241231/1.html create mode 100644 results/websites/durres/20240101-20241231/2.html delete mode 100644 results/websites/durres/20240101-20241231/l10000001_l1_sun.html delete mode 100644 results/websites/durres/20240101-20241231/l11111110_l1_mon-sat.html diff --git a/README.md b/README.md index db2a147..00b158e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,4 @@ -# osm-generated-pt-info - -
- -> **VISIT WEBSITE**: https://pomodoren.github.io/osm-generated-pt-info/ +# freeBus
@@ -12,27 +8,6 @@
-### Tools used - -- https://github.com/mapanica/easy-timetable-generator <-- decide on frequencies -- https://github.com/Jungle-Bus/osm2gtfs <-- generate trips -- https://gtfs-validator.mobilitydata.org/ <-- get report on GTFS validity -- https://github.com/blinktaginc/gtfs-to-html <-- render schedules and map - https://run.gtfstohtml.com/ - -
- -### Notes on possible issues - -- Make sure OSM data is correct: - - Order of Stations is correct - - From and To is same to From and To that you have defined in the frequencies table - - Via is defined (in case no error comes up - might be related to this) -- Make sure you have cleaned up after error in osm2gtfs - - the data is cached under data/ - `rm -rf data/al_*` -- python3 tools/unpickling.py - for debugging routes built - - -
### Sneak Peek @@ -40,8 +15,7 @@ | Example| Example per line | | --|--| -| ![](docs/example.png) | ![](docs/example-line.png) | -| **Tirana - L2** | **Prishtina - L1A** | -| ![](docs/tirana.png) | ![](docs/prishtina.png) | - +| ![](docs/example.png) | Example City Network| +| Using this in Prishtina
for the Airport line| ![](docs/prishtina.png) | +|![](docs/tirana.png) | Using this in Tirana
for one line | diff --git a/data/durres/config/gtfs-to-html.config.json b/data/durres/config/gtfs-to-html.config.json index 5e769f0..6894009 100644 --- a/data/durres/config/gtfs-to-html.config.json +++ b/data/durres/config/gtfs-to-html.config.json @@ -13,12 +13,12 @@ "daysShortStrings": ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"], "daysStrings": ["monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"], "defaultOrientation": "vertical", - "effectiveDate": "July 8, 2016", + "effectiveDate": "Janar 2024", "interpolatedStopSymbol": "•", "interpolatedStopText": "Estimated time of arrival", "linkStopUrls": true, "mapboxAccessToken": "pk.eyJ1IjoicG9tb2RvcmVuIiwiYSI6ImNscXNxbHgzNjRkbnoycXJxODB6b2F2ZTYifQ.yepzIdraeKMJ0QeCPKoWAA", - "menuType": "radio", + "menuType": "simple", "noDropoffSymbol": "‡", "noDropoffText": "No drop off available", "noHead": false, @@ -35,16 +35,16 @@ "serviceProvidedOnText": "Service provided on", "showArrivalOnDifference": 0.2, "showMap": true, - "showOnlyTimepoint": true, + "showOnlyTimepoint": false, "showRouteTitle": true, "showStopCity": false, "showStopDescription": false, - "showStoptimesForRequestStops": true, + "showStoptimesForRequestStops": false, "skipImport": false, "sortingAlgorithm": "common", "templatePath": "views/default", "timeFormat": "h:mma", - "useParentStation": true, + "useParentStation": false, "verbose": true, "zipOutput": false } diff --git a/data/durres/frequencies.csv b/data/durres/frequencies.csv index f0f6abd..b3821d4 100644 --- a/data/durres/frequencies.csv +++ b/data/durres/frequencies.csv @@ -1,5 +1,5 @@ ref,from,to,via,intermediates,opening-hours,exceptions,duration,intermediate-durations,frequency -L1,Plepa,Sheshi Pranvera,,Posta;Ura e Dajlanit,Mo-Sa 05:40-18:20;Mo-Sa 18:50,,35,10;20,60 -L1,Plepa,Sheshi Pranvera,,Posta;Ura e Dajlanit,Su 06:20; Su 07:00-17:00;Su 17:40,,35,10;20,60 L1,Sheshi Pranvera,Plepa,,Ura e Dajlanit;Posta,Mo-Sa 05:40-18:20;Mo-Sa 18:50,,35,10;20,60 -L1,Sheshi Pranvera,Plepa,,Ura e Dajlanit;Posta,Su 06:20; Su 07:00-17:00;Su 17:40,,35,10;20,60 \ No newline at end of file +L1,Sheshi Pranvera,Plepa,,Ura e Dajlanit;Posta,Su 06:20; Su 07:00-17:00;Su 17:40,,35,10;20,60 +L1,Plepa,Sheshi Pranvera,,Posta;Ura e Dajlanit,Mo-Sa 06:40-18:20;Mo-Sa 18:50,,35,10;20,45 +L1,Plepa,Sheshi Pranvera,,Posta;Ura e Dajlanit,Su 07:20; Su 07:00-17:00;Su 17:40,,35,10;20,45 diff --git a/data/durres/timetable.json b/data/durres/timetable.json index 5b472bd..cdf7822 100644 --- a/data/durres/timetable.json +++ b/data/durres/timetable.json @@ -5,15 +5,15 @@ "L1": [ { "exceptions": [], - "from": "Plepa", + "from": "Sheshi Pranvera", "services": [ "Mo-Sa" ], "stations": [ - "Plepa", - "Posta", + "Sheshi Pranvera", "Ura e Dajlanit", - "Sheshi Pranvera" + "Posta", + "Plepa" ], "times": [ [ @@ -101,19 +101,19 @@ "19:25" ] ], - "to": "Sheshi Pranvera" + "to": "Plepa" }, { "exceptions": [], - "from": "Plepa", + "from": "Sheshi Pranvera", "services": [ "Su" ], "stations": [ - "Plepa", - "Posta", + "Sheshi Pranvera", "Ura e Dajlanit", - "Sheshi Pranvera" + "Posta", + "Plepa" ], "times": [ [ @@ -195,27 +195,21 @@ "18:15" ] ], - "to": "Sheshi Pranvera" + "to": "Plepa" }, { "exceptions": [], - "from": "Sheshi Pranvera", + "from": "Plepa", "services": [ "Mo-Sa" ], "stations": [ - "Sheshi Pranvera", - "Ura e Dajlanit", + "Plepa", "Posta", - "Plepa" + "Ura e Dajlanit", + "Sheshi Pranvera" ], "times": [ - [ - "05:40", - "05:50", - "06:00", - "06:15" - ], [ "06:40", "06:50", @@ -223,16 +217,22 @@ "07:15" ], [ - "07:40", - "07:50", - "08:00", - "08:15" + "07:25", + "07:35", + "07:45", + "08:00" ], [ - "08:40", - "08:50", - "09:00", - "09:15" + "08:10", + "08:20", + "08:30", + "08:45" + ], + [ + "08:55", + "09:05", + "09:15", + "09:30" ], [ "09:40", @@ -241,16 +241,22 @@ "10:15" ], [ - "10:40", - "10:50", - "11:00", - "11:15" + "10:25", + "10:35", + "10:45", + "11:00" ], [ - "11:40", - "11:50", - "12:00", - "12:15" + "11:10", + "11:20", + "11:30", + "11:45" + ], + [ + "11:55", + "12:05", + "12:15", + "12:30" ], [ "12:40", @@ -259,16 +265,22 @@ "13:15" ], [ - "13:40", - "13:50", - "14:00", - "14:15" + "13:25", + "13:35", + "13:45", + "14:00" ], [ - "14:40", - "14:50", - "15:00", - "15:15" + "14:10", + "14:20", + "14:30", + "14:45" + ], + [ + "14:55", + "15:05", + "15:15", + "15:30" ], [ "15:40", @@ -277,16 +289,22 @@ "16:15" ], [ - "16:40", - "16:50", - "17:00", - "17:15" + "16:25", + "16:35", + "16:45", + "17:00" ], [ - "17:40", - "17:50", - "18:00", - "18:15" + "17:10", + "17:20", + "17:30", + "17:45" + ], + [ + "17:55", + "18:05", + "18:15", + "18:30" ], [ "18:50", @@ -295,26 +313,26 @@ "19:25" ] ], - "to": "Plepa" + "to": "Sheshi Pranvera" }, { "exceptions": [], - "from": "Sheshi Pranvera", + "from": "Plepa", "services": [ "Su" ], "stations": [ - "Sheshi Pranvera", - "Ura e Dajlanit", + "Plepa", "Posta", - "Plepa" + "Ura e Dajlanit", + "Sheshi Pranvera" ], "times": [ [ - "06:20", - "06:30", - "06:40", - "06:55" + "07:20", + "07:30", + "07:40", + "07:55" ], [ "07:00", @@ -323,16 +341,22 @@ "07:35" ], [ - "08:00", - "08:10", - "08:20", - "08:35" + "07:45", + "07:55", + "08:05", + "08:20" ], [ - "09:00", - "09:10", - "09:20", - "09:35" + "08:30", + "08:40", + "08:50", + "09:05" + ], + [ + "09:15", + "09:25", + "09:35", + "09:50" ], [ "10:00", @@ -341,16 +365,22 @@ "10:35" ], [ - "11:00", - "11:10", - "11:20", - "11:35" + "10:45", + "10:55", + "11:05", + "11:20" ], [ - "12:00", - "12:10", - "12:20", - "12:35" + "11:30", + "11:40", + "11:50", + "12:05" + ], + [ + "12:15", + "12:25", + "12:35", + "12:50" ], [ "13:00", @@ -359,16 +389,22 @@ "13:35" ], [ - "14:00", - "14:10", - "14:20", - "14:35" + "13:45", + "13:55", + "14:05", + "14:20" ], [ - "15:00", - "15:10", - "15:20", - "15:35" + "14:30", + "14:40", + "14:50", + "15:05" + ], + [ + "15:15", + "15:25", + "15:35", + "15:50" ], [ "16:00", @@ -377,10 +413,10 @@ "16:35" ], [ - "17:00", - "17:10", - "17:20", - "17:35" + "16:45", + "16:55", + "17:05", + "17:20" ], [ "17:40", @@ -389,7 +425,7 @@ "18:15" ] ], - "to": "Plepa" + "to": "Sheshi Pranvera" } ] }, diff --git a/index.html b/index.html index b739b21..4c078b6 100644 --- a/index.html +++ b/index.html @@ -7485,23 +7485,25 @@

pomodoren/open-labs

-

OSM-generated PT Info