diff options
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere-leaflet.js | 9 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/map.html | 1 | ||||
| -rw-r--r-- | chimere/templatetags/chimere_tags.py | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere-leaflet.js b/chimere/static/chimere/js/jquery.chimere-leaflet.js index 56ba696..51bd00a 100644 --- a/chimere/static/chimere/js/jquery.chimere-leaflet.js +++ b/chimere/static/chimere/js/jquery.chimere-leaflet.js @@ -41,6 +41,7 @@ See the file COPYING for details. permalink_div: null, permalink: null, // OL Control, could be overrided map_layers: null, + map_layer_names: null, selected_map_layer: null, dynamic_categories: false, display_submited: false, @@ -120,9 +121,13 @@ See the file COPYING for details. var map_element = $(this).attr('id'); settings.map = map = L.map(map_element); - for (idx in settings.map_layers){ - map.addLayer(settings.map_layers[idx]); + map.addLayer(settings.map_layers[0]); + var map_layers = {}; + for (idx=0 ; idx < settings.map_layers.length ; idx++){ + map_layers[settings.map_layer_names[idx]] = settings.map_layers[idx]; + alert(map_layers[settings.map_layer_names[idx]]); } + L.control.layers(map_layers).addTo(map); if(settings.zoom && settings.lat && settings.lon){ map.setView([settings.lat, settings.lon], settings.zoom); } else { diff --git a/chimere/templates/chimere/blocks/map.html b/chimere/templates/chimere/blocks/map.html index 2614f39..2c225de 100644 --- a/chimere/templates/chimere/blocks/map.html +++ b/chimere/templates/chimere/blocks/map.html @@ -21,6 +21,7 @@ var chimere_init_options = {}; chimere_init_options["default_icon"] = '{{STATIC_URL}}img/marker-green.png'; chimere_init_options["map_layers"] = [{{js_map_layers|safe|escape}}]; + chimere_init_options["map_layer_names"] = [{{js_map_layer_names|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 f180061..fd700d9 100644 --- a/chimere/templatetags/chimere_tags.py +++ b/chimere/templatetags/chimere_tags.py @@ -202,6 +202,8 @@ def map(context, map_id='map'): map_layers, default_area = get_map_layers(area_name) context_data['js_map_layers'] = ", ".join( [js for name, js, default in map_layers]) + context_data['js_map_layer_names'] = '"'+ '", "'.join( + [name for name, js, default in map_layers]) + '"' context_data['map_layers'] = map_layers if default_area: context_data['selected_map_layer'] = default_area |