OL3 adaptations

1 files changed, 6 insertions, 4 deletions

diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html
index 5c85ddb..57cfe95 100644
--- a/templates/chimere/blocks/map.html
+++ b/templates/chimere/blocks/map.html
@@ -57,8 +57,9 @@ $(function(){
     {% if p_routing_end_lon %}chimere_init_options["routing_end_lon"] = {{ p_routing_end_lon }};{% endif %}
     {% if p_routing_end_lat %}chimere_init_options["routing_end_lat"] = {{ p_routing_end_lat }};{% endif %}
     {% if p_routing_steps %}chimere_init_options["routing_steps_lonlat"] = [{{ p_routing_steps }}];{% 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 %}];
@@ -82,11 +83,11 @@ $(function(){
     }
     $("#main-map").chimere(chimere_init_options);
     {% if zoom %}
-    $('#maps').chimere('zoom', {'area':{{zoom}} });
+    //$('#maps').chimere('zoom', {'area':{{zoom}} });
     {% endif %}
 
     // init layer selection
-    $(function() {
+    /* $(function() {
         {% for layer_name, js, def in map_layers %}
         $('#layer_list').append("<li><input type='radio' value='{{forloop.counter0}}' name='layer_type' id='layer_{{forloop.counter}}'{% if def %} checked='checked'{% endif %}><label for='layer_{{forloop.counter}}'>{{layer_name}}</li>");{% endfor %}
         {% for subcat in subcat_layer %}
@@ -108,6 +109,7 @@ $(function(){
         });
         highlight_selected_categories();
     });
+    */
 </script>
 <div id='marker_hover'><div id='marker_hover_content'></div></div>
 <div id='cluster_list'></div>