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

MapWithAILayerInfo: Fix CME 

Signed-off-by: Taylor Smock <tsmock@fb.com>
pull/1/head
Taylor Smock 2021-10-18 14:30:57 -06:00
rodzic feabf1db73
commit 453ceb38b9
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
1 zmienionych plików z 32 dodań i 30 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

62
src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/MapWithAILayerInfo.java
Wyświetl plik

@ -423,41 +423,43 @@ public class MapWithAILayerInfo {
boolean changed = false; boolean changed = false;
Collection<String> knownDefaults = new TreeSet<>(Config.getPref().getList(CONFIG_PREFIX + "layers.default")); Collection<String> knownDefaults = new TreeSet<>(Config.getPref().getList(CONFIG_PREFIX + "layers.default"));
Collection<String> newKnownDefaults = new TreeSet<>(); Collection<String> newKnownDefaults = new TreeSet<>();
for (MapWithAIInfo def : defaultLayers) { synchronized (defaultLayers) {
if (def.isDefaultEntry()) { for (MapWithAIInfo def : defaultLayers) {
boolean isKnownDefault = false; if (def.isDefaultEntry()) {
for (String entry : knownDefaults) { boolean isKnownDefault = false;
if (entry.equals(def.getId())) { for (String entry : knownDefaults) {
isKnownDefault = true; if (entry.equals(def.getId())) {
newKnownDefaults.add(entry); isKnownDefault = true;
knownDefaults.remove(entry); newKnownDefaults.add(entry);
break; knownDefaults.remove(entry);
} else if (isSimilar(entry, def.getUrl())) { break;
isKnownDefault = true; } else if (isSimilar(entry, def.getUrl())) {
isKnownDefault = true;
if (def.getId() != null) {
newKnownDefaults.add(def.getId());
}
knownDefaults.remove(entry);
break;
}
}
boolean isInUserList = false;
if (!isKnownDefault) {
if (def.getId() != null) { if (def.getId() != null) {
newKnownDefaults.add(def.getId()); newKnownDefaults.add(def.getId());
} for (MapWithAIInfo i : layers) {
knownDefaults.remove(entry); if (isSimilar(def, i)) {
break; isInUserList = true;
} break;
} }
boolean isInUserList = false;
if (!isKnownDefault) {
if (def.getId() != null) {
newKnownDefaults.add(def.getId());
for (MapWithAIInfo i : layers) {
if (isSimilar(def, i)) {
isInUserList = true;
break;
} }
} else {
Logging.error("Default imagery ''{0}'' has no id. Skipping.", def.getName());
} }
} else {
Logging.error("Default imagery ''{0}'' has no id. Skipping.", def.getName());
} }
} if (!isKnownDefault && !isInUserList) {
if (!isKnownDefault && !isInUserList) { add(new MapWithAIInfo(def));
add(new MapWithAIInfo(def)); changed = true;
changed = true; }
} }
} }
} }