1.1 --- a/scripts/v2.1/Refine.sparql	Wed Jul 11 00:34:05 2012 +0300
     1.2 +++ b/scripts/v2.1/Refine.sparql	Wed Jul 11 14:49:52 2012 +0300
     1.3 @@ -1,12 +1,10 @@
     1.4  PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 
     1.5  PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
     1.6 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
     1.7  PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 
     1.8  PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 
     1.9 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
    1.10  
    1.11  INSERT { ?h noa:isDiscarded "1"^^xsd:int . 
    1.12 -	?valid rdf:type noa:Hotspot ;
    1.13 +	 ?valid rdf:type noa:Hotspot ;
    1.14  		noa:hasConfidence ?conf ;
    1.15  	        noa:hasGeometry ?dif ;
    1.16  		noa:hasAcquisitionTime "TIMESTAMP"^^xsd:dateTime ; 
    1.17 @@ -14,23 +12,18 @@
    1.18  		noa:hasConfirmation noa:unknown ;
    1.19  	        noa:producedFromProcessingChain "PROCESSING_CHAIN"^^xsd:string ; 
    1.20  		noa:isProducedBy noa:noa ;
    1.21 -		noa:isDerivedFromSatellite "SAT"^^xsd:string ;
    1.22 -		gag:hasMunicipality ?muni .
    1.23 +		noa:isDerivedFromSatellite "SAT"^^xsd:string .
    1.24  }
    1.25  WHERE { 
    1.26 -  SELECT ?h (SAMPLE(?mLabel) AS ?muni) (strdf:intersection(?hGeo, strdf:union(?cGeo)) AS ?dif) (BNODE() AS ?valid) ?conf 
    1.27 -  WHERE {
    1.28 -	?h  noa:hasAcquisitionTime "TIMESTAMP"^^xsd:dateTime; 
    1.29 -		noa:producedFromProcessingChain "PROCESSING_CHAIN"^^xsd:string ; 
    1.30 -		noa:isDerivedFromSensor "SENSOR"^^xsd:string ;
    1.31 -		noa:hasGeometry ?hGeo ;
    1.32 -		noa:hasConfidence ?conf .
    1.33 -	?c  rdf:type noa:Coastline ;
    1.34 -		noa:hasGeometry ?cGeo .
    1.35 -	?m	rdf:type gag:Dhmos ;
    1.36 -		rdfs:label ?mLabel ;
    1.37 -		strdf:hasGeometry ?mGeo .
    1.38 -	FILTER(strdf:anyInteract(?hGeo, ?mGeo)) .
    1.39 +  SELECT ?h  (strdf:intersection(?hGeo, strdf:union(?cGeo)) AS ?dif) (BNODE() AS ?valid) ?conf 
    1.40 +  WHERE { 
    1.41 +?h     noa:hasAcquisitionTime "TIMESTAMP"^^xsd:dateTime; 
    1.42 +       noa:producedFromProcessingChain "PROCESSING_CHAIN"^^xsd:string ; 
    1.43 +       noa:isDerivedFromSensor "SENSOR"^^xsd:string ;
    1.44 +       noa:hasGeometry ?hGeo ;
    1.45 +       noa:hasConfidence ?conf .
    1.46 +?c     rdf:type noa:Coastline ;
    1.47 +       noa:hasGeometry ?cGeo .
    1.48      FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 
    1.49    }
    1.50    GROUP BY ?h ?hGeo ?conf