summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-16 15:37:50 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-16 15:37:50 +0100
commite735f3ecf66db4ce9913695e86ab497d9723624b (patch)
tree31ad29f8123466214aecb618478cc36dbcfbe12c
parentec4d7456b5143e12f41ffed038bc8c0e72ec0e6b (diff)
downloadChimère - projet Saclay-e735f3ecf66db4ce9913695e86ab497d9723624b.tar.bz2
Chimère - projet Saclay-e735f3ecf66db4ce9913695e86ab497d9723624b.zip
Fix permalink when default categories are checked
-rw-r--r--templates/chimere/blocks/map.html8
1 files changed, 6 insertions, 2 deletions
diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html
index da68b49..a14f115 100644
--- a/templates/chimere/blocks/map.html
+++ b/templates/chimere/blocks/map.html
@@ -36,7 +36,6 @@ $("#{{map_id}}").show();
"explicit_popup_hide": true,
"map_layers": [{{js_map_layers|safe|escape}}],
'routing': {{routing}},
- {% if dynamic_categories %}'dynamic_categories': true,{% endif %}
{% if default_area %}"default_area": new Array({{default_area.upper_left_corner.x}}, {{default_area.upper_left_corner.y}}, {{default_area.lower_right_corner.x}}, {{default_area.lower_right_corner.y}}),{% endif %}
{% if p_zoom %}"zoom": {{ p_zoom }},{% endif %}
{% if p_lat %}"lat": {{ p_lat }},{% endif %}
@@ -50,7 +49,6 @@ $("#{{map_id}}").show();
{% if p_routing_speed %}"routing_speed": "{{ p_routing_speed }}",{% endif %}
"dynamic_categories": {{ dynamic_categories }},
{% if p_display_submited %}"display_submited": {{ p_display_submited }},{% endif %}
- "checked_categories": [{% for cc in checked_categories %}{% if forloop.counter0 > 0 %}, {% endif %}{{cc}}{% endfor %}],
{% if area_id %}'area_id': "{{area_id}}",{% endif %}
{% if p_current_feature %}"display_feature": {{ p_current_feature }},{% endif %}
{% if selected_map_layer %}"selected_map_layer": {{selected_map_layer}},{% endif %}
@@ -61,6 +59,12 @@ $("#{{map_id}}").show();
{% if restricted_extent %}{{ restricted_extent }}
chimere_init_options["restricted_extent"] = bounds;
{% endif %}
+ {% if checked_categories %}
+ if (window.location.href.indexOf("#") <= -1) {
+ chimere_init_options["checked_categories"] = [
+ {% for cc in checked_categories %}{% if forloop.counter0 > 0 %}, {% endif %}{{cc}}{% endfor %}];
+ }
+ {% endif %}
$("#{{map_id}}").chimere(chimere_init_options);
{% if zoom %}