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

StubEndsTest: Clarify double-initialization of maxLength, fix some sonarlint issues 

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
pull/1/head
Taylor Smock 2020-06-10 10:36:57 -06:00
rodzic f29d5d53c5
commit c18ee6ba33
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
1 zmienionych plików z 8 dodań i 5 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/StubEndsTest.java
Wyświetl plik

@ -26,7 +26,9 @@ public class StubEndsTest extends Test {
private static final String HIGHWAY = "highway"; private static final String HIGHWAY = "highway";
private static final List<String> BAD_HIGHWAYS = Arrays.asList("services", "rest_area"); private static final List<String> BAD_HIGHWAYS = Arrays.asList("services", "rest_area");
private static final double DEFAULT_MAX_LENGTH = 5.0; private static final double DEFAULT_MAX_LENGTH = 5.0;
private double max_length = Config.getPref().getDouble(MapWithAIPlugin.NAME + ".stubendlength", DEFAULT_MAX_LENGTH); private static final int ERROR_CODE = 333_300_239;
// Initialize for use with just a `visit` statement
private double maxLength = Config.getPref().getDouble(MapWithAIPlugin.NAME + ".stubendlength", DEFAULT_MAX_LENGTH);
public StubEndsTest() { public StubEndsTest() {
super(tr("Stub Ends ({0})", MapWithAIPlugin.NAME), tr("Look for short ends on ways")); super(tr("Stub Ends ({0})", MapWithAIPlugin.NAME), tr("Look for short ends on ways"));
@ -35,7 +37,8 @@ public class StubEndsTest extends Test {
@Override @Override
public void startTest(ProgressMonitor monitor) { public void startTest(ProgressMonitor monitor) {
super.startTest(monitor); super.startTest(monitor);
max_length = Config.getPref().getDouble(MapWithAIPlugin.NAME + ".stubendlength", DEFAULT_MAX_LENGTH); // Ensure that we pick up changes made to the preference on a per-run basis
maxLength = Config.getPref().getDouble(MapWithAIPlugin.NAME + ".stubendlength", DEFAULT_MAX_LENGTH);
} }
@Override @Override
@ -48,19 +51,19 @@ public class StubEndsTest extends Test {
private void checkEnds(Way way) { private void checkEnds(Way way) {
List<Node> nodesToFirstConnection = new ArrayList<>(); List<Node> nodesToFirstConnection = new ArrayList<>();
double distanceToFirstConnection = distanceToFirstConnection(way, nodesToFirstConnection); double distanceToFirstConnection = distanceToFirstConnection(way, nodesToFirstConnection);
if (distanceToFirstConnection < max_length && !nodesToFirstConnection.isEmpty()) { if (distanceToFirstConnection < maxLength && !nodesToFirstConnection.isEmpty()) {
errors.add(createError(way, nodesToFirstConnection, distanceToFirstConnection)); errors.add(createError(way, nodesToFirstConnection, distanceToFirstConnection));
} }
List<Node> nodesToLastConnection = new ArrayList<>(); List<Node> nodesToLastConnection = new ArrayList<>();
double distanceToLastConnection = distanceToLastConnection(way, nodesToLastConnection); double distanceToLastConnection = distanceToLastConnection(way, nodesToLastConnection);
if (distanceToLastConnection < max_length && !nodesToLastConnection.isEmpty()) { if (distanceToLastConnection < maxLength && !nodesToLastConnection.isEmpty()) {
errors.add(createError(way, nodesToLastConnection, distanceToLastConnection)); errors.add(createError(way, nodesToLastConnection, distanceToLastConnection));
} }
} }
private TestError createError(Way way, List<Node> nodes, double distance) { private TestError createError(Way way, List<Node> nodes, double distance) {
TestError.Builder error = TestError.builder(this, Severity.ERROR, 333300239) TestError.Builder error = TestError.builder(this, Severity.ERROR, ERROR_CODE)
.message(tr("{0} (experimental)", MapWithAIPlugin.NAME), marktr("Stub end ({0}m)"), .message(tr("{0} (experimental)", MapWithAIPlugin.NAME), marktr("Stub end ({0}m)"),
Math.round(distance)) Math.round(distance))
.primitives(way).highlight(nodes); .primitives(way).highlight(nodes);