From 4079229956c2d5136f35488c26e3cfe7f05abf1b Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 30 Sep 2025 18:50:42 +0200 Subject: [PATCH] =?UTF-8?q?-=20Fix=20for=20Neue=20Meotrolregion=20angelegt?= =?UTF-8?q?=20inkl.=20Rate,=20wird=20aber=20nicht=20beim=20Routing=20ber?= =?UTF-8?q?=C3=BCcksichtigt=20#43?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/de/avatic/lcc/repositories/NodeRepository.java | 4 ++-- .../de/avatic/lcc/service/calculation/RoutingService.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/avatic/lcc/repositories/NodeRepository.java b/src/main/java/de/avatic/lcc/repositories/NodeRepository.java index ec95252..7213b74 100644 --- a/src/main/java/de/avatic/lcc/repositories/NodeRepository.java +++ b/src/main/java/de/avatic/lcc/repositories/NodeRepository.java @@ -387,7 +387,7 @@ public class NodeRepository { String query = """ SELECT * FROM node - WHERE is_deprecated = FALSE AND + WHERE is_deprecated = FALSE AND id != ? AND ( 6371 * acos( cos(radians(?)) * @@ -399,7 +399,7 @@ public class NodeRepository { ) <= ? """; - return jdbcTemplate.query(query, new NodeMapper(), node.getGeoLat(), node.getGeoLng(), node.getGeoLat(), regionRadius); + return jdbcTemplate.query(query, new NodeMapper(), node.getId(), node.getGeoLat(), node.getGeoLng(), node.getGeoLat(), regionRadius); } diff --git a/src/main/java/de/avatic/lcc/service/calculation/RoutingService.java b/src/main/java/de/avatic/lcc/service/calculation/RoutingService.java index d92e70f..bd95c54 100644 --- a/src/main/java/de/avatic/lcc/service/calculation/RoutingService.java +++ b/src/main/java/de/avatic/lcc/service/calculation/RoutingService.java @@ -448,7 +448,7 @@ public class RoutingService { finalSection = connectNearByNodes(chain.getLast(), nearByNodes, container); if (finalSection != null) { connectionType = SourceConnectionType.FINAL_SECTION_WITH_NEAR_BY_NODE; - nearByNode = finalSection.getToNode(); + nearByNode = finalSection.getFromNode(); } }