Unverified Commit 9d4fd296 authored by María's avatar María Committed by GitHub
Browse files

Merge pull request #62 from OnToologyUser/master

OnToology update
parents dd47256d 1715caaa
Loading
Loading
Loading
Loading
+0 −9
Original line number Diff line number Diff line
@@ -143,9 +143,6 @@
    "TemporalEntity" : {
      "@id" : "http://www.w3.org/2006/time#TemporalEntity"
    },
    "hadPrimarySource" : {
      "@id" : "http://www.w3.org/ns/prov#hadPrimarySource"
    },
    "isAvailableInLanguage" : {
      "@id" : "https://w3id.org/def/saref4city#isAvailableInLanguage",
      "@type" : "@id"
@@ -173,9 +170,6 @@
    "KeyPerformanceIndicator" : {
      "@id" : "https://w3id.org/def/saref4city#KeyPerformanceIndicator"
    },
    "definition" : {
      "@id" : "http://www.w3.org/2004/02/skos/core#definition"
    },
    "makesMeasurement" : {
      "@id" : "https://w3id.org/saref#makesMeasurement",
      "@type" : "@id"
@@ -304,9 +298,6 @@
    "AdministrativeArea" : {
      "@id" : "https://w3id.org/def/saref4city#AdministrativeArea"
    },
    "prefLabel" : {
      "@id" : "http://www.w3.org/2004/02/skos/core#prefLabel"
    },
    "description" : {
      "@id" : "http://purl.org/dc/elements/1.1/description"
    },
+6 −16
Original line number Diff line number Diff line
@@ -462,12 +462,18 @@
}, {
  "@id" : "http://purl.org/dc/elements/1.1/description",
  "@type" : [ "http://www.w3.org/2002/07/owl#AnnotationProperty" ]
}, {
  "@id" : "http://purl.org/dc/elements/1.1/publisher",
  "@type" : [ "http://www.w3.org/2002/07/owl#AnnotationProperty" ]
}, {
  "@id" : "http://purl.org/dc/elements/1.1/title",
  "@type" : [ "http://www.w3.org/2002/07/owl#AnnotationProperty" ]
}, {
  "@id" : "http://purl.org/dc/terms/LinguisticSystem",
  "@type" : [ "http://www.w3.org/2002/07/owl#Class" ]
}, {
  "@id" : "http://purl.org/dc/terms/creator",
  "@type" : [ "http://www.w3.org/2002/07/owl#AnnotationProperty" ]
}, {
  "@id" : "http://purl.org/vocab/cpsv#PublicService",
  "@type" : [ "http://www.w3.org/2002/07/owl#Class" ],
@@ -702,12 +708,6 @@
  "http://www.w3.org/2000/01/rdf-schema#isDefinedBy" : [ {
    "@id" : "http://www.w3.org/2004/02/skos/core#"
  } ]
}, {
  "@id" : "http://www.w3.org/2004/02/skos/core#definition",
  "@type" : [ "http://www.w3.org/2002/07/owl#AnnotationProperty" ]
}, {
  "@id" : "http://www.w3.org/2004/02/skos/core#prefLabel",
  "@type" : [ "http://www.w3.org/2002/07/owl#AnnotationProperty" ]
}, {
  "@id" : "http://www.w3.org/2006/time#Instant",
  "@type" : [ "http://www.w3.org/2002/07/owl#Class" ],
@@ -768,9 +768,6 @@
  "http://www.w3.org/2000/01/rdf-schema#subClassOf" : [ {
    "@id" : "http://xmlns.com/foaf/0.1/Agent"
  } ]
}, {
  "@id" : "http://www.w3.org/ns/prov#hadPrimarySource",
  "@type" : [ "http://www.w3.org/2002/07/owl#AnnotationProperty" ]
}, {
  "@id" : "http://xmlns.com/foaf/0.1/Agent",
  "@type" : [ "http://www.w3.org/2002/07/owl#Class" ],
@@ -816,9 +813,6 @@
  }, {
    "@id" : "http://www.garcia-castro.com/foaf.rdf#me"
  } ],
  "http://purl.org/dc/terms/license" : [ {
    "@id" : "http://purl.org/NET/rdflicense/cc-by4.0"
  } ],
  "http://purl.org/vocab/vann/preferredNamespacePrefix" : [ {
    "@value" : "s4city"
  } ],
@@ -1258,10 +1252,6 @@
}, {
  "@id" : "https://w3id.org/saref#FeatureOfInterest",
  "@type" : [ "http://www.w3.org/2002/07/owl#Class" ],
  "http://www.w3.org/2000/01/rdf-schema#comment" : [ {
    "@language" : "en",
    "@value" : "WARNING!\n This class might be moved to the SAREF ontology"
  } ],
  "http://www.w3.org/2000/01/rdf-schema#subClassOf" : [ {
    "@id" : "_:genid35"
  }, {
+7 −12
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@
<https://w3id.org/def/saref4city> <http://purl.org/dc/elements/1.1/title> "SAREF extension for Smart City"@en .
<https://w3id.org/def/saref4city> <http://purl.org/dc/terms/creator> <http://w3id.org/people/mpoveda> .
<https://w3id.org/def/saref4city> <http://purl.org/dc/terms/creator> <http://www.garcia-castro.com/foaf.rdf#me> .
<https://w3id.org/def/saref4city> <http://purl.org/dc/terms/license> <http://purl.org/NET/rdflicense/cc-by4.0> .
<https://w3id.org/def/saref4city> <http://purl.org/vocab/vann/preferredNamespacePrefix> "s4city" .
<https://w3id.org/def/saref4city> <http://purl.org/vocab/vann/preferredNamespaceUri> "https://w3id.org/def/saref4city#" .
<https://w3id.org/def/saref4city> <http://www.w3.org/2002/07/owl#versionInfo> "0.6"^^<http://www.w3.org/2001/XMLSchema#decimal> .
@@ -30,9 +29,15 @@
# http://purl.org/dc/elements/1.1/description
<http://purl.org/dc/elements/1.1/description> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#AnnotationProperty> .
# 
# http://purl.org/dc/elements/1.1/publisher
<http://purl.org/dc/elements/1.1/publisher> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#AnnotationProperty> .
# 
# http://purl.org/dc/elements/1.1/title
<http://purl.org/dc/elements/1.1/title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#AnnotationProperty> .
# 
# http://purl.org/dc/terms/creator
<http://purl.org/dc/terms/creator> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#AnnotationProperty> .
# 
# http://purl.org/vocab/vann/preferredNamespacePrefix
<http://purl.org/vocab/vann/preferredNamespacePrefix> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#AnnotationProperty> .
# 
@@ -61,15 +66,6 @@
<http://www.w3.org/2003/01/geo/wgs84_pos#long> <http://www.w3.org/2000/01/rdf-schema#label> "longitude" .
<http://www.w3.org/2003/01/geo/wgs84_pos#long> <http://www.w3.org/2000/01/rdf-schema#domain> <http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing> .
# 
# http://www.w3.org/2004/02/skos/core#definition
<http://www.w3.org/2004/02/skos/core#definition> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#AnnotationProperty> .
# 
# http://www.w3.org/2004/02/skos/core#prefLabel
<http://www.w3.org/2004/02/skos/core#prefLabel> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#AnnotationProperty> .
# 
# http://www.w3.org/ns/prov#hadPrimarySource
<http://www.w3.org/ns/prov#hadPrimarySource> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#AnnotationProperty> .
# 
# http://xmlns.com/foaf/0.1/based_near
<http://xmlns.com/foaf/0.1/based_near> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#AnnotationProperty> .
# 
@@ -637,7 +633,6 @@ _:genid36 <http://www.w3.org/2002/07/owl#allValuesFrom> <https://w3id.org/saref#
_:genid37 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Restriction> .
_:genid37 <http://www.w3.org/2002/07/owl#onProperty> <https://w3id.org/saref#isFeatureOfInterestOf> .
_:genid37 <http://www.w3.org/2002/07/owl#allValuesFrom> <https://w3id.org/saref#Measurement> .
<https://w3id.org/saref#FeatureOfInterest> <http://www.w3.org/2000/01/rdf-schema#comment> "WARNING!\n This class might be moved to the SAREF ontology"@en .
# 
# https://w3id.org/saref#Measurement
<https://w3id.org/saref#Measurement> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Class> .
@@ -730,4 +725,4 @@ _:genid49 <http://www.w3.org/2002/07/owl#allValuesFrom> <https://w3id.org/saref#
<http://www.w3.org/2003/01/geo/wgs84_pos#location> <http://www.w3.org/2000/01/rdf-schema#comment> "The relation between something and the point, \n or other geometrical thing in space, where it is.  For example, the realtionship between\n a radio tower and a Point with a given lat and long.\n Or a relationship between a park and its outline as a closed arc of points, or a road and\n its location as a arc (a sequence of points).\n Clearly in practice there will be limit to the accuracy of any such statement, but one would expect\n an accuracy appropriate for the size of the object and uses such as mapping .\n " .
<http://www.w3.org/2003/01/geo/wgs84_pos#location> <http://www.w3.org/2000/01/rdf-schema#label> "location"@en .
# 
# Generated by the OWL API (version 5.1.7) https://github.com/owlcs/owlapi/
# Generated by the OWL API (version 5.1.9) https://github.com/owlcs/owlapi/
+10 −17
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@
                                   <http://purl.org/dc/elements/1.1/title> "SAREF extension for Smart City"@en ;
                                   <http://purl.org/dc/terms/creator> <http://w3id.org/people/mpoveda> ,
                                                                      <http://www.garcia-castro.com/foaf.rdf#me> ;
                                   <http://purl.org/dc/terms/license> <http://purl.org/NET/rdflicense/cc-by4.0> ;
                                   <http://purl.org/vocab/vann/preferredNamespacePrefix> "s4city" ;
                                   <http://purl.org/vocab/vann/preferredNamespaceUri> "https://w3id.org/def/saref4city#" ;
                                   owl:versionInfo 0.6 .
@@ -38,10 +37,18 @@
<http://purl.org/dc/elements/1.1/description> rdf:type owl:AnnotationProperty .


###  http://purl.org/dc/elements/1.1/publisher
<http://purl.org/dc/elements/1.1/publisher> rdf:type owl:AnnotationProperty .


###  http://purl.org/dc/elements/1.1/title
<http://purl.org/dc/elements/1.1/title> rdf:type owl:AnnotationProperty .


###  http://purl.org/dc/terms/creator
<http://purl.org/dc/terms/creator> rdf:type owl:AnnotationProperty .


###  http://purl.org/vocab/vann/preferredNamespacePrefix
<http://purl.org/vocab/vann/preferredNamespacePrefix> rdf:type owl:AnnotationProperty .

@@ -76,18 +83,6 @@
                                               rdfs:domain <http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing> .


###  http://www.w3.org/2004/02/skos/core#definition
<http://www.w3.org/2004/02/skos/core#definition> rdf:type owl:AnnotationProperty .


###  http://www.w3.org/2004/02/skos/core#prefLabel
<http://www.w3.org/2004/02/skos/core#prefLabel> rdf:type owl:AnnotationProperty .


###  http://www.w3.org/ns/prov#hadPrimarySource
<http://www.w3.org/ns/prov#hadPrimarySource> rdf:type owl:AnnotationProperty .


###  http://xmlns.com/foaf/0.1/based_near
<http://xmlns.com/foaf/0.1/based_near> rdf:type owl:AnnotationProperty .

@@ -715,9 +710,7 @@ sameThing(P1, P2) :- type(P1, Point), type(P2, Point), spaciallyIntersects(P1, P
                                                           [ rdf:type owl:Restriction ;
                                                             owl:onProperty <https://w3id.org/saref#isFeatureOfInterestOf> ;
                                                             owl:allValuesFrom <https://w3id.org/saref#Measurement>
                                                           ] ;
                                           rdfs:comment """WARNING!
 This class might be moved to the SAREF ontology"""@en .
                                                           ] .


###  https://w3id.org/saref#Measurement
@@ -819,4 +812,4 @@ A device that has category saref:Sensor and performs a saref:SensingFunction."""
                                                   rdfs:label "location"@en .


###  Generated by the OWL API (version 5.1.7) https://github.com/owlcs/owlapi/
###  Generated by the OWL API (version 5.1.9) https://github.com/owlcs/owlapi/
+15 −27
Original line number Diff line number Diff line
@@ -7,9 +7,7 @@
     xmlns:xml="http://www.w3.org/XML/1998/namespace"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
     xmlns:foaf="http://xmlns.com/foaf/0.1/"
     xmlns:prov="http://www.w3.org/ns/prov#"
     xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
     xmlns:skos="http://www.w3.org/2004/02/skos/core#"
     xmlns:vann="http://purl.org/vocab/vann/"
     xmlns:terms="http://purl.org/dc/terms/"
     xmlns:wgs84_pos="http://www.w3.org/2003/01/geo/wgs84_pos#">
@@ -20,7 +18,6 @@
        <dc:title xml:lang="en">SAREF extension for Smart City</dc:title>
        <terms:creator rdf:resource="http://w3id.org/people/mpoveda"/>
        <terms:creator rdf:resource="http://www.garcia-castro.com/foaf.rdf#me"/>
        <terms:license rdf:resource="http://purl.org/NET/rdflicense/cc-by4.0"/>
        <vann:preferredNamespacePrefix>s4city</vann:preferredNamespacePrefix>
        <vann:preferredNamespaceUri>https://w3id.org/def/saref4city#</vann:preferredNamespaceUri>
        <owl:versionInfo rdf:datatype="http://www.w3.org/2001/XMLSchema#decimal">0.6</owl:versionInfo>
@@ -68,6 +65,13 @@
    


    <!-- http://purl.org/dc/elements/1.1/publisher -->


    <owl:AnnotationProperty rdf:about="http://purl.org/dc/elements/1.1/publisher"/>
    


    <!-- http://purl.org/dc/elements/1.1/title -->


@@ -75,6 +79,13 @@
    


    <!-- http://purl.org/dc/terms/creator -->


    <owl:AnnotationProperty rdf:about="http://purl.org/dc/terms/creator"/>
    


    <!-- http://purl.org/vocab/vann/preferredNamespacePrefix -->


@@ -131,27 +142,6 @@
    


    <!-- http://www.w3.org/2004/02/skos/core#definition -->


    <owl:AnnotationProperty rdf:about="http://www.w3.org/2004/02/skos/core#definition"/>
    


    <!-- http://www.w3.org/2004/02/skos/core#prefLabel -->


    <owl:AnnotationProperty rdf:about="http://www.w3.org/2004/02/skos/core#prefLabel"/>
    


    <!-- http://www.w3.org/ns/prov#hadPrimarySource -->


    <owl:AnnotationProperty rdf:about="http://www.w3.org/ns/prov#hadPrimarySource"/>
    


    <!-- http://xmlns.com/foaf/0.1/based_near -->


@@ -1178,8 +1168,6 @@ sameThing(P1, P2) :- type(P1, Point), type(P2, Point), spaciallyIntersects(P1, P
                <owl:allValuesFrom rdf:resource="https://w3id.org/saref#Measurement"/>
            </owl:Restriction>
        </rdfs:subClassOf>
        <rdfs:comment xml:lang="en">WARNING!
 This class might be moved to the SAREF ontology</rdfs:comment>
    </owl:Class>
    

@@ -1332,6 +1320,6 @@ A device that has category saref:Sensor and performs a saref:SensingFunction.</r



<!-- Generated by the OWL API (version 5.1.7) https://github.com/owlcs/owlapi/ -->
<!-- Generated by the OWL API (version 5.1.9) https://github.com/owlcs/owlapi/ -->

Loading