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

BoundingBoxMapWithAIDownloader: Use response headers to determine parser 

Signed-off-by: Taylor Smock <tsmock@fb.com>
pull/1/head v1.9.2
Taylor Smock 2021-11-22 08:27:56 -07:00
rodzic 385c16a061
commit 516a508620
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
1 zmienionych plików z 3 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/BoundingBoxMapWithAIDownloader.java
Wyświetl plik

@ -32,7 +32,6 @@ import org.openstreetmap.josm.io.OsmTransferException;
import org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin; import org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin;
import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIConflationCategory; import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIConflationCategory;
import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIInfo; import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIInfo;
import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIType;
import org.openstreetmap.josm.plugins.mapwithai.tools.MapPaintUtils; import org.openstreetmap.josm.plugins.mapwithai.tools.MapPaintUtils;
import org.openstreetmap.josm.tools.HttpClient; import org.openstreetmap.josm.tools.HttpClient;
import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.Logging;
@ -168,10 +167,9 @@ public class BoundingBoxMapWithAIDownloader extends BoundingBoxDownloader {
@Override @Override
protected DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException { protected DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
DataSet ds; DataSet ds;
String contentType = this.activeConnection.getResponse().getHeaderField("Content-Type"); String contentType = this.activeConnection.getResponse().getContentType();
if (contentType.contains("text/xml")) { if (contentType.contains("text/json") || contentType.contains("application/json")
ds = OsmReader.parseDataSet(source, progressMonitor, OsmReader.Options.SAVE_ORIGINAL_ID); || contentType.contains("application/geo+json")) {
} else if (MapWithAIType.ESRI_FEATURE_SERVER == this.info.getSourceType()) {
ds = GeoJSONReader.parseDataSet(source, progressMonitor); ds = GeoJSONReader.parseDataSet(source, progressMonitor);
if (info.getReplacementTags() != null) { if (info.getReplacementTags() != null) {
GetDataRunnable.replaceKeys(ds, info.getReplacementTags()); GetDataRunnable.replaceKeys(ds, info.getReplacementTags());