diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-19 15:58:58 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-19 15:58:58 +0100 |
| commit | d71a788fe9ae8c5d89834b2b09167df1b366951e (patch) | |
| tree | 8d9762b1e187de4862365a78c974fea5f6f1e0b2 | |
| parent | 7b9427c32185f99f1568e69cc6a77534ae6e09cc (diff) | |
| download | Chimère-d71a788fe9ae8c5d89834b2b09167df1b366951e.tar.bz2 Chimère-d71a788fe9ae8c5d89834b2b09167df1b366951e.zip | |
Filter OL2 configuration. MapQuest layer when none is defined.
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 12 | ||||
| -rw-r--r-- | chimere/templatetags/chimere_tags.py | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index a73ff49..9927f9b 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -156,6 +156,18 @@ function transform(obj) { new OpenLayers.Pixel(0, -32)); } */ + if (defaults.map_layers == null || defaults.map_layers == []){ + defaults.map_layers = [ + new ol.layer.Tile({ + style: 'Road', + source: new ol.source.MapQuest({layer: 'osm'}) + }), + new ol.layer.Tile({ + style: 'Aerial', + visible: false, + source: new ol.source.MapQuest({layer: 'sat'}) + })]; + } settings = $.extend({}, defaults); if ( options ) $.extend(settings, options); diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py index a5ce9c0..6e40462 100644 --- a/chimere/templatetags/chimere_tags.py +++ b/chimere/templatetags/chimere_tags.py @@ -228,7 +228,7 @@ def map(context, map_id='map'): 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( - [js for name, js, default in map_layers]) + [js for name, js, default in map_layers if "OpenLayers" not in js]) context_data['map_layers'] = map_layers if default_area: context_data['selected_map_layer'] = default_area |