Keep suite stabilising data model.

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 fe881ffb5c3963d9794d1c12f56e9f26ecf650f3..0cf53b67678434ef42e6b1a1a57b1ef8dd824ff8 100644 (file)
--- 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 a5221f26ade3cabc1d4c5feb2c0b1349ddbc3ead..29075fe1a6fcd908e2fab5a699e3faa9b3cb9d28 100644 (file)
--- 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 baed374e72aade6644fb707cfeb08c449bdf0748..91dcf2589f6823f5cacbba1bb3fbc7efe79e7e6a 100644 (file)
--- 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 ead041ca99f8032f5176fd071ad7ca82f084a4c8..e363a62ff23d0b7ec325f5093a18701a61d2fbf9 100644 (file)
--- 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) {