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

Fix warnings from various tools 

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
pull/1/head
Taylor Smock 2020-02-03 15:35:57 -07:00
rodzic 7e89da6b3f
commit c7a913ef0b
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
3 zmienionych plików z 9 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java
Wyświetl plik

@ -58,8 +58,6 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
private final transient DataSet dataSet;
private final transient ProgressMonitor monitor;
private static final Object LOCK = new Object();
private static final int MAX_NUMBER_OF_BBOXES_TO_PROCESS = 1;
private static final String SERVER_ID_KEY = "server_id";

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

@ -139,10 +139,8 @@ public class StreetAddressOrder extends Test {
way.setNodes(Collections.emptyList());
List<T> badPrimitives = issueCentroids.stream().map(centroids::indexOf).map(primitives::get)
.collect(Collectors.toList());
Map<T, List<T>> badPrimitivesNeighborMap = badPrimitives.stream()
.map(p -> new Pair<T, List<T>>(p, getNeighbors(p, primitives)))
return badPrimitives.stream().map(p -> new Pair<T, List<T>>(p, getNeighbors(p, primitives)))
.collect(Collectors.toMap(p -> p.a, p -> p.b));
return badPrimitivesNeighborMap;
}
/**

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

@ -7,6 +7,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
@ -30,16 +31,16 @@ import org.openstreetmap.josm.tools.Geometry;
import org.openstreetmap.josm.tools.Pair;
public class StreetAddressTest extends Test {
private static double BBOX_EXPANSION = 0.001;
private static String ADDR_STREET = "addr:street";
private static final double BBOX_EXPANSION = 0.001;
private static final String ADDR_STREET = "addr:street";
/**
* Classified highways in order of importance
*
* Copied from {@link org.openstreetmap.josm.data.validation.tests.Highways}
*/
public static final List<String> CLASSIFIED_HIGHWAYS = Arrays.asList("motorway", "motorway_link", "trunk",
"trunk_link", "primary", "primary_link", "secondary", "secondary_link", "tertiary", "tertiary_link",
"unclassified", "residential", "living_street");
public static final List<String> CLASSIFIED_HIGHWAYS = Collections.unmodifiableList(
Arrays.asList("motorway", "motorway_link", "trunk", "trunk_link", "primary", "primary_link", "secondary",
"secondary_link", "tertiary", "tertiary_link", "unclassified", "residential", "living_street"));
public StreetAddressTest() {
super(tr("Mismatched street/street addresses ({0})", MapWithAIPlugin.NAME),
@ -93,7 +94,7 @@ public class StreetAddressTest extends Test {
max = entry.getValue();
likelyNames.clear();
likelyNames.add(entry.getKey());
} else if (entry.getValue() == max) {
} else if (max.equals(entry.getValue())) {
likelyNames.add(entry.getKey());
}
}
@ -143,10 +144,8 @@ public class StreetAddressTest extends Test {
.filter(StreetAddressTest::hasStreetAddressTags).collect(Collectors.toList());
List<Relation> addrRelations = way.getDataSet().searchRelations(bbox).parallelStream()
.filter(StreetAddressTest::hasStreetAddressTags).collect(Collectors.toList());
List<IPrimitive> nearbyAddresses = Stream.of(addrNodes, addrWays, addrRelations).flatMap(List::parallelStream)
return Stream.of(addrNodes, addrWays, addrRelations).flatMap(List::parallelStream)
.filter(prim -> StreetAddressTest.isNearestRoad(way, prim)).collect(Collectors.toList());
return nearbyAddresses;
}
/**