Merge branch 'fronkdev' into 'master'
Not showing trenches in Preorder Map See merge request fronk/thetool!235
This commit is contained in:
@@ -531,18 +531,13 @@
|
|||||||
}).bindTooltip(preorder.borderpoint_lat + ", " + preorder.borderpoint_long).addTo(preorderMap);
|
}).bindTooltip(preorder.borderpoint_lat + ", " + preorder.borderpoint_long).addTo(preorderMap);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(preorder.trenches) {
|
/*if(preorder.trenches) {
|
||||||
console.log(preorder.trenches);
|
|
||||||
preorder.trenches.forEach((trench) => {
|
preorder.trenches.forEach((trench) => {
|
||||||
//console.log(trench);
|
|
||||||
var trench_line = L.polyline(trench, {
|
var trench_line = L.polyline(trench, {
|
||||||
color: "limegreen"
|
color: "limegreen"
|
||||||
}).addTo(preorderMap);
|
}).addTo(preorderMap);
|
||||||
//trench.forEach((segment) => {
|
|
||||||
|
|
||||||
//});
|
|
||||||
});
|
});
|
||||||
}
|
}*/
|
||||||
|
|
||||||
if(preorder.home_trench) {
|
if(preorder.home_trench) {
|
||||||
var home_line = L.polyline(preorder.home_trench, {
|
var home_line = L.polyline(preorder.home_trench, {
|
||||||
@@ -670,22 +665,11 @@
|
|||||||
radius: 1
|
radius: 1
|
||||||
}).bindTooltip(lat + ", " + long).addTo(map);
|
}).bindTooltip(lat + ", " + long).addTo(map);
|
||||||
|
|
||||||
/*var circle = L.circle([blat,blong], {
|
|
||||||
color: 'black',
|
|
||||||
fillColor: 'limegreen',
|
|
||||||
fillOpacity: 0.5,
|
|
||||||
radius: 1
|
|
||||||
}).addTo(map);*/
|
|
||||||
|
|
||||||
if(trenches) {
|
if(trenches) {
|
||||||
trenches.forEach((trench) => {
|
trenches.forEach((trench) => {
|
||||||
//console.log(trench);
|
|
||||||
var trench_line = L.polyline(trench, {
|
var trench_line = L.polyline(trench, {
|
||||||
color: "limegreen"
|
color: "limegreen"
|
||||||
}).addTo(map);
|
}).addTo(map);
|
||||||
//trench.forEach((segment) => {
|
|
||||||
|
|
||||||
//});
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user