Merge branch 'develop'

azavea · Dec 12, 2016 · de35e39 · de35e39
2 parents 7886e31 + 52e362f
commit de35e39
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 16 deletions.
diff --git a/deployment/ansible/group_vars/development_template b/deployment/ansible/group_vars/development_template
@@ -24,3 +24,6 @@ use_s3_storage: false
 default_admin_username: 'admin'
 default_admin_password: 'admin'
 default_admin_email: 'systems+cac@azavea.com'
+
+# for bike share directions
+bcycle_api_key: ''
diff --git a/deployment/ansible/roles.yml b/deployment/ansible/roles.yml
@@ -29,4 +29,4 @@
   version: 0.1.0
 
 - src: azavea.postgresql-support
-  version: 0.3.1
+  version: 0.3.2
diff --git a/deployment/ansible/roles/cac-tripplanner.otp-data/defaults/main.yml b/deployment/ansible/roles/cac-tripplanner.otp-data/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+bikeshare_update_interval_s: 500
+bikeshare_update_network_name: 'Indego'
+bikeshare_update_url: 'https://publicapi.bcycle.com/api/1.0/ListProgramKiosks/3'
diff --git a/deployment/ansible/roles/cac-tripplanner.otp-data/tasks/main.yml b/deployment/ansible/roles/cac-tripplanner.otp-data/tasks/main.yml
@@ -42,11 +42,22 @@
 - name: Create Graph Directory
   file: path="{{ otp_data_dir}}/{{ otp_router }}" state=directory
 
+- 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 }}
   notify: Restart OpenTripPlanner
   when: develop or test
 
 - name: Copy Local Graph to Graph Directory (production)
   copy: src=./otp_data/Graph.obj dest="{{ otp_data_dir }}/{{ otp_router }}/Graph.obj" owner={{ansible_user_id}} group={{ansible_user_id}} mode=0664
+  notify: Restart OpenTripPlanner
   when: production
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
@@ -0,0 +1,12 @@
+{
+    updaters: [
+        {
+            type: "bike-rental",
+            frequencySec: {{ bikeshare_update_interval_s}},
+            network: "{{ bikeshare_update_network_name }}",
+            sourceType: "b-cycle",
+            url: "{{ bikeshare_update_url }}",
+            apiKey: "{{ bcycle_api_key }}"
+        }
+    ]
+}
diff --git a/python/cac_tripplanner/templates/home.html b/python/cac_tripplanner/templates/home.html
@@ -89,10 +89,10 @@ <h3 class="text-center hidden-xs">There are 2 easy ways to use the map:</h3>
             <h1>Featured Locations <small>
                 <a id="viewAllDestinations" href="#">View all &raquo;</a>
             </small></h1>
-            <div id="#destinationsSpinner" class="sk-spinner sk-spinner-three-bounce hidden">
-                <div class="sk-bounce1"></div>
-                <div class="sk-bounce2"></div>
-                <div class="sk-bounce3"></div>
+            <div id="#destinationsSpinner" class="sk-spinner sk-three-bounce hidden">
+                <div class="sk-child sk-bounce1"></div>
+                <div class="sk-child sk-bounce2"></div>
+                <div class="sk-child sk-bounce3"></div>
             </div>
             <div class="row destinations">
                 {% for destination in destinations|slice:":2" %}
@@ -133,10 +133,10 @@ <h5 class="destination-address-2">{{ destination.city }}, {{ destination.state }
                     <h3>GoPhillyGo Spotlight <small>
                         <a id="viewAllArticles" href="#">View all &raquo;</a>
                     </small></h3>
-                    <div id="articlesSpinner" class="sk-spinner sk-spinner-three-bounce hidden">
-                        <div class="sk-bounce1"></div>
-                        <div class="sk-bounce2"></div>
-                        <div class="sk-bounce3"></div>
+                    <div id="articlesSpinner" class="sk-spinner sk-three-bounce hidden">
+                        <div class="sk-child sk-bounce1"></div>
+                        <div class="sk-child sk-bounce2"></div>
+                        <div class="sk-child sk-bounce3"></div>
                     </div>
                     <div class="row articles">
                       {% if community_profile %}

diff --git a/python/cac_tripplanner/templates/map.html b/python/cac_tripplanner/templates/map.html
@@ -104,9 +104,9 @@ <h6>Maximum walking distance</h6>
             </div>
             <div class="sidebar-block sidebar-details">
                 <div class="sk-spinner sk-spinner-three-bounce hidden block block-destination">
-                    <div class="sk-bounce1"></div>
-                    <div class="sk-bounce2"></div>
-                    <div class="sk-bounce3"></div>
+                    <div class="sk-child sk-bounce1"></div>
+                    <div class="sk-child sk-bounce2"></div>
+                    <div class="sk-child sk-bounce3"></div>
                 </div>
                 <div class="destinations">
                 </div>
@@ -179,10 +179,10 @@ <h6>Maximum walking distance</h6>
             </div>
             <div class="sidebar-clip">
                 <div class="sidebar-block sidebar-details">
-                    <div class="sk-spinner sk-spinner-three-bounce hidden">
-                        <div class="sk-bounce1"></div>
-                        <div class="sk-bounce2"></div>
-                        <div class="sk-bounce3"></div>
+                    <div class="sk-spinner sk-three-bounce hidden">
+                        <div class="sk-child sk-bounce1"></div>
+                        <div class="sk-child sk-bounce2"></div>
+                        <div class="sk-child sk-bounce3"></div>
                     </div>
                     <div class="itineraries"></div>
                     <div class="directions-list hidden"></div>