Reorganization in templates

3 files changed, 24 insertions, 19 deletions

diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index df5dea5..7733670 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -143,13 +143,6 @@ function transform(obj) {
   return obj.transform(EPSG_DISPLAY_PROJECTION, EPSG_PROJECTION);
 }
 
-var invisibleStyleIcon = new ol.style.Style({
-        image: new ol.style.Icon({
-            src : MEDIA_URL+'chimere/img/marker-cluster.png', //still need something even if it's invisible
-            opacity : 0
-        })
-    });
-
 /*
 * Little hasattr helper
 */
@@ -706,6 +699,12 @@ jQuery.expr[":"].hovering = function(elem) {
 
 
             if (settings.enable_clustering){
+                settings.invisibleStyleIcon = new ol.style.Style({
+                        image: new ol.style.Icon({
+                            src : MEDIA_URL+'chimere/img/marker-cluster.png', //still need something even if it's invisible
+                            opacity : 0
+                        })
+                    });
                 methods.enableClustering();
             }
             /* OL3-deprecated-cluster
@@ -871,6 +870,8 @@ jQuery.expr[":"].hovering = function(elem) {
 
 
             return;
+
+            /*
             if (settings.routing_start_lon && settings.routing_start_lat){
                 /// OL3-TODO
                 settings.current_position = new OpenLayers.LonLat(
@@ -914,6 +915,7 @@ jQuery.expr[":"].hovering = function(elem) {
             //methods.update_permalink_activation();
 
             methods.preload_images();
+            */
         }, // end of init
         register_reload_on_move: function(){
             var reload_on_move = function(evnt){
@@ -1001,7 +1003,7 @@ jQuery.expr[":"].hovering = function(elem) {
                             if (!settings._remindOldStyle[feat.getId()]){
                                 settings._remindOldStyle[feat.getId()] = feat.getStyle();
                             }
-                            feat.setStyle(invisibleStyleIcon);
+                            feat.setStyle(settings.invisibleStyleIcon);
                             settings._remindUpdated[feat.getId()] = 1;
                         }
                     }
@@ -1218,6 +1220,7 @@ jQuery.expr[":"].hovering = function(elem) {
         activateRouteEdit: function(){
             // TODO OL3
             return;
+            /*
             settings.edition_type_is_route = true;
             methods.cleanMarker();
             // settings.map.events.unregister('click', settings.map,
@@ -1231,6 +1234,7 @@ jQuery.expr[":"].hovering = function(elem) {
                 settings.layerVectors.events.register('featureadded',
                     settings.layerVectors, helpers.featureRouteCreated);
             }
+            */
         },
 
         activateMarkerEdit: function(){
@@ -1912,6 +1916,7 @@ jQuery.expr[":"].hovering = function(elem) {
             }));
             settings.dbFeatures.push(feat);
             return;
+            /*
             var polyline = route.geometry;
             var point_array = new Array();
             for (i=0; i<polyline.coordinates.length; i++){
@@ -1935,6 +1940,7 @@ jQuery.expr[":"].hovering = function(elem) {
                 map.zoomToExtent(dataExtent, closest=true);
                 methods.loadCategories();
             }
+            */
         },
         /*
         * Put a multiline on the map
@@ -1964,6 +1970,7 @@ jQuery.expr[":"].hovering = function(elem) {
             }));
             settings.dbFeatures.push(feat);
             return;
+            /*
             var gformat = new OpenLayers.Format.GeoJSON();
             var feats = gformat.read(feature);
             var style = OpenLayers.Util.extend({},
@@ -1975,6 +1982,7 @@ jQuery.expr[":"].hovering = function(elem) {
                                             EPSG_DISPLAY_PROJECTION,
                                             settings.map.getProjectionObject());
             settings.layerVectors.addFeatures(feats);
+            */
         },
         routingInputChange: function(nominatim_id){
             $('#map_menu_clear').show();
@@ -2585,22 +2593,23 @@ jQuery.expr[":"].hovering = function(elem) {
             var extent;
             return;
             //////// OL3-deprecated
+            /*
             if (OpenLayers && current_extent && current_extent.length == 4){
                 extent = new OpenLayers.Bounds(
                                 current_extent[0], current_extent[1],
                                 current_extent[2], current_extent[3]);
             }
-            /*
-            else if (OpenLayers && default_area && default_area.length == 4){
-                extent = new OpenLayers.Bounds(default_area[0], default_area[1],
-                                               default_area[2], default_area[3]);
-            }*/
+            //else if (OpenLayers && default_area && default_area.length == 4){
+            //    extent = new OpenLayers.Bounds(default_area[0], default_area[1],
+            //                                   default_area[2], default_area[3]);
+            //}
             else{
                 return;
             }
             extent.transform(EPSG_DISPLAY_PROJECTION, EPSG_PROJECTION);
             settings.map.zoomToExtent(extent, true);
             return true;
+            */
         },
         zoomToMarkerExtent: function(){
             settings.map.zoomToExtent(
diff --git a/chimere/templates/chimere/blocks/map.html b/chimere/templates/chimere/blocks/map.html
index 10f1c97..4ee9613 100644
--- a/chimere/templates/chimere/blocks/map.html
+++ b/chimere/templates/chimere/blocks/map.html
@@ -13,6 +13,8 @@
 </div>
 
 <div id='{{map_id}}'></div>
+<div id='popup'></div>
+<div id='layerSwitcher'></div>
 <script type="text/javascript">
 $("#{{map_id}}").show();
 </script>
diff --git a/chimere/templates/chimere/main_map.html b/chimere/templates/chimere/main_map.html
index fd3f0b8..cb83642 100644
--- a/chimere/templates/chimere/main_map.html
+++ b/chimere/templates/chimere/main_map.html
@@ -27,12 +27,6 @@
 {% block search_box %} {% endblock %}
 {% block content %}
     {{block.super}}
-    <div id='popup'></div>
-    <div id='layerSwitcher'></div>
-    <div id='main-map'></div>
-<script type="text/javascript">
-   $("#main-map").show();
-</script>
     {% map_menu %}
     {% map 'main-map' %}
     <script type='text/javascript'>