From c6f7e24e373142e8618f4b6ed60df04bc0872354 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@proxience.com>
Date: Mon, 27 Apr 2015 23:33:11 +0200
Subject: First step to implement permalink for leaflet using leaflet-plugins

---
 chimere/settings.sample.py                          | 5 ++++-
 chimere/static/chimere/js/jquery.chimere-leaflet.js | 1 +
 chimere/templates/chimere/blocks/head_chimere.html  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/chimere/settings.sample.py b/chimere/settings.sample.py
index 1ddeca6..a1069f2 100644
--- a/chimere/settings.sample.py
+++ b/chimere/settings.sample.py
@@ -329,7 +329,10 @@ if 'MAP_JS_URLS' not in globals():
         'leaflet':[
             STATIC_URL + "leaflet/leaflet.js",
             STATIC_URL + "chimere/js/jquery.chimere-leaflet.js",
-            "http://maps.stamen.com/js/tile.stamen.js?v1.2.1"
+            "http://maps.stamen.com/js/tile.stamen.js?v1.2.1",
+            STATIC_URL + "leaflet-plugins/control/Permalink.js",
+            STATIC_URL + "leaflet-plugins/control/Permalink.Marker.js",
+            STATIC_URL + "leaflet-plugins/control/Permalink.Layer.js",
             ]
     }
     if CHIMERE_ENABLE_CLUSTERING:
diff --git a/chimere/static/chimere/js/jquery.chimere-leaflet.js b/chimere/static/chimere/js/jquery.chimere-leaflet.js
index 14c0688..385599c 100644
--- a/chimere/static/chimere/js/jquery.chimere-leaflet.js
+++ b/chimere/static/chimere/js/jquery.chimere-leaflet.js
@@ -133,6 +133,7 @@ See the file COPYING for details.
                 layer_control_options['position'] = 'topleft';
             }
             settings.layer_control = L.control.layers(map_layers, null, layer_control_options).addTo(map);
+            map.addControl(new L.Control.Permalink({text: 'Permalink', layers: map_layers}));
             if(settings.zoom && settings.lat && settings.lon){
                 map.setView([settings.lat, settings.lon], settings.zoom);
             } else {
diff --git a/chimere/templates/chimere/blocks/head_chimere.html b/chimere/templates/chimere/blocks/head_chimere.html
index 133192c..a48e23b 100644
--- a/chimere/templates/chimere/blocks/head_chimere.html
+++ b/chimere/templates/chimere/blocks/head_chimere.html
@@ -1,6 +1,6 @@
 {% for css_url, condition in MAP_CONDITIONNAL_CSS_URLS %}
 {% if condition %}<!--[if {{condition}}]>{%endif%}<link rel="stylesheet" href="{{ css_url }}" />{% if condition %}<![endif]-->{%endif%}{% endfor %}
-{% if enable_clustering %}<script src="{{ STATIC_URL }}chimere/js/clustering.js" type="text/javascript"></script>{% endif %}
+{% if enable_clustering and map_renderer == 'openlayers' %}<script src="{{ STATIC_URL }}chimere/js/clustering.js" type="text/javascript"></script>{% endif %}
 {% for js_url in MAP_JS_URLS %}
 <script src="{{ js_url }}" type="text/javascript"></script>{% endfor %}
 {% if routing %}<script src="{{ STATIC_URL }}chimere/js/routing-widget.js" type="text/javascript"></script>{% endif %}
-- 
cgit v1.2.3