From ae9fca09a4d0b03f0814c025cd1b752b42cdf4d5 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 20 Jan 2016 23:33:07 +0100
Subject: Wrok on OL3 transition

---
 chimere/templates/chimere/blocks/head_chimere.html | 10 ++++++----
 chimere/templates/chimere/blocks/head_jme.html     |  3 +++
 chimere/templates/chimere/blocks/map.html          |  5 +++--
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'chimere/templates')

diff --git a/chimere/templates/chimere/blocks/head_chimere.html b/chimere/templates/chimere/blocks/head_chimere.html
index f0e214e..0554f4c 100644
--- a/chimere/templates/chimere/blocks/head_chimere.html
+++ b/chimere/templates/chimere/blocks/head_chimere.html
@@ -1,7 +1,8 @@
-{% for css_url in MAP_CSS_URLS %}
+{% if not is_edit %}{% for css_url in MAP_CSS_URLS %}
 <link rel="stylesheet" href="{{ css_url }}" />{% endfor %}
 {% for js_url in MAP_JS_URLS %}
 <script src="{{ js_url }}" type="text/javascript"></script>{% endfor %}
+{% endif %}
 {% if routing %}<script src="{{ STATIC_URL }}chimere/js/routing-widget.js" type="text/javascript"></script>{% endif %}
 {% if enable_clustering %}<script src="{{ STATIC_URL }}chimere/js/clustering.js" type="text/javascript"></script>{% endif %}
 <script src="{{ STATIC_URL }}chimere/js/jquery.chimere.js" type="text/javascript"></script>
@@ -15,11 +16,12 @@
 <script src="{{ STATIC_URL }}chimere/js/base.js" type="text/javascript"></script>
 <script type="text/javascript">
     var DEFAULT_ZOOM = {{ DEFAULT_ZOOM }};
-    var EPSG_DISPLAY_PROJECTION = '{{ EPSG_DISPLAY_PROJECTION }}';
+    var EPSG_DISPLAY_PROJECTION = 'EPSG:{{ EPSG_DISPLAY_PROJECTION }}';
     //OL3-deprecated: OpenLayers.ImgPath = '{{ STATIC_URL }}chimere/img/';
-    var EPSG_PROJECTION = epsg_projection = '{{ EPSG_PROJECTION }}';
+    var EPSG_PROJECTION = epsg_projection = 'EPSG:{{ EPSG_PROJECTION }}';
     var CENTER_LONLAT = centerLonLat = ol.proj.transform(
-        [{{DEFAULT_CENTER}}], epsg_display_projection, epsg_projection);
+        [{{DEFAULT_CENTER.0|safe}}, {{DEFAULT_CENTER.1|safe}}],
+        EPSG_DISPLAY_PROJECTION, EPSG_PROJECTION);
     var restricted_extent;
     {% if area_name %}var area_name = '{{ area_name }}';{% endif %}
     var get_share_url = '{% url chimere:get-share-url %}';
diff --git a/chimere/templates/chimere/blocks/head_jme.html b/chimere/templates/chimere/blocks/head_jme.html
index bf31e6f..47bda85 100644
--- a/chimere/templates/chimere/blocks/head_jme.html
+++ b/chimere/templates/chimere/blocks/head_jme.html
@@ -1,3 +1,5 @@
+
+{% comment %}
 <script class="jwPlayer" type="application/swf" src="{{STATIC_URL}}jme/packages/player.swf"></script>
 <script src="{{STATIC_URL}}jme/packages/mm.full.min.js" type="text/javascript"></script>
 <script src="{{STATIC_URL}}jme/utils/jmeEmbedControls.js" type="text/javascript"></script>
@@ -11,6 +13,7 @@
 <script src="{{STATIC_URL}}jme/plugins/fullwindow.js" type="text/javascript"></script>
 <!-- useractivity -->
 <script src="{{STATIC_URL}}jme/utils/useractivity.js" type="text/javascript"></script>
+{% endcomment %}
 
 <!-- prettyPhoto not jme but media -->
 <link rel="stylesheet" href="{{STATIC_URL}}prettyPhoto/css/prettyPhoto.css" />
diff --git a/chimere/templates/chimere/blocks/map.html b/chimere/templates/chimere/blocks/map.html
index 764d07b..065fc34 100644
--- a/chimere/templates/chimere/blocks/map.html
+++ b/chimere/templates/chimere/blocks/map.html
@@ -46,8 +46,9 @@ $(function(){
     {% if p_routing_steps %}chimere_init_options["routing_steps_lonlat"] = [{{ p_routing_steps }}];{% endif %}
     {% if p_routing_transport %}chimere_init_options["routing_transport"] = "{{ p_routing_transport }}";{% endif %}
     {% if p_routing_speed %}chimere_init_options["routing_speed"] = "{{ p_routing_speed }}";{% endif %}
-    chimere_init_options["icon_offset"] = new OpenLayers.Pixel({{icon_offset_x}},
-                                                            {{icon_offset_y}});
+    // chimere_init_options["icon_offset"] = new OpenLayers.Pixel({{icon_offset_x}},
+    //                                                         {{icon_offset_y}});
+    chimere_init_options["icon_offset"] = ({{icon_offset_x}}, {{icon_offset_y}});
     chimere_init_options["dynamic_categories"] = {{ dynamic_categories }};
     {% if p_display_submited %}chimere_init_options["display_submited"] = {{ p_display_submited }};{% endif %}
     chimere_init_options["checked_categories"] = [{% for cc in checked_categories %}{% if forloop.counter0 > 0 %}, {% endif %}{{cc}}{% endfor %}];
-- 
cgit v1.2.3