|
@@ -76,17 +76,12 @@ $points_asText = unserialize(file_get_contents('points_asText.txt'));
|
|
|
|
|
|
|
|
|
|
|
|
|
function findWay($joinA, $joinB, $path = array()) {
|
|
function findWay($joinA, $joinB, $path = array()) {
|
|
|
- global $ways2joins, $joins2ways, $points2joins, $ways_asText, $points_asText, $res;
|
|
|
|
|
-//echo implode('->',$path)."\n\n";
|
|
|
|
|
|
|
+ global $ways2joins, $joins2ways, $points2joins, $ways_asText, $points_asText;
|
|
|
if ($joinA == $joinB) return $path;
|
|
if ($joinA == $joinB) return $path;
|
|
|
else {
|
|
else {
|
|
|
$subPaths = array();
|
|
$subPaths = array();
|
|
|
foreach ($joins2ways[$joinA] as $way_key) {
|
|
foreach ($joins2ways[$joinA] as $way_key) {
|
|
|
if (!in_array($way_key, $path)) {
|
|
if (!in_array($way_key, $path)) {
|
|
|
-// $joins = $ways2joins[$way_key];
|
|
|
|
|
-// $back_join_subkey = array_search($join_key, $joins);
|
|
|
|
|
-// $new_join_subkey = 1 - $back_join_subkey;
|
|
|
|
|
-// $new_join = $joins[$new_join_subkey];
|
|
|
|
|
$new_join = $ways2joins[$way_key][1 - array_search($joinA, $ways2joins[$way_key])];
|
|
$new_join = $ways2joins[$way_key][1 - array_search($joinA, $ways2joins[$way_key])];
|
|
|
if ($subPath = findWay($new_join, $joinB, array_merge($path,array($way_key)))) $subPaths[] = $subPath;
|
|
if ($subPath = findWay($new_join, $joinB, array_merge($path,array($way_key)))) $subPaths[] = $subPath;
|
|
|
}
|
|
}
|