# HG changeset patch # User Babis Nikolaou # Date 1365191252 -10800 # Node ID 53ff1f55fa0117dbb4026b6d353cbfce19ef4cc7 # Parent 033b5611e0e4d770e6c5dc783acfedbe005d63af moved GeoSPARQL geometry properties from GeoConstants to GeoSPARQL diff -r 033b5611e0e4 -r 53ff1f55fa01 constants/src/main/java/eu/earthobservatory/constants/GeoConstants.java --- a/constants/src/main/java/eu/earthobservatory/constants/GeoConstants.java Fri Apr 05 22:33:57 2013 +0300 +++ b/constants/src/main/java/eu/earthobservatory/constants/GeoConstants.java Fri Apr 05 22:47:32 2013 +0300 @@ -82,49 +82,6 @@ public static final String GML_OGC = "http://www.opengis.net/gml"; - - - /** * - * URIs * - * */ - - /** * - * GeoSPARQL Version 1.0.1 Document# 11-052r4 * - * http://schemas.opengis.net/geosparql/geosparql-1_0_1.zip */ - - /** The following GeoSPARQL classes and properties are - * commented out because they are not currently used. - */ - - /** - * The URIs for GeoSPARQL classes - */ -/* public static final String SpatialObject = GEO + "SpatialObject"; - public static final String Geometry = GEO + "Geometry"; - public static final String Feauture = GEO + "Feature"; -*/ - - /** - * The URIs for GeoSPARQL properties - */ - public static final String GEOhasGeometry = GeoSPARQL.hasGeometry; - public static final String GEOdefaultGeometry = GeoSPARQL.hasDefaultGeometry; - public static final String GEOdimension = GEO + "dimension"; - public static final String GEOcoordinateDimension = GEO + "coordinateDimension"; - public static final String GEOspatialDimension = GEO + "spatialDimension"; - public static final String GEOisEmpty = GEO + "isEmpty"; - public static final String GEOisSimple = GEO + "isSimple"; - public static final String GEOhasSerialization = GEO + "hasSerialization"; - public static final String GEOasWKT = GEO + "asWKT"; - public static final String GEOasGML = GEO + "asGML"; - - - - /** * - * URIs for datatypes * - * */ - - /** * The URI for the datatype SemiLinearPointSet * (linear constraint-based representation of geometries) diff -r 033b5611e0e4 -r 53ff1f55fa01 constants/src/main/java/eu/earthobservatory/vocabulary/GeoSPARQL.java --- a/constants/src/main/java/eu/earthobservatory/vocabulary/GeoSPARQL.java Fri Apr 05 22:33:57 2013 +0300 +++ b/constants/src/main/java/eu/earthobservatory/vocabulary/GeoSPARQL.java Fri Apr 05 22:47:32 2013 +0300 @@ -10,6 +10,7 @@ package eu.earthobservatory.vocabulary; + /** * GeoSPARQL vocabulary, version 1.0.1, Document 11-052r4 * http://schemas.opengis.net/geosparql/geosparql-1_0_1.zip @@ -18,25 +19,39 @@ */ public class GeoSPARQL { + /** + * Namespaces + */ public static final String ONTOLOGY_NAMESPACE = "http://www.opengis.net/ont/geosparql#"; public static final String FUNCTION_NAMESPACE = "http://www.opengis.net/def/function/geosparql/"; public static final String RULE_NAMESPACE = "http://www.opengis.net/def/rule/geosparql/"; + /** + * Prefixes + */ public static final String GEO = ONTOLOGY_NAMESPACE; public static final String GEOF = FUNCTION_NAMESPACE; public static final String GEOR = RULE_NAMESPACE; /** - * Defined Classes + * Geometry classes */ public static final String SpatialObject = GEO + "SpatialObject"; public static final String Feature = GEO + "Feature"; public static final String Geometry = GEO + "Geometry"; /** - * Defined geometry properties + * Geometry properties */ public static final String hasGeometry = GEO + "hasGeometry"; public static final String hasDefaultGeometry = GEO + "hasDefaultGeometry"; + public static final String dimension = GEO + "dimension"; + public static final String coordinateDimension = GEO + "coordinateDimension"; + public static final String spatialDimension = GEO + "spatialDimension"; + public static final String isEmpty = GEO + "isEmpty"; + public static final String isSimple = GEO + "isSimple"; + public static final String hasSerialization = GEO + "hasSerialization"; + public static final String asWKT = GEO + "asWKT"; + public static final String asGML = GEO + "asGML"; } diff -r 033b5611e0e4 -r 53ff1f55fa01 runtime/src/main/java/eu/earthobservatory/runtime/generaldb/GeosparqlRDFHandlerBase.java --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/GeosparqlRDFHandlerBase.java Fri Apr 05 22:33:57 2013 +0300 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/GeosparqlRDFHandlerBase.java Fri Apr 05 22:47:32 2013 +0300 @@ -30,8 +30,9 @@ //private static final Logger logger = LoggerFactory.getLogger(eu.earthobservatory.runtime.generaldb.GeosparqlRDFHandlerBase.class); - private static String TYPE = RDF.TYPE.stringValue(); - private static String SUBCLASS = RDFS.SUBCLASSOF.stringValue(); + private static String TYPE = RDF.TYPE.stringValue(); + private static String CLASS = RDFS.CLASS.stringValue(); + private static String SUBCLASS = RDFS.SUBCLASSOF.stringValue(); private StringBuffer triples = new StringBuffer(1024); @@ -68,9 +69,9 @@ * from * subj {any topological property from the Topology Vocabulary Extension} obj */ - if( pred.startsWith(GeoConstants.GEO+"sf") || - pred.startsWith(GeoConstants.GEO+"eh") || - pred.startsWith(GeoConstants.GEO+"rcc8")) + if( pred.startsWith(GeoSPARQL.GEO+"sf") || + pred.startsWith(GeoSPARQL.GEO+"eh") || + pred.startsWith(GeoSPARQL.GEO+"rcc8")) { writeTriple(subj, TYPE, GeoSPARQL.SpatialObject); writeTriple(obj, TYPE, GeoSPARQL.SpatialObject); @@ -290,10 +291,10 @@ * from * subj {any spatial property defined in Req. 9, 14, and 18} obj */ - } else if ( GeoConstants.GEOspatialDimension.equals(pred) || GeoConstants.GEOdimension.equals(pred) || - GeoConstants.GEOcoordinateDimension.equals(pred) || GeoConstants.GEOisEmpty.equals(pred) || - GeoConstants.GEOisSimple.equals(pred) || GeoConstants.GEOhasSerialization.equals(pred) || - GeoConstants.GEOasWKT.equals(pred) || GeoConstants.GEOasGML.equals(pred)) { + } else if ( GeoSPARQL.spatialDimension.equals(pred) || GeoSPARQL.dimension.equals(pred) || + GeoSPARQL.coordinateDimension.equals(pred) || GeoSPARQL.isEmpty.equals(pred) || + GeoSPARQL.isSimple.equals(pred) || GeoSPARQL.hasSerialization.equals(pred) || + GeoSPARQL.asWKT.equals(pred) || GeoSPARQL.asGML.equals(pred)) { writeTriple(subj, TYPE, GeoSPARQL.Geometry); writeTriple(subj, TYPE, GeoSPARQL.SpatialObject); @@ -311,23 +312,23 @@ * Materializes the RDF class hierarchy of Simple Features */ protected void insertSimpleFeaturesClassHierarchy() { - writeTriple(SimpleFeatures.Geometry, TYPE, RDFS.CLASS.stringValue()); - writeTriple(SimpleFeatures.Point, TYPE, RDFS.CLASS.stringValue()); - writeTriple(SimpleFeatures.Curve, TYPE, RDFS.CLASS.stringValue()); - writeTriple(SimpleFeatures.Surface, TYPE, RDFS.CLASS.stringValue()); - writeTriple(SimpleFeatures.GeometryCollection, TYPE, RDFS.CLASS.stringValue()); - writeTriple(SimpleFeatures.LineString, TYPE, RDFS.CLASS.stringValue()); - writeTriple(SimpleFeatures.Polygon, TYPE, RDFS.CLASS.stringValue()); - writeTriple(SimpleFeatures.PolyhedralSurface, TYPE, RDFS.CLASS.stringValue()); - writeTriple(SimpleFeatures.MultiSurface, TYPE, RDFS.CLASS.stringValue()); - writeTriple(SimpleFeatures.MultiCurve, TYPE, RDFS.CLASS.stringValue()); - writeTriple(SimpleFeatures.MultiPoint, TYPE, RDFS.CLASS.stringValue()); - writeTriple(SimpleFeatures.Line, TYPE, RDFS.CLASS.stringValue()); - writeTriple(SimpleFeatures.LinearRing, TYPE, RDFS.CLASS.stringValue()); - writeTriple(SimpleFeatures.Triangle, TYPE, RDFS.CLASS.stringValue()); - writeTriple(SimpleFeatures.TIN, TYPE, RDFS.CLASS.stringValue()); - writeTriple(SimpleFeatures.MultiPolygon, TYPE, RDFS.CLASS.stringValue()); - writeTriple(SimpleFeatures.MultiLineString, TYPE, RDFS.CLASS.stringValue()); + writeTriple(SimpleFeatures.Geometry, TYPE, CLASS); + writeTriple(SimpleFeatures.Point, TYPE, CLASS); + writeTriple(SimpleFeatures.Curve, TYPE, CLASS); + writeTriple(SimpleFeatures.Surface, TYPE, CLASS); + writeTriple(SimpleFeatures.GeometryCollection, TYPE, CLASS); + writeTriple(SimpleFeatures.LineString, TYPE, CLASS); + writeTriple(SimpleFeatures.Polygon, TYPE, CLASS); + writeTriple(SimpleFeatures.PolyhedralSurface, TYPE, CLASS); + writeTriple(SimpleFeatures.MultiSurface, TYPE, CLASS); + writeTriple(SimpleFeatures.MultiCurve, TYPE, CLASS); + writeTriple(SimpleFeatures.MultiPoint, TYPE, CLASS); + writeTriple(SimpleFeatures.Line, TYPE, CLASS); + writeTriple(SimpleFeatures.LinearRing, TYPE, CLASS); + writeTriple(SimpleFeatures.Triangle, TYPE, CLASS); + writeTriple(SimpleFeatures.TIN, TYPE, CLASS); + writeTriple(SimpleFeatures.MultiPolygon, TYPE, CLASS); + writeTriple(SimpleFeatures.MultiLineString, TYPE, CLASS); // first level writeTriple(SimpleFeatures.Point, SUBCLASS, SimpleFeatures.Geometry); @@ -384,9 +385,9 @@ * Materializes the RDF class hierarchy of GeoSPARQL */ protected void insertGeoSPARQLClassHierarchy() { - writeTriple(GeoSPARQL.SpatialObject, TYPE, RDFS.CLASS.stringValue()); - writeTriple(GeoSPARQL.Feature, TYPE, RDFS.CLASS.stringValue()); - writeTriple(GeoSPARQL.Geometry, TYPE, RDFS.CLASS.stringValue()); + writeTriple(GeoSPARQL.SpatialObject, TYPE, CLASS); + writeTriple(GeoSPARQL.Feature, TYPE, CLASS); + writeTriple(GeoSPARQL.Geometry, TYPE, CLASS); writeTriple(GeoSPARQL.Feature, SUBCLASS, GeoSPARQL.SpatialObject);