Use Mapbox GL for visualisations in the worked examples

.circleci/config.yml

@@ -83,7 +83,7 @@ executors:
         default: "2015-01-01"
       disaster_end_date:
         type: string
-        default: "2015-01-01"
+        default: "2015-01-01" 
     environment:
         POSTGRES_PASSWORD: flowflow
         MPLBACKEND: "agg"
@@ -108,8 +108,8 @@ executors:
       - image: flowminder/flowdb-<<parameters.flowdb_image>>:$CIRCLE_SHA1
         environment:
           N_DAYS: <<parameters.num_days>>
-          DISASTER_START_DATE: <<parameters.disaster_start_date>>
-          DISASTER_END_DATE: <<parameters.disaster_end_date>>
+          DISASTER_START: <<parameters.disaster_start_date>>
+          DISASTER_END: <<parameters.disaster_end_date>>
           N_SUBSCRIBERS: <<parameters.num_subscribers>>
           N_CELLS: <<parameters.num_cells>>
           N_SITES: <<parameters.num_sites>>

CHANGELOG.md

@@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - The Flowmachine loggers are now initialised only once when flowmachine is imported, with a call to `connect()` only changing the log level [#691](https://github.com/Flowminder/FlowKit/issues/691)
 - The FERNET_KEY environment variable for FlowAuth is now named FLOWAUTH_FERNET_KEY
 - The quick-start script now correctly aborts if one of the FlowKit services doesn't fully start up [#745](https://github.com/Flowminder/flowkit/issues/745)
+- The maps in the worked examples docs pages now appear in any browser
 
 ### Removed
 

Dockerfile

@@ -13,7 +13,7 @@ RUN rm -rf /home/$NB_USER/work
 COPY docs/source/worked_examples/*.ipynb /home/$NB_USER/
 COPY flowmachine /flowmachine
 COPY flowclient /flowclient
-RUN pip install folium /flowclient /flowmachine && \
+RUN pip install geopandas mapboxgl /flowclient /flowmachine && \
     fix-permissions $CONDA_DIR && \
     fix-permissions /home/$NB_USER && \
     cd /home/$NB_USER/ && jupyter trust -y *

Makefile

@@ -21,7 +21,7 @@
 DOCKER_COMPOSE_FILE ?= docker-compose.yml
 DOCKER_COMPOSE_FILE_BUILD ?= docker-compose-build.yml
 FLOWDB_SERVICES ?= flowdb_testdata
-DOCKER_SERVICES ?= $(FLOWDB_SERVICES) flowapi flowmachine flowauth flowmachine_query_locker flowetl flowetldb worked_examples
+DOCKER_SERVICES ?= $(FLOWDB_SERVICES) flowapi flowmachine flowauth flowmachine_query_locker flowetl flowetl_db worked_examples
 export DOCKER_FLOWDB_HOST=$(word 1, $(FLOWDB_SERVICES))
 
 

docker-compose.yml

@@ -126,10 +126,11 @@ services:
       - FLOWDB_HOST=${DOCKER_FLOWDB_HOST:?Must set DOCKER_FLOWDB_HOST env var}
       - FLOWMACHINE_FLOWDB_USER=${FLOWMACHINE_FLOWDB_USER:?Must set FLOWMACHINE_FLOWDB_USER env var}
       - FLOWMACHINE_FLOWDB_PASSWORD=${FLOWMACHINE_FLOWDB_PASSWORD:?Must set FLOWMACHINE_FLOWDB_PASSWORD env var}
-      - REDIS_HOST=query_locker
+      - REDIS_HOST=flowmachine_query_locker
       - REDIS_PORT=6379
       - REDIS_PASSWORD=${REDIS_PASSWORD:?Must set REDIS_PASSWORD env var}
       - FLOWAPI_URL=http://flowapi:9090
+      - MAPBOX_ACCESS_TOKEN=$MAPBOX_ACCESS_TOKEN
     restart: always
     networks:
       - db

docs/Pipfile

@@ -24,17 +24,16 @@ marshmallow-oneofschema = {editable = true,ref = "8195dc3e595fa33a5f007f10ba7cfc
 descartes = "*"
 flowclient = {editable = true,path = "./../flowclient"}
 flowapi = {editable = true,path = "./../flowapi"}
+flowkit-jwt-generator = {editable = true,path = "./../flowkit_jwt_generator"}
 mktheapidocs = "*"
 mknotebooks = "*"
 flask-jwt-extended = "*"
 quart = "*"
-python-dotenv = "*"
 structlog = "*"
-folium = "*"
+mapboxgl = "*"
 
 [dev-packages]
 jupyterlab = "*"
-flowkit-jwt-generator = {editable = true,path = "./../flowkit_jwt_generator"}
 
 [requires]
 python_version = "3.7"