Changeset 35727 in osm

Timestamp:

2021-03-14T17:42:43+01:00 (3 years ago)

Author:

Don-vip

Message:

fix #20596 - better error message when GeoAPI fails. Ask to report issues to ​https://github.com/etalab/geo.data.gouv.fr, ​https://twitter.com/geodatagouv, geo@…

File:

• applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/api/CadastreAPI.java (modified) (4 diffs)

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/api/CadastreAPI.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.fr.cadastre.api;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.IOException;
@@ -17 +19 @@
 import org.openstreetmap.josm.io.OsmApiException;
 import org.openstreetmap.josm.tools.HttpClient;
+import org.openstreetmap.josm.tools.HttpClient.Response;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 
@@ -24 +27 @@
 public final class CadastreAPI {
 
-    private static final String API_ENDPOINT = "https://sandbox.geo.api.gouv.fr/cadastre/";
+    private static final String API_ENDPOINT = "https://sandbox.geo.api.gouv.fr/cadastre";
 
     private CadastreAPI() {
@@ -53 +56 @@
                 Double.toString(minlon), Double.toString(minlat), Double.toString(maxlon), Double.toString(maxlat)));
         try {
-            JsonStructure json = Json.createReader(new StringReader(HttpClient.create(url).connect().fetchContent())).read();
+            Response response = HttpClient.create(url).connect();
+            if (response.getResponseCode() >= 400) {
+                throw new IOException(
+                        tr("Cadastre GeoAPI returned HTTP error {0}. This is not a JOSM bug.\nPlease report the issue to {1}, {2} or {3}",
+                        response.getResponseCode(), "https://github.com/etalab/geo.data.gouv.fr/issues", "https://twitter.com/geodatagouv",
+                        "geo@data.gouv.fr"));
+            }
+            JsonStructure json = Json.createReader(new StringReader(response.fetchContent())).read();
             if (json instanceof JsonArray) {
                 return json.asJsonArray().stream().map(x -> x.asJsonObject().getString("id")).collect(Collectors.toSet());