From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 3 Nov 2023 07:00:38 +0000 (+0100)
Subject: Make geopoint more robust
X-Git-Tag: v2.3.19~2
X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=e0b05d6328f810c4009a636e52e20e6ece5c6c0a

Make geopoint more robust
---

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));