Merge branch 'HH-feat-2' into 'qa'

removed js library for dark mode basemap

See merge request kdam0/helpthehomeless!6

6 files changed, 10 insertions, 21 deletions

diff --git a/mobile/.expo/packager-info.json b/mobile/.expo/packager-info.json
index 606e044..7391ba7 100644
--- a/mobile/.expo/packager-info.json
+++ b/mobile/.expo/packager-info.json
@@ -1,9 +1,9 @@
 {
   "devToolsPort": 19002,
-  "expoServerPort": 19000,
-  "packagerPort": 19001,
-  "packagerPid": 29021,
-  "expoServerNgrokUrl": "https://h6-m98.csc301dreamteam.mobile.exp.direct",
-  "packagerNgrokUrl": "https://packager.h6-m98.csc301dreamteam.mobile.exp.direct",
-  "ngrokPid": 29069
+  "expoServerPort": null,
+  "packagerPort": null,
+  "packagerPid": null,
+  "expoServerNgrokUrl": null,
+  "packagerNgrokUrl": null,
+  "ngrokPid": null
 }
\ No newline at end of file
diff --git a/web/package-lock.json b/web/package-lock.json
index 8daafcc..25902a1 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -522,11 +522,6 @@
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
       "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4="
     },
-    "leaflet.tilelayer.colorfilter": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/leaflet.tilelayer.colorfilter/-/leaflet.tilelayer.colorfilter-1.2.5.tgz",
-      "integrity": "sha512-wUvqVlpEofDEDi0ocXApXAcz1l06RsNBEw3L/2ColaygDPERswgas2Jgv/DVrWrVd0HQAxDerwFqOtBI+zbw3w=="
-    },
     "lodash": {
       "version": "4.17.11",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
diff --git a/web/package.json b/web/package.json
index 01a4b43..8a59f6e 100644
--- a/web/package.json
+++ b/web/package.json
@@ -11,7 +11,6 @@
     "express": "~4.16.0",
     "geojson-geometries-lookup": "^0.3.0",
     "http-errors": "~1.6.2",
-    "leaflet.tilelayer.colorfilter": "^1.2.5",
     "mongodb": "*",
     "mongoose": "*",
     "morgan": "~1.9.0",
diff --git a/web/public/javascripts/leaflet-tilelayer-colorfilter.min.js b/web/public/javascripts/leaflet-tilelayer-colorfilter.min.js
deleted file mode 120000
index d817736..0000000
--- a/web/public/javascripts/leaflet-tilelayer-colorfilter.min.js
+++ /dev/null
@@ -1 +0,0 @@
-../../node_modules/leaflet.tilelayer.colorfilter/src/leaflet-tilelayer-colorfilter.min.js
\ No newline at end of file
diff --git a/web/public/javascripts/map.js b/web/public/javascripts/map.js
index 23f4ec0..db50cbe 100644
--- a/web/public/javascripts/map.js
+++ b/web/public/javascripts/map.js
@@ -216,26 +216,23 @@ function initLiveLoading() {
   }
 }
 
-function getModeFilter(darkmode) {
-  return darkmode ? ['hue:186deg', 'invert:100%'] : [];
-}
-
 function toggleDarkMap(e) {
-  mainTileLayer.updateFilter(getModeFilter(!darkmode));
   darkmode = !darkmode;
+  document.getElementById('map').style['-webkit-filter'] =
+    document.getElementById('sidebar').style['-webkit-filter'] =
+    (darkmode) ? "invert(100%)" : "invert(0%)";
 }
 
 let toggleDarkModeBtn = document.getElementById('toggle-btn')
   .addEventListener("click", toggleDarkMap);
 
 // different basemap
-let mainTileLayer = L.tileLayer.colorFilter('https://stamen-tiles-{s}.a.ssl.fastly.net/toner-lite/{z}/{x}/{y}{r}.{ext}', {
+let mainTileLayer = L.tileLayer('https://stamen-tiles-{s}.a.ssl.fastly.net/toner-lite/{z}/{x}/{y}{r}.{ext}', {
   attribution: 'Map tiles by <a href="http://stamen.com">Stamen Design</a>, <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a> &mdash; Map data &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
   subdomains: 'abcd',
   minZoom: 0,
   maxZoom: 18,
   ext: 'png',
-  filter: [],
 }).addTo(map);
 
 // keep track of the boundary of the markers so that we can update the
diff --git a/web/views/layout.pug b/web/views/layout.pug
index 09e01fe..900a601 100644
--- a/web/views/layout.pug
+++ b/web/views/layout.pug
@@ -5,6 +5,5 @@ html
     link(rel='stylesheet', href='https://unpkg.com/leaflet@1.4.0/dist/leaflet.css')
     link(rel='stylesheet', href='/stylesheets/style.css')
     script(src='https://unpkg.com/leaflet@1.4.0/dist/leaflet.js')
-    script(type='text/javascript' src='/javascripts/leaflet-tilelayer-colorfilter.min.js')
   body
     block content