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

Localization and move test to MapWithAI category 

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

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

@ -1,6 +1,7 @@
// License: GPL. For details, see LICENSE file. // License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.plugins.mapwithai.data.validation.tests; package org.openstreetmap.josm.plugins.mapwithai.data.validation.tests;
import static org.openstreetmap.josm.tools.I18n.marktr;
import static org.openstreetmap.josm.tools.I18n.tr; import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.ArrayList; import java.util.ArrayList;
@ -97,7 +98,8 @@ public class RoutingIslandsTest extends Test {
.allMatch(way::equals) .allMatch(way::equals)
&& way.getNodes().parallelStream().noneMatch(Node::isOutsideDownloadArea)) { && way.getNodes().parallelStream().noneMatch(Node::isOutsideDownloadArea)) {
errors.add(TestError.builder(this, SEVERITY_MAP.get(LONELY_WAY), LONELY_WAY).primitives(way) errors.add(TestError.builder(this, SEVERITY_MAP.get(LONELY_WAY), LONELY_WAY).primitives(way)
.message(tr("Routable way not connected to other ways")).build()); .message(tr("MapWithAI (experimental)"), marktr("Routable way not connected to other ways"))
.build());
} else if ((ValidatorPrefHelper.PREF_OTHER.get() || ValidatorPrefHelper.PREF_OTHER_UPLOAD.get() } else if ((ValidatorPrefHelper.PREF_OTHER.get() || ValidatorPrefHelper.PREF_OTHER_UPLOAD.get()
|| !Severity.OTHER.equals(SEVERITY_MAP.get(ROUTING_ISLAND)))) { || !Severity.OTHER.equals(SEVERITY_MAP.get(ROUTING_ISLAND)))) {
if (way.hasKey(HIGHWAY)) { if (way.hasKey(HIGHWAY)) {
@ -126,8 +128,10 @@ public class RoutingIslandsTest extends Test {
.filter(way -> !incomingWays.contains(way) || !outgoingWays.contains(way)) .filter(way -> !incomingWays.contains(way) || !outgoingWays.contains(way))
.filter(way -> Access.getPositiveAccessValues().contains( .filter(way -> Access.getPositiveAccessValues().contains(
getDefaultAccessTags(way).getOrDefault(currentTransportMode, Access.AccessTags.NO.getKey()))) getDefaultAccessTags(way).getOrDefault(currentTransportMode, Access.AccessTags.NO.getKey())))
.collect(Collectors.toSet())).parallelStream() .collect(Collectors.toSet()))
.map(way -> new Pair<>((incomingWays.containsAll(way) ? "outgoing" : "incoming"), way)) .parallelStream()
.map(way -> new Pair<>(
(incomingWays.containsAll(way) ? marktr("outgoing") : marktr("incoming")), way))
.collect(Collectors.toList()); .collect(Collectors.toList());
createErrors(problematic, currentTransportMode); createErrors(problematic, currentTransportMode);
} }
@ -210,7 +214,8 @@ public class RoutingIslandsTest extends Test {
for (Pair<String, Set<Way>> ways : problematic) { for (Pair<String, Set<Way>> ways : problematic) {
errors.add( errors.add(
TestError.builder(this, SEVERITY_MAP.getOrDefault(ROUTING_ISLAND, Severity.OTHER), ROUTING_ISLAND) TestError.builder(this, SEVERITY_MAP.getOrDefault(ROUTING_ISLAND, Severity.OTHER), ROUTING_ISLAND)
.message(tr("Routing island"), "{1}: {0}", tr(ways.a), mode == null ? "default" : mode) .message(tr("MapWithAI (experimental)"), marktr("Routing island"), "{1}: {0}", tr(ways.a),
mode == null ? marktr("default") : mode)
.primitives(ways.b).build()); .primitives(ways.b).build());
} }
} }