diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-02 19:46:28 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-02 19:46:28 +0200 |
| commit | 677b3393ea466ed9ddc9c0911aa7f0b37b2f574d (patch) | |
| tree | e5abab53f83d96233b173ca5665fdabd27ddd6d9 | |
| parent | feaae2fb3ec146d0e184d13bbf38d5667a7ebca4 (diff) | |
| download | Chimère-677b3393ea466ed9ddc9c0911aa7f0b37b2f574d.tar.bz2 Chimère-677b3393ea466ed9ddc9c0911aa7f0b37b2f574d.zip | |
Remove MaQuest reference - Fix ol3 non debug mode
| -rw-r--r-- | chimere/fixtures/initial_data.json | 8 | ||||
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 14 | ||||
| -rw-r--r-- | chimere/widgets.py | 4 |
3 files changed, 6 insertions, 20 deletions
diff --git a/chimere/fixtures/initial_data.json b/chimere/fixtures/initial_data.json index 177d2d1..592e589 100644 --- a/chimere/fixtures/initial_data.json +++ b/chimere/fixtures/initial_data.json @@ -197,13 +197,5 @@ "layer_code": "new ol.layer.Tile({\r\n source: new ol.source.OSM(),\r\n baselayer: true,\r\n name: 'OSM - Mapnik'\r\n})", "name": "OSM - Mapnik" } - }, - { - "pk": 2, - "model": "chimere.layer", - "fields": { - "layer_code": "new ol.layer.Tile({\r\n source: new ol.source.MapQuest({layer: 'osm'}),\r\n baselayer: true,\r\n name: 'OSM - MapQuest'\r\n})", - "name": "OSM - MapQuest" - } } ] diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index 4275eb1..8ab08ef 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -268,15 +268,9 @@ function transform(obj) { if (defaults.map_layers == null || ! defaults.map_layers.length){ defaults.map_layers = [ new ol.layer.Tile({ - style: 'Road', - name: 'Road', - source: new ol.source.MapQuest({layer: 'osm'}) - }), - new ol.layer.Tile({ - style: 'Aerial', - name: 'Aerial', - visible: false, - source: new ol.source.MapQuest({layer: 'sat'}) + style: 'OSM', + name: 'OSM', + source: new ol.source.OSM() })]; } settings = $.extend({}, defaults); @@ -482,7 +476,7 @@ function transform(obj) { settings.popup_item = document.getElementById('popup'); settings.popup = new ol.Overlay({ element: settings.popup_item, - positioning: ol.OverlayPositioning.BOTTOM_LEFT, + positioning: 'bottom-left', stopEvent: false/*, autoPan: true, autoPanAnimation: { diff --git a/chimere/widgets.py b/chimere/widgets.py index 2672ba0..6d61965 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -93,9 +93,9 @@ def get_map_layers(area_name='', get_area_zoom=False): map_layers = [(_(u"Default layer"), settings.CHIMERE_DEFAULT_MAP_LAYER, True, '')] else: - map_layers = [(u"Mapquest", """new ol.layer.Tile({ + map_layers = [(u"OSM", """new ol.layer.Tile({ style: 'Road', - source: new ol.source.MapQuest({layer: 'osm'}) + source: new ol.source.OSM() })""", True, '')] if not get_area_zoom: return map_layers, default |