v3.3.0

Dockerfile

@@ -7,7 +7,7 @@ RUN apt-get update && apt-get -y upgrade && \
 RUN mkdir -p /app
 WORKDIR /app
 COPY . /app/
-RUN pip3 install -r requirements.txt --user --no-cache-dir
+RUN pip3 install -r requirements.txt --user
 
 EXPOSE 5000
 

GTFSManager.py

@@ -1414,7 +1414,7 @@ def signal_term_handler(signal, frame):
 
 	thisURL = "http://localhost:" + str(port)
 	webbrowser.open(thisURL)
-	logmessage("Open {} in your Web Browser if you don't see it opening automatically within 5 seconds.".format(thisURL))
+	logmessage("Open {} in your Web Browser if you don't see it opening automatically in 5 seconds.\nNote: If this is through docker, then it's not going to auto-open in browser, don't wait.".format(thisURL))
 	tornado.ioloop.IOLoop.current().start()
 
 

MacOS_docker_install.command

@@ -0,0 +1,3 @@
+#!/bin/sh
+cd "`dirname "$0"`"
+docker build -t static-gtfs-manager .

MacOS_docker_run.command

@@ -0,0 +1,3 @@
+#!/bin/sh
+cd "`dirname "$0"`"
+docker run -it -p 5000:5000 -v "`pwd`":/app static-gtfs-manager

README.md

@@ -5,8 +5,11 @@
 
 A browser-based user interface for creating, editing, exporting of static GTFS (General Transit Feed Specification Reference) feeds for a public transit authority.
 
-**Development Status** : V 3.2.1   
-Windows binary is available too now. Download from [Releases page](https://github.com/WRI-Cities/static-GTFS-manager/releases/).
+**Development Status** : V 3.3.0  
+Download from [Releases page](https://github.com/WRI-Cities/static-GTFS-manager/releases/).  
+- Windows binary is available in the repo itself, just double-click GTFSManager.exe to start the program.
+- Mac, Ubuntu users can run by first installing docker, then double-clicking two scripts. See [Running with Docker on any OS](https://github.com/WRI-Cities/static-GTFS-manager/wiki/Running-with-Docker-on-any-OS)
+
 
 ## Intro
 This project is the result of a collaboration between WRI ([World Resources Institute](http://wri-india.org/)) and KMRL ([Kochi Metro Rail Limited](http://kochimetro.org)). 
@@ -20,7 +23,7 @@ See the [KMRL open data portal](https://kochimetro.org/open-data/) and some news
 This program adheres to the static GTFS (General Transit Feed Specification Reference) open transit data specs as published by Google Transit here: <https://developers.google.com/transit/gtfs/reference/>  
 It also implements a [GTFS extension for translations](https://developers.google.com/transit/gtfs/reference/gtfs-extensions#translations) of stops and routes names to facilitate multilingual use of the data.
 
-Lead programmer up till April 2018: [Nikhil VJ](https://answerquest.github.io) from Pune, India.
+Lead programmer up till November 2018: [Nikhil VJ](https://answerquest.github.io) from Pune, India.
 
 See this and many more GTFS related resources listed on **[Awesome Transit](https://github.com/CUTR-at-USF/awesome-transit#gtfs-tools)**, a one-stop community listing for all things GTFS.
 
@@ -44,15 +47,14 @@ Psst! Password is `program`.
 4. More notes on this, including some troubleshooting and watchouts, **[on the wiki](https://github.com/WRI-Cities/static-GTFS-manager/wiki/Standalone-Windows-Executable)**.
 
 
-### On Ubuntu / Linux OS
+### On Ubuntu / Linux OS, on Python 3
 See on the project wiki: [Running on Ubuntu OS](https://github.com/WRI-Cities/static-GTFS-manager/wiki/Running-on-Ubuntu-OS)
 
-### Running with Python3 on a Windows OS
+### Running on Windows on Python 3
 See on the project wiki: [Running on Windows OS with Python 3](https://github.com/WRI-Cities/static-GTFS-manager/wiki/Running-on-Windows-OS-with-Python-3)
 
-### Running in Docker with Compose
-Work in progress! See [this](https://github.com/WRI-Cities/static-GTFS-manager/issues/69)
-
+### Running in Docker on all OS's (including Mac)
+See [Running with Docker on any OS](https://github.com/WRI-Cities/static-GTFS-manager/wiki/Running-with-Docker-on-any-OS)
 ----
 
 ## Changing the password
@@ -88,13 +90,12 @@ In the import process, the program creates a backup ZIP of the current data and
 ## Improvements, Feedback
 Please see the [Issues](https://github.com/WRI-Cities/static-GTFS-manager/issues) section for seeing existing program improvement efforts, feedback, questions. Please make sure you search through all the issues ([click here](https://github.com/WRI-Cities/static-GTFS-manager/issues?utf8=%E2%9C%93&q=) for full list) before filing a new one : it might already be covered in another.
 
-**Invitation**: This project invites active participation from professionals in the coding and GTFS fields to join in to take it forward. Please feel free to fork, write your fixes/enhancements and create a pull request.
+**Invitation**: This project invites active participation from professionals in the coding and GTFS fields to join in to take it forward. Please feel free to fork, write your fixes/enhancements and submit a pull request.
 
 
 ## Known limitations
-- Schedules with frequencies currently not supported, [this is desired](https://github.com/WRI-Cities/static-GTFS-manager/issues/23) as for some systems their schedules may be frequency-based rather than fixed times, plus using frequency greatly reduces the database/feed size by removing repetitive entries from stop_times table.
 - Shapes are only accepted in .geojson format. The first entry in the file will be picked up and others will be discarded.
-- Doesn't support calendar_dates.txt yet. For that and all such extra files: If you've imported it, it'll be there in the DB, and will be there in the feed when you export again. Just haven't gotten around to making their UI yet. Code contributions welcome in that regard.
+- Extra files that are optional : If you've imported it, it'll be there in the DB, and will be there in the feed when you export again. Code contributions welcome in that regard.
 
 ## Technical Overview
 Moved to Wiki: [Technical Overview](https://github.com/WRI-Cities/static-GTFS-manager/wiki/Technical-Overview)

config/settings.js

@@ -1,6 +1,6 @@
 // from commonfuncs.js
 
-const VERSION = 'v3.2.0';
+const VERSION = 'v3.3.0';
 const APIpath = 'API/';
 const CURRENCY = 'INR';
 // this flag tells whether it is mandatory for all UIDs to be in capitals or not.

docker_install.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+cd "`dirname "$0"`"
+docker build -t static-gtfs-manager .

docker_run.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+cd "`dirname "$0"`"
+docker run -it -p 5000:5000 -v "`pwd`":/app static-gtfs-manager

logs/log.txt

@@ -1053,3 +1053,88 @@ tableColumn GET call for table=trips, column=trip_id
 2018-Nov-09 08:39:50 : readTableDB: table:trips, column:route_id, value:"100A"
 2018-Nov-09 08:39:50 : readTableDB: Loaded trips, 25 records
 2018-Nov-09 08:39:50 : tableColumn GET call took 0.9 seconds.
+2018-Nov-11 18:42:15 : Loaded dependencies, starting static GTFS Manager program.
+2018-Nov-11 18:42:16 : Open http://localhost:5000 in your Web Browser if you don't see it opening automatically within 5 seconds.
+2018-Nov-11 18:42:25 : 
+pastCommits GET call
+2018-Nov-11 18:42:25 : pastCommits GET call took 0.05 seconds.
+2018-Nov-11 18:42:25 : 
+stats GET call
+2018-Nov-11 18:42:32 : readTableDB: Loaded agency, 1 records
+2018-Nov-11 18:42:32 : agency              : 1 entries
+2018-Nov-11 18:42:32 : calendar            : 1 entries
+2018-Nov-11 18:42:32 : stops               : 1,628 entries
+2018-Nov-11 18:42:33 : routes              : 747 entries
+2018-Nov-11 18:42:33 : trips               : 16,931 entries
+2018-Nov-11 18:42:33 : stop_times          : 508,467 entries
+2018-Nov-11 18:42:33 : calendar_dates      : 1 entries
+2018-Nov-11 18:42:33 : fare_attributes     : 0 entries
+2018-Nov-11 18:42:33 : fare_rules          : 0 entries
+2018-Nov-11 18:42:33 : shapes              : 0 entries
+2018-Nov-11 18:42:33 : frequencies         : 0 entries
+2018-Nov-11 18:42:33 : transfers           : 0 entries
+2018-Nov-11 18:42:33 : feed_info           : 1 entries
+2018-Nov-11 18:42:33 : stats GET call took 7.83 seconds.
+2018-Nov-11 18:50:30 : 
+tableReadSave GET call for table=frequencies
+2018-Nov-11 18:50:30 : readTableDB: Loaded frequencies, 0 records
+2018-Nov-11 18:50:30 : tableReadSave GET call for table=frequencies took 0.05 seconds.
+2018-Nov-11 18:50:30 : 
+routeIdList GET call
+2018-Nov-11 18:50:30 : 
+tableColumn GET call for table=routes, column=route_id
+2018-Nov-11 18:50:30 : readTableDB: Loaded routes, 747 records
+2018-Nov-11 18:50:30 : tableColumn GET call took 0.21 seconds.
+2018-Nov-11 18:50:33 : 
+routeIdList GET call
+2018-Nov-11 18:50:33 : 
+tableColumn GET call for table=trips, column=trip_id
+2018-Nov-11 18:50:33 : readTableDB: table:trips, column:route_id, value:"10"
+2018-Nov-11 18:50:34 : readTableDB: Loaded trips, 50 records
+2018-Nov-11 18:50:34 : tableColumn GET call took 0.38 seconds.
+2018-Nov-11 20:48:45 : Loaded dependencies, starting static GTFS Manager program.
+2018-Nov-11 20:48:45 : Open http://localhost:5000 in your Web Browser if you don't see it opening automatically in 5 seconds.
+Note: If this is through docker, then it's not going to auto-open in browser, don't wait.
+2018-Nov-11 20:48:49 : 
+pastCommits GET call
+2018-Nov-11 20:48:49 : pastCommits GET call took 0.0 seconds.
+2018-Nov-11 20:48:49 : 
+stats GET call
+2018-Nov-11 20:48:50 : readTableDB: Loaded agency, 1 records
+2018-Nov-11 20:48:50 : agency              : 1 entries
+2018-Nov-11 20:48:50 : calendar            : 1 entries
+2018-Nov-11 20:48:50 : stops               : 1,628 entries
+2018-Nov-11 20:48:50 : routes              : 747 entries
+2018-Nov-11 20:48:50 : trips               : 16,931 entries
+2018-Nov-11 20:48:51 : stop_times          : 508,467 entries
+2018-Nov-11 20:48:51 : calendar_dates      : 1 entries
+2018-Nov-11 20:48:51 : fare_attributes     : 0 entries
+2018-Nov-11 20:48:51 : fare_rules          : 0 entries
+2018-Nov-11 20:48:51 : shapes              : 0 entries
+2018-Nov-11 20:48:51 : frequencies         : 0 entries
+2018-Nov-11 20:48:51 : transfers           : 0 entries
+2018-Nov-11 20:48:51 : feed_info           : 1 entries
+2018-Nov-11 20:48:51 : stats GET call took 1.5 seconds.
+2018-Nov-11 20:50:19 : Loaded dependencies, starting static GTFS Manager program.
+2018-Nov-11 20:50:19 : Open http://localhost:5000 in your Web Browser if you don't see it opening automatically in 5 seconds.
+Note: If this is through docker, then it's not going to auto-open in browser, don't wait.
+2018-Nov-11 20:50:20 : 
+stats GET call
+2018-Nov-11 20:50:20 : readTableDB: Loaded agency, 1 records
+2018-Nov-11 20:50:20 : agency              : 1 entries
+2018-Nov-11 20:50:20 : calendar            : 1 entries
+2018-Nov-11 20:50:20 : stops               : 1,628 entries
+2018-Nov-11 20:50:20 : routes              : 747 entries
+2018-Nov-11 20:50:20 : trips               : 16,931 entries
+2018-Nov-11 20:50:21 : stop_times          : 508,467 entries
+2018-Nov-11 20:50:21 : calendar_dates      : 1 entries
+2018-Nov-11 20:50:21 : fare_attributes     : 0 entries
+2018-Nov-11 20:50:21 : fare_rules          : 0 entries
+2018-Nov-11 20:50:21 : shapes              : 0 entries
+2018-Nov-11 20:50:21 : frequencies         : 0 entries
+2018-Nov-11 20:50:21 : transfers           : 0 entries
+2018-Nov-11 20:50:21 : feed_info           : 1 entries
+2018-Nov-11 20:50:21 : stats GET call took 0.67 seconds.
+2018-Nov-11 20:50:21 : 
+pastCommits GET call
+2018-Nov-11 20:50:21 : pastCommits GET call took 0.0 seconds.

win_docker_install.bat

@@ -0,0 +1 @@
+docker build -t static-gtfs-manager .

win_docker_run.bat

@@ -0,0 +1 @@
+docker run -it -p 5000:5000 -v "%cd%":/app static-gtfs-manager