Added Mureck import & borderpoint testing
This commit is contained in:
@@ -8,6 +8,9 @@
|
||||
<li class="nav-item"><a class="nav-link active" href="#preorder-detail-<?=$preorder->id?>-detail" data-toggle="tab" aria-expanded="false">Details</a></li>
|
||||
<li class="nav-item"><a class="nav-link" href="#preorder-detail-<?=$preorder->id?>-address" data-toggle="tab" aria-expanded="false">Adressdetails</a></li>
|
||||
<li class="nav-item"><a class="nav-link" href="#preorder-detail-<?=$preorder->id?>-rimo" data-toggle="tab" aria-expanded="false">RIMO</a></li>
|
||||
<?php if($me->is("Admin") && $preorder->adb_hausnummer->borderpoint_lat && $preorder->adb_hausnummer->borderpoint_long): ?>
|
||||
<li class="nav-item"><a class="nav-link" href="#preorder-detail-<?=$preorder->id?>-map" data-toggle="tab" aria-expanded="false" onclick="loadBorderpointMap(<?=$preorder->id?>)">Übergabepunkt</a></li>
|
||||
<?php endif; ?>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -424,12 +427,45 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php if($me->is("Admin")): ?>
|
||||
<div
|
||||
id="preorder-detail-<?=$preorder->id?>-map"
|
||||
class="tab-pane"
|
||||
data-lat="<?=$preorder->adb_hausnummer->borderpoint_lat?>"
|
||||
data-long="<?=$preorder->adb_hausnummer->borderpoint_long?>"
|
||||
data-blat="<?=$preorder->adb_hausnummer->gps_lat?>"
|
||||
data-blong="<?=$preorder->adb_hausnummer->gps_long?>"
|
||||
data-trench="<?=$preorder->adb_hausnummer->trenches?>"
|
||||
data-home-trench="<?=$preorder->adb_hausnummer->home_trench?>"
|
||||
>
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-12">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
|
||||
<div class="row" id="map-row">
|
||||
<div id="preorder-map-<?=$preorder->id?>" style="height:50vh; width: 100%"></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
function togglePortdata(pid) {
|
||||
@@ -612,4 +648,78 @@
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
var maps = {};
|
||||
|
||||
function loadBorderpointMap(id) {
|
||||
var lat = $("#preorder-detail-" + id + "-map").data("lat");
|
||||
var long = $("#preorder-detail-" + id + "-map").data("long");
|
||||
|
||||
var blat = $("#preorder-detail-" + id + "-map").data("blat");
|
||||
var blong = $("#preorder-detail-" + id + "-map").data("blong");
|
||||
|
||||
var trenches = $("#preorder-detail-" + id + "-map").data("trench");
|
||||
var home_trench = $("#preorder-detail-" + id + "-map").data("home-trench");
|
||||
|
||||
if(!("map-" + id in maps)) {
|
||||
|
||||
var map = L.map('preorder-map-' + id).setView([lat, long], 20);
|
||||
|
||||
var tileLayer = L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token={accessToken}', {
|
||||
attribution: 'Map data © <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
|
||||
minZoom: 6,
|
||||
maxZoom: 22,
|
||||
id: "mapbox/satellite-streets-v12",
|
||||
accessToken: '<?=TT_MAPBOX_TILE_API_TOKEN?>'
|
||||
}).addTo(map);
|
||||
|
||||
//map.invalidateSize();
|
||||
|
||||
//var marker = L.marker([lat, long], {icon: icon}).addTo(preorderMap);
|
||||
/*L.circleMarker([lat, long], {
|
||||
color: '#FF9999'
|
||||
}).addTo(map);
|
||||
*/
|
||||
|
||||
var circle = L.circle([lat,long], {
|
||||
color: 'orange',
|
||||
fillColor: 'orange',
|
||||
fillOpacity: 0.5,
|
||||
radius: 1
|
||||
}).bindTooltip(lat + ", " + long).addTo(map);
|
||||
|
||||
/*var circle = L.circle([blat,blong], {
|
||||
color: 'black',
|
||||
fillColor: 'limegreen',
|
||||
fillOpacity: 0.5,
|
||||
radius: 1
|
||||
}).addTo(map);*/
|
||||
|
||||
if(trenches) {
|
||||
trenches.forEach((trench) => {
|
||||
//console.log(trench);
|
||||
var trench_line = L.polyline(trench, {
|
||||
color: "limegreen"
|
||||
}).addTo(map);
|
||||
//trench.forEach((segment) => {
|
||||
|
||||
//});
|
||||
});
|
||||
}
|
||||
|
||||
if(home_trench) {
|
||||
var home_line = L.polyline(home_trench, {
|
||||
color: "aqua"
|
||||
}).addTo(map);
|
||||
}
|
||||
|
||||
maps["map-" + id] = map;
|
||||
|
||||
setTimeout((id) => {maps["map-" + id].invalidateSize()}, 50, id);
|
||||
}
|
||||
}
|
||||
|
||||
function addMarkers(id) {
|
||||
|
||||
}
|
||||
</script>
|
||||
Reference in New Issue
Block a user