X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fresources%2Forg%2Fargeo%2Fjcr%2Fgis%2Fargeo_gis.cnd;h=de147bbc13d4ccde456dbe105691559e564c85d0;hb=4682eb19bc95c0ce41abe543d76268943a530d5d;hp=43e3b574c39c169cf4ac4a9b42245f72dbc761ef;hpb=977a7a352131b082a98739f15e421f2bff747567;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/gis/argeo_gis.cnd b/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/gis/argeo_gis.cnd
index 43e3b574c..de147bbc1 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/gis/argeo_gis.cnd
+++ b/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/gis/argeo_gis.cnd
@@ -1,4 +1,4 @@
-<gis = 'http://www.argeo.org/gis'>
+<gis = 'http://www.argeo.org/ns/gis'>
 
 // GEOMETRIES (based on JTS http://www.vividsolutions.com/jts/JTSHome.htm) 
 [gis:coordinate] > nt:base
@@ -7,10 +7,40 @@ mixin
 - gis:y (DOUBLE) m
 - gis:z (DOUBLE)
 
-[gis:geometry] > mix:created, mix:lastModified
+// marker any node that is located or has a located parent 
+[gis:indexed] > nt:unstructured, mix:lastModified
 mixin
-// either an EPSG code (EPSG:4326 for WGS 84) or a WKT representation
+
+[gis:located] > gis:indexed
+abstract mixin
+// either an EPSG code (e.g. EPSG:4326 for WGS 84) or a WKT representation
 - gis:srs (STRING)
+// WKB
+- gis:bbox (BINARY)
+// WKB
+- gis:centroid (BINARY)
+// - gis:role (STRING)
+
+[gis:geometry] > nt:unstructured, gis:located
+- gis:wkb (BINARY)
+
+// GEOTOOLS
+[gis:feature] > nt:base
+mixin
+- gis:srs (STRING) m
+// WKB
+- gis:bbox (BINARY) m
+// WKB
+- gis:centroid (BINARY) m
+//- gis:relatedNode (REFERENCE) *
 
-[gis:point] > gis:geometry, gis:coordinate
+[gis:featureSource] > nt:unstructured, mix:title
 mixin
+- gis:type (STRING)
+
+[gis:dataStore] > nt:unstructured, mix:title
+- gis:type (STRING)
++ * (gis:featureSource) *
+// FIXME + * (gis:featureSource)
+
+[gis:relatedFeature] > nt:address, gis:located