summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chimere/templates/chimere/blocks/map.html2
-rw-r--r--chimere/templatetags/chimere_tags.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/chimere/templates/chimere/blocks/map.html b/chimere/templates/chimere/blocks/map.html
index 4affb19..e00ff8b 100644
--- a/chimere/templates/chimere/blocks/map.html
+++ b/chimere/templates/chimere/blocks/map.html
@@ -20,7 +20,7 @@
$(function() {$('#panel').hide()});{% endif %}
var chimere_init_options = {};
chimere_init_options["default_icon"] = '{{STATIC_URL}}img/marker-green.png';
- chimere_init_options["map_layers"] = [{{map_layers|safe|escape}}];
+ chimere_init_options["map_layers"] = [{{js_map_layers|safe|escape}}];
chimere_init_options['permalink_label'] = '{%trans "Permalink"%}';
chimere_init_options['permalink_element'] = document.getElementById('permalink');
chimere_init_options['routing'] = {{routing}};
diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py
index 036067f..a6b82c8 100644
--- a/chimere/templatetags/chimere_tags.py
+++ b/chimere/templatetags/chimere_tags.py
@@ -189,7 +189,7 @@ def map(context, map_id='map'):
context_data['routing'] = 'true' \
if hasattr(settings, 'CHIMERE_ENABLE_ROUTING') and \
settings.CHIMERE_ENABLE_ROUTING \
- else 'none'
+ else 'false'
area_name = context['area_name'] if 'area_name' in context else 'area_name'
map_layers, default_area = get_map_layers(area_name)
context_data['js_map_layers'] = ", ".join(