X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.geo%2Fsrc%2Forg%2Fargeo%2Fapp%2Fgeo%2Facr%2FGeoEntityUtils.java;h=43f0a022e772fcaa754e369bf469a6e97baa1c2d;hb=2bdad474db365c49118b5a8e2d58c258d53b3d78;hp=6019ee9ae46ab4b20c4d1a55035f49033a56f2cd;hpb=1eaec4a7690f29973a712a9000c010a37f725ea1;p=gpl%2Fargeo-suite.git

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 6019ee9..43f0a02 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
@@ -35,7 +35,6 @@ import jakarta.json.stream.JsonGenerator;
 
 /** Utilities around entity types related to geography. */
 public class GeoEntityUtils {
-	public static final String PLACE_GEOM_JSON = "place.geom.json";
 	public static final String _GEOM_JSON = ".geom.json";
 
 	public static void putGeometry(Content c, QNamed name, Geometry geometry) {
@@ -81,9 +80,10 @@ public class GeoEntityUtils {
 		if (c.hasContentClass(EntityType.geopoint)) {
 			Double lat = c.get(WGS84PosName.lat, Double.class).orElseThrow();
 			Double lon = c.get(WGS84PosName.lon, Double.class).orElseThrow();
-			Double alt = c.get(WGS84PosName.alt, Double.class).orElse(null);
-			return JTS.GEOMETRY_FACTORY_WGS84
-					.createPoint(alt != null ? new Coordinate(lat, lon, alt) : new Coordinate(lat, lon));
+			return JTS.GEOMETRY_FACTORY_WGS84.createPoint(new Coordinate(lat, lon));
+//			Double alt = c.get(WGS84PosName.alt, Double.class).orElse(null);
+//			return JTS.GEOMETRY_FACTORY_WGS84
+//					.createPoint(alt != null ? new Coordinate(lat, lon, alt) : new Coordinate(lat, lon));
 		}
 		return null;
 	}
@@ -118,6 +118,19 @@ public class GeoEntityUtils {
 		entity.put(EntityName.maxLon, bbox.getMaxY());
 	}
 
+	public static void updateBoundingBox(Content entity, QName prop) {
+		Geometry geom = getGeometry(entity, prop, Geometry.class);
+		if (geom == null)
+			return;
+		entity.addContentClasses(EntityType.geobounded.qName());
+
+		Envelope bbox = geom.getEnvelopeInternal();
+		entity.put(EntityName.minLat, bbox.getMinX());
+		entity.put(EntityName.minLon, bbox.getMinY());
+		entity.put(EntityName.maxLat, bbox.getMaxX());
+		entity.put(EntityName.maxLon, bbox.getMaxY());
+	}
+
 	/** singleton */
 	private GeoEntityUtils() {
 	}