Commit 585f850e authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

fixing alignment application

parent 13abc0ab
...@@ -337,6 +337,8 @@ ...@@ -337,6 +337,8 @@
this._slidingMarker.setLatLng(p2_ll); this._slidingMarker.setLatLng(p2_ll);
this._slidingLine.setLatLngs(l_d); this._slidingLine.setLatLngs(l_d);
this._slidingMarker.setTooltipContent(distance.toFixed(1)+' m'); this._slidingMarker.setTooltipContent(distance.toFixed(1)+' m');
// close
this._slidingMarker.closeTooltip();
} }
......
...@@ -248,12 +248,12 @@ function apply_alignment_dialog_hll(xyh0,xyh1,c,e,de){ ...@@ -248,12 +248,12 @@ function apply_alignment_dialog_hll(xyh0,xyh1,c,e,de){
*/ */
function apply_alignment_hll(xyh){ function apply_alignment_hll(xyh){
//console.log("Applying Ze Alignment!");
for(var i=0;i<xyh.length;i++){ for(var i=0;i<xyh.length;i++){
xyh[i] = parseFloat(xyh[i]); xyh[i] = parseFloat(xyh[i]);
} }
var Camera = Map.marker;
Data.camera.heading = xyh[2]; Data.camera.heading = xyh[2];
Data.camera.latitude = xyh[0]; Data.camera.latitude = xyh[0];
Data.camera.longitude = xyh[1]; Data.camera.longitude = xyh[1];
...@@ -268,10 +268,10 @@ function apply_alignment_hll(xyh){ ...@@ -268,10 +268,10 @@ function apply_alignment_hll(xyh){
Map.marker._syncMeasureMarkersToBasePoint(); Map.marker._syncMeasureMarkersToBasePoint();
//update on 3d //update on 3d
var p1_ll = Camera._latlng; var p1_ll = Map.marker._latlng;
for(var i=0;i<Data.markers.length;i++){ for(var i=0;i<Data.markers.length;i++){
var p2_ll = Camera._measureMarkers[i]._latlng; var p2_ll = Map.marker._measureMarkers[i]._latlng;
leaf_update_x3dom_marker(p1_ll,p2_ll,i); leaf_update_x3dom_marker(p1_ll,p2_ll,i);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment