From e0b05d6328f810c4009a636e52e20e6ece5c6c0a Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 3 Nov 2023 08:00:38 +0100 Subject: [PATCH] Make geopoint more robust --- .../src/org/argeo/app/geo/acr/GeoEntityUtils.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/org.argeo.app.geo/src/org/argeo/app/geo/acr/GeoEntityUtils.java b/org.argeo.app.geo/src/org/argeo/app/geo/acr/GeoEntityUtils.java index 62b432e..48c3c1b 100644 --- a/org.argeo.app.geo/src/org/argeo/app/geo/acr/GeoEntityUtils.java +++ b/org.argeo.app.geo/src/org/argeo/app/geo/acr/GeoEntityUtils.java @@ -54,6 +54,13 @@ public class GeoEntityUtils { } catch (IOException e) { throw new UncheckedIOException("Cannot add geometry " + name + " to " + c, e); } + +// try (BufferedReader in = new BufferedReader( +// new InputStreamReader(geom.open(InputStream.class), StandardCharsets.UTF_8))) { +// System.out.println(in.readLine()); +// } catch (IOException e) { +// throw new UncheckedIOException("Cannot parse " + c, e); +// } updateBoundingBox(c); } @@ -91,7 +98,7 @@ public class GeoEntityUtils { } public static Point toPoint(Content c) { - if (c.hasContentClass(EntityType.geopoint)) { + if (c.containsKey(WGS84PosName.lon) && c.containsKey(WGS84PosName.lat)) { Double lat = c.get(WGS84PosName.lat, Double.class).orElseThrow(); Double lon = c.get(WGS84PosName.lon, Double.class).orElseThrow(); return JTS.GEOMETRY_FACTORY_WGS84.createPoint(new Coordinate(lat, lon)); -- 2.30.2