Commit 12d309e3 authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

Merge branch 'issue-32' into 'issue-22'

closes #32: define criticalobject as a feature kind, with narrower kinds

See merge request !25
parents c0d20264 eb7d8f10
Loading
Loading
Loading
Loading
Loading
+62 −118
Original line number Original line Diff line number Diff line
@@ -83,13 +83,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
  rdfs:label "has Environment"@en .
  rdfs:label "has Environment"@en .




###  https://saref.etsi.org/saref4auto/hasOpeningTimeAvailability
:hasOpeningTimeAvailability rdf:type owl:ObjectProperty ;
  rdfs:range time:TemporalEntity ;
  rdfs:comment "A relation to express the opening time of parking spot"@en ;
  rdfs:label "hasOpeningTimeAvailability"@en .


###  https://saref.etsi.org/saref4auto/hasPlatoonRole
###  https://saref.etsi.org/saref4auto/hasPlatoonRole
:hasPlatoonRole rdf:type owl:ObjectProperty ;
:hasPlatoonRole rdf:type owl:ObjectProperty ;
  rdfs:subPropertyOf :hasRole ;
  rdfs:subPropertyOf :hasRole ;
@@ -141,40 +134,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
                  rdfs:label "AutomotiveObject"@en .
                  rdfs:label "AutomotiveObject"@en .




###  https://saref.etsi.org/saref4auto/CriticalObject
:CriticalObject rdf:type owl:Class ;
                rdfs:subClassOf owl:Thing ,
                                [ rdf:type owl:Restriction ;
                                  owl:onProperty :hasProperty ;
                                  owl:hasValue :Height
                                ] ,
                                [ rdf:type owl:Restriction ;
                                  owl:onProperty saref:hasProperty ;
                                  owl:hasValue :Length
                                ] ,
                                [ rdf:type owl:Restriction ;
                                  owl:onProperty saref:hasState ;
                                  owl:someValuesFrom :Movement
                                ] ,
                                [ rdf:type owl:Restriction ;
                                  owl:onProperty :hasShape ;
                                  owl:someValuesFrom :Shape
                                ] ,
                                [ rdf:type owl:Restriction ;
                                  owl:onProperty :hasWidth ;
                                  owl:hasValue :Width
                                ] ;
                rdfs:comment "A critical object located on the road. Critical objects are small object, medium object, large object"@en ;
                rdfs:label "CriticalObject"@en .


###  https://saref.etsi.org/saref4auto/ElectricChargingParkingSpot
:ElectricChargingParkingSpot rdf:type owl:Class ;
                             rdfs:subClassOf :ParkingSpot ;
                             rdfs:comment "A type pf parking spot"@en ;
                             rdfs:label "ElectricChargingParkingSpot"@en .


###  https://saref.etsi.org/saref4auto/ElectronicControlUnit
###  https://saref.etsi.org/saref4auto/ElectronicControlUnit
:ElectronicControlUnit rdf:type owl:Class ;
:ElectronicControlUnit rdf:type owl:Class ;
                       rdfs:subClassOf saref:Device ,
                       rdfs:subClassOf saref:Device ,
@@ -207,20 +166,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
                       rdfs:label "ElectronicControlUnit"@en .
                       rdfs:label "ElectronicControlUnit"@en .




###  https://saref.etsi.org/saref4auto/LargeObject
:LargeObject rdf:type owl:Class ;
             rdfs:subClassOf :CriticalObject ;
             rdfs:comment "A type of Critical Object"@en ;
             rdfs:label "Large Object"@en .


###  https://saref.etsi.org/saref4auto/MediumObject
:MediumObject rdf:type owl:Class ;
              rdfs:subClassOf :CriticalObject ;
              rdfs:comment "A type of Critical Object"@en ;
              rdfs:label "Medium Object"@en .


###  https://saref.etsi.org/saref4auto/NotifiedEvent
###  https://saref.etsi.org/saref4auto/NotifiedEvent
:NotifiedEvent rdf:type owl:Class ;
:NotifiedEvent rdf:type owl:Class ;
               rdfs:subClassOf owl:Thing ;
               rdfs:subClassOf owl:Thing ;
@@ -228,38 +173,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
               rdfs:label "NotifiedEvent"@en .
               rdfs:label "NotifiedEvent"@en .




###  https://saref.etsi.org/saref4auto/ParkingSpot
:ParkingSpot rdf:type owl:Class ;
             rdfs:subClassOf saref:FeatureOfInterest, geo:Feature ,
                             [ rdf:type owl:Restriction ;
                               owl:onProperty saref:hasProperty ;
                               owl:hasValue :Height
                             ] ,
                             [ rdf:type owl:Restriction ;
                               owl:onProperty saref:hasIdentifier ;
                               owl:minCardinality 1
                             ] ,
                             [ rdf:type owl:Restriction ;
                               owl:onProperty saref:hasProperty ;
                               owl:hasValue :Length
                             ] ,
                             [ rdf:type owl:Restriction ;
                               owl:onProperty :hasOpeningTimeAvailability ;
                               owl:someValuesFrom time:TemporalEntity
                             ] ,
                             [ rdf:type owl:Restriction ;
                               owl:onProperty :hasWidth ;
                               owl:hasValue :Width
                             ] ,
                             [ rdf:type owl:Restriction ;
                               owl:onProperty saref:hasState ;
                               owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
                               owl:onClass :ParkingSpotState
                             ] ;
             rdfs:comment "A location that is designated for parking. A parking spot is a geo:Feature and can thus have a geometry."@en ;
             rdfs:label "ParkingSpot"@en .


###  https://saref.etsi.org/saref4auto/PersonalDevice
###  https://saref.etsi.org/saref4auto/PersonalDevice
:PersonalDevice rdf:type owl:Class ;
:PersonalDevice rdf:type owl:Class ;
                rdfs:subClassOf saref:Device ,
                rdfs:subClassOf saref:Device ,
@@ -313,13 +226,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
             rdfs:label "PlatoonRole"@en .
             rdfs:label "PlatoonRole"@en .




###  https://saref.etsi.org/saref4auto/RegularParkingSpot
:RegularParkingSpot rdf:type owl:Class ;
                    rdfs:subClassOf :ParkingSpot ;
                    rdfs:comment "A type pf parking spot"@en ;
                    rdfs:label "RegularParkingSpot"@en .


###  https://saref.etsi.org/saref4auto/RoadEntity
###  https://saref.etsi.org/saref4auto/RoadEntity
:RoadEntity rdf:type owl:Class ;
:RoadEntity rdf:type owl:Class ;
            rdfs:subClassOf saref:FeatureOfInterest ,
            rdfs:subClassOf saref:FeatureOfInterest ,
@@ -333,7 +239,7 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
                            ] ,
                            ] ,
                            [ rdf:type owl:Restriction ;
                            [ rdf:type owl:Restriction ;
                              owl:onProperty saref:consistsOf ;
                              owl:onProperty saref:consistsOf ;
                              owl:someValuesFrom :CriticalObject
                              owl:someValuesFrom [ a owl:Restriction ; owl:onProperty saref:hasFeatureKind ; owl:hasValue :CriticalObject ] ;
                            ] ,
                            ] ,
                            [ rdf:type owl:Restriction ;
                            [ rdf:type owl:Restriction ;
                              owl:onProperty saref:consistsOf ;
                              owl:onProperty saref:consistsOf ;
@@ -360,8 +266,8 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
                              owl:hasValue :RelativePosition
                              owl:hasValue :RelativePosition
                            ] ,
                            ] ,
                            [ rdf:type owl:Restriction ;
                            [ rdf:type owl:Restriction ;
                              owl:onProperty :hasShape ;
                              owl:onProperty saref:hasProperty ;
                              owl:someValuesFrom :Shape
                              owl:hasValue :Shape
                            ] ,
                            ] ,
                            [ rdf:type owl:Restriction ;
                            [ rdf:type owl:Restriction ;
                              owl:onProperty :hasWidth ;
                              owl:onProperty :hasWidth ;
@@ -453,20 +359,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
       rdfs:label "Route"@en .
       rdfs:label "Route"@en .




###  https://saref.etsi.org/saref4auto/SmallObject
:SmallObject rdf:type owl:Class ;
             rdfs:subClassOf :CriticalObject ;
             rdfs:comment "A type of Critical Object"@en ;
             rdfs:label "Small Object"@en .


###  https://saref.etsi.org/saref4auto/SpecialPermitParkingSpot
:SpecialPermitParkingSpot rdf:type owl:Class ;
                          rdfs:subClassOf :ParkingSpot ;
                          rdfs:comment "A type pf parking spot. Parking spot reserved for special permits (authorities, disabled, blue Zone, resident ...)"@en ;
                          rdfs:label "SpecialPermitParkingSpot"@en .


###  https://saref.etsi.org/saref4auto/TrafficLightController
###  https://saref.etsi.org/saref4auto/TrafficLightController
:TrafficLightController rdf:type owl:Class ;
:TrafficLightController rdf:type owl:Class ;
                        rdfs:subClassOf :RoadSideActuator ;
                        rdfs:subClassOf :RoadSideActuator ;
@@ -627,6 +519,32 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
#    Individuals
#    Individuals
#################################################################
#################################################################




### Instances of CriticalObject

:CriticalObject rdf:type saref:FeatureKind ;
  saref:hasProperty :Height , :Length , :Width , :Shape ;
  saref:hasState :Movement ;
  rdfs:comment "A critical object located on the road. Critical objects are small object, medium object, large object"@en ;
  rdfs:label "Critical Object"@en .

:LargeObject rdf:type saref:FeatureKind ;
  skos:broader :CriticalObject ;
  rdfs:comment "A kind of Critical Object"@en ;
  rdfs:label "Large Object"@en .

:MediumObject rdf:type saref:FeatureKind ;
  skos:broader :CriticalObject ;
  rdfs:comment "A kind of Critical Object"@en ;
  rdfs:label "Medium Object"@en .

:SmallObject rdf:type saref:FeatureKind ;
  skos:broader :CriticalObject ;
  rdfs:comment "A kind of Critical Object"@en ;
  rdfs:label "Small Object"@en .


### Instances of VehicleKind
### Instances of VehicleKind


:Car rdf:type :VehicleKind ;
:Car rdf:type :VehicleKind ;
@@ -891,6 +809,14 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
  rdfs:comment "The location where the vehicle member joins a platoon" ;
  rdfs:comment "The location where the vehicle member joins a platoon" ;
  rdfs:label "Rendez-vous Location"@en .
  rdfs:label "Rendez-vous Location"@en .


:Shape rdf:type saref:Property ;
  rdfs:comment "The shape of an entity: i.e., Sphere, Torus, Cylinder, Cone, Ellipsoid, Cube, Cuboid, Pyramid, Prism, Multiple shapes"@en ;
  rdfs:label "Shape"@en .

:OpeningTimeAvailability rdf:type owl:ObjectProperty ;
  rdfs:comment "The opening time of a parking spot."@en ;
  rdfs:label "has opening time availability"@en .

### SAREF patterns for states: Categorizing states for the automotive domain
### SAREF patterns for states: Categorizing states for the automotive domain


:AutomotiveState a owl:Class ;
:AutomotiveState a owl:Class ;
@@ -898,6 +824,31 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
    rdfs:label "Automotive State"@en ;
    rdfs:label "Automotive State"@en ;
    rdfs:comment "Class of states related to the automotive domain."@en .
    rdfs:comment "Class of states related to the automotive domain."@en .



### SAREF patterns for feature kinds: for parking spots

:ParkingSpot rdf:type saref:FeatureKind ;
  saref:hasProperty :Height , :Length , :Width , :OpeningTimeAvailability ;
  saref:hasState :ParkingSpotState ;
  rdfs:comment "A location that is designated for parking. A parking spot is a geo:Feature and can thus have a geometry."@en ;
  rdfs:label "ParkingSpot"@en .

:ElectricChargingParkingSpot rdf:type saref:FeatureKind ;
  skos:broader :ParkingSpot ;
  rdfs:comment "A type pf parking spot"@en ;
  rdfs:label "ElectricChargingParkingSpot"@en .

:RegularParkingSpot rdf:type saref:FeatureKind ;
  skos:broader :ParkingSpot ;
  rdfs:comment "A type pf parking spot"@en ;
  rdfs:label "RegularParkingSpot"@en .

:SpecialPermitParkingSpot rdf:type saref:FeatureKind ;
  skos:broader :ParkingSpot ;
  rdfs:comment "A type pf parking spot. Parking spot reserved for special permits (authorities, disabled, blue Zone, resident ...)"@en ;
  rdfs:label "SpecialPermitParkingSpot"@en .


### SAREF patterns for states: for parking spots
### SAREF patterns for states: for parking spots


:ParkingSpotState rdf:type owl:Class ;
:ParkingSpotState rdf:type owl:Class ;
@@ -1090,13 +1041,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
  rdfs:label "static"@en .
  rdfs:label "static"@en .




### SAREF Pattern for states: shape

:Shape rdf:type owl:Class ;
  rdfs:subClassOf saref:State ;
  rdfs:comment "The state of shape of an entity: i.e., Sphere, Torus, Cylinder, Cone, Ellipsoid, Cube, Cuboid, Pyramid, Prism, Multiple shapes"@en ;
  rdfs:label "Shape"@en .

### SAREF Pattern for states: automation level
### SAREF Pattern for states: automation level


:PlatoonAutomationLevel rdf:type saref:State ;
:PlatoonAutomationLevel rdf:type saref:State ;