dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- closed #102 added "set waypoint/destination" context menu to route finder module

Browse Source 
- update "Select2" 4.0.0 -> 4.0.3
- update "Font Awesome" 4.6.1 -> 4.6.3
This commit is contained in:
Exodus4D
2016-06-20 17:16:27 +02:00
parent 38ea709f2a
commit a6234749ad
60 changed files with 407 additions and 13834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/main/controller/api/route.php
View File

@@ -589,8 +589,8 @@ class Route extends \Controller\AccessController {
];
$returnRoutData = [
'systemFrom' => $routeData['systemFrom'],
'systemTo' => $routeData['systemTo'],
'systemFromData' => $routeData['systemFromData'],
'systemToData' => $routeData['systemToData'],
'maps' => $mapData,
'mapIds' => $mapIds
];
@@ -599,10 +599,14 @@ class Route extends \Controller\AccessController {
$returnRoutData += $filterData;
if(count($mapIds) > 0){
$systemFrom = $routeData['systemFromData']['name'];
$systemTo = $routeData['systemToData']['name'];
$cacheKey = $this->getRouteCacheKey(
$mapIds,
$routeData['systemFrom'],
$routeData['systemTo'],
$systemFrom,
$systemTo,
$filterData
);
@@ -614,7 +618,7 @@ class Route extends \Controller\AccessController {
$this->initJumpData($mapIds, $filterData);
// no cached route data found
$foundRoutData = $this->findRoute($routeData['systemFrom'], $routeData['systemTo']);
$foundRoutData = $this->findRoute($systemFrom, $systemTo);
$returnRoutData = array_merge($returnRoutData, $foundRoutData);
// cache if route was found