Improve GIS types

[lgpl/argeo-commons.git] / server / runtime / org.argeo.server.jcr / src / main / resources / org / argeo / jcr / gis / argeo_gis.cnd

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 14c24e7b06843f640b9fa5753ffc2942598ebc79..de147bbc13d4ccde456dbe105691559e564c85d0 100644 (file)
--- 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
@@ -14,19 +14,24 @@ mixin
 [gis:located] > gis:indexed
 abstract mixin
 // either an EPSG code (e.g. EPSG:4326 for WGS 84) or a WKT representation
-- gis:srs (STRING) m
+- gis:srs (STRING)
 // WKB
-- gis:bbox (BINARY) m
+- gis:bbox (BINARY)
 // WKB
-- gis:centroid (BINARY) m
+- gis:centroid (BINARY)
 // - gis:role (STRING)
 
 [gis:geometry] > nt:unstructured, gis:located
-- gis:wkb (STRING) m
+- 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:featureSource] > nt:unstructured, mix:title