From 9cd258d2c3de54e128c780adb991ecec7e6b2b9c Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 30 Nov 2020 10:21:04 +0100
Subject: [PATCH] Keep suite stabilising data model.

---
 .../src/org/argeo/entity/EntityNames.java                | 4 ++++
 .../src/org/argeo/entity/EntityType.java                 | 2 ++
 org.argeo.entity.api/src/org/argeo/entity/entity.cnd     | 9 ++++++++-
 org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java  | 1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java b/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java
index fe881ff..0cf53b6 100644
--- a/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java
+++ b/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java
@@ -41,4 +41,8 @@ public interface EntityNames {
 	final String GEO_LAT = "geo:lat";
 	final String GEO_LONG = "geo:long";
 	final String GEO_ALT = "geo:alt";
+
+	// SVG
+	final String SVG_WIDTH = "svg:width";
+	final String SVG_HEIGHT = "svg:height";
 }
diff --git a/org.argeo.entity.api/src/org/argeo/entity/EntityType.java b/org.argeo.entity.api/src/org/argeo/entity/EntityType.java
index a5221f2..29075fe 100644
--- a/org.argeo.entity.api/src/org/argeo/entity/EntityType.java
+++ b/org.argeo.entity.api/src/org/argeo/entity/EntityType.java
@@ -10,6 +10,8 @@ public enum EntityType implements JcrName {
 	form, formSet, formSubmission,
 	// graphics
 	box,
+	// geography
+	geopoint,
 	// ldap
 	person, user;
 
diff --git a/org.argeo.entity.api/src/org/argeo/entity/entity.cnd b/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
index baed374..91dcf25 100644
--- a/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
+++ b/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
@@ -2,7 +2,7 @@
 <xsd = "http://www.w3.org/2001/XMLSchema">
 <h = "http://www.w3.org/1999/xhtml">
 // see https://www.w3.org/2003/01/geo/
-//<geo = "http://www.w3.org/2003/01/geo/wgs84_pos#">
+<geo = "http://www.w3.org/2003/01/geo/wgs84_pos#">
 <svg = "http://www.w3.org/2000/svg">
 
 <ldap = "http://www.argeo.org/ns/ldap">
@@ -83,3 +83,10 @@ mixin
 - ldap:distinguishedName (String)
 - ldap:uid (String)
 
+// GEOGRAPHY
+[entity:geopoint]
+mixin
+- geo:long (DOUBLE)
+- geo:lat (DOUBLE)
+- geo:alt (DOUBLE)
+
diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
index ead041c..e363a62 100644
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
@@ -343,6 +343,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 				String layerId = get(event, SuiteEvent.LAYER);
 				if (layerId != null) {
 					ui.switchToLayer(layerId, Jcr.getRootNode(ui.getSession(null)));
+					//ui.getCmsView().navigateTo("~");
 				} else {
 					Node node = getNode(ui, event);
 					if (node != null) {
-- 
2.30.2