diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index fe38c4fa..7205a0f6 100644
Binary files a/locale/fr/LC_MESSAGES/django.mo and b/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 1944d773..d690ee63 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -1418,6 +1418,10 @@ msgstr "Volume de cyclistes"
msgid "Our rider density data comes directly from the Strava cycling and running mobile tracker application. Using Strava, you can track your cycling commutes and recreational rides using your Android or iPhone."
msgstr "Nos données sur le volume de cyclistes proviennent directement de l’application mobile de localisation de Strava pour les cyclistes et les coureurs. Grâce à Strava, vous pouvez suivre vos déplacements et vos promenades à vélo sur votre appareil Android ou votre iPhone."
+#: .\mapApp\templates\mapApp\util\tips.html:61
+msgid "The Canadian Bikeway Comfort and Safety Classification (Can-BICS) assigns bicycling facilities into three categories (low, medium, or high) based on user comfort and safety."
+msgstr "Le Système de classification du confort et de la sécurité des voies cyclables canadiennes (Can-BICS) classe les installations cyclables en trois catégories (faible, moyen ou élevé) en fonction du confort et de la sécurité des cyclistes."
+
#: .\mapApp\templates\mapApp\vis.html:8
msgid "Bikemaps Data Visualization"
msgstr "Visualisation des données de Bikemaps"
diff --git a/mapApp/static/mapApp/css/index.css b/mapApp/static/mapApp/css/index.css
index bb012434..1aabaec9 100755
--- a/mapApp/static/mapApp/css/index.css
+++ b/mapApp/static/mapApp/css/index.css
@@ -143,6 +143,13 @@ span.date{
display: inline-block;
}
+.canBICS-line {
+ border-bottom: 2px solid #386cb0;
+ height: 2px;
+ width: 150px;
+ display: inline-block;
+}
+
.bikerack{
display:inline-block;
background: #666666;
diff --git a/mapApp/static/mapApp/js/index.js b/mapApp/static/mapApp/js/index.js
index b5626f25..c0a3ac2c 100755
--- a/mapApp/static/mapApp/js/index.js
+++ b/mapApp/static/mapApp/js/index.js
@@ -16,7 +16,7 @@ var map = L.map('map', {
minZoom: 2,
zoom: 4,
zoomControl: false,
- layers: [OpenStreetMap, CyclOSM, stravaHM],
+ layers: [OpenStreetMap, CyclOSM, canBICS, stravaHM],
worldCopyJump: true,
});
@@ -28,7 +28,6 @@ var geocoder = L.Control.geocoder({
placeholder: gettext('Search...'),
errorMessage: gettext('Nothing found.')
}).on('markgeocode', function(result) {
- console.log(result.geocode);
map.fitBounds(result.geocode.bbox);
geocodeMarker && map.removeLayer(geocodeMarker); //remove old marker if it exists
geocodeMarker = new L.Marker(result.geocode.center, {
diff --git a/mapApp/static/mapApp/js/map.js b/mapApp/static/mapApp/js/map.js
index d2334c34..9060fc49 100755
--- a/mapApp/static/mapApp/js/map.js
+++ b/mapApp/static/mapApp/js/map.js
@@ -11,6 +11,9 @@ var MapQuestOpen_OSM = L.tileLayer('http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z
minZoom: 14,
attribution: '© OpenStreetMap contributors'
}),
+ canBICS = L.esri.featureLayer({
+ url: 'https://services.arcgis.com/E5vyYQKPMX5X3R3H/arcgis/rest/services/national/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'
diff --git a/mapApp/templates/mapApp/index.html b/mapApp/templates/mapApp/index.html
index 491da488..59a93438 100755
--- a/mapApp/templates/mapApp/index.html
+++ b/mapApp/templates/mapApp/index.html
@@ -53,6 +53,9 @@
+
+
+