X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.entity.api%2Fsrc%2Forg%2Fargeo%2Fentity%2Fentity.cnd;h=2ea89f9b533d177d08217797184745ef1809b27e;hb=41e9998f7f1c87c747c57f60c6bec65fa20757a6;hp=baed374e72aade6644fb707cfeb08c449bdf0748;hpb=921e69ca45d5e257429c019b984428a59f891487;p=gpl%2Fargeo-suite.git

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..2ea89f9 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">
@@ -15,6 +15,10 @@ mixin
 mixin
 - entity:type (String) m
 
+[entity:relatedTo]
+mixin
++ entity:relatedTo (nt:address) *
+
 //
 // ENTITY DEFINITION
 //
@@ -31,6 +35,20 @@ mixin
 //+ * (entity:reference)
 //+ * (entity:composite)
 
+[entity:query] > nt:query, mix:referenceable
+
+[entity:querySet]
++ * (entity:query) = entity:query *
+
+//
+// STRUCTURE
+//
+[entity:space]
+mixin
+
+[entity:document]
+mixin
+
 //
 // TYPOLOGY
 //
@@ -39,7 +57,7 @@ mixin
 
 [entity:term]
 orderable
-- name (NAME) m
+- name (NAME)
 - * (*)
 + term (entity:term) = entity:term *
 
@@ -52,6 +70,7 @@ orderable
 //
 [entity:form]
 mixin
++ queries (entity:querySet) = entity:querySet
 
 [entity:formSubmission]
 mixin
@@ -83,3 +102,13 @@ mixin
 - ldap:distinguishedName (String)
 - ldap:uid (String)
 
+// GEOGRAPHY
+[entity:geopoint]
+mixin
+- geo:long (DOUBLE)
+- geo:lat (DOUBLE)
+- geo:alt (DOUBLE)
+
+[entity:bearing]
+mixin
+- svg:direction (DOUBLE)