X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.geo%2Fsrc%2Forg%2Fargeo%2Fapp%2Fgeo%2Facr%2FGeoEntityUtils.java;h=62b432e7f42e59155d3f0a5f383b9057b087ef7d;hb=6e13b9416a5fd1f5477eb7233f86d3eacbb88c55;hp=43f0a022e772fcaa754e369bf469a6e97baa1c2d;hpb=b4b19aebd564f6be5195f2e5ea1499ac8a3f40e7;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 43f0a02..62b432e 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
@@ -42,7 +42,7 @@ public class GeoEntityUtils {
 	}
 
 	public static void putGeometry(Content c, QName name, Geometry geometry) {
-		QName jsonFileName = new ContentName(name.getNamespaceURI(), name.getLocalPart() + _GEOM_JSON);
+		QName jsonFileName = getJsonFileName(name);
 		Content geom = c.soleChild(jsonFileName).orElseGet(
 				() -> c.add(jsonFileName, Collections.singletonMap(DName.getcontenttype.qName(), "application/json")));
 		try (OutputStream out = geom.open(OutputStream.class)) {
@@ -57,12 +57,21 @@ public class GeoEntityUtils {
 		updateBoundingBox(c);
 	}
 
+	public static boolean hasGeometry(Content c, QNamed name) {
+		return hasGeometry(c, name.qName());
+	}
+
+	public static boolean hasGeometry(Content c, QName name) {
+		QName jsonFileName = getJsonFileName(name);
+		return c.hasChild(jsonFileName);
+	}
+
 	public static <T extends Geometry> T getGeometry(Content c, QNamed name, Class<T> clss) {
 		return getGeometry(c, name.qName(), clss);
 	}
 
 	public static <T extends Geometry> T getGeometry(Content c, QName name, Class<T> clss) {
-		QName jsonFileName = new ContentName(name.getNamespaceURI(), name.getLocalPart() + _GEOM_JSON);
+		QName jsonFileName = getJsonFileName(name);
 		Content geom = c.soleChild(jsonFileName).orElse(null);
 		if (geom == null)
 			return null;
@@ -76,6 +85,11 @@ public class GeoEntityUtils {
 		}
 	}
 
+	private static QName getJsonFileName(QName name) {
+		QName jsonFileName = new ContentName(name.getNamespaceURI(), name.getLocalPart() + _GEOM_JSON);
+		return jsonFileName;
+	}
+
 	public static Point toPoint(Content c) {
 		if (c.hasContentClass(EntityType.geopoint)) {
 			Double lat = c.get(WGS84PosName.lat, Double.class).orElseThrow();