Browse Source

Merge branch 'rezine-style' of ssh://code.ffdn.org:55555/FFDN/celutz into rezine-style

julpec 8 years ago
parent
commit
d4bf124d04
1 changed files with 10 additions and 11 deletions
  1. 10 11
      panorama/static/panorama/js/pano.js

+ 10 - 11
panorama/static/panorama/js/pano.js

@@ -32,6 +32,7 @@ var point_colors = {
 	'temporary'  : '255,255,128', // yellow
 	'unlocated'  : '255,255,255'  // white
 };
+var map_never_drawn = true; //Pour empecher d'enlever des Layers inexistants
 var map; // minimap object
 var viewField; // cone drawn on the minimap
 var viewDirection; // blue line drawn on the minimap
@@ -752,6 +753,7 @@ function change_angle() {
     var pos_x = resxy.x;
     var pos_y = Math.floor(zm.im.height/2 - resxy.y);
     putImage(pos_x, pos_y);
+    //update_map(); // Doesn't work on first load...
 }
 
 function check_prox(x, y, r) {   //verification si un point de coordonnées x, y est bien dans un cercle de rayon r centré en X,Y.
@@ -1270,23 +1272,20 @@ function load_map(){
 
 	L.marker([panorama_lat, panorama_lng]).addTo(map);
 
-    var bearing = $('#angle_ctrl').val();
-    var cap = getCapMinMaxVisible();
-
-    // viewField and viewDirection must be global in order to be view from update_map()
-    viewField = getCone(panorama_lat, panorama_lng,bearing,cap,7000);
-    viewDirection = L.polygon([[panorama_lat, panorama_lng],[destVincenty(panorama_lat, panorama_lng, bearing, 7000).lat,destVincenty(panorama_lat, panorama_lng, bearing, 7000).lng]]);
-    viewDirection.addTo(map);
-	viewField.addTo(map);
+    update_map();
 
 };
 
 function update_map(){
     /* Update the map: view cone and bearing 
     */
-    map.removeLayer(viewField);
-    map.removeLayer(viewDirection);
-
+    if (map_never_drawn){
+        map_never_drawn = false;
+    } else {
+        map.removeLayer(viewField);
+        map.removeLayer(viewDirection);
+    };
+        
     var bearing = $('#angle_ctrl').val();
     var cap = getCapMinMaxVisible();