Merge branch 'develop'

azavea · Sep 22, 2017 · 4f9df87 · 4f9df87
2 parents dc199e4 + 630e5bf
commit 4f9df87
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 18 deletions.
diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all
@@ -9,6 +9,9 @@ virtualenv_version: 15.1.0
 
 otp_router: "default"
 
+otp_version: "1.2.0"
+otp_jar_sha1: "a7f659a63a54e894457bab6fc162fb0f47586057"
+
 # used by nginx and gunicorn to set timeouts; OTP defaults to 30s
 otp_session_timeout_s: 30
 

diff --git a/deployment/ansible/group_vars/development_template b/deployment/ansible/group_vars/development_template
@@ -24,6 +24,3 @@ use_s3_storage: false
 default_admin_username: 'admin'
 default_admin_password: 'admin'
 default_admin_email: '[email protected]'
-
-# for bike share directions
-bcycle_api_key: ''
diff --git a/deployment/ansible/roles/cac-tripplanner.otp-data/defaults/main.yml b/deployment/ansible/roles/cac-tripplanner.otp-data/defaults/main.yml
@@ -1,4 +1,3 @@
 ---
-bikeshare_update_interval_s: 500
-bikeshare_update_network_name: 'Indego'
-bikeshare_update_url: 'https://publicapi.bcycle.com/api/1.0/ListProgramKiosks/3'
+bikeshare_update_interval_s: 120
+bikeshare_update_url: 'https://gbfs.bcycle.com/bcycle_indego/'
diff --git a/deployment/ansible/roles/cac-tripplanner.otp-data/tasks/main.yml b/deployment/ansible/roles/cac-tripplanner.otp-data/tasks/main.yml
@@ -44,13 +44,6 @@
 
 - name: Copy Router Configuration to Graph Directory
   template: src=router-config.json.j2 dest={{ otp_data_dir }}/{{ otp_router }}/router-config.json
-  when: not(
-          (bcycle_api_key is undefined)
-          or
-          (bcycle_api_key is none)
-          or
-          (bcycle_api_key | trim == '')
-        )
 
 - name: Move Graph to Graph Directory (test/develop)
   command: mv {{ otp_data_dir }}/Graph.obj {{ otp_data_dir }}/{{ otp_router }}

diff --git a/deployment/ansible/roles/cac-tripplanner.otp-data/templates/router-config.json.j2 b/deployment/ansible/roles/cac-tripplanner.otp-data/templates/router-config.json.j2
@@ -3,10 +3,8 @@
         {
             type: "bike-rental",
             frequencySec: {{ bikeshare_update_interval_s}},
-            network: "{{ bikeshare_update_network_name }}",
-            sourceType: "b-cycle",
-            url: "{{ bikeshare_update_url }}",
-            apiKey: "{{ bcycle_api_key }}"
+            sourceType: "gbfs",
+            url: "{{ bikeshare_update_url }}"
         }
     ]
 }
diff --git a/python/cac_tripplanner/cac_tripplanner/settings.py b/python/cac_tripplanner/cac_tripplanner/settings.py
@@ -14,7 +14,6 @@
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 import yaml
-import logging.config
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
 try: