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

Third party conflation: Add some better guards against conflation 

Signed-off-by: Taylor Smock <tsmock@fb.com>
pull/1/head
Taylor Smock 2021-12-02 09:37:14 -07:00
rodzic 516a508620
commit 8ec50cc5dc
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
2 zmienionych plików z 5 dodań i 3 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/BoundingBoxMapWithAIDownloader.java
Wyświetl plik

@ -85,7 +85,7 @@ public class BoundingBoxMapWithAIDownloader extends BoundingBoxDownloader {
synchronized (BoundingBoxMapWithAIDownloader.class) { synchronized (BoundingBoxMapWithAIDownloader.class) {
externalData = super.parseOsm(progressMonitor); externalData = super.parseOsm(progressMonitor);
} }
if (!this.info.isConflated() if (MapWithAIInfo.THIRD_PARTY_CONFLATE.get() && !this.info.isConflated()
&& !MapWithAIConflationCategory.conflationUrlFor(this.info.getCategory()).isEmpty()) { && !MapWithAIConflationCategory.conflationUrlFor(this.info.getCategory()).isEmpty()) {
if (externalData.getDataSourceBounds().isEmpty()) { if (externalData.getDataSourceBounds().isEmpty()) {
externalData.addDataSource(new DataSource(this.downloadArea, "External Data")); externalData.addDataSource(new DataSource(this.downloadArea, "External Data"));

6
src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/MapWithAIInfo.java
Wyświetl plik

@ -25,9 +25,9 @@ import org.openstreetmap.josm.data.StructUtils.StructEntry;
import org.openstreetmap.josm.data.imagery.ImageryInfo; import org.openstreetmap.josm.data.imagery.ImageryInfo;
import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryBounds; import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryBounds;
import org.openstreetmap.josm.data.imagery.Shape; import org.openstreetmap.josm.data.imagery.Shape;
import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.data.sources.SourceInfo; import org.openstreetmap.josm.data.sources.SourceInfo;
import org.openstreetmap.josm.data.sources.SourcePreferenceEntry; import org.openstreetmap.josm.data.sources.SourcePreferenceEntry;
import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.tools.CheckParameterUtil; import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.Logging;
@ -40,6 +40,8 @@ public class MapWithAIInfo extends
private Map<String, String> replacementTags; private Map<String, String> replacementTags;
private boolean conflate; private boolean conflate;
private String conflationUrl; private String conflationUrl;
public static BooleanProperty THIRD_PARTY_CONFLATE = new BooleanProperty("mapwithai.third_party.conflate", true);
/** /**
* The preferred source string for the source. This is added as a source tag on * The preferred source string for the source. This is added as a source tag on
* the object _and_ is added to the changeset tags. * the object _and_ is added to the changeset tags.
@ -391,7 +393,7 @@ public class MapWithAIInfo extends
public String getUrlExpanded() { public String getUrlExpanded() {
StringBuilder sb; StringBuilder sb;
if (conflate && Config.getPref().getBoolean("mapwithai.third_party.conflate", true)) { if (conflate && THIRD_PARTY_CONFLATE.get()) {
sb = getConflationUrl(); sb = getConflationUrl();
} else { } else {
sb = getNonConflatedUrl(); sb = getNonConflatedUrl();