Strabon

changeset 862:a0c85ff6a60e

Update teleios queries after to conform to function renaming
author George Garbis <ggarbis@di.uoa.gr>
date Wed Jan 23 00:35:45 2013 +0200 (2013-01-23)
parents 473979eb4c0a
children 6889ed6b7ca2
files examples/teleios/landUseInvalidForFires.rq examples/teleios/refinePartialSeaHotspots.rq
line diff
     1.1 --- a/examples/teleios/landUseInvalidForFires.rq	Wed Jan 23 00:32:05 2013 +0200
     1.2 +++ b/examples/teleios/landUseInvalidForFires.rq	Wed Jan 23 00:35:45 2013 +0200
     1.3 @@ -16,7 +16,7 @@
     1.4  			noa:hasGeometry ?hGeo.
     1.5  		?a  rdf:type   clc:ExcludeArea;
     1.6  			clc:hasGeometry ?aGeo.
     1.7 -		FILTER(strdf:mbbOverlaps(?hGeo,?aGeo)).
     1.8 +		FILTER(strdf:mbbIntersects(?hGeo,?aGeo)).
     1.9  	} 
    1.10  	GROUP BY ?h ?hGeo
    1.11  	HAVING strdf:contains(strdf:union(?aGeo),?hGeo)
     2.1 --- a/examples/teleios/refinePartialSeaHotspots.rq	Wed Jan 23 00:32:05 2013 +0200
     2.2 +++ b/examples/teleios/refinePartialSeaHotspots.rq	Wed Jan 23 00:35:45 2013 +0200
     2.3 @@ -22,16 +22,18 @@
     2.4  WHERE { 
     2.5    SELECT ?h  (strdf:intersection(?hGeo, strdf:union(?cGeo)) AS ?dif) (URI(CONCAT(STR(?h),"/refined")) AS ?valid) ?conf ?muni
     2.6    WHERE { 
     2.7 -	 ?h     noa:hasAcquisitionTime "TIMESTAMP"^^xsd:dateTime; 
     2.8 +	?h     noa:hasAcquisitionTime "TIMESTAMP"^^xsd:dateTime; 
     2.9         		noa:producedFromProcessingChain "PROCESSING_CHAIN"^^xsd:string ; 
    2.10         		noa:isDerivedFromSensor "SENSOR"^^xsd:string ;
    2.11 -		noa:hasGeometry ?hGeo ;
    2.12 +			noa:hasGeometry ?hGeo ;
    2.13         		gag:hasMunicipality ?muni ;
    2.14         		noa:hasConfidence ?conf .
    2.15 +	 OPTIONAL{?h noa:refinedBy ?r. FILTER(?r=noa:coastlineRefinement)}.
    2.16 +	 FILTER(!bound(?r)).
    2.17  	 ?c     rdf:type gag:GeometryPart ;
    2.18         		gag:hasGeometry ?cGeo .
    2.19 -       	FILTER(strdf:mbbOverlaps(?hGeo, ?cGeo)) . 
    2.20 -	OPTIONAL { ?h noa:refinedBy ?refined } .
    2.21 +     FILTER(strdf:mbbIntersects(?hGeo, ?cGeo)) . 
    2.22 +	 OPTIONAL { ?h noa:refinedBy ?refined } .
    2.23    }
    2.24    GROUP BY ?h ?hGeo ?conf ?muni
    2.25    HAVING strdf:overlaps(?hGeo, strdf:union(?cGeo))