From f955a1ff2ea0f6da5d860c6466ee861cbb7c92b3 Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@gmail.com>
Date: Sat, 30 Sep 2017 17:02:30 +1300
Subject: [PATCH 01/18] Initial gtfsproj using django-admin

---
 examples/gtfsproj/gtfsapp/__init__.py         |   0
 examples/gtfsproj/gtfsapp/admin.py            |   6 +
 examples/gtfsproj/gtfsapp/apps.py             |   8 ++
 .../gtfsproj/gtfsapp/migrations/__init__.py   |   0
 examples/gtfsproj/gtfsapp/models.py           |   6 +
 examples/gtfsproj/gtfsapp/tests.py            |   6 +
 examples/gtfsproj/gtfsapp/views.py            |   6 +
 examples/gtfsproj/gtfsproj/__init__.py        |   0
 examples/gtfsproj/gtfsproj/settings.py        | 120 ++++++++++++++++++
 examples/gtfsproj/gtfsproj/urls.py            |  21 +++
 examples/gtfsproj/gtfsproj/wsgi.py            |  16 +++
 examples/gtfsproj/manage.py                   |  22 ++++
 examples/gtfsproj/requirements.txt            |   4 +
 13 files changed, 215 insertions(+)
 create mode 100644 examples/gtfsproj/gtfsapp/__init__.py
 create mode 100644 examples/gtfsproj/gtfsapp/admin.py
 create mode 100644 examples/gtfsproj/gtfsapp/apps.py
 create mode 100644 examples/gtfsproj/gtfsapp/migrations/__init__.py
 create mode 100644 examples/gtfsproj/gtfsapp/models.py
 create mode 100644 examples/gtfsproj/gtfsapp/tests.py
 create mode 100644 examples/gtfsproj/gtfsapp/views.py
 create mode 100644 examples/gtfsproj/gtfsproj/__init__.py
 create mode 100644 examples/gtfsproj/gtfsproj/settings.py
 create mode 100644 examples/gtfsproj/gtfsproj/urls.py
 create mode 100644 examples/gtfsproj/gtfsproj/wsgi.py
 create mode 100755 examples/gtfsproj/manage.py
 create mode 100644 examples/gtfsproj/requirements.txt

diff --git a/examples/gtfsproj/gtfsapp/__init__.py b/examples/gtfsproj/gtfsapp/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/examples/gtfsproj/gtfsapp/admin.py b/examples/gtfsproj/gtfsapp/admin.py
new file mode 100644
index 0000000..13be29d
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/admin.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.contrib import admin
+
+# Register your models here.
diff --git a/examples/gtfsproj/gtfsapp/apps.py b/examples/gtfsproj/gtfsapp/apps.py
new file mode 100644
index 0000000..47dddba
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/apps.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.apps import AppConfig
+
+
+class GtfsappConfig(AppConfig):
+    name = 'gtfsapp'
diff --git a/examples/gtfsproj/gtfsapp/migrations/__init__.py b/examples/gtfsproj/gtfsapp/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/examples/gtfsproj/gtfsapp/models.py b/examples/gtfsproj/gtfsapp/models.py
new file mode 100644
index 0000000..1dfab76
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/models.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models
+
+# Create your models here.
diff --git a/examples/gtfsproj/gtfsapp/tests.py b/examples/gtfsproj/gtfsapp/tests.py
new file mode 100644
index 0000000..5982e6b
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/tests.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/examples/gtfsproj/gtfsapp/views.py b/examples/gtfsproj/gtfsapp/views.py
new file mode 100644
index 0000000..e784a0b
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/views.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.shortcuts import render
+
+# Create your views here.
diff --git a/examples/gtfsproj/gtfsproj/__init__.py b/examples/gtfsproj/gtfsproj/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/examples/gtfsproj/gtfsproj/settings.py b/examples/gtfsproj/gtfsproj/settings.py
new file mode 100644
index 0000000..f84fc8e
--- /dev/null
+++ b/examples/gtfsproj/gtfsproj/settings.py
@@ -0,0 +1,120 @@
+"""
+Django settings for gtfsproj project.
+
+Generated by 'django-admin startproject' using Django 1.11.5.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.11/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/1.11/ref/settings/
+"""
+
+import os
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = '+$8pgzf)luxklr(rhzg4!$6+b^2hbw*-frvh_2-7an9-_==n_u'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+INSTALLED_APPS = [
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+]
+
+MIDDLEWARE = [
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+]
+
+ROOT_URLCONF = 'gtfsproj.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'gtfsproj.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/1.11/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    }
+}
+
+
+# Password validation
+# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/1.11/topics/i18n/
+
+LANGUAGE_CODE = 'en-us'
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.11/howto/static-files/
+
+STATIC_URL = '/static/'
diff --git a/examples/gtfsproj/gtfsproj/urls.py b/examples/gtfsproj/gtfsproj/urls.py
new file mode 100644
index 0000000..5a32c22
--- /dev/null
+++ b/examples/gtfsproj/gtfsproj/urls.py
@@ -0,0 +1,21 @@
+"""gtfsproj URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/1.11/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  url(r'^$', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  url(r'^$', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.conf.urls import url, include
+    2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
+"""
+from django.conf.urls import url
+from django.contrib import admin
+
+urlpatterns = [
+    url(r'^admin/', admin.site.urls),
+]
diff --git a/examples/gtfsproj/gtfsproj/wsgi.py b/examples/gtfsproj/gtfsproj/wsgi.py
new file mode 100644
index 0000000..278abd7
--- /dev/null
+++ b/examples/gtfsproj/gtfsproj/wsgi.py
@@ -0,0 +1,16 @@
+"""
+WSGI config for gtfsproj project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "gtfsproj.settings")
+
+application = get_wsgi_application()
diff --git a/examples/gtfsproj/manage.py b/examples/gtfsproj/manage.py
new file mode 100755
index 0000000..9d97264
--- /dev/null
+++ b/examples/gtfsproj/manage.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "gtfsproj.settings")
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError:
+        # The above import may fail for some other reason. Ensure that the
+        # issue is really that Django is missing to avoid masking other
+        # exceptions on Python 2.
+        try:
+            import django
+        except ImportError:
+            raise ImportError(
+                "Couldn't import Django. Are you sure it's installed and "
+                "available on your PYTHONPATH environment variable? Did you "
+                "forget to activate a virtual environment?"
+            )
+        raise
+    execute_from_command_line(sys.argv)
diff --git a/examples/gtfsproj/requirements.txt b/examples/gtfsproj/requirements.txt
new file mode 100644
index 0000000..752dd09
--- /dev/null
+++ b/examples/gtfsproj/requirements.txt
@@ -0,0 +1,4 @@
+# Install multigtfs from PyPi
+multigtfs
+# Or from local source project
+#-e ../..

From 4ab5dd712168b6e5491cf97e94d2613472a748f8 Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@gmail.com>
Date: Sat, 30 Sep 2017 17:52:10 +1300
Subject: [PATCH 02/18] Apply .env for debug and allowed hosts

---
 examples/gtfsproj/.env.example         | 2 ++
 examples/gtfsproj/gtfsproj/settings.py | 6 +++---
 examples/gtfsproj/requirements.txt     | 7 +++++++
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 examples/gtfsproj/.env.example

diff --git a/examples/gtfsproj/.env.example b/examples/gtfsproj/.env.example
new file mode 100644
index 0000000..a57fe72
--- /dev/null
+++ b/examples/gtfsproj/.env.example
@@ -0,0 +1,2 @@
+DEBUG=True
+ALLOWED_HOSTS=*
diff --git a/examples/gtfsproj/gtfsproj/settings.py b/examples/gtfsproj/gtfsproj/settings.py
index f84fc8e..1eb4e6c 100644
--- a/examples/gtfsproj/gtfsproj/settings.py
+++ b/examples/gtfsproj/gtfsproj/settings.py
@@ -11,6 +11,7 @@
 """
 
 import os
+from decouple import config, Csv
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -23,9 +24,8 @@
 SECRET_KEY = '+$8pgzf)luxklr(rhzg4!$6+b^2hbw*-frvh_2-7an9-_==n_u'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = []
+DEBUG = config('DEBUG', default=False, cast=bool)
+ALLOWED_HOSTS = config('ALLOWED_HOSTS', default='', cast=Csv())
 
 
 # Application definition
diff --git a/examples/gtfsproj/requirements.txt b/examples/gtfsproj/requirements.txt
index 752dd09..ec823a3 100644
--- a/examples/gtfsproj/requirements.txt
+++ b/examples/gtfsproj/requirements.txt
@@ -2,3 +2,10 @@
 multigtfs
 # Or from local source project
 #-e ../..
+
+# Configure the database from the environment
+dj-database-url
+
+# Configure other settings from the environment
+python-decouple
+

From d005bfeeb3f9dc089cba81f8e5de07b57defc4ca Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@gmail.com>
Date: Sat, 30 Sep 2017 18:23:31 +1300
Subject: [PATCH 03/18] Add db url settings

---
 examples/gtfsproj/.env.example         |  5 +++++
 examples/gtfsproj/gtfsproj/settings.py | 14 +++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/examples/gtfsproj/.env.example b/examples/gtfsproj/.env.example
index a57fe72..5a0166d 100644
--- a/examples/gtfsproj/.env.example
+++ b/examples/gtfsproj/.env.example
@@ -1,2 +1,7 @@
+SECRET_KEY=l$hc*-biy7*#7cic5q5r^mtf-2&l34pq4k7znn%)si+$h(i%e&
+
 DEBUG=True
 ALLOWED_HOSTS=*
+
+#DATABASE_URL=spatialite:////db.sqlite3
+
diff --git a/examples/gtfsproj/gtfsproj/settings.py b/examples/gtfsproj/gtfsproj/settings.py
index 1eb4e6c..caa130a 100644
--- a/examples/gtfsproj/gtfsproj/settings.py
+++ b/examples/gtfsproj/gtfsproj/settings.py
@@ -11,6 +11,7 @@
 """
 
 import os
+import dj_database_url
 from decouple import config, Csv
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -21,7 +22,7 @@
 # See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '+$8pgzf)luxklr(rhzg4!$6+b^2hbw*-frvh_2-7an9-_==n_u'
+SECRET_KEY = config('SECRET_KEY', default='+$8pgzf)luxklr(rhzg4!$6+b^2hbw*-frvh_2-7an9-_==n_u', cast=str)
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = config('DEBUG', default=False, cast=bool)
@@ -37,6 +38,8 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'gtfsapp',
+    'multigtfs',
 ]
 
 MIDDLEWARE = [
@@ -74,13 +77,14 @@
 # https://docs.djangoproject.com/en/1.11/ref/settings/#databases
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-    }
+    'default': config('DATABASE_URL',
+                   default='spatialite:///%s' % os.path.join(BASE_DIR, 'db.sqlite3'),
+                   cast=dj_database_url.parse)
 }
 
 
+
+
 # Password validation
 # https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators
 

From a5b1d7e0548fd3f25428698622331dd38d077564 Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@gmail.com>
Date: Sat, 30 Sep 2017 18:37:00 +1300
Subject: [PATCH 04/18] Add config for postgis

---
 examples/gtfsproj/.env.example     | 2 +-
 examples/gtfsproj/requirements.txt | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/gtfsproj/.env.example b/examples/gtfsproj/.env.example
index 5a0166d..e789022 100644
--- a/examples/gtfsproj/.env.example
+++ b/examples/gtfsproj/.env.example
@@ -4,4 +4,4 @@ DEBUG=True
 ALLOWED_HOSTS=*
 
 #DATABASE_URL=spatialite:////db.sqlite3
-
+#DATABASE_URL=postgis://USER:PASSWORD@HOST:PORT/DBNAME
diff --git a/examples/gtfsproj/requirements.txt b/examples/gtfsproj/requirements.txt
index ec823a3..4122dde 100644
--- a/examples/gtfsproj/requirements.txt
+++ b/examples/gtfsproj/requirements.txt
@@ -9,3 +9,5 @@ dj-database-url
 # Configure other settings from the environment
 python-decouple
 
+# Connect to postgresql database
+psycopg2

From 231f5a17698e77544a96f5433067f16edbba8802 Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@gmail.com>
Date: Sat, 30 Sep 2017 18:48:13 +1300
Subject: [PATCH 05/18] Now works with postgis too with eg

---
 examples/gtfsproj/.env.example         | 2 +-
 examples/gtfsproj/gtfsproj/settings.py | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/examples/gtfsproj/.env.example b/examples/gtfsproj/.env.example
index e789022..b5b1a7f 100644
--- a/examples/gtfsproj/.env.example
+++ b/examples/gtfsproj/.env.example
@@ -3,5 +3,5 @@ SECRET_KEY=l$hc*-biy7*#7cic5q5r^mtf-2&l34pq4k7znn%)si+$h(i%e&
 DEBUG=True
 ALLOWED_HOSTS=*
 
-#DATABASE_URL=spatialite:////db.sqlite3
+#DATABASE_URL=spatialite:///db.sqlite3
 #DATABASE_URL=postgis://USER:PASSWORD@HOST:PORT/DBNAME
diff --git a/examples/gtfsproj/gtfsproj/settings.py b/examples/gtfsproj/gtfsproj/settings.py
index caa130a..d089de7 100644
--- a/examples/gtfsproj/gtfsproj/settings.py
+++ b/examples/gtfsproj/gtfsproj/settings.py
@@ -84,7 +84,6 @@
 
 
 
-
 # Password validation
 # https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators
 
@@ -107,9 +106,9 @@
 # Internationalization
 # https://docs.djangoproject.com/en/1.11/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = config('LANGUAGE_CODE', default='en-us')
 
-TIME_ZONE = 'UTC'
+TIME_ZONE = config('TIME_ZONE', default='UTC')
 
 USE_I18N = True
 

From 7d89aebe70bd7def0972e347601143e105d7b62f Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@gmail.com>
Date: Sat, 30 Sep 2017 22:43:37 +1300
Subject: [PATCH 06/18] Feed list views first cut

---
 .../gtfsproj/gtfsapp/static/css/explore.css   |  8 +++
 .../gtfsproj/gtfsapp/static/js/explore.js     | 44 +++++++++++++++
 .../gtfsapp/templates/multigtfs/base.html     | 54 +++++++++++++++++++
 .../templates/multigtfs/feed_detail.html      | 14 +++++
 .../templates/multigtfs/feed_list.html        | 20 +++++++
 examples/gtfsproj/gtfsapp/urls.py             |  8 +++
 examples/gtfsproj/gtfsapp/views.py            | 10 +++-
 examples/gtfsproj/gtfsproj/urls.py            |  3 +-
 8 files changed, 159 insertions(+), 2 deletions(-)
 create mode 100644 examples/gtfsproj/gtfsapp/static/css/explore.css
 create mode 100644 examples/gtfsproj/gtfsapp/static/js/explore.js
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/base.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/feed_detail.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/feed_list.html
 create mode 100644 examples/gtfsproj/gtfsapp/urls.py

diff --git a/examples/gtfsproj/gtfsapp/static/css/explore.css b/examples/gtfsproj/gtfsapp/static/css/explore.css
new file mode 100644
index 0000000..4151d28
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/static/css/explore.css
@@ -0,0 +1,8 @@
+body {
+  padding-top: 20px;
+}
+
+.body-top {
+  padding: 40px 15px;
+  text-align: center;
+}
diff --git a/examples/gtfsproj/gtfsapp/static/js/explore.js b/examples/gtfsproj/gtfsapp/static/js/explore.js
new file mode 100644
index 0000000..1e6ae2c
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/static/js/explore.js
@@ -0,0 +1,44 @@
+explore = {
+    mapPoint: function(map_id, x, y, zoom) {
+        var map = new OpenLayers.Map(map_id);
+        var osm = new OpenLayers.Layer.OSM("OpenStreetMap Map");
+        var fromProjection = new OpenLayers.Projection("EPSG:4326");
+        var toProjection = new OpenLayers.Projection("EPSG:900913");
+        var position = new OpenLayers.LonLat(x, y).transform(fromProjection, toProjection);
+        map.addLayer(osm);
+
+        var markers = new OpenLayers.Layer.Markers( "Markers" );
+        map.addLayer(markers);
+        markers.addMarker(new OpenLayers.Marker(position));
+
+        map.setCenter(position, zoom);
+    },
+    mapLine: function(map_id, line_wkt) {
+        var map = new OpenLayers.Map(map_id);
+        var osm = new OpenLayers.Layer.OSM("OpenStreetMap Map");
+        var fromProjection = new OpenLayers.Projection("EPSG:4326");
+        var toProjection = new OpenLayers.Projection("EPSG:900913");
+        map.addLayer(osm);
+
+        var style = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
+        style.strokeColor = "red";
+        style.strokeColor = "red";
+        style.fillColor = "red";
+        style.pointRadius = 10;
+        style.strokeWidth = 3;
+        style.rotation = 45;
+        style.strokeLinecap = "butt";
+        var vectorLayer = new OpenLayers.Layer.Vector("Line", {'style': style});
+        var wkt = new OpenLayers.Format.WKT({
+            'internalProjection': toProjection,
+            'externalProjection': fromProjection,
+            'style': style });
+        var lineVector = wkt.read(line_wkt);
+        var bounds = lineVector.geometry.getBounds();
+
+        map.addLayer(vectorLayer);
+        vectorLayer.addFeatures([lineVector]);
+
+        map.zoomToExtent(bounds);
+    }
+}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/base.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/base.html
new file mode 100644
index 0000000..9ebb71a
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/base.html
@@ -0,0 +1,54 @@
+{% load staticfiles %}
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{% block head_title %}Multi GTFS - django-multi-gtfs{% endblock %}</title>
+    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
+    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css">
+    <link rel="stylesheet" href="{% static 'css/explore.css' %}">
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    {% block head_extra %}{% endblock %}
+  </head>
+  <body>
+    <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="">Multi GTFS</a>
+        </div>
+        <div class="collapse navbar-collapse">
+          <ul class="nav navbar-nav">
+            <li{% block nav_feed_active_class %}{% endblock %}><a href="{% url 'feed_list' %}">Home</a></li>
+            <li><a href="{% url 'admin:index' %}">Admin</a></li>
+          </ul>
+        </div>
+      </div>
+    </div> 
+    <div class="container">
+      <div class="body-top">
+        <h1>{% block page_title %}TODO: set page_title{% endblock %}</h1>
+        {% block page_top_content_elem %}
+        <p class="lead">
+            {% block page_top_content %}TODO: set page_top_content{% endblock %}
+        <p>
+        {% endblock %}
+      </div>
+      <div class="body-middle">{% block page_middle_content %}{% endblock %}</div>
+    </div>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+    <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+    {% block body_script %}{% endblock %}
+  </body>
+</html>
+
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/feed_detail.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/feed_detail.html
new file mode 100644
index 0000000..3a0f044
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/feed_detail.html
@@ -0,0 +1,14 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Feed {{object}}{% endblock %}
+{% block page_title %}Feed {{object}}{% endblock %}
+{% block page_top_content_elem %}
+A <strong>Feed</strong> represents a single GTFS feed.
+{% endblock %}
+{% block page_middle_content %}
+<h2>Attributes</h2>
+<dl>
+    <dt>id</dt><dd>{{object.id}}</dd>
+    <dt>name</dt><dd>{{object.name}}</dd>
+    <dt>created</dt><dd>{{object.created}}</dd>
+</dl>
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/feed_list.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/feed_list.html
new file mode 100644
index 0000000..382f8dc
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/feed_list.html
@@ -0,0 +1,20 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Feeds{% endblock %}
+{% block nav_feed_active_class %} class="active"{% endblock %}
+{% block page_title %}Feeds{% endblock %}
+{% block page_top_content_elem %}
+A <strong>Feed</strong> represents a single GTFS feed.
+{% endblock %}
+{% block page_middle_content %}
+{% for feed in object_list %}
+  {% if forloop.first %}<ul>{% endif %}
+    <li><a href="{% url 'feed_detail' pk=feed.pk %}">{{ feed.name }} created {{ feed.created }} (feed #{{ feed.id}})</a></li>
+  {% if forloop.last %}</ul>{% endif %}
+{% empty %}
+  <p><em>No feeds yet.</em></p>
+{% endfor %}
+<br/>
+<p>To add a feed, use:</p>
+<pre>./manage.py importgtfs --name "Feed Name" /path/to/feed.zip</pre>
+{% endblock %}
+
diff --git a/examples/gtfsproj/gtfsapp/urls.py b/examples/gtfsproj/gtfsapp/urls.py
new file mode 100644
index 0000000..347d767
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/urls.py
@@ -0,0 +1,8 @@
+from django.conf.urls import url
+
+from gtfsapp.views import FeedList, FeedDetail
+
+urlpatterns = [
+    url(r'^$', FeedList.as_view(), name='feed_list'),
+    url(r'^feed/(?P<pk>\d+)/$', FeedDetail.as_view(), name='feed_detail'),
+]
diff --git a/examples/gtfsproj/gtfsapp/views.py b/examples/gtfsproj/gtfsapp/views.py
index e784a0b..e17748f 100644
--- a/examples/gtfsproj/gtfsapp/views.py
+++ b/examples/gtfsproj/gtfsapp/views.py
@@ -3,4 +3,12 @@
 
 from django.shortcuts import render
 
-# Create your views here.
+from django.views.generic import ListView, DetailView
+from multigtfs.models import Feed
+
+class FeedList(ListView):
+    #model = Feed
+    queryset = Feed.objects.order_by('name', '-created')
+
+class FeedDetail(DetailView):
+    model = Feed
diff --git a/examples/gtfsproj/gtfsproj/urls.py b/examples/gtfsproj/gtfsproj/urls.py
index 5a32c22..e057e9e 100644
--- a/examples/gtfsproj/gtfsproj/urls.py
+++ b/examples/gtfsproj/gtfsproj/urls.py
@@ -13,9 +13,10 @@
     1. Import the include() function: from django.conf.urls import url, include
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
-from django.conf.urls import url
+from django.conf.urls import include, url
 from django.contrib import admin
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
+    url(r'', include('gtfsapp.urls')),
 ]

From d1ea34152b1a1ed21c59f644260d0b907a4a61a8 Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@gmail.com>
Date: Sun, 1 Oct 2017 00:11:41 +1300
Subject: [PATCH 07/18] List views created from other eg

---
 .../templates/multigtfs/agency_detail.html    | 21 +++++
 .../templates/multigtfs/agency_list.html      | 15 ++++
 .../gtfsapp/templates/multigtfs/base.html     |  3 +-
 .../templates/multigtfs/block_detail.html     | 19 +++++
 .../templates/multigtfs/block_list.html       | 15 ++++
 .../templates/multigtfs/extra_data.html       |  8 ++
 .../templates/multigtfs/fare_detail.html      | 24 ++++++
 .../templates/multigtfs/fare_list.html        | 15 ++++
 .../templates/multigtfs/farerule_detail.html  | 17 ++++
 .../templates/multigtfs/farerule_list.html    | 20 +++++
 .../templates/multigtfs/feed_detail.html      | 11 +++
 .../templates/multigtfs/feedinfo_detail.html  | 20 +++++
 .../templates/multigtfs/feedinfo_list.html    | 15 ++++
 .../templates/multigtfs/frequency_detail.html | 18 +++++
 .../templates/multigtfs/frequency_list.html   | 19 +++++
 .../templates/multigtfs/route_detail.html     | 57 +++++++++++++
 .../templates/multigtfs/route_list.html       | 15 ++++
 .../templates/multigtfs/service_detail.html   | 29 +++++++
 .../templates/multigtfs/service_list.html     | 16 ++++
 .../multigtfs/servicedate_detail.html         | 16 ++++
 .../templates/multigtfs/servicedate_list.html | 16 ++++
 .../templates/multigtfs/shape_detail.html     | 48 +++++++++++
 .../templates/multigtfs/shape_list.html       | 15 ++++
 .../multigtfs/shapepoint_detail.html          | 28 +++++++
 .../templates/multigtfs/shapepoint_list.html  | 18 +++++
 .../templates/multigtfs/stop_detail.html      | 40 ++++++++++
 .../templates/multigtfs/stop_list.html        | 15 ++++
 .../templates/multigtfs/stoptime_detail.html  | 22 ++++++
 .../templates/multigtfs/stoptime_list.html    | 20 +++++
 .../templates/multigtfs/trip_detail.html      | 57 +++++++++++++
 .../templates/multigtfs/trip_list.html        | 24 ++++++
 .../templates/multigtfs/zone_detail.html      | 15 ++++
 .../templates/multigtfs/zone_list.html        | 15 ++++
 examples/gtfsproj/gtfsapp/urls.py             | 21 ++++-
 examples/gtfsproj/gtfsapp/views.py            | 79 ++++++++++++++++++-
 35 files changed, 800 insertions(+), 6 deletions(-)
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/agency_detail.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/agency_list.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/block_detail.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/block_list.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/extra_data.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/fare_detail.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/fare_list.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/farerule_detail.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/farerule_list.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/feedinfo_detail.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/feedinfo_list.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/frequency_detail.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/frequency_list.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/route_detail.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/route_list.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/service_detail.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/service_list.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/servicedate_detail.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/servicedate_list.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/shape_detail.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/shape_list.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/shapepoint_detail.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/shapepoint_list.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/stop_detail.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/stop_list.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/stoptime_detail.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/stoptime_list.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/trip_detail.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/trip_list.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/zone_detail.html
 create mode 100644 examples/gtfsproj/gtfsapp/templates/multigtfs/zone_list.html

diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/agency_detail.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/agency_detail.html
new file mode 100644
index 0000000..4b3e8d7
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/agency_detail.html
@@ -0,0 +1,21 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Agency {{object}}{% endblock %}
+{% block page_title %}Agency {{object}}{% endblock %}
+{% block page_top_content_elem %}
+An <strong>Agency</strong> represents a transit agency.
+{% endblock %}
+{% block page_middle_content %}
+<h2>Attributes</h2>
+<dl>
+    <dt>feed</dt><dd><a href="{% url 'feed_detail' pk=object.feed_id %}">Feed {{object.feed}}</a></dd>
+    <dt>id</dt><dd>{{object.id}}</dd>
+    <dt>agency_id</dt><dd>{{object.agency_id|default:'<em>Not set</em>'}}</dd>
+    <dt>name</dt><dd>{{object.name}}</dd>
+    <dt>url</dt><dd>{% if object.url %}<a href="{{object.url}}">{{object.url}}</a>{% else %}<em>Not set</em>{% endif %}</dd>
+    <dt>timezone</dt><dd>{{object.timezone}}</dd>
+    <dt>lang</dt><dd>{{object.lang|default:'<em>Not set</em>'}}</dd>
+    <dt>phone</dt><dd>{{object.phone|default:'<em>Not set</em>'}}</dd>
+    <dt>fare_url</dt><dd>{% if object.fare_url %}<a href="{{object.fare_url}}">{{object.fare_url}}</a>{% else %}<em>Not set</em>{% endif %}</dd>
+</dl>
+{% include "multigtfs/extra_data.html" %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/agency_list.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/agency_list.html
new file mode 100644
index 0000000..2f9b4ec
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/agency_list.html
@@ -0,0 +1,15 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Agencies{% endblock %}
+{% block page_title %}Agencies{% endblock %}
+{% block page_top_content_elem %}
+An <strong>Agency</strong> represents a transit agency.
+{% endblock %}
+{% block page_middle_content %}
+{% for agency in object_list %}
+  {% if forloop.first %}<ul>{% endif %}
+    <li><a href="{% url 'agency_detail' feed_id=agency.feed_id pk=agency.pk %}">Agency {{ agency }}</a></li>
+  {% if forloop.last %}</ul>{% endif %}
+{% empty %}
+  <p><em>No agencies yet.</em></p>
+{% endfor %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/base.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/base.html
index 9ebb71a..775cacf 100644
--- a/examples/gtfsproj/gtfsapp/templates/multigtfs/base.html
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/base.html
@@ -25,7 +25,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="">Multi GTFS</a>
+          <a class="navbar-brand" href="{% url 'feed_list' %}">Multi GTFS</a>
         </div>
         <div class="collapse navbar-collapse">
           <ul class="nav navbar-nav">
@@ -51,4 +51,3 @@ <h1>{% block page_title %}TODO: set page_title{% endblock %}</h1>
     {% block body_script %}{% endblock %}
   </body>
 </html>
-
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/block_detail.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/block_detail.html
new file mode 100644
index 0000000..77c2cd6
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/block_detail.html
@@ -0,0 +1,19 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Block {{object}}{% endblock %}
+{% block page_title %}Block {{object}}{% endblock %}
+{% block page_top_content_elem %}
+A <strong>Block</strong> represents a fare zone for a trip.
+{% endblock %}
+{% block page_middle_content %}
+<h2>Attributes</h2>
+<dl>
+    <dt>feed</dt><dd><a href="{% url 'feed_detail' pk=object.feed_id %}">Feed {{object.feed}}</a></dd>
+    <dt>id</dt><dd>{{object.id}}</dd>
+    <dt>block_id</dt><dd>{{object.block_id}}</dd>
+</dl>
+{% include "multigtfs/extra_data.html" %}
+<h2>Related Objects</h2>
+<ul>
+    <li><a href="{% url 'trip_by_block_list' feed_id=object.id block_id=object.id %}">{{object.trip_set.count}} Trip{{ object.trip_set.count|pluralize }}</a></li>
+</ul>
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/block_list.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/block_list.html
new file mode 100644
index 0000000..10bccee
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/block_list.html
@@ -0,0 +1,15 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Blocks{% endblock %}
+{% block page_title %}Blocks{% endblock %}
+{% block page_top_content_elem %}
+A <strong>Block</strong> represents a fare zone for a trip.
+{% endblock %}
+{% block page_middle_content %}
+{% for blocks in object_list %}
+  {% if forloop.first %}<ul>{% endif %}
+    <li><a href="{% url 'blocks_detail' feed_id=blocks.feed_id pk=blocks.pk %}">Block {{ blocks }}</a></li>
+  {% if forloop.last %}</ul>{% endif %}
+{% empty %}
+  <p><em>No blockss yet.</em></p>
+{% endfor %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/extra_data.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/extra_data.html
new file mode 100644
index 0000000..d04d11e
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/extra_data.html
@@ -0,0 +1,8 @@
+{% if object.extra_data %}
+<h2>Extra Attributes</h2>
+<dl>
+{% for key, val in object.extra_data.iteritems %}
+    <dt>{{ key }}</dt><dd>{{ val }}</dd>
+{% endfor %}
+</dl>
+{% endif %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/fare_detail.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/fare_detail.html
new file mode 100644
index 0000000..5b21737
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/fare_detail.html
@@ -0,0 +1,24 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Fare {{object}}{% endblock %}
+{% block page_title %}Fare {{object}}{% endblock %}
+{% block page_top_content_elem %}
+A <strong>Fare</strong> describes how passengers pay for service.
+{% endblock %}
+{% block page_middle_content %}
+<h2>Attributes</h2>
+<dl>
+    <dt>feed</dt><dd><a href="{% url 'feed_detail' pk=object.feed_id %}">Feed {{object.feed}}</a></dd>
+    <dt>id</dt><dd>{{object.id}}</dd>
+    <dt>fare_id</dt><dd>{{object.fare_id}}</dd>
+    <dt>price</dt><dd>{{object.price}}</dd>
+    <dt>currency_type</dt><dd>{{object.currency_type}}</dd>
+    <dt>payment_method</dt>{{object.get_payment_method_display|default:'<em>Not set</em>'}}</dd>
+    <dt>transfers</dt>{{object.get_transfers_display|default:'<em>Not set</em>'}}</dd>
+    <dt>transfer_duration</dt><dd>{{object.transfer_duration|default:'<em>Not set</em>'}}</dd>
+</dl>
+{% include "multigtfs/extra_data.html" %}
+<h2>Related Objects</h2>
+<ul>
+    <li><a href="{% url 'farerule_by_fare_list' feed_id=object.id fare_id=object.id %}">{{object.farerule_set.count}} FareRule{{ object.farerule_set.count|pluralize }}</a></li>
+</ul>
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/fare_list.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/fare_list.html
new file mode 100644
index 0000000..0aa4340
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/fare_list.html
@@ -0,0 +1,15 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}Explore - - django-multi-gtfs - Fares{% endblock %}
+{% block page_title %}Fares{% endblock %}
+{% block page_top_content_elem %}
+A <strong>Fare</strong> describes how passengers pay for service.
+{% endblock %}
+{% block page_middle_content %}
+{% for fare in object_list %}
+  {% if forloop.first %}<ul>{% endif %}
+    <li><a href="{% url 'fare_detail' feed_id=fare.feed_id pk=fare.pk %}">Fare {{ fare }}</a></li>
+  {% if forloop.last %}</ul>{% endif %}
+{% empty %}
+  <p><em>No fares yet.</em></p>
+{% endfor %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/farerule_detail.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/farerule_detail.html
new file mode 100644
index 0000000..573bec2
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/farerule_detail.html
@@ -0,0 +1,17 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - FareRule {{object}}{% endblock %}
+{% block page_title %}FareRule {{object}}{% endblock %}
+{% block page_top_content_elem %}
+A <strong>FareRule</strong> is the intersection between a Route and a Fare
+{% endblock %}
+{% block page_middle_content %}
+<h2>Attributes</h2>
+<dl>
+    <dt>route</dt><dd><a href="{% url 'route_detail' feed_id=object.route.feed_id pk=object.route_id %}">Route {{object.route}}</a></dd>
+    <dt>fare</dt><dd><a href="{% url 'fare_detail' feed_id=object.fare.feed_id pk=object.fare_id %}">Fare {{object.fare}}</a></dd>
+    <dt>origin</dt><dd>{% if object.origin_id %}<a href="{% url 'zone_detail' feed_id=object.id origin_id=object.origin_id %}">Zone {{object.origin}}</a>{% else %}<em>Not set</em>{% endif %}</dd>
+    <dt>destination</dt><dd>{% if object.destination_id %}<a href="{% url 'zone_detail' feed_id=object.id destination_id=object.destination_id %}">Zone {{object.destination}}</a>{% else %}<em>Not set</em>{% endif %}</dd>
+    <dt>contains</dt><dd>{% if object.contains_id %}<a href="{% url 'zone_detail' feed_id=object.id contains_id=object.contains_id %}">Zone {{object.contains}}</a>{% else %}<em>Not set</em>{% endif %}</dd>
+</dl>
+{% include "multigtfs/extra_data.html" %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/farerule_list.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/farerule_list.html
new file mode 100644
index 0000000..d514a6b
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/farerule_list.html
@@ -0,0 +1,20 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - FareRules{% endblock %}
+{% block page_title %}FareRules{% endblock %}
+{% block page_top_content_elem %}
+A <strong>FareRule</strong> is the intersection between a Fare and a Route.
+{% endblock %}
+{% block page_middle_content %}
+{% if route %}
+<p>FareRules for <a href="{% url 'route_detail' feed_id=feed_id pk=route.pk %}">Route {{route}}</a></p>
+{% elif fare %}
+<p>FareRules for <a href="{% url 'fare_detail' feed_id=feed_id pk=fare.pk %}">Fare {{fare}}</a></p>
+{% endif %}
+{% for farerule in object_list %}
+  {% if forloop.first %}<ul>{% endif %}
+    <li><a href="{% url 'farerule_detail' feed_id=feed_id pk=farerule.pk %}">FareRule {{ farerule }}</a></li>
+  {% if forloop.last %}</ul>{% endif %}
+{% empty %}
+  <p><em>No farerules yet.</em></p>
+{% endfor %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/feed_detail.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/feed_detail.html
index 3a0f044..3e4e6c7 100644
--- a/examples/gtfsproj/gtfsapp/templates/multigtfs/feed_detail.html
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/feed_detail.html
@@ -11,4 +11,15 @@ <h2>Attributes</h2>
     <dt>name</dt><dd>{{object.name}}</dd>
     <dt>created</dt><dd>{{object.created}}</dd>
 </dl>
+<h2>Related Objects</h2>
+<ul>
+    <li><a href="{% url 'agency_list' feed_id=object.id %}">{{feed.agency_set.count}} Agenc{{ feed.agency_set.count|pluralize:"y,ies"}}</a></li>
+    <li><a href="{% url 'stop_list' feed_id=object.id %}">{{feed.stop_set.count}} Stop{{ feed.stop_set.count|pluralize }}</a></li>
+    <li><a href="{% url 'route_list' feed_id=object.id %}">{{feed.route_set.count}} Route{{ feed.route_set.count|pluralize }}</a></li>
+    <li><a href="{% url 'service_list' feed_id=object.id %}">{{feed.service_set.count}} Service{{ feed.service_set.count|pluralize }}</a></li>
+    <li><a href="{% url 'shape_list' feed_id=object.id %}">{{feed.shape_set.count}} Shape{{ feed.shape_set.count|pluralize }}</a></li>
+    <li><a href="{% url 'fare_list' feed_id=object.id %}">{{feed.fare_set.count}} Fare{{ feed.fare_set.count|pluralize }}</a></li>
+    <li><a href="{% url 'feedinfo_list' feed_id=object.id %}">{{feed.feedinfo_set.count}} FeedInfo{{ feed.feedinfo_set.count|pluralize }}</a></li>
+    <li><a href="{% url 'zone_list' feed_id=object.id %}">{{feed.zone_set.count}} Zone{{ feed.zone_set.count|pluralize }}</a></li>
+</ul>
 {% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/feedinfo_detail.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/feedinfo_detail.html
new file mode 100644
index 0000000..baca415
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/feedinfo_detail.html
@@ -0,0 +1,20 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - FeedInfo {{object}}{% endblock %}
+{% block page_title %}FeedInfo {{object}}{% endblock %}
+{% block page_top_content_elem %}
+<strong>FeedInfo</strong> contains information about the feed.
+{% endblock %}
+{% block page_middle_content %}
+<h2>Attributes</h2>
+<dl>
+    <dt>feed</dt><dd><a href="{% url 'feed_detail' pk=object.feed_id %}">Feed {{object.feed}}</a></dd>
+    <dt>id</dt><dd>{{object.id}}</dd>
+    <dt>publisher_name</dt><dd>{{object.publisher_name}}</dd>
+    <dt>publisher_url</dt><dd>{% if object.publisher_url %}<a href="{{object.publisher_url}}">{{object.publisher_url}}</a>{% else %}<em>Not set</em>{% endif %}</dd>
+    <dt>lang</dt><dd>{{object.lang|default:'<em>Not set</em>'}}</dd>
+    <dt>start_date</dt><dd>{{object.start_date|default:'<em>Not set</em>'}}</dd>
+    <dt>end_date</dt><dd>{{object.end_date|default:'<em>Not set</em>'}}</dd>
+    <dt>version</dt><dd>{{object.version|default:'<em>Not set</em>'}}</dd>
+</dl>
+{% include "multigtfs/extra_data.html" %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/feedinfo_list.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/feedinfo_list.html
new file mode 100644
index 0000000..0074da5
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/feedinfo_list.html
@@ -0,0 +1,15 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - FeedInfos{% endblock %}
+{% block page_title %}FeedInfos{% endblock %}
+{% block page_top_content_elem %}
+<strong>FeedInfo</strong> contains information about the feed.
+{% endblock %}
+{% block page_middle_content %}
+{% for feedinfo in object_list %}
+  {% if forloop.first %}<ul>{% endif %}
+    <li><a href="{% url 'feedinfo_detail' feed_id=feedinfo.feed_id pk=feedinfo.pk %}">FeedInfo {{ feedinfo }}</a></li>
+  {% if forloop.last %}</ul>{% endif %}
+{% empty %}
+  <p><em>No feedinfos yet.</em></p>
+{% endfor %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/frequency_detail.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/frequency_detail.html
new file mode 100644
index 0000000..e0e2d3b
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/frequency_detail.html
@@ -0,0 +1,18 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Frequency {{object}}{% endblock %}
+{% block page_title %}Frequency {{object}}{% endblock %}
+{% block page_top_content_elem %}
+A <strong>Frequency</strong> represents a periodic trip without a set schedule.
+{% endblock %}
+{% block page_middle_content %}
+<h2>Attributes</h2>
+<dl>
+    <dt>trip</dt><dd><a href="{% url 'trip_detail' feed_id=view.kwargs.feed_id pk=trip_id  %}">Trip {{object.trip}}</a></dd>
+    <dt>id</dt><dd>{{object.id}}</dd>
+    <dt>start_time</dt><dd>{{object.start_time}}</dd>
+    <dt>end_time</dt><dd>{{object.end_time}}</dd>
+    <dt>headway_secs</dt><dd>{{object.headway_secs}}</dd>
+    <dt>exact_times</dt>{{object.get_exact_times_display|default:'<em>Not set</em>'}}</dd>
+</dl>
+{% include "multigtfs/extra_data.html" %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/frequency_list.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/frequency_list.html
new file mode 100644
index 0000000..5dbf630
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/frequency_list.html
@@ -0,0 +1,19 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Frequencies{% endblock %}
+{% block page_title %}Frequencies{% endblock %}
+{% block page_top_content_elem %}
+A <strong>Frequency</strong> represents a periodic trip without a set schedule.
+route runs.
+{% endblock %}
+{% block page_middle_content %}
+{% if trip %}
+<p>Frequencies for <a href="{% url 'trip_detail' feed_id=view.kwargs.feed_id pk=trip.pk %}">Trip {{trip}}</a></p>
+{% endif %}
+{% for frequency in object_list %}
+  {% if forloop.first %}<ul>{% endif %}
+    <li><a href="{% url 'frequency_detail' feed_id=frequency.feed_id pk=frequency.pk %}">Frequency {{ frequency }}</a></li>
+  {% if forloop.last %}</ul>{% endif %}
+{% empty %}
+  <p><em>No frequencies yet.</em></p>
+{% endfor %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/route_detail.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/route_detail.html
new file mode 100644
index 0000000..83fd1c1
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/route_detail.html
@@ -0,0 +1,57 @@
+{% extends "multigtfs/base.html" %}
+{% load staticfiles %}
+{% block head_title %}{{ block.super }} - Route {{object}}{% endblock %}
+
+{% block head_extra %}
+{% if object.geometry %}
+<script src="http://openlayers.org/api/OpenLayers.js"></script>
+<script src="{% static 'js/explore.js' %}"></script>
+{% endif %}
+{% endblock %}
+
+{% block page_title %}Route {{object}}{% endblock %}
+
+{% block page_top_content_elem %}
+A <strong>Route</strong> is a named route in the schedule
+{% endblock %}
+
+{% block page_middle_content %}
+{% if object.geometry %}
+<div class="row" style="height:300px" id="map"></div>
+{% else %}
+<h2>Map</h2>
+<p><em>
+    This route does not have a populated geometry.  A route must have at least
+    one related Trip, and update_geometry() must be run on the Route.
+</em></p>
+{% endif %}
+<h2>Attributes</h2>
+<dl>
+    <dt>feed</dt><dd><a href="{% url 'feed_detail' pk=object.feed_id %}">Feed {{object.feed}}</a></dd>
+    <dt>id</dt><dd>{{object.id}}</dd>
+    <dt>route_id</dt><dd>{{object.route_id}}</dd>
+    <dt>agency</dt><dd>{% if object.agency_id %}<a href="{% url 'agency_detail' feed_id=object.feed_id pk=object.agency_id %}">Agency {{object.agency}}</a>{% else %}<em>Not set</em>{% endif %}</dd>
+    <dt>short_name</dt><dd>{{object.short_name}}</dd>
+    <dt>long_name</dt><dd>{{object.long_name}}</dd>
+    <dt>desc</dt><dd>{{object.desc|default:'<em>Not set</em>'}}</dd>
+    <dt>rtype</dt>{{object.get_rtype_display|default:'<em>Not set</em>'}}</dd>
+    <dt>url</dt><dd>{% if object.url %}<a href="{{object.url}}">{{object.url}}</a>{% else %}<em>Not set</em>{% endif %}</dd>
+    <dt>color</dt><dd>{{object.color|default:'<em>Not set</em>'}}</dd>
+    <dt>text_color</dt><dd>{{object.text_color|default:'<em>Not set</em>'}}</dd>
+    {% if object.color and object.text_color %}<dt><em>(Sample Coloring)</em></dt><dd><span style="color:#{{object.text_color}}; background-color:#{{object.color}};">{{object.short_name}} {{object.long_name}}</span></dd>{% endif %}
+</dl>
+{% include "multigtfs/extra_data.html" %}
+<h2>Related Objects</h2>
+<ul>
+    <li><a href="{% url 'farerule_by_route_list' feed_id=object.id route_id=object.id %}">{{object.farerule_set.count}} FareRule{{ object.FareRule_set.count|pluralize }}</a></li>
+    <li><a href="{% url 'trip_by_route_list' feed_id=object.id route_id=object.id %}">{{object.trip_set.count}} Trip{{ object.trip_set.count|pluralize }}</a></li>
+</ul>
+{% endblock %}
+
+{% block body_script %}
+{% if object.geometry %}
+<script defer="defer" type="text/javascript">
+explore.mapLine('map', '{{object.geometry.wkt}}');
+</script>
+{% endif %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/route_list.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/route_list.html
new file mode 100644
index 0000000..cd0c706
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/route_list.html
@@ -0,0 +1,15 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Routes{% endblock %}
+{% block page_title %}Routes{% endblock %}
+{% block page_top_content_elem %}
+A <strong>Route</strong> is named route in the schedule
+{% endblock %}
+{% block page_middle_content %}
+{% for route in object_list %}
+  {% if forloop.first %}<ul>{% endif %}
+    <li><a href="{% url 'route_detail' feed_id=route.feed_id pk=route.pk %}">Route {{ route }}</a></li>
+  {% if forloop.last %}</ul>{% endif %}
+{% empty %}
+  <p><em>No routes yet.</em></p>
+{% endfor %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/service_detail.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/service_detail.html
new file mode 100644
index 0000000..cb6a056
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/service_detail.html
@@ -0,0 +1,29 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Service {{object}}{% endblock %}
+{% block page_title %}Service {{object}}{% endblock %}
+{% block page_top_content_elem %}
+A <strong>Service</strong> is one or more days with the same schedule.
+{% endblock %}
+{% block page_middle_content %}
+<h2>Attributes</h2>
+<dl>
+    <dt>feed</dt><dd><a href="{% url 'feed_detail' pk=object.feed_id %}">Feed {{object.feed}}</a></dd>
+    <dt>id</dt><dd>{{object.id}}</dd>
+    <dt>service_id</dt><dd>{{object.service_id|default:'<em>Not set</em>'}}</dd>
+    <dt>monday</dt><dd>{{object.monday}}</dd>
+    <dt>tuesday</dt><dd>{{object.tuesday}}</dd>
+    <dt>wednesday</dt><dd>{{object.wednesday}}</dd>
+    <dt>thursday</dt><dd>{{object.thursday}}</dd>
+    <dt>friday</dt><dd>{{object.friday}}</dd>
+    <dt>saturday</dt><dd>{{object.saturday}}</dd>
+    <dt>sunday</dt><dd>{{object.sunday}}</dd>
+    <dt>start_date</dt><dd>{{object.start_date}}</dd>
+    <dt>end_date</dt><dd>{{object.end_date}}</dd>
+</dl>
+{% include "multigtfs/extra_data.html" %}
+<h2>Related Objects</h2>
+<ul>
+    <li><a href="{% url 'servicedate_by_service_list' feed_id=object.id service_id=object.id %}">{{object.servicedate_set.count}} ServiceDate{{ object.servicedate_set.count|pluralize }}</a></li>
+    <li><a href="{% url 'trip_by_service_list' feed_id=object.id service_id=object.id %}">{{object.trip_set.count}} Trip{{ object.trip_set.count|pluralize }}</a></li>
+</ul>
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/service_list.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/service_list.html
new file mode 100644
index 0000000..1b67b4d
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/service_list.html
@@ -0,0 +1,16 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Services{% endblock %}
+{% block page_title %}Services{% endblock %}
+{% block page_top_content_elem %}
+A <strong>Service</strong> is one or more days of the week that a scheduled
+route runs.
+{% endblock %}
+{% block page_middle_content %}
+{% for service in object_list %}
+  {% if forloop.first %}<ul>{% endif %}
+    <li><a href="{% url 'service_detail' feed_id=service.feed_id pk=service.pk %}">Service {{ service }}</a></li>
+  {% if forloop.last %}</ul>{% endif %}
+{% empty %}
+  <p><em>No services yet.</em></p>
+{% endfor %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/servicedate_detail.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/servicedate_detail.html
new file mode 100644
index 0000000..293e454
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/servicedate_detail.html
@@ -0,0 +1,16 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Trip {{object}}{% endblock %}
+{% block page_title %}Trip {{object}}{% endblock %}
+{% block page_top_content_elem %}
+A <strong>ServiceDate</strong> is an exception to a Service's routine schedule
+{% endblock %}
+{% block page_middle_content %}
+<h2>Attributes</h2>
+<dl>
+    <dt>service</dt><dd><a href="{% url 'service_detail' feed_id=object.service.feed_id pk=object.service_id %}">Service {{object.service}}</a></dd>
+    <dt>id</dt><dd>{{object.id}}</dd>
+    <dt>date</dt><dd>{{object.date}}</dd>
+    <dt>exception_type</dt><dd>{{object.get_exception_type_display|default:'<em>Not set</em>'}}</dd>
+</dl>
+{% include "multigtfs/extra_data.html" %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/servicedate_list.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/servicedate_list.html
new file mode 100644
index 0000000..c877ab9
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/servicedate_list.html
@@ -0,0 +1,16 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - ServiceDates{% endblock %}
+{% block page_title %}ServiceDates{% endblock %}
+{% block page_top_content_elem %}
+A <strong>ServiceDate</strong> is an exception to a Service's routine schedule
+{% endblock %}
+{% block page_middle_content %}
+<p>ServiceDates for <a href="{% url 'service_detail' feed_id=service.feed_id pk=service.pk %}">Service {{service}}</a></p>
+{% for servicedate in object_list %}
+  {% if forloop.first %}<ul>{% endif %}
+    <li><a href="{% url 'servicedate_detail' feed_id=service.feed_id pk=servicedate.pk %}">ServiceDate {{ servicedate }}</a></li>
+  {% if forloop.last %}</ul>{% endif %}
+{% empty %}
+  <p><em>No servicedates yet.</em></p>
+{% endfor %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/shape_detail.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/shape_detail.html
new file mode 100644
index 0000000..9562163
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/shape_detail.html
@@ -0,0 +1,48 @@
+{% extends "multigtfs/base.html" %}
+{% load staticfiles %}
+{% block head_title %}{{ block.super }} - Shape {{object}}{% endblock %}
+
+{% block head_extra %}
+{% if object.geometry %}
+<script src="http://openlayers.org/api/OpenLayers.js"></script>
+<script src="{% static 'js/explore.js' %}"></script>
+{% endif %}
+{% endblock %}
+
+{% block page_title %}Shape {{object}}{% endblock %}
+
+{% block page_top_content_elem %}
+A <strong>Shape</strong> is the path a vehicle travels, on the road or on a track.
+{% endblock %}
+
+{% block page_middle_content %}
+{% if object.geometry %}
+<div class="row" style="height:300px" id="map"></div>
+{% else %}
+<h2>Map</h2>
+<p><em>
+    This shape does not have a populated geometry.  A shape must have at
+    least 2 ShapePoints, and update_geometry() must be run on the shape.
+</em></p>
+{% endif %}
+<h2>Attributes</h2>
+<dl>
+    <dt>feed</dt><dd><a href="{% url 'feed_detail' pk=object.feed_id %}">Feed {{object.feed}}</a></dd>
+    <dt>id</dt><dd>{{object.id}}</dd>
+    <dt>shape_id</dt><dd>{{object.shape_id|default:'<em>Not set</em>'}}</dd>
+</dl>
+{% include "multigtfs/extra_data.html" %}
+<h2>Related Objects</h2>
+<ul>
+    <li><a href="{% url 'trip_by_shape_list' feed_id=object.id shape_id=object.id %}">{{object.trip_set.count}} Trip{{ object.trip_set.count|pluralize }}</a></li>
+    <li><a href="{% url 'shapepoint_by_shape_list' feed_id=object.id shape_id=object.id %}">{{object.points.count}} ShapePoint{{ object.points.count|pluralize }}</a></li>
+</ul>
+{% endblock %}
+
+{% block body_script %}
+{% if object.geometry %}
+<script defer="defer" type="text/javascript">
+explore.mapLine('map', '{{object.geometry.wkt}}');
+</script>
+{% endif %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/shape_list.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/shape_list.html
new file mode 100644
index 0000000..2b5f38e
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/shape_list.html
@@ -0,0 +1,15 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Shapes{% endblock %}
+{% block page_title %}Shapes{% endblock %}
+{% block page_top_content_elem %}
+A <strong>Shape</strong> is the path a vehicle travels, on the road or on a track.
+{% endblock %}
+{% block page_middle_content %}
+{% for shape in object_list %}
+  {% if forloop.first %}<ul>{% endif %}
+    <li><a href="{% url 'shape_detail' feed_id=shape.feed_id pk=shape.pk %}">Shape {{ shape }}</a></li>
+  {% if forloop.last %}</ul>{% endif %}
+{% empty %}
+  <p><em>No shapes yet.</em></p>
+{% endfor %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/shapepoint_detail.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/shapepoint_detail.html
new file mode 100644
index 0000000..9aad541
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/shapepoint_detail.html
@@ -0,0 +1,28 @@
+{% extends "multigtfs/base.html" %}
+{% load staticfiles %}
+{% block head_title %}{{ block.super }} - ShapePoint {{object}}{% endblock %}
+{% block head_extra %}
+<script src="http://openlayers.org/api/OpenLayers.js"></script>
+<script src="{% static 'js/explore.js' %}"></script>
+{% endblock %}
+{% block page_title %}ShapePoint {{object}}{% endblock %}
+{% block page_top_content_elem %}
+A <strong>ShapePoint</strong> is a point of a shape
+{% endblock %}
+{% block page_middle_content %}
+<div class="row" style="height:300px" id="map"></div>
+<h2>Attributes</h2>
+<dl>
+    <dt>shape</dt><dd><a href="{% url 'shape_detail' feed_id=object.shape.feed_id pk=object.shape_id %}">Shape {{object.shape}}</a></dd>
+    <dt>id</dt><dd>{{object.id}}</dd>
+    <dt>point</dt><dd>{{object.point}}</dd>
+    <dt>sequence</dt><dd>{{object.sequence}}</dd>
+    <dt>traveled</dt><dd>{{object.traveled}}</dd>
+</dl>
+{% include "multigtfs/extra_data.html" %}
+{% endblock %}
+{% block body_script %}
+<script defer="defer" type="text/javascript">
+  explore.mapPoint('map', {{object.point.x}}, {{object.point.y}}, 16);
+</script>
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/shapepoint_list.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/shapepoint_list.html
new file mode 100644
index 0000000..abcada8
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/shapepoint_list.html
@@ -0,0 +1,18 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - ShapePoints{% endblock %}
+{% block page_title %}ShapePoints{% endblock %}
+{% block page_top_content_elem %}
+A <strong>ShapePoint</strong> is a point of a shape
+{% endblock %}
+{% block page_middle_content %}
+{% if shape %}
+<p>ShapePoints for <a href="{% url 'shape_detail' feed_id=feed_id pk=shape.pk %}">Shape {{shape}}</a></p>
+{% endif %}
+{% for shapepoint in object_list %}
+  {% if forloop.first %}<ul>{% endif %}
+    <li><a href="{% url 'shapepoint_detail' feed_id=feed_id pk=shapepoint.pk %}">ShapePoint {{ shapepoint }}</a></li>
+  {% if forloop.last %}</ul>{% endif %}
+{% empty %}
+  <p><em>No shapepoints yet.</em></p>
+{% endfor %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/stop_detail.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/stop_detail.html
new file mode 100644
index 0000000..2203778
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/stop_detail.html
@@ -0,0 +1,40 @@
+{% extends "multigtfs/base.html" %}
+{% load staticfiles %}
+{% block head_title %}{{ block.super }} - Stop {{object}}{% endblock %}
+{% block head_extra %}
+<script src="http://openlayers.org/api/OpenLayers.js"></script>
+<script src="{% static 'js/explore.js' %}"></script>
+{% endblock %}
+{% block page_title %}Stop {{object}}{% endblock %}
+{% block page_top_content_elem %}
+A <strong>Stop</strong> is a stop or station in the schedule.
+{% endblock %}
+{% block page_middle_content %}
+<div class="row" style="height:300px" id="map"></div>
+<h2>Attributes</h2>
+<dl>
+    <dt>feed</dt><dd><a href="{% url 'feed_detail' pk=object.feed_id %}">Feed {{object.feed}}</a></dd>
+    <dt>id</dt><dd>{{object.id}}</dd>
+    <dt>stop_id</dt><dd>{{object.stop_id|default:'<em>Not set</em>'}}</dd>
+    <dt>code</dt><dd>{{object.code|default:'<em>Not set</em>'}}</dd>
+    <dt>name</dt><dd>{{object.name}}</dd>
+    <dt>desc</dt><dd>{{object.desc|default:'<em>Not set</em>'}}</dd>
+    <dt>point</dt><dd>{{object.point}}</dd>
+    <dt>zone</dt><dd>{% if object.zone_id %}<a href="{% url 'zone_detail' feed_id=object.id pk=object.zone_id %}">Zone {{object.zone}}</a>{% else %}<em>No Zone</em>{% endif %}</dd>
+    <dt>url</dt><dd>{% if object.url %}<a href="{{object.url}}">{{object.url}}</a>{% else %}<em>Not set</em>{% endif %}</dd>
+    <dt>location_type</dt><dd>{{object.get_location_type_display|default:'<em>Not set</em>'}}</dd>
+    <dt>parent_station</dt><dd>{% if object.parent_station_id %}<a href="{% url 'stop_detail' feed_id=object.id pk=object.parent_station_id %}">Parent Station {{object.name}}</a>{% else %}<em>No Parent Station</em>{% endif %}</dd>
+    <dt>timezone</dt><dd>{{object.timezone|default:'<em>Not set</em>'}}</dd>
+    <dt>wheelchair_boarding</dt><dd>{{object.get_wheelchair_boarding_type_display|default:'<em>Not set</em>'}}</dd>
+</dl>
+{% include "multigtfs/extra_data.html" %}
+<h2>Related Objects</h2>
+<ul>
+    <li><a href="{% url 'stoptime_by_stop_list' feed_id=object.id stop_id=object.id %}">{{object.stoptime_set.count}} StopTime{{ object.stoptime_set.count|pluralize }}</a></li>
+</ul>
+{% endblock %}
+{% block body_script %}
+<script defer="defer" type="text/javascript">
+  explore.mapPoint('map', {{object.point.x}}, {{object.point.y}}, 16);
+</script>
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/stop_list.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/stop_list.html
new file mode 100644
index 0000000..148b753
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/stop_list.html
@@ -0,0 +1,15 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Stops{% endblock %}
+{% block page_title %}Stops{% endblock %}
+{% block page_top_content_elem %}
+A <strong>Stop</strong> is a stop or station in the schedule.
+{% endblock %}
+{% block page_middle_content %}
+{% for stop in object_list %}
+  {% if forloop.first %}<ul>{% endif %}
+    <li><a href="{% url 'stop_detail' feed_id=stop.feed_id pk=stop.pk %}">Stop {{ stop }}</a></li>
+  {% if forloop.last %}</ul>{% endif %}
+{% empty %}
+  <p><em>No stops yet.</em></p>
+{% endfor %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/stoptime_detail.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/stoptime_detail.html
new file mode 100644
index 0000000..8aaf4ab
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/stoptime_detail.html
@@ -0,0 +1,22 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - StopTime {{object}}{% endblock %}
+{% block page_title %}StopTime {{object}}{% endblock %}
+{% block page_top_content_elem %}
+A <strong>StopTime</strong> is the intersection between a Trip and a Stop.
+{% endblock %}
+{% block page_middle_content %}
+<h2>Attributes</h2>
+<dl>
+    <dt>trip</dt><dd><a href="{% url 'trip_detail' feed_id=object.stop.feed_id pk=object.trip_id %}">Trip {{object.trip}}</a></dd>
+    <dt>stop</dt><dd><a href="{% url 'stop_detail' feed_id=object.stop.feed_id pk=object.stop_id %}">Stop {{object.stop}}</a></dd>
+    <dt>id</dt><dd>{{object.id}}</dd>
+    <dt>arrival_time</dt><dd>{{object.arrival_time|default:'<em>Not set</em>'}}</dd>
+    <dt>departure_time</dt><dd>{{object.departure_time|default:'<em>Not set</em>'}}</dd>
+    <dt>stop_sequence</dt><dd>{{object.stop_sequence}}</dd>
+    <dt>stop_headsign</dt><dd>{{object.stop_headsign|default:'<em>Not set</em>'}}</dd>
+    <dt>pickup_type</dt>{{object.get_pickup_type_display|default:'<em>Not set</em>'}}</dd>
+    <dt>dropoff_type</dt>{{object.get_dropoff_type_display|default:'<em>Not set</em>'}}</dd>
+    <dt>shape_dist_traveled</dt><dd>{{object.shape_dist_traveled|default:'<em>Not set</em>'}}</dd>
+</dl>
+{% include "multigtfs/extra_data.html" %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/stoptime_list.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/stoptime_list.html
new file mode 100644
index 0000000..fb873c9
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/stoptime_list.html
@@ -0,0 +1,20 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - StopTimes{% endblock %}
+{% block page_title %}StopTimes{% endblock %}
+{% block page_top_content_elem %}
+A <strong>StopTime</strong> is the intersection between a Trip and a Stop.
+{% endblock %}
+{% block page_middle_content %}
+{% if stop %}
+<p>StopTimes for <a href="{% url 'stop_detail' feed_id=feed_id pk=stop.pk %}">Stop {{stop}}</a></p>
+{% elif trip %}
+<p>StopTimes for <a href="{% url 'trip_detail' feed_id=feed_id pk=trip.pk %}">Trip {{trip}}</a></p>
+{% endif %}
+{% for stoptime in object_list %}
+  {% if forloop.first %}<ul>{% endif %}
+    <li><a href="{% url 'stoptime_detail' feed_id=feed_id pk=stoptime.pk %}">StopTime {{ stoptime }}</a></li>
+  {% if forloop.last %}</ul>{% endif %}
+{% empty %}
+  <p><em>No stoptimes yet.</em></p>
+{% endfor %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/trip_detail.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/trip_detail.html
new file mode 100644
index 0000000..39895d3
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/trip_detail.html
@@ -0,0 +1,57 @@
+{% extends "multigtfs/base.html" %}
+{% load staticfiles %}
+{% block head_title %}{{ block.super }} - Trip {{object}}{% endblock %}
+
+{% block head_extra %}
+{% if object.geometry %}
+<script src="http://openlayers.org/api/OpenLayers.js"></script>
+<script src="{% static 'js/explore.js' %}"></script>
+{% endif %}
+{% endblock %}
+
+{% block page_title %}Trip {{object}}{% endblock %}
+
+{% block page_top_content_elem %}
+A <strong>Trip</strong> is a single run of a Route
+{% endblock %}
+
+{% block page_middle_content %}
+{% if object.geometry %}
+<div class="row" style="height:300px" id="map"></div>
+{% else %}
+<h2>Map</h2>
+<p><em>
+    This trip does not have a populated geometry.  A trip must have a
+    related Shape or at least 2 StopTrips, and update_geometry() must
+    be run on the Trip.
+</em></p>
+{% endif %}
+<h2>Attributes</h2>
+<dl>
+    <dt>route</dt><dd><a href="{% url 'route_detail' feed_id=object.route.feed_id pk=object.route_id %}">Route {{object.route}}</a></dd>
+    <dt>service</dt><dd><a href="{% url 'service_detail' feed_id=object.route.feed_id pk=object.service_id %}">Service {{object.service}}</a></dd>
+    <dt>id</dt><dd>{{object.id}}</dd>
+    <dt>trip_id</dt><dd>{{object.trip_id|default:'<em>Not set</em>'}}</dd>
+    <dt>headsign</dt><dd>{{object.headsign|default:'<em>Not set</em>'}}</dd>
+    <dt>short_name</dt><dd>{{object.short_name|default:'<em>Not set</em>'}}</dd>
+    <dt>direction</dt><dd>{{object.get_direction_display|default:'<em>Not set</em>'}}</dd>
+    <dt>block</dt><dd>{% if object.block_id %}<a href="{% url 'block_detail' feed_id=view.kwargs.feed_id pk=object.block_id %}">Block {{object.block}}</a>{% else %}<em>No Block</em>{% endif %}</dd>
+    <dt>shape</dt><dd>{% if object.shape_id %}<a href="{% url 'shape_detail' feed_id=view.kwargs.feed_id pk=object.shape_id %}">Shape {{object.shape}}</a>{% else %}<em>No Shape</em>{% endif %}</dd>
+    <dt>wheelchair_accessible</dt><dd>{{object.get_wheelchair_accessible_display|default:'<em>Not set</em>'}}</dd>
+    <dt>bikes_allowed</dt><dd>{{object.get_bikes_allowed_display|default:'<em>Not set</em>'}}</dd>
+</dl>
+{% include "multigtfs/extra_data.html" %}
+<h2>Related Objects</h2>
+<ul>
+    <li><a href="{% url 'frequency_by_trip_list' feed_id=object.route.feed_id trip_id=object.id %}">{{object.frequency_set.count}} Frequenc{{ object.frequency_set.count|pluralize:"y,ies" }}</a></li>
+    <li><a href="{% url 'stoptime_by_trip_list' feed_id=object.route.feed_id trip_id=object.id %}">{{object.stoptime_set.count}} StopTime{{ object.stoptime_set.count|pluralize }}</a></li>
+</ul>
+{% endblock %}
+
+{% block body_script %}
+{% if object.geometry %}
+<script defer="defer" type="text/javascript">
+explore.mapLine('map', '{{object.geometry.wkt}}');
+</script>
+{% endif %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/trip_list.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/trip_list.html
new file mode 100644
index 0000000..6221e90
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/trip_list.html
@@ -0,0 +1,24 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Trips{% endblock %}
+{% block page_title %}Trips{% endblock %}
+{% block page_top_content_elem %}
+A <strong>Trip</strong> is a single run of a Route
+{% endblock %}
+{% block page_middle_content %}
+{% if route %}
+<p>Trips for <a href="{% url 'route_detail' feed_id=feed_id pk=route.pk %}">Route {{route}}</a></p>
+{% elif service %}
+<p>Trips for <a href="{% url 'service_detail' feed_id=feed_id pk=service.pk %}">Service {{service}}</a></p>
+{% elif shape %}
+<p>Trips for <a href="{% url 'shape_detail' feed_id=feed_id pk=shape.pk %}">Shape {{shape}}</a></p>
+{% elif the_block %}
+<p>Trips for <a href="{% url 'block_detail' feed_id=feed_id pk=the_block.pk %}">Block {{the_block}}</a></p>
+{% endif %}
+{% for trip in object_list %}
+  {% if forloop.first %}<ul>{% endif %}
+    <li><a href="{% url 'trip_detail' feed_id=feed_id pk=trip.pk %}">Trip {{ trip }}</a></li>
+  {% if forloop.last %}</ul>{% endif %}
+{% empty %}
+  <p><em>No trips yet.</em></p>
+{% endfor %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/zone_detail.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/zone_detail.html
new file mode 100644
index 0000000..d22b0dc
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/zone_detail.html
@@ -0,0 +1,15 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Zone {{object}}{% endblock %}
+{% block page_title %}Zone {{object}}{% endblock %}
+{% block page_top_content_elem %}
+A <strong>Zone</strong> is an area with the same fare rules.
+{% endblock %}
+{% block page_middle_content %}
+<h2>Attributes</h2>
+<dl>
+    <dt>feed</dt><dd><a href="{% url 'feed_detail' pk=object.feed_id %}">Feed {{object.feed}}</a></dd>
+    <dt>id</dt><dd>{{object.id}}</dd>
+    <dt>zone_id</dt><dd>{{object.zone_id}}</dd>
+</dl>
+{% include "multigtfs/extra_data.html" %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/templates/multigtfs/zone_list.html b/examples/gtfsproj/gtfsapp/templates/multigtfs/zone_list.html
new file mode 100644
index 0000000..b1e7b35
--- /dev/null
+++ b/examples/gtfsproj/gtfsapp/templates/multigtfs/zone_list.html
@@ -0,0 +1,15 @@
+{% extends "multigtfs/base.html" %}
+{% block head_title %}{{ block.super }} - Zones{% endblock %}
+{% block page_title %}Zones{% endblock %}
+{% block page_top_content_elem %}
+A <strong>Zone</strong> is an area with the same fare rules.
+{% endblock %}
+{% block page_middle_content %}
+{% for zone in object_list %}
+  {% if forloop.first %}<ul>{% endif %}
+    <li><a href="{% url 'zone_detail' feed_id=zone.feed_id pk=zone.pk %}">Zone {{ zone }}</a></li>
+  {% if forloop.last %}</ul>{% endif %}
+{% empty %}
+  <p><em>No zones yet.</em></p>
+{% endfor %}
+{% endblock %}
diff --git a/examples/gtfsproj/gtfsapp/urls.py b/examples/gtfsproj/gtfsapp/urls.py
index 347d767..b3d2343 100644
--- a/examples/gtfsproj/gtfsapp/urls.py
+++ b/examples/gtfsproj/gtfsapp/urls.py
@@ -1,8 +1,27 @@
 from django.conf.urls import url
 
-from gtfsapp.views import FeedList, FeedDetail
+from gtfsapp.views import FeedList, FeedInfoList, FeedAgencyList, FeedRouteList, FeedStopList, FeedServiceList, FeedShapeList, FeedFareList, FeedZoneList
+from gtfsapp.views import FeedDetail, FeedInfoDetail, AgencyDetail, RouteDetail, StopDetail, ServiceDetail, ShapeDetail, FareDetail, ZoneDetail
 
 urlpatterns = [
     url(r'^$', FeedList.as_view(), name='feed_list'),
+    url(r'feed/(?P<feed_id>\d+)/feedinfo/$', FeedInfoList.as_view(), name='feedinfo_list'),
+    url(r'feed/(?P<feed_id>\d+)/agency/$', FeedAgencyList.as_view(), name='agency_list'),
+    url(r'feed/(?P<feed_id>\d+)/route/$', FeedRouteList.as_view(), name='route_list'),
+    url(r'feed/(?P<feed_id>\d+)/stop/$', FeedStopList.as_view(), name='stop_list'),
+    url(r'feed/(?P<feed_id>\d+)/service/$', FeedServiceList.as_view(), name='service_list'),
+    url(r'feed/(?P<feed_id>\d+)/shape/$', FeedShapeList.as_view(), name='shape_list'),
+    url(r'feed/(?P<feed_id>\d+)/fare/$', FeedFareList.as_view(), name='fare_list'),
+    url(r'feed/(?P<feed_id>\d+)/zone/$', FeedZoneList.as_view(), name='zone_list'),
+
     url(r'^feed/(?P<pk>\d+)/$', FeedDetail.as_view(), name='feed_detail'),
+    url(r'feed/(?P<feed_id>\d+)/feedinfo/(?P<pk>\d+)/$', FeedInfoDetail.as_view(), name='feedinfo_detail'),
+    url(r'feed/(?P<feed_id>\d+)/agency/(?P<pk>\d+)/$', AgencyDetail.as_view(), name='agency_detail'),
+    url(r'feed/(?P<feed_id>\d+)/route/(?P<pk>\d+)/$', RouteDetail.as_view(), name='route_detail'),
+    url(r'feed/(?P<feed_id>\d+)/stop/(?P<pk>\d+)/$', StopDetail.as_view(), name='stop_detail'),
+    url(r'feed/(?P<feed_id>\d+)/service/(?P<pk>\d+)/$', ServiceDetail.as_view(), name='service_detail'),
+    url(r'feed/(?P<feed_id>\d+)/shape/(?P<pk>\d+)/$', ShapeDetail.as_view(), name='shape_detail'),
+    url(r'feed/(?P<feed_id>\d+)/fare/(?P<pk>\d+)/$', FareDetail.as_view(), name='fare_detail'),
+    url(r'feed/(?P<feed_id>\d+)/zone/(?P<pk>\d+)/$', ZoneDetail.as_view(), name='zone_detail'),
+
 ]
diff --git a/examples/gtfsproj/gtfsapp/views.py b/examples/gtfsproj/gtfsapp/views.py
index e17748f..82eb144 100644
--- a/examples/gtfsproj/gtfsapp/views.py
+++ b/examples/gtfsproj/gtfsapp/views.py
@@ -2,13 +2,86 @@
 from __future__ import unicode_literals
 
 from django.shortcuts import render
-
 from django.views.generic import ListView, DetailView
-from multigtfs.models import Feed
 
+from multigtfs.models import Feed, FeedInfo, Agency, Route, Service, Stop, Shape, Fare, Zone
+
+# List feed
 class FeedList(ListView):
-    #model = Feed
     queryset = Feed.objects.order_by('name', '-created')
 
+# Filter lists by feed
+class ByFeedListView(ListView):
+    by_col = 'feed_id'
+    by_kwarg = 'feed_id'
+    by_class = Feed
+    by_classname = 'feed'
+
+    def get_context_data(self, **kwargs):
+        context = super(ByFeedListView, self).get_context_data(
+            **kwargs)
+        context[self.by_classname] = self.by_class.objects.get(
+            id=self.kwargs[self.by_kwarg])
+        context['feed_id'] = self.kwargs['feed_id']
+        return context
+
+    def get_queryset(self, **kwargs):
+        q_filter = {self.by_col: self.kwargs[self.by_kwarg]}
+        qset = super(ByFeedListView, self).get_queryset(**kwargs)
+        return qset.filter(**q_filter)
+
+
+# List
+class FeedInfoList(ByFeedListView):
+    model = FeedInfo
+
+class FeedAgencyList(ByFeedListView):
+    model = Agency
+
+class FeedStopList(ByFeedListView):
+    model = Stop
+
+class FeedRouteList(ByFeedListView):
+    model = Route
+
+class  FeedShapeList(ByFeedListView):
+    model = Shape
+
+class FeedServiceList(ByFeedListView):
+    model = Service
+
+class FeedZoneList(ByFeedListView):
+    model = Zone
+
+class FeedFareList(ByFeedListView):
+    model = Fare
+
+
+# Detail
 class FeedDetail(DetailView):
     model = Feed
+
+class FeedInfoDetail(DetailView):
+    model = FeedInfo
+
+class AgencyDetail(DetailView):
+    model = Agency
+
+class StopDetail(DetailView):
+    model = Stop
+
+class RouteDetail(DetailView):
+    model = Route
+
+class ShapeDetail(DetailView):
+    model = Shape
+
+class ServiceDetail(DetailView):
+    model = Service
+
+class ZoneDetail(DetailView):
+    model = Zone
+
+class FareDetail(DetailView):
+    model = Fare
+

From 084f420168ff80e9f0326183f100ed0e2a40cfee Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@gmail.com>
Date: Sun, 1 Oct 2017 01:08:48 +1300
Subject: [PATCH 08/18] Most of app running now

---
 examples/gtfsproj/gtfsapp/urls.py  |  37 +++++++++-
 examples/gtfsproj/gtfsapp/views.py | 112 ++++++++++++++++++++++++++++-
 2 files changed, 145 insertions(+), 4 deletions(-)

diff --git a/examples/gtfsproj/gtfsapp/urls.py b/examples/gtfsproj/gtfsapp/urls.py
index b3d2343..e7cdd31 100644
--- a/examples/gtfsproj/gtfsapp/urls.py
+++ b/examples/gtfsproj/gtfsapp/urls.py
@@ -1,7 +1,22 @@
-from django.conf.urls import url
+from django.conf.urls import url, include
 
-from gtfsapp.views import FeedList, FeedInfoList, FeedAgencyList, FeedRouteList, FeedStopList, FeedServiceList, FeedShapeList, FeedFareList, FeedZoneList
-from gtfsapp.views import FeedDetail, FeedInfoDetail, AgencyDetail, RouteDetail, StopDetail, ServiceDetail, ShapeDetail, FareDetail, ZoneDetail
+from gtfsapp.views import (
+    FeedList, FeedInfoList, FeedAgencyList, FeedRouteList, 
+    FeedStopList, FeedServiceList, FeedShapeList, FeedFareList, 
+    FeedZoneList, 
+
+    FeedDetail, FeedInfoDetail, AgencyDetail, 
+    RouteDetail, TripDetail, StopDetail, StopTimeDetail, 
+    ServiceDetail, ShapeDetail, ShapePointDetail, FareDetail, 
+    ZoneDetail, 
+
+    StopTimeByStopList, FareRuleByRouteList, TripByRouteList,
+
+    FrequencyByTripList, StopTimeByTripList, 
+
+    TripByShapeList, ShapePointByShapeList,
+
+)
 
 urlpatterns = [
     url(r'^$', FeedList.as_view(), name='feed_list'),
@@ -18,10 +33,26 @@
     url(r'feed/(?P<feed_id>\d+)/feedinfo/(?P<pk>\d+)/$', FeedInfoDetail.as_view(), name='feedinfo_detail'),
     url(r'feed/(?P<feed_id>\d+)/agency/(?P<pk>\d+)/$', AgencyDetail.as_view(), name='agency_detail'),
     url(r'feed/(?P<feed_id>\d+)/route/(?P<pk>\d+)/$', RouteDetail.as_view(), name='route_detail'),
+    url(r'feed/(?P<feed_id>\d+)/trip/(?P<pk>\d+)/$', TripDetail.as_view(), name='trip_detail'),
     url(r'feed/(?P<feed_id>\d+)/stop/(?P<pk>\d+)/$', StopDetail.as_view(), name='stop_detail'),
+    url(r'feed/(?P<feed_id>\d+)/stoptime/(?P<pk>\d+)/$', StopTimeDetail.as_view(), name='stoptime_detail'),
     url(r'feed/(?P<feed_id>\d+)/service/(?P<pk>\d+)/$', ServiceDetail.as_view(), name='service_detail'),
     url(r'feed/(?P<feed_id>\d+)/shape/(?P<pk>\d+)/$', ShapeDetail.as_view(), name='shape_detail'),
+    url(r'feed/(?P<feed_id>\d+)/shapepoint/(?P<pk>\d+)$', ShapePointDetail.as_view(), name='shapepoint_detail'),
+
     url(r'feed/(?P<feed_id>\d+)/fare/(?P<pk>\d+)/$', FareDetail.as_view(), name='fare_detail'),
     url(r'feed/(?P<feed_id>\d+)/zone/(?P<pk>\d+)/$', ZoneDetail.as_view(), name='zone_detail'),
 
+    url(r'feed/(?P<feed_id>\d+)/route/(?P<route_id>\d+)/farerule/$', FareRuleByRouteList.as_view(), name='farerule_by_route_list'),
+    url(r'feed/(?P<feed_id>\d+)/route/(?P<route_id>\d+)/trip/$', TripByRouteList.as_view(), name='trip_by_route_list'),
+
+    url(r'feed/(?P<feed_id>\d+)/trip/(?P<trip_id>\d+)/frequency/$', FrequencyByTripList.as_view(), name='frequency_by_trip_list'),
+    url(r'feed/(?P<feed_id>\d+)/trip/(?P<trip_id>\d+)/stoptime/$', StopTimeByTripList.as_view(), name='stoptime_by_trip_list'),
+
+    url(r'feed/(?P<feed_id>\d+)/stop/(?P<stop_id>\d+)/stoptime/$', StopTimeByStopList.as_view(), name='stoptime_by_stop_list'),
+
+
+    url(r'feed/(?P<feed_id>\d+)/shape/(?P<shape_id>\d+)/shapepoint/$', ShapePointByShapeList.as_view(), name='shapepoint_by_shape_list'),
+    url(r'feed/(?P<feed_id>\d+)/shape/(?P<shape_id>\d+)/trip/$', TripByShapeList.as_view(), name='trip_by_shape_list'),
+
 ]
diff --git a/examples/gtfsproj/gtfsapp/views.py b/examples/gtfsproj/gtfsapp/views.py
index 82eb144..9d9a8bf 100644
--- a/examples/gtfsproj/gtfsapp/views.py
+++ b/examples/gtfsproj/gtfsapp/views.py
@@ -4,7 +4,10 @@
 from django.shortcuts import render
 from django.views.generic import ListView, DetailView
 
-from multigtfs.models import Feed, FeedInfo, Agency, Route, Service, Stop, Shape, Fare, Zone
+from multigtfs.models import (
+    Feed, FeedInfo, Agency, Route, Trip, Service, Stop, 
+    Shape, ShapePoint, Fare, Zone, StopTime, FareRule, Frequency
+)
 
 # List feed
 class FeedList(ListView):
@@ -57,6 +60,20 @@ class FeedFareList(ByFeedListView):
     model = Fare
 
 
+class StopTimeByStopList(ListView):
+    model = StopTime
+
+    def get_context_data(self, **kwargs):
+        context = super(StopTimeByStopList, self).get_context_data(
+            **kwargs)
+        context['stop'] = Stop.objects.get(id=self.kwargs['stop_id'])
+        context['feed_id'] = self.kwargs['feed_id']
+        return context
+
+    def get_queryset(self, **kwargs):
+        return StopTime.objects.filter(stop_id=self.kwargs['stop_id'])
+
+
 # Detail
 class FeedDetail(DetailView):
     model = Feed
@@ -70,12 +87,21 @@ class AgencyDetail(DetailView):
 class StopDetail(DetailView):
     model = Stop
 
+class StopTimeDetail(DetailView):
+    model = StopTime
+
 class RouteDetail(DetailView):
     model = Route
 
+class TripDetail(DetailView):
+    model = Trip
+
 class ShapeDetail(DetailView):
     model = Shape
 
+class ShapePointDetail(DetailView):
+    model = ShapePoint
+
 class ServiceDetail(DetailView):
     model = Service
 
@@ -85,3 +111,87 @@ class ZoneDetail(DetailView):
 class FareDetail(DetailView):
     model = Fare
 
+
+class TripByRouteList(ListView):
+    model = Trip
+
+    def get_context_data(self, **kwargs):
+        context = super(TripByRouteList, self).get_context_data(**kwargs)
+        context['route'] = Route.objects.get(id=self.kwargs['route_id'])
+        context['feed_id'] = self.kwargs['feed_id']
+        return context
+
+    def get_queryset(self, **kwargs):
+        return Trip.objects.filter(route_id=self.kwargs['route_id'])
+
+
+class FareRuleByRouteList(ListView):
+    model = FareRule
+
+    def get_context_data(self, **kwargs):
+        context = super(FareRuleByRouteList, self).get_context_data(
+            **kwargs)
+        context['route'] = Route.objects.get(id=self.kwargs['route_id'])
+        context['feed_id'] = self.kwargs['feed_id']
+        return context
+
+    def get_queryset(self, **kwargs):
+        return FareRule.objects.filter(route_id=self.kwargs['route_id'])
+
+
+class StopTimeByTripList(ListView):
+    model = StopTime
+
+    def get_context_data(self, **kwargs):
+        context = super(StopTimeByTripList, self).get_context_data(
+            **kwargs)
+        context['trip'] = Trip.objects.get(id=self.kwargs['trip_id'])
+        context['feed_id'] = self.kwargs['feed_id']
+        return context
+
+    def get_queryset(self, **kwargs):
+        return StopTime.objects.filter(trip=self.kwargs['trip_id'])
+
+
+class FrequencyByTripList(ListView):
+    model = Frequency
+
+    def get_context_data(self, **kwargs):
+        context = super(FrequencyByTripList, self).get_context_data(
+            **kwargs)
+        context['trip'] = Trip.objects.get(id=self.kwargs['trip_id'])
+        context['feed_id'] = self.kwargs['feed_id']
+        return context
+
+    def get_queryset(self, **kwargs):
+        return Frequency.objects.filter(trip=self.kwargs['trip_id'])
+
+
+
+class TripByShapeList(ListView):
+    model = ShapePoint
+
+    def get_context_data(self, **kwargs):
+        context = super(TripByShapeList, self).get_context_data(**kwargs)
+        context['shape'] = Shape.objects.get(id=self.kwargs['shape_id'])
+        context['feed_id'] = self.kwargs['feed_id']
+        return context
+
+    def get_queryset(self, **kwargs):
+        return Trip.objects.filter(shape=self.kwargs['shape_id'])
+
+class ShapePointByShapeList(ListView):
+    model = ShapePoint
+
+    def get_context_data(self, **kwargs):
+        context = super(ShapePointByShapeList, self).get_context_data(
+            **kwargs)
+        context['shape'] = Shape.objects.get(id=self.kwargs['shape_id'])
+        context['feed_id'] = self.kwargs['feed_id']
+        return context
+
+    def get_queryset(self, **kwargs):
+        return ShapePoint.objects.filter(shape=self.kwargs['shape_id'])
+
+
+

From a0a7c6c5ef16c9269163fa651e65e2178726458e Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@gmail.com>
Date: Sun, 1 Oct 2017 10:32:16 +1300
Subject: [PATCH 09/18] More views fixed, copy from explore

---
 examples/gtfsproj/gtfsapp/urls.py  |  8 ++++++--
 examples/gtfsproj/gtfsapp/views.py | 28 +++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/examples/gtfsproj/gtfsapp/urls.py b/examples/gtfsproj/gtfsapp/urls.py
index e7cdd31..4760a3d 100644
--- a/examples/gtfsproj/gtfsapp/urls.py
+++ b/examples/gtfsproj/gtfsapp/urls.py
@@ -8,7 +8,7 @@
     FeedDetail, FeedInfoDetail, AgencyDetail, 
     RouteDetail, TripDetail, StopDetail, StopTimeDetail, 
     ServiceDetail, ShapeDetail, ShapePointDetail, FareDetail, 
-    ZoneDetail, 
+    ZoneDetail, ServiceDateDetail,
 
     StopTimeByStopList, FareRuleByRouteList, TripByRouteList,
 
@@ -16,6 +16,7 @@
 
     TripByShapeList, ShapePointByShapeList,
 
+    ServiceDateByServiceList, TripByServiceList, 
 )
 
 urlpatterns = [
@@ -39,6 +40,7 @@
     url(r'feed/(?P<feed_id>\d+)/service/(?P<pk>\d+)/$', ServiceDetail.as_view(), name='service_detail'),
     url(r'feed/(?P<feed_id>\d+)/shape/(?P<pk>\d+)/$', ShapeDetail.as_view(), name='shape_detail'),
     url(r'feed/(?P<feed_id>\d+)/shapepoint/(?P<pk>\d+)$', ShapePointDetail.as_view(), name='shapepoint_detail'),
+    url(r'feed/(?P<feed_id>\d+)/servicedate/(?P<pk>\d+)/$', ServiceDateDetail.as_view(), name='servicedate_detail'),
 
     url(r'feed/(?P<feed_id>\d+)/fare/(?P<pk>\d+)/$', FareDetail.as_view(), name='fare_detail'),
     url(r'feed/(?P<feed_id>\d+)/zone/(?P<pk>\d+)/$', ZoneDetail.as_view(), name='zone_detail'),
@@ -55,4 +57,6 @@
     url(r'feed/(?P<feed_id>\d+)/shape/(?P<shape_id>\d+)/shapepoint/$', ShapePointByShapeList.as_view(), name='shapepoint_by_shape_list'),
     url(r'feed/(?P<feed_id>\d+)/shape/(?P<shape_id>\d+)/trip/$', TripByShapeList.as_view(), name='trip_by_shape_list'),
 
-]
+    url(r'feed/(?P<feed_id>\d+)/service/(?P<service_id>\d+)/servicedate/$', ServiceDateByServiceList.as_view(), name='servicedate_by_service_list'),
+    url(r'feed/(?P<feed_id>\d+)/service/(?P<service_id>\d+)/trip/$', TripByServiceList.as_view(), name='trip_by_service_list'), ]
+   
diff --git a/examples/gtfsproj/gtfsapp/views.py b/examples/gtfsproj/gtfsapp/views.py
index 9d9a8bf..ee7337d 100644
--- a/examples/gtfsproj/gtfsapp/views.py
+++ b/examples/gtfsproj/gtfsapp/views.py
@@ -6,7 +6,8 @@
 
 from multigtfs.models import (
     Feed, FeedInfo, Agency, Route, Trip, Service, Stop, 
-    Shape, ShapePoint, Fare, Zone, StopTime, FareRule, Frequency
+    Shape, ShapePoint, Fare, Zone, StopTime, FareRule, Frequency,
+    ServiceDate
 )
 
 # List feed
@@ -111,6 +112,10 @@ class ZoneDetail(DetailView):
 class FareDetail(DetailView):
     model = Fare
 
+class ServiceDateDetail(DetailView):
+    model = ServiceDate
+
+
 
 class TripByRouteList(ListView):
     model = Trip
@@ -193,5 +198,26 @@ def get_context_data(self, **kwargs):
     def get_queryset(self, **kwargs):
         return ShapePoint.objects.filter(shape=self.kwargs['shape_id'])
 
+class ServiceDateByServiceList(ListView):
+    model = ServiceDate
+
+    def get_context_data(self, **kwargs):
+        context = super(ServiceDateByServiceList, self).get_context_data(
+            **kwargs)
+        context['service'] = Service.objects.get(id=self.kwargs['service_id'])
+        return context
+
+    def get_queryset(self, **kwargs):
+        return ServiceDate.objects.filter(service=self.kwargs['service_id'])
 
+class TripByServiceList(ListView):
+    model = Trip
 
+    def get_context_data(self, **kwargs):
+        context = super(TripByServiceList, self).get_context_data(**kwargs)
+        context['service'] = Service.objects.get(id=self.kwargs['service_id'])
+        context['feed_id'] = self.kwargs['feed_id']
+        return context
+
+    def get_queryset(self, **kwargs):
+        return Trip.objects.filter(service=self.kwargs['service_id'])

From 6ee59d30024e6b43aedcd8a651f8a4371559fca5 Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@gmail.com>
Date: Tue, 3 Oct 2017 10:21:01 +1300
Subject: [PATCH 10/18] Adding docker script first step

---
 examples/gtfsproj/.env.example   |  2 +-
 examples/gtfsproj/Dockerfile     | 21 +++++++++++++++++++++
 examples/gtfsproj/README.md      | 10 ++++++++++
 examples/gtfsproj/run_project.sh | 10 ++++++++++
 4 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 examples/gtfsproj/Dockerfile
 create mode 100644 examples/gtfsproj/README.md
 create mode 100644 examples/gtfsproj/run_project.sh

diff --git a/examples/gtfsproj/.env.example b/examples/gtfsproj/.env.example
index b5b1a7f..fd2fc93 100644
--- a/examples/gtfsproj/.env.example
+++ b/examples/gtfsproj/.env.example
@@ -3,5 +3,5 @@ SECRET_KEY=l$hc*-biy7*#7cic5q5r^mtf-2&l34pq4k7znn%)si+$h(i%e&
 DEBUG=True
 ALLOWED_HOSTS=*
 
-#DATABASE_URL=spatialite:///db.sqlite3
+DATABASE_URL=spatialite:///db.sqlite3
 #DATABASE_URL=postgis://USER:PASSWORD@HOST:PORT/DBNAME
diff --git a/examples/gtfsproj/Dockerfile b/examples/gtfsproj/Dockerfile
new file mode 100644
index 0000000..798755e
--- /dev/null
+++ b/examples/gtfsproj/Dockerfile
@@ -0,0 +1,21 @@
+FROM python:3
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+  binutils \
+  gdal-bin \
+  libproj-dev \
+  postgresql-client
+
+# Copy project code (current folder)
+COPY . /code
+
+# Install project dependencies
+WORKDIR /code
+RUN pip install -r requirements.txt
+
+# Create volume for feeds
+VOLUME /gtfs/feeds
+
+CMD ["/bin/bash"]
+
diff --git a/examples/gtfsproj/README.md b/examples/gtfsproj/README.md
new file mode 100644
index 0000000..4cc6dff
--- /dev/null
+++ b/examples/gtfsproj/README.md
@@ -0,0 +1,10 @@
+
+Build docker image.
+
+    sudo docker build -t multiproj .
+
+Run docker container as background (to run in forground change 
+"-d" to "-it".
+
+    sudo docker run -d -p 8000:8000 --name multiproj1 multiproj
+
diff --git a/examples/gtfsproj/run_project.sh b/examples/gtfsproj/run_project.sh
new file mode 100644
index 0000000..110edee
--- /dev/null
+++ b/examples/gtfsproj/run_project.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Create environment variables if not exist
+ENVIRONMENT_FILE=.env2
+if [ ! -f $ENVIRONMENT_FILE ]; then
+    echo "Create default environment from example"
+    cp .env.example $ENVIRONMENT_FILE
+fi
+
+./manage.py runserver 0.0.0.0:8000

From 26d2b70cc32819068badc957f0615f2acee30f76 Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@gmail.com>
Date: Tue, 3 Oct 2017 11:25:38 +1300
Subject: [PATCH 11/18] Docker almost working

---
 examples/gtfsproj/Dockerfile     | 12 +++++++++---
 examples/gtfsproj/run_project.sh | 22 ++++++++++++++++++----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/examples/gtfsproj/Dockerfile b/examples/gtfsproj/Dockerfile
index 798755e..14f78a0 100644
--- a/examples/gtfsproj/Dockerfile
+++ b/examples/gtfsproj/Dockerfile
@@ -10,12 +10,18 @@ RUN apt-get update && apt-get install -y \
 # Copy project code (current folder)
 COPY . /code
 
-# Install project dependencies
+# Install project dependencies, please note uses
+# pypi version of gtfsmulti not local version.
+# NB: To use local you will need to copy multigtfs 
+# code to image and update requirements.txt
 WORKDIR /code
 RUN pip install -r requirements.txt
 
 # Create volume for feeds
 VOLUME /gtfs/feeds
 
-CMD ["/bin/bash"]
-
+# run_project script passes all arguments except
+# bash to django manage.py script for project
+# runs development server by default
+ENTRYPOINT ["bash", "/code/run_project.sh"]
+CMD ["runserver", "0.0.0.0:8000"]
diff --git a/examples/gtfsproj/run_project.sh b/examples/gtfsproj/run_project.sh
index 110edee..88c7298 100644
--- a/examples/gtfsproj/run_project.sh
+++ b/examples/gtfsproj/run_project.sh
@@ -1,10 +1,24 @@
 #!/bin/bash
+set -e
 
 # Create environment variables if not exist
-ENVIRONMENT_FILE=.env2
+ENVIRONMENT_FILE=".env"
 if [ ! -f $ENVIRONMENT_FILE ]; then
-    echo "Create default environment from example"
-    cp .env.example $ENVIRONMENT_FILE
+  echo "Create default parameters using $ENVIRONMENT_FILE file"
+  cp .env.example $ENVIRONMENT_FILE
+fi
+
+# If no arguments provided then run server on port 8000
+if [ $# -eq 0 ]; then
+  # If no arguments provided then run server on port 8000
+  exec ./manage.py runserver 0.0.0.0:8000
+else
+  if [ $1 = "bash" ]; then
+    # If bash first argument then use that for all arguments
+    exec "$@"
+  else
+    # Otherwise pass arguments to django manage.py script
+    exec ./manage.py "$@"
+  fi
 fi
 
-./manage.py runserver 0.0.0.0:8000

From 07c0f9567b5f38319026ba775bb6dd3efa7442d0 Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@gmail.com>
Date: Tue, 3 Oct 2017 12:11:32 +1300
Subject: [PATCH 12/18] Docker available

---
 examples/gtfsproj/Dockerfile     |  5 ++-
 examples/gtfsproj/README.md      | 66 +++++++++++++++++++++++++++++++-
 examples/gtfsproj/run_project.sh |  9 +----
 3 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/examples/gtfsproj/Dockerfile b/examples/gtfsproj/Dockerfile
index 14f78a0..617281a 100644
--- a/examples/gtfsproj/Dockerfile
+++ b/examples/gtfsproj/Dockerfile
@@ -23,5 +23,6 @@ VOLUME /gtfs/feeds
 # run_project script passes all arguments except
 # bash to django manage.py script for project
 # runs development server by default
-ENTRYPOINT ["bash", "/code/run_project.sh"]
-CMD ["runserver", "0.0.0.0:8000"]
+RUN chmod +x /code/run_project.sh
+ENTRYPOINT ["/code/run_project.sh"]
+CMD ["./manage.py", "runserver", "0.0.0.0:8000"]
diff --git a/examples/gtfsproj/README.md b/examples/gtfsproj/README.md
index 4cc6dff..3eee525 100644
--- a/examples/gtfsproj/README.md
+++ b/examples/gtfsproj/README.md
@@ -1,10 +1,72 @@
+<h1>Multi GTFS project</h1>
 
-Build docker image.
+<h2>With Docker</h2>
+
+<h3>Build and run</h3>
+
+Build docker image. This will use the settings in teh .env.example
+file, which can be replaced by creating a ".env" file before building
+the image (eg. cp env.example .env).
 
     sudo docker build -t multiproj .
 
 Run docker container as background (to run in forground change 
-"-d" to "-it".
+"-d" to "-it". This will automatically run the development server 
+using the settings in the .env.example file.
 
     sudo docker run -d -p 8000:8000 --name multiproj1 multiproj
 
+Now setup database and superuser (if database does not already exist)
+
+    ./manage.py migrate
+    ./manage.py createsuperuser
+
+Now you can access from browser using host IP address and port 8000.
+
+<h3>Management commands</h3>
+
+You can run django management commands as follows:
+
+    sudo docker exec -it multiproj1 ./manage.py help
+
+For example, to load a new feed you can do the following (assuming 
+container name is "multiproj1"). NB: The first command copies a 
+file from host system to the container. 
+
+    cat /host/feeds/feed.zip | sudo docker exec -i multiproj1 sh -c 'cat > /gtfs/feeds/feed.zip'
+    sudo docker exec -it multiproj1 ./manage.py importgtfs /gtfs/feeds/feed.zip
+
+To specify a feed name rather than the defaul use the following.
+
+    sudo docker exec -it multiproj1 ./manage.py importgtfs --name "Feed name" /feeds/feed.zip
+
+<h2>Without Docker</h2>
+
+The following applies to Ubunutu
+
+    sudo apt-get install -y git python-pip python-virtualenv spatialite-bin gdal-bin
+ 
+    cd ~/
+    git clone https://github.com/alaw005/django-multi-gtfs.git
+ 
+    # Navigate to project folder
+    cd django-multi-gtfs/examples/multiproj
+ 
+    # Create and activate new virtual environment (myenv). 
+    # Use "deactivate" to deactivate virtualenv.
+    virtualenv --always-copy myenv
+    source myenv/bin/activate
+ 
+    pip install -r requirements.txt
+ 
+    # Create multigtfs tables in database
+    ./manage.py migrate
+ 
+    # Create db.sqlite3, superuser. Enter "yes" to create superuser and 
+    # then enter username and password when prompted (you can leave email address blank)
+    ./manage.py createsuperuser
+ 
+    # Run
+    ./manage.py runserver 0.0.0.0:8000
+
+Now you can access from browser using host IP address and port 8000.
diff --git a/examples/gtfsproj/run_project.sh b/examples/gtfsproj/run_project.sh
index 88c7298..996da2c 100644
--- a/examples/gtfsproj/run_project.sh
+++ b/examples/gtfsproj/run_project.sh
@@ -13,12 +13,5 @@ if [ $# -eq 0 ]; then
   # If no arguments provided then run server on port 8000
   exec ./manage.py runserver 0.0.0.0:8000
 else
-  if [ $1 = "bash" ]; then
-    # If bash first argument then use that for all arguments
-    exec "$@"
-  else
-    # Otherwise pass arguments to django manage.py script
-    exec ./manage.py "$@"
-  fi
+  exec "$@"
 fi
-

From 905261aea0a78732d74e7aaecdedb419a579b903 Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@gmail.com>
Date: Tue, 3 Oct 2017 12:24:28 +1300
Subject: [PATCH 13/18] Update readment for multiproj

---
 examples/gtfsproj/README.md | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/examples/gtfsproj/README.md b/examples/gtfsproj/README.md
index 3eee525..c241be8 100644
--- a/examples/gtfsproj/README.md
+++ b/examples/gtfsproj/README.md
@@ -1,6 +1,14 @@
 <h1>Multi GTFS project</h1>
 
-<h2>With Docker</h2>
+This is an alternative example project. It is largely based on the 
+"explore" example project but has been recreated with slightly different
+structure. 
+
+The intention is that this example will ultimately provide a  
+slightly different experience. This will include more mapping (possibly
+using leaflet), new template (e.g. bootstrap 4) and different navigation.
+
+<h2>Run with Docker</h2>
 
 <h3>Build and run</h3>
 
@@ -8,18 +16,27 @@ Build docker image. This will use the settings in teh .env.example
 file, which can be replaced by creating a ".env" file before building
 the image (eg. cp env.example .env).
 
+    # Get source code
+    git clone https://github.com/alaw005/django-multi-gtfs.git
+    cd django-multi-gtfs/examples/gtfsproj
+
+    # Build image
     sudo docker build -t multiproj .
 
 Run docker container as background (to run in forground change 
 "-d" to "-it". This will automatically run the development server 
 using the settings in the .env.example file.
 
+    # Create container
     sudo docker run -d -p 8000:8000 --name multiproj1 multiproj
 
-Now setup database and superuser (if database does not already exist)
+Now setup database and superuser, refer management commands below.
+This is only required if database does not already exist or multgtfs
+has been updated (in which case need to migrate only)
 
-    ./manage.py migrate
-    ./manage.py createsuperuser
+    # Setup database (if required)
+    sudo docker exec -it multiproj1 ./manage.py migrate
+    sudo docker exec -it multiproj1 ./manage.py createsuperuser
 
 Now you can access from browser using host IP address and port 8000.
 
@@ -40,7 +57,7 @@ To specify a feed name rather than the defaul use the following.
 
     sudo docker exec -it multiproj1 ./manage.py importgtfs --name "Feed name" /feeds/feed.zip
 
-<h2>Without Docker</h2>
+<h2>Run without Docker</h2>
 
 The following applies to Ubunutu
 

From d89d6552b0cd3003fa8879c2c70c3bb55a69c5db Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@gmail.com>
Date: Tue, 3 Oct 2017 12:33:59 +1300
Subject: [PATCH 14/18] Update readme for env variables

---
 examples/gtfsproj/README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/examples/gtfsproj/README.md b/examples/gtfsproj/README.md
index c241be8..5e54330 100644
--- a/examples/gtfsproj/README.md
+++ b/examples/gtfsproj/README.md
@@ -87,3 +87,21 @@ The following applies to Ubunutu
     ./manage.py runserver 0.0.0.0:8000
 
 Now you can access from browser using host IP address and port 8000.
+
+<h2>Environment variables</h2>
+
+You can either set environment variables in the .env file as per above or directly
+at command line when you create the container. For example, to use existing postgis database:
+
+    sudo docker run -d -p 8000:8000 --name multiproj1 -e DATABASE_URL=postgis://USER:PASSWORD@HOST:PORT/DBNAME  multiproj
+
+The environment variables you can change are identified in the following file:
+
+    django-multi-gtfs/examples/gtfsproj/gtfsproj/settings.py
+
+They all use the config() function e.g. SECRET_KEY is set in the following example,
+indicated by the "config('SECRET_KEY'" section.
+
+    SECRET_KEY = config('SECRET_KEY', default='+$8pgzf)luxklr(rhzg4!$6+b^2hbw*-frvh_2-7an9-_==n_u', cast=str)
+
+

From a21102b066cdcb17406ac901531a6fb4cf17558f Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@users.noreply.github.com>
Date: Tue, 3 Oct 2017 16:40:54 +1300
Subject: [PATCH 15/18] Update README.md

---
 examples/gtfsproj/README.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/examples/gtfsproj/README.md b/examples/gtfsproj/README.md
index 5e54330..d00a438 100644
--- a/examples/gtfsproj/README.md
+++ b/examples/gtfsproj/README.md
@@ -57,6 +57,26 @@ To specify a feed name rather than the defaul use the following.
 
     sudo docker exec -it multiproj1 ./manage.py importgtfs --name "Feed name" /feeds/feed.zip
 
+<h3>Creating postgres database (assumes server already running)</h3>
+
+At the command line (as long as postgres is installed):
+
+    # Create database
+    createdb -h HOST -p 5432 -U USERNAME multigtfs
+
+    # Install postgis extension
+    psql -h HOST -p 5432 -U USERNAME -d multigtfs -c "CREATE EXTENSION postgis;"
+
+Now initiatise the database using multigtfs:
+
+	# Configure database
+    sudo docker exec -it multigtfs ./manage.py migrate
+
+    # Create superuser
+    sudo docker exec -it multigtfs ./manage.py createsuperuser
+
+That's it.
+
 <h2>Run without Docker</h2>
 
 The following applies to Ubunutu

From 14b3fabce3ca73f9f61a04d4ea8d7719aa83fad2 Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@gmail.com>
Date: Sat, 7 Oct 2017 12:54:26 +1300
Subject: [PATCH 16/18] Prevent admin feed delete listing all objects

---
 examples/explore/exploreproj/settings.py      |  6 ++-
 .../templates/admin/delete_confirmation.html  | 50 ++++++++++++++++++
 .../admin/delete_selected_confirmation.html   | 51 +++++++++++++++++++
 3 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 multigtfs/templates/admin/delete_confirmation.html
 create mode 100644 multigtfs/templates/admin/delete_selected_confirmation.html

diff --git a/examples/explore/exploreproj/settings.py b/examples/explore/exploreproj/settings.py
index 5f30f6c..c23f048 100644
--- a/examples/explore/exploreproj/settings.py
+++ b/examples/explore/exploreproj/settings.py
@@ -21,7 +21,11 @@
 ALLOWED_HOSTS = config('ALLOWED_HOSTS', default='', cast=Csv())
 
 # Application definition
+# NB new apps need to be placed first for their templates
+# to override subsequent apps
 INSTALLED_APPS = [
+    'exploreapp',
+    'multigtfs',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -29,8 +33,6 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.gis',
-    'exploreapp',
-    'multigtfs',
 ]
 
 LOCAL_INSTALLED_APPS = list(config('LOCAL_INSTALLED_APPS',
diff --git a/multigtfs/templates/admin/delete_confirmation.html b/multigtfs/templates/admin/delete_confirmation.html
new file mode 100644
index 0000000..403f560
--- /dev/null
+++ b/multigtfs/templates/admin/delete_confirmation.html
@@ -0,0 +1,50 @@
+{% extends "admin/base_site.html" %}
+{% load i18n admin_urls static %}
+
+{% block extrahead %}
+    {{ block.super }}
+    {{ media }}
+    <script type="text/javascript" src="{% static 'admin/js/cancel.js' %}"></script>
+{% endblock %}
+
+{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation{% endblock %}
+
+{% block breadcrumbs %}
+<div class="breadcrumbs">
+<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
+&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
+&rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst|escape }}</a>
+&rsaquo; <a href="{% url opts|admin_urlname:'change' object.pk|admin_urlquote %}">{{ object|truncatewords:"18" }}</a>
+&rsaquo; {% trans 'Delete' %}
+</div>
+{% endblock %}
+
+{% block content %}
+{% if perms_lacking %}
+    <p>{% blocktrans with escaped_object=object %}Deleting the {{ object_name }} '{{ escaped_object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}</p>
+    <ul>
+    {% for obj in perms_lacking %}
+        <li>{{ obj }}</li>
+    {% endfor %}
+    </ul>
+{% elif protected %}
+    <p>{% blocktrans with escaped_object=object %}Deleting the {{ object_name }} '{{ escaped_object }}' would require deleting the following protected related objects:{% endblocktrans %}</p>
+    <ul>
+    {% for obj in protected %}
+        <li>{{ obj }}</li>
+    {% endfor %}
+    </ul>
+{% else %}
+    <p>{% blocktrans with escaped_object=object %}Are you sure you want to delete the {{ object_name }} "{{ escaped_object }}"? All of the following related items will be deleted:{% endblocktrans %}</p>
+    {% include "admin/includes/object_delete_summary.html" %}
+    <form method="post">{% csrf_token %}
+    <div>
+    <input type="hidden" name="post" value="yes" />
+    {% if is_popup %}<input type="hidden" name="{{ is_popup_var }}" value="1" />{% endif %}
+    {% if to_field %}<input type="hidden" name="{{ to_field_var }}" value="{{ to_field }}" />{% endif %}
+    <input type="submit" value="{% trans "Yes, I'm sure" %}" />
+    <a href="#" class="button cancel-link">{% trans "No, take me back" %}</a>
+    </div>
+    </form>
+{% endif %}
+{% endblock %}
diff --git a/multigtfs/templates/admin/delete_selected_confirmation.html b/multigtfs/templates/admin/delete_selected_confirmation.html
new file mode 100644
index 0000000..3af3112
--- /dev/null
+++ b/multigtfs/templates/admin/delete_selected_confirmation.html
@@ -0,0 +1,51 @@
+{% extends "admin/base_site.html" %}
+{% load i18n l10n admin_urls static %}
+
+{% block extrahead %}
+    {{ block.super }}
+    {{ media }}
+    <script type="text/javascript" src="{% static 'admin/js/cancel.js' %}"></script>
+{% endblock %}
+
+{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation delete-selected-confirmation{% endblock %}
+
+{% block breadcrumbs %}
+<div class="breadcrumbs">
+<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
+&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
+&rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
+&rsaquo; {% trans 'Delete multiple objects' %}
+</div>
+{% endblock %}
+
+{% block content %}
+{% if perms_lacking %}
+    <p>{% blocktrans %}Deleting the selected {{ objects_name }} would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}</p>
+    <ul>
+    {% for obj in perms_lacking %}
+        <li>{{ obj }}</li>
+    {% endfor %}
+    </ul>
+{% elif protected %}
+    <p>{% blocktrans %}Deleting the selected {{ objects_name }} would require deleting the following protected related objects:{% endblocktrans %}</p>
+    <ul>
+    {% for obj in protected %}
+        <li>{{ obj }}</li>
+    {% endfor %}
+    </ul>
+{% else %}
+    <p>{% blocktrans %}Are you sure you want to delete the selected {{ objects_name }}? All of the following objects and their related items will be deleted:{% endblocktrans %}</p>
+    {% include "admin/includes/object_delete_summary.html" %}
+    <form method="post">{% csrf_token %}
+    <div>
+    {% for obj in queryset %}
+    <input type="hidden" name="{{ action_checkbox_name }}" value="{{ obj.pk|unlocalize }}" />
+    {% endfor %}
+    <input type="hidden" name="action" value="delete_selected" />
+    <input type="hidden" name="post" value="yes" />
+    <input type="submit" value="{% trans "Yes, I'm sure" %}" />
+    <a href="#" class="button cancel-link">{% trans "No, take me back" %}</a>
+    </div>
+    </form>
+{% endif %}
+{% endblock %}

From 1d9915c541d52c00afb9adaa21643ed2e2946247 Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@gmail.com>
Date: Sat, 7 Oct 2017 13:21:45 +1300
Subject: [PATCH 17/18] Fix bug in settings missing gis

---
 examples/gtfsproj/gtfsproj/settings.py | 8 +++++---
 examples/gtfsproj/run_project.sh       | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/examples/gtfsproj/gtfsproj/settings.py b/examples/gtfsproj/gtfsproj/settings.py
index d089de7..01186cf 100644
--- a/examples/gtfsproj/gtfsproj/settings.py
+++ b/examples/gtfsproj/gtfsproj/settings.py
@@ -30,16 +30,18 @@
 
 
 # Application definition
-
+# NB new apps need to be placed first for their templates
+# to override subsequent apps
 INSTALLED_APPS = [
+    'gtfsapp',
+    'multigtfs',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'gtfsapp',
-    'multigtfs',
+    'django.contrib.gis',
 ]
 
 MIDDLEWARE = [
diff --git a/examples/gtfsproj/run_project.sh b/examples/gtfsproj/run_project.sh
index 996da2c..529ef45 100644
--- a/examples/gtfsproj/run_project.sh
+++ b/examples/gtfsproj/run_project.sh
@@ -11,6 +11,7 @@ fi
 # If no arguments provided then run server on port 8000
 if [ $# -eq 0 ]; then
   # If no arguments provided then run server on port 8000
+  echo "Run development server on port 8000"
   exec ./manage.py runserver 0.0.0.0:8000
 else
   exec "$@"

From 5d589cebf8748b333cfc749fdfdd117db1321e75 Mon Sep 17 00:00:00 2001
From: Adam Lawrence <alaw005@gmail.com>
Date: Sat, 7 Oct 2017 14:06:39 +1300
Subject: [PATCH 18/18] Add gunicorn as server option

---
 examples/gtfsproj/gtfsproj/settings.py | 3 ++-
 examples/gtfsproj/requirements.txt     | 3 +++
 examples/gtfsproj/run_project.sh       | 9 +++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/examples/gtfsproj/gtfsproj/settings.py b/examples/gtfsproj/gtfsproj/settings.py
index 01186cf..e486728 100644
--- a/examples/gtfsproj/gtfsproj/settings.py
+++ b/examples/gtfsproj/gtfsproj/settings.py
@@ -122,4 +122,5 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.11/howto/static-files/
 
-STATIC_URL = '/static/'
+STATIC_URL = config('STATIC_URL', default='/static/')
+STATIC_ROOT = config('STATIC_ROOT', default='/var/www/multigtfs/static')
diff --git a/examples/gtfsproj/requirements.txt b/examples/gtfsproj/requirements.txt
index 4122dde..0f82aa8 100644
--- a/examples/gtfsproj/requirements.txt
+++ b/examples/gtfsproj/requirements.txt
@@ -11,3 +11,6 @@ python-decouple
 
 # Connect to postgresql database
 psycopg2
+
+# Install gunicorn server 
+gunicorn
diff --git a/examples/gtfsproj/run_project.sh b/examples/gtfsproj/run_project.sh
index 529ef45..652be41 100644
--- a/examples/gtfsproj/run_project.sh
+++ b/examples/gtfsproj/run_project.sh
@@ -10,9 +10,18 @@ fi
 
 # If no arguments provided then run server on port 8000
 if [ $# -eq 0 ]; then
+
   # If no arguments provided then run server on port 8000
   echo "Run development server on port 8000"
   exec ./manage.py runserver 0.0.0.0:8000
+
+elif [ "$1" == "gunicorn" ]; then
+
+  echo "Run gunicorn server on port 8000"
+  exec gunicorn --bind 0.0.0.0:8000 gtfsproj.wsgi
+
 else
+
   exec "$@"
+
 fi