Merge pull request #21 from CityofEdmonton/update-basemap

update basemap
CityofEdmonton · Oct 25, 2023 · fac6a31 · fac6a31
2 parents 9b1e84a + a379477
commit fac6a31
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -19,12 +19,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get -y update \
 
 # Freezing packages:
 # get from https://packagemanager.rstudio.com/client/#/repos/1/overview
+ARG PACKAGEDATE=2023-10-23
 ARG TARGETPLATFORM
 RUN case ${TARGETPLATFORM} in \
   "linux/amd64") \
-  echo "options(repos = c(REPO_NAME = 'https://packagemanager.rstudio.com/cran/__linux__/jammy/2023-05-30'))" >> $R_HOME/etc/Rprofile.site ;; \
+  echo "options(repos = c(REPO_NAME = 'https://packagemanager.rstudio.com/cran/__linux__/jammy/${PACKAGEDATE}'))" >> $R_HOME/etc/Rprofile.site ;; \
   "linux/arm64") \
-  echo "options(repos = c(REPO_NAME = 'https://packagemanager.rstudio.com/cran/2023-05-30'))" >> $R_HOME/etc/Rprofile.site ;; \
+  echo "options(repos = c(REPO_NAME = 'https://packagemanager.rstudio.com/cran/${PACKAGEDATE}'))" >> $R_HOME/etc/Rprofile.site ;; \
 esac
 
 # https://github.com/daattali/shinycssloaders/issues/82

diff --git a/dashboard_utils.R b/dashboard_utils.R
@@ -28,6 +28,11 @@ get_configs = memoise(get_configs_from_file)
 
 connect_ES <- function() {
   prop <- get_configs()
+  # Uncomment the below 3 lines when connecting to an elasticsearch server
+  # without certificates (e.g. a temporary test server)
+  # crul::set_opts(ssl_verifyhost = FALSE)
+  # crul::set_opts(ssl_verifypeer = FALSE)
+  # crul::set_opts(ssl_verifystatus = FALSE)
   x <- elastic::connect(host = prop$apiurl,
                         user = prop$apiuser,
                         pwd = prop$apipassword,

diff --git a/sentiment_neighbourhoods_module.R b/sentiment_neighbourhoods_module.R
@@ -85,7 +85,7 @@ mapPlot <- function(input, output, session,
     min.lng = as.numeric(bbox$xmin)
     max.lng = as.numeric(bbox$xmax)
     map = leaflet() %>%
-      addProviderTiles(providers$Stamen.TonerLite, options = providerTileOptions(noWrap = TRUE)) %>%
+      addProviderTiles(providers$Stadia.StamenTonerLite, options = providerTileOptions(noWrap = TRUE)) %>%
       fitBounds(min.lng, min.lat, max.lng, max.lat)
 
     if (nrow(aggregations$hoods.names.buckets) > 0) {