X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.entity.api%2Fsrc%2Forg%2Fargeo%2Fentity%2Fentity.cnd;h=0b3127b305115cf16c82412b1f1b23df15825bdb;hp=8a6b2e084d2a607c52f27244e32722ec194c0eb6;hb=8347556c9afb8e7ff128722ded5aa3f198b31079;hpb=ad02c6409af0ac720108168a51f202d21a9dfa3f

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 8a6b2e0..0b3127b 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">
@@ -10,21 +10,27 @@
 
 [entity:entity] > mix:created, mix:referenceable
 mixin
-//- entity:uid (String) m // an implementation dependent UID for each entity
-//- entity:type (String) // the type of this entity
+
+[entity:local] > entity:entity
+mixin
+- entity:type (String) m
+
+[entity:relatedTo]
+mixin
++ entity:relatedTo (nt:address) *
 
 //
 // ENTITY DEFINITION
 //
-[entity:definition] > entity:composite, mix:created, mix:lastModified, mix:referenceable
+//[entity:definition] > entity:composite, mix:created, mix:lastModified, mix:referenceable
 //- entity:type (String) multiple
 
 //[entity:part]
 
 //[entity:reference]
 
-[entity:composite]
-orderable
+//[entity:composite]
+//orderable
 //+ * (entity:part)
 //+ * (entity:reference)
 //+ * (entity:composite)
@@ -74,3 +80,17 @@ mixin
 mixin
 - ldap:sn (String)
 - ldap:givenName (String)
+- ldap:mail (String) *
+
+[entity:user] > entity:person
+mixin
+- ldap:distinguishedName (String)
+- ldap:uid (String)
+
+// GEOGRAPHY
+[entity:geopoint]
+mixin
+- geo:long (DOUBLE)
+- geo:lat (DOUBLE)
+- geo:alt (DOUBLE)
+