mirror
/
MapWithAI
kopia lustrzana https://github.com/JOSM/MapWithAI
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Avoid calling the same function multiple times 

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
pull/1/head
Taylor Smock 2019-12-20 08:59:23 -07:00
rodzic ed884ef8da
commit a3a2daa4e4
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
1 zmienionych plików z 15 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

32
src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/RoutingIslandsTest.java
Wyświetl plik

@ -144,24 +144,22 @@ public class RoutingIslandsTest extends Test {
*/
private static void findConnectedWays(String currentTransportMode, Collection<Way> potentialWays,
Collection<Way> incomingWays, Collection<Way> outgoingWays) {
for (Way way : potentialWays) {
if (way.isUsable() && way.isOutsideDownloadArea()) {
Node firstNode = firstNode(way, currentTransportMode);
Node lastNode = lastNode(way, currentTransportMode);
if (isOneway(way, currentTransportMode) != 0 && firstNode != null
&& firstNode.isOutsideDownloadArea()) {
incomingWays.add(way);
}
if (isOneway(way, currentTransportMode) != 0 && lastNode != null && lastNode.isOutsideDownloadArea()) {
outgoingWays.add(way);
}
if (isOneway(way, currentTransportMode) == 0 && firstNode != null // Don't need to test lastNode
&& (way.firstNode().isOutsideDownloadArea() || way.lastNode().isOutsideDownloadArea())) {
incomingWays.add(way);
outgoingWays.add(way);
}
potentialWays.stream().filter(Way::isUsable).filter(Way::isOutsideDownloadArea).forEach(way -> {
Node firstNode = firstNode(way, currentTransportMode);
Node lastNode = lastNode(way, currentTransportMode);
Integer isOneway = isOneway(way, currentTransportMode);
if (firstNode != null && firstNode.isOutsideDownloadArea()) {
incomingWays.add(way);
}
}
if (lastNode != null && lastNode.isOutsideDownloadArea()) {
outgoingWays.add(way);
}
if (isOneway == 0 && firstNode != null && lastNode != null
&& (firstNode.isOutsideDownloadArea() || lastNode.isOutsideDownloadArea())) {
incomingWays.add(way);
outgoingWays.add(way);
}
});
}
/**