From 27efebab99c47e6b40cbd7f986bedfee40d4b33d Mon Sep 17 00:00:00 2001 From: Finn Date: Wed, 8 Dec 2021 20:49:53 -0500 Subject: [PATCH 1/9] add canbics layer to map --- mapApp/static/mapApp/js/index.js | 2 +- mapApp/static/mapApp/js/map.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mapApp/static/mapApp/js/index.js b/mapApp/static/mapApp/js/index.js index 87d64e2a..429e8195 100755 --- a/mapApp/static/mapApp/js/index.js +++ b/mapApp/static/mapApp/js/index.js @@ -39,7 +39,7 @@ var map = L.map('map', { minZoom: 2, zoom: 4, zoomControl: false, - layers: [OpenStreetMap, CyclOSM, stravaHM, incidentData, alertAreas], + layers: [OpenStreetMap, CyclOSM, canBICS, stravaHM, incidentData, alertAreas], worldCopyJump: true, }); diff --git a/mapApp/static/mapApp/js/map.js b/mapApp/static/mapApp/js/map.js index 7234158b..70300c40 100755 --- a/mapApp/static/mapApp/js/map.js +++ b/mapApp/static/mapApp/js/map.js @@ -10,8 +10,11 @@ var MapQuestOpen_OSM = L.tileLayer('http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z CyclOSM = L.tileLayer('https://{s}.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png', { minZoom: 14, attribution: '© OpenStreetMap contributors' - }) + }), Esri_Streets_Basemap = L.esri.basemapLayer("Streets"), + canBICS = L.esri.featureLayer({ + url: 'https://services.arcgis.com/E5vyYQKPMX5X3R3H/arcgis/rest/services/OSM_CAN_BICS_V1/FeatureServer/0' + }), Mapnik_BW = L.tileLayer('http://{s}.www.toolserver.org/tiles/bw-mapnik/{z}/{x}/{y}.png', { attribution: '© OpenStreetMap contributors, CC-BY-SA', subdomains: '1234' From 83612ac1e31a21ceff6b27d46d7ceb0dae7c6195 Mon Sep 17 00:00:00 2001 From: Finn Date: Wed, 8 Dec 2021 21:06:12 -0500 Subject: [PATCH 2/9] add styling --- mapApp/static/mapApp/js/map.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mapApp/static/mapApp/js/map.js b/mapApp/static/mapApp/js/map.js index 70300c40..4d9913f5 100755 --- a/mapApp/static/mapApp/js/map.js +++ b/mapApp/static/mapApp/js/map.js @@ -13,7 +13,11 @@ var MapQuestOpen_OSM = L.tileLayer('http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z }), Esri_Streets_Basemap = L.esri.basemapLayer("Streets"), canBICS = L.esri.featureLayer({ - url: 'https://services.arcgis.com/E5vyYQKPMX5X3R3H/arcgis/rest/services/OSM_CAN_BICS_V1/FeatureServer/0' + url: 'https://services.arcgis.com/E5vyYQKPMX5X3R3H/arcgis/rest/services/OSM_CAN_BICS_V1/FeatureServer/0', + style: { + color: "#BA55D3", + weight: 2 + } }), Mapnik_BW = L.tileLayer('http://{s}.www.toolserver.org/tiles/bw-mapnik/{z}/{x}/{y}.png', { attribution: '© OpenStreetMap contributors, CC-BY-SA', From 30458b47ab06eeb65ca4607b8cfbc63ed6834159 Mon Sep 17 00:00:00 2001 From: Finn Date: Wed, 8 Dec 2021 21:25:29 -0500 Subject: [PATCH 3/9] Add layer toggle to legend --- mapApp/static/mapApp/css/index.css | 9 ++++++++- mapApp/templates/mapApp/map_legend.html | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/mapApp/static/mapApp/css/index.css b/mapApp/static/mapApp/css/index.css index 523236d3..68e8adc7 100755 --- a/mapApp/static/mapApp/css/index.css +++ b/mapApp/static/mapApp/css/index.css @@ -139,6 +139,13 @@ span.date{ display: inline-block; } +.canBICS-line { + border-bottom: 2px solid #BA55D3; + height: 2px; + width: 150px; + display: inline-block; +} + .bikerack{ display:inline-block; background: #666666; @@ -205,4 +212,4 @@ span.date{ #basemap-about{ width: 190px; padding: 5px 5px 10px 10px; -} \ No newline at end of file +} diff --git a/mapApp/templates/mapApp/map_legend.html b/mapApp/templates/mapApp/map_legend.html index c7fe64eb..e5d7fc44 100755 --- a/mapApp/templates/mapApp/map_legend.html +++ b/mapApp/templates/mapApp/map_legend.html @@ -51,6 +51,14 @@ +
+ + {% trans "Bikeway Classification" %} +
+ +
+
+
{% trans "Alert Areas" %} From b12b05e4c666ced3e2c974cbf50ee7dfde4dec14 Mon Sep 17 00:00:00 2001 From: Finn Date: Wed, 2 Mar 2022 00:31:33 -0500 Subject: [PATCH 4/9] change color to blue to distinguish from strava better --- mapApp/static/mapApp/css/index.css | 2 +- mapApp/static/mapApp/js/map.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mapApp/static/mapApp/css/index.css b/mapApp/static/mapApp/css/index.css index 4c48db02..1aabaec9 100755 --- a/mapApp/static/mapApp/css/index.css +++ b/mapApp/static/mapApp/css/index.css @@ -144,7 +144,7 @@ span.date{ } .canBICS-line { - border-bottom: 2px solid #BA55D3; + border-bottom: 2px solid #386cb0; height: 2px; width: 150px; display: inline-block; diff --git a/mapApp/static/mapApp/js/map.js b/mapApp/static/mapApp/js/map.js index 4d9913f5..f9421036 100755 --- a/mapApp/static/mapApp/js/map.js +++ b/mapApp/static/mapApp/js/map.js @@ -15,7 +15,7 @@ var MapQuestOpen_OSM = L.tileLayer('http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z canBICS = L.esri.featureLayer({ url: 'https://services.arcgis.com/E5vyYQKPMX5X3R3H/arcgis/rest/services/OSM_CAN_BICS_V1/FeatureServer/0', style: { - color: "#BA55D3", + color: "#386cb0", weight: 2 } }), From e646e3a231906907a0c9b4b976e1d50d84a111c1 Mon Sep 17 00:00:00 2001 From: Finn Date: Wed, 2 Mar 2022 00:34:01 -0500 Subject: [PATCH 5/9] add about modal for canbics --- mapApp/templates/mapApp/map_legend.html | 3 ++- mapApp/templates/mapApp/util/tips.html | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/mapApp/templates/mapApp/map_legend.html b/mapApp/templates/mapApp/map_legend.html index 1406c355..277e924c 100755 --- a/mapApp/templates/mapApp/map_legend.html +++ b/mapApp/templates/mapApp/map_legend.html @@ -60,7 +60,8 @@
- {% trans "Bikeway Classification" %} + {% trans "Can-BICS" %} +
diff --git a/mapApp/templates/mapApp/util/tips.html b/mapApp/templates/mapApp/util/tips.html index 750a389d..67fcc1e0 100755 --- a/mapApp/templates/mapApp/util/tips.html +++ b/mapApp/templates/mapApp/util/tips.html @@ -63,6 +63,27 @@

{% trans "Rider density" %}

+ + +