Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

added new way to select areas for shipping note

Browse Source
This commit is contained in:
Luca Haid
2025-04-28 13:37:58 +02:00
parent a076cf6b9c
commit fee73ab5f2
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
application/WarehouseShippingNote/WarehouseShippingNoteController.php
View File

@@ -452,15 +452,25 @@ class WarehouseShippingNoteController extends TTCrud {
}
$parsedDisplayNameParts[] = $part;
}
$out[] = ['value' => $entry['lat'] . "," . $entry['lon'], 'text' => implode(',', $parsedDisplayNameParts)];
if (!empty($out)) {
foreach ($out as $key => $value) {
if ($value['text'] === implode(',', $parsedDisplayNameParts)) {
continue 2;
}
}
}
$out[] = ['value' => $entry['lat'] . "," . $entry['lon'] . (!isset($entry['house_number']) ? ", area" : ""), 'text' => implode(',', $parsedDisplayNameParts)];
}
self::returnJson($out);
}
protected function geoReverseAction() {
$lat = $this->request->lat;
$lon = $this->request->lon;
$url = "https://nominatim.haid.in/reverse?lat=$lat&lon=$lon&format=json";
$url = "https://nominatim.haid.in/reverse?lat=$lat&lon=$lon&format=json&addressdetails=1";
$data = json_decode(file_get_contents($url), true);
self::returnJson(is_array($data) ? $data : ['data' => $data]);
}
@@ -468,6 +478,7 @@ class WarehouseShippingNoteController extends TTCrud {
//TODO: export this to an api class for openstreetmap
protected function getDistanceAction() {
$this->request->to = str_replace("Gebiet ", "", $this->request->to);
$filename = TEMP_DIR . "/OpenStreetMap/" . urlencode($this->request->from) . "-" . urlencode($this->request->to) . ".json";
if (file_exists($filename)) {