Changeset 34711 in osm for applications/editors/josm/plugins
- Timestamp:
- 2018-10-31T21:33:39+01:00 (6 years ago)
- Location:
- applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionLoadFromCache.java
r34668 r34711 54 54 !CadastrePlugin.isLambert_cc9()) 55 55 || (ext.length() == 4 && ext.substring(0, CacheControl.C_UTM20N.length()).equals(CacheControl.C_UTM20N) && 56 ! (CadastrePlugin.isUtm_france_dom()))56 !CadastrePlugin.isUtm_france_dom()) 57 57 || (ext.length() == 1 && !CadastrePlugin.isLambert())) { 58 58 JOptionPane.showMessageDialog(MainApplication.getMainFrame(), -
applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/api/CadastreAPI.java
r34351 r34711 10 10 11 11 import javax.json.Json; 12 import javax.json.JsonArray; 13 import javax.json.JsonObject; 14 import javax.json.JsonStructure; 12 15 13 16 import org.openstreetmap.josm.data.Bounds; 17 import org.openstreetmap.josm.io.OsmApiException; 14 18 import org.openstreetmap.josm.tools.HttpClient; 15 19 import org.openstreetmap.josm.tools.JosmRuntimeException; … … 46 50 */ 47 51 public static Set<String> getSheets(double minlon, double minlat, double maxlon, double maxlat) throws IOException { 52 URL url = new URL(API_ENDPOINT + "/feuilles?bbox=" + String.join(",", 53 Double.toString(minlon), Double.toString(minlat), Double.toString(maxlon), Double.toString(maxlat))); 48 54 try { 49 return Json.createReader(new StringReader( 50 HttpClient.create(new URL(API_ENDPOINT + "/feuilles?bbox=" + String.join(",", 51 Double.toString(minlon), Double.toString(minlat), Double.toString(maxlon), Double.toString(maxlat)))) 52 .connect().fetchContent())) 53 .readArray().stream().map(x -> x.asJsonObject().getString("id")).collect(Collectors.toSet()); 55 JsonStructure json = Json.createReader(new StringReader(HttpClient.create(url).connect().fetchContent())).read(); 56 if (json instanceof JsonArray) { 57 return json.asJsonArray().stream().map(x -> x.asJsonObject().getString("id")).collect(Collectors.toSet()); 58 } else { 59 JsonObject obj = json.asJsonObject(); 60 throw new IOException(new OsmApiException(obj.getInt("code"), null, obj.getString("message"), url.toExternalForm())); 61 } 54 62 } catch (MalformedURLException e) { 55 63 throw new JosmRuntimeException(e); -
applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadTask.java
r34355 r34711 13 13 import java.util.stream.Stream; 14 14 15 import javax.swing.JOptionPane; 16 15 17 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask; 16 18 import org.openstreetmap.josm.actions.downloadtasks.DownloadParams; … … 20 22 import org.openstreetmap.josm.data.osm.UploadPolicy; 21 23 import org.openstreetmap.josm.gui.MainApplication; 24 import org.openstreetmap.josm.gui.Notification; 22 25 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 23 26 import org.openstreetmap.josm.gui.progress.ProgressMonitor; 24 27 import org.openstreetmap.josm.plugins.fr.cadastre.api.CadastreAPI; 25 28 import org.openstreetmap.josm.tools.Logging; 29 import org.openstreetmap.josm.tools.Utils; 26 30 27 31 /** … … 59 63 } catch (IOException e) { 60 64 Logging.error(e); 65 new Notification(Utils.escapeReservedCharactersHTML(Utils.getRootCause(e).getMessage())) 66 .setIcon(JOptionPane.ERROR_MESSAGE).show(); 61 67 } 62 68 return MainApplication.worker.submit(() -> {
Note:
See TracChangeset
for help on using the changeset viewer.