Merge pull request #34 from julianrojas87/dev

Bring up to v2.3.0!
julianrojas87 · Sep 13, 2021 · a219484 · a219484
2 parents 1044587 + b60255c
commit a219484
Show file tree

Hide file tree

Showing 29 changed files with 6,906 additions and 2,373 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,50 @@
 
 All notable changes to this project will be documented in this file.
 
-## [v2.0.0](https://github.com/julianrojas87/era-data-mappings/compare/v1.2.1...v2.0.0) (2021-06-15)
+## [v2.3.0](https://git.fpfis.eu/datateam/ERA/era-data-mappings/-/releases/v2.3.0) (2021-09-13)
+
+### Raw Data: [ERA-KG-v2.3.0](https://cloud.ilabt.imec.be/index.php/s/gtz9RjQ5fGMB4TQ)
+
+### Features and Bug Fixes
+
+* Fix for #33
+* Fix for #34
+* Add local ID predicates for platforms, tunnels and sidings
+* Add name predicate for Operational Points
+* Fix prefixes URIs
+
+## [v2.2.0](https://git.fpfis.eu/datateam/ERA/era-data-mappings/-/releases/v2.2.0) (2021-09-01)
+
+### Raw Data: [ERA-KG-v2.2.0](https://cloud.ilabt.imec.be/index.php/s/DyaZpqkrJpfPz73)
+
+### Features and Bug Fixes
+
+* annotations of RINF and ERATV property codes
+* cleanup of unnecessary reference dataset mappings
+* adjust remianing TRIM SQL functions
+* fully map ERATV properties
+* full refactoring to use new official URI http://data.europa.eu/949/
+* Add missing rdf:type mapping for train detection systems
+* Comment labels to SoL properties
+* Adjust mappings for verification and demonstration params
+* Corrected various errors
+* Added mappings for nominal track gauges concepts
+* Added full mappings for OPTracks
+* Added mappings for OPTracks tunnels and properties
+* Added full mappings for Sidings
+* Added mappings for Siding tunnels and properties
+* Added OP missing parameters
+* Adjusted SoL mappings
+* Adjusted Platforms mappings
+* added mappings for SoL natures
+* mappings for complete set of SoL parameters
+* adjust all TSI compliance mappings
+* added mappings for skos concept schemes era-tdssc, era-malvc and era-mas
+* removed skos concept scheme era-minwidhtrim
+* added all mappings for SET-based properties
+* added various properties for SoLs, Tunnels and National Lines
+
+## [v2.0.0](https://git.fpfis.eu/datateam/ERA/era-data-mappings/-/releases#v2.0.0) (2021-04-12)
 
 ### Raw Data: [ERA-KG-v2.0.0](https://cloud.ilabt.imec.be/index.php/s/PogwXPSr8yEkKmo)
 

diff --git a/conf.env b/conf.env
@@ -1,4 +1,4 @@
-KG_VERSION=2.0.0
+KG_VERSION=2.3.0
 NAMED_GRAPH=http://era.europa.eu/knowledge-graph
 RINF_HOST=//10.10.160.21:1433
 RINF_USER=SA

diff --git a/data/index_predicate_mappings.csv b/data/index_predicate_mappings.csv
@@ -0,0 +1,221 @@
+index,predicate
+1.1.0.0.0.1,http://data.europa.eu/949/imCode
+1.1.0.0.0.2,http://data.europa.eu/949/lineNationalId
+1.1.0.0.0.3,http://data.europa.eu/949/opStart
+1.1.0.0.0.4,http://data.europa.eu/949/opEnd
+1.1.0.0.0.5,http://data.europa.eu/949/length
+1.1.0.0.0.6,http://data.europa.eu/949/solNature
+1.1.1.0.0.1,http://data.europa.eu/949/trackId
+1.1.1.0.0.2,http://data.europa.eu/949/trackDirection
+1.1.1.1.1.1,http://data.europa.eu/949/verificationINF
+1.1.1.1.1.2,http://data.europa.eu/949/demonstrationINF
+1.1.1.1.2.1,http://data.europa.eu/949/tenClassification
+1.1.1.1.2.1.2,http://data.europa.eu/949/tenGISId
+1.1.1.1.2.2,http://data.europa.eu/949/lineCategory
+1.1.1.1.2.3,http://data.europa.eu/949/freightCorridor
+1.1.1.1.2.4,http://data.europa.eu/949/loadCapability
+1.1.1.1.2.4.1,http://data.europa.eu/949/nationalLoadCapability
+1.1.1.1.2.4.2,http://data.europa.eu/949/highSpeedLoadModelCompliance
+1.1.1.1.2.4.3,http://data.europa.eu/949/structureCheckLocation
+1.1.1.1.2.4.4,http://data.europa.eu/949/compatibilityProcedureDocument
+1.1.1.1.2.5,http://data.europa.eu/949/maximumPermittedSpeed
+1.1.1.1.2.6,http://data.europa.eu/949/minimumTemperature
+1.1.1.1.2.6,http://data.europa.eu/949/maximumTemperature
+1.1.1.1.2.7,http://data.europa.eu/949/maximumAltitude
+1.1.1.1.2.8,http://data.europa.eu/949/hasSevereWeatherConditions
+1.1.1.1.3.1.1,http://data.europa.eu/949/gaugingProfile
+1.1.1.1.3.1.2,http://data.europa.eu/949/gaugingCheckLocation
+1.1.1.1.3.1.3,http://data.europa.eu/949/gaugingTransversalDocument
+1.1.1.1.3.4,http://data.europa.eu/949/profileNumberSwapBodies
+1.1.1.1.3.5,http://data.europa.eu/949/profileNumberSemiTrailers
+1.1.1.1.3.5.1,http://data.europa.eu/949/specificInformation
+1.1.1.1.3.6,http://data.europa.eu/949/gradientProfile
+1.1.1.1.3.7,http://data.europa.eu/949/minimumHorizontalRadius
+1.1.1.1.4.1,http://data.europa.eu/949/wheelSetGauge
+1.1.1.1.4.2,http://data.europa.eu/949/cantDeficiency
+1.1.1.1.4.3,http://data.europa.eu/949/railInclination
+1.1.1.1.4.4,http://data.europa.eu/949/hasBallast
+1.1.1.1.5.1,http://data.europa.eu/949/tsiSwitchCrossing
+1.1.1.1.5.2,http://data.europa.eu/949/minimumWheelDiameter
+1.1.1.1.6.1,http://data.europa.eu/949/maximumTrainDeceleration
+1.1.1.1.6.2,http://data.europa.eu/949/eddyCurrentBraking
+1.1.1.1.6.3,http://data.europa.eu/949/magneticBraking
+1.1.1.1.6.4,http://data.europa.eu/949/eddyCurrentBrakingConditionsDocument
+1.1.1.1.6.5,http://data.europa.eu/949/magneticBrakingConditionsDocument
+1.1.1.1.7.1,http://data.europa.eu/949/flangeLubeForbidden
+1.1.1.1.7.2,http://data.europa.eu/949/hasLevelCrossings
+1.1.1.1.7.3,http://data.europa.eu/949/accelerationLevelCrossing
+1.1.1.1.7.4,http://data.europa.eu/949/hasHotAxleBoxDetector
+1.1.1.1.7.5,http://data.europa.eu/949/hotAxleBoxDetectorTSICompliant
+1.1.1.1.7.6,http://data.europa.eu/949/hotAxleBoxDetectorIdentification
+1.1.1.1.7.7,http://data.europa.eu/949/hotAxleBoxDetectorGeneration
+1.1.1.1.7.8,http://data.europa.eu/949/hotAxleBoxDetectorLocation
+1.1.1.1.7.9,http://data.europa.eu/949/hotAxleBoxDetectorDirection
+1.1.1.1.7.10,http://data.europa.eu/949/redLightsRequired
+1.1.1.1.7.11,http://data.europa.eu/949/isQuietRoute
+1.1.1.1.8.1,http://data.europa.eu/949/imCode
+1.1.1.1.8.2,http://data.europa.eu/949/tunnelIdentification
+1.1.1.1.8.3,http://data.europa.eu/949/startLocation
+1.1.1.1.8.4,http://data.europa.eu/949/endLocation
+1.1.1.1.8.5,http://data.europa.eu/949/verificationSRT
+1.1.1.1.8.6,http://data.europa.eu/949/demonstrationSRT
+1.1.1.1.8.7,http://data.europa.eu/949/length
+1.1.1.1.8.8,http://data.europa.eu/949/crossSectionArea
+1.1.1.1.8.8.1,http://data.europa.eu/949/complianceInfTsi
+1.1.1.1.8.8.2,http://data.europa.eu/949/tunnelDocRef
+1.1.1.1.8.9,http://data.europa.eu/949/hasEmergencyPlan
+1.1.1.1.8.10,http://data.europa.eu/949/rollingStockFireCategory
+1.1.1.1.8.11,http://data.europa.eu/949/nationalRollingStockFireCategory
+1.1.1.2.1.1,http://data.europa.eu/949/verificationENE
+1.1.1.2.1.2,http://data.europa.eu/949/demonstrationENE
+1.1.1.2.2.1.1,http://data.europa.eu/949/contactLineSystemType
+1.1.1.2.2.1.2,http://data.europa.eu/949/energySupplySystem
+1.1.1.2.2.1.2.1,http://data.europa.eu/949/energySupplySystemTSICompliant
+1.1.1.2.2.1.3,http://data.europa.eu/949/umax2
+1.1.1.2.2.2,http://data.europa.eu/949/maxTrainCurrent
+1.1.1.2.2.3,http://data.europa.eu/949/maxCurrentStandstillPantograph
+1.1.1.2.2.4,http://data.europa.eu/949/hasRegenerativeBrake
+1.1.1.2.2.4,http://data.europa.eu/949/conditionalRegenerativeBrake
+1.1.1.2.2.5,http://data.europa.eu/949/maximumContactWireHeight
+1.1.1.2.2.6,http://data.europa.eu/949/minimumContactWireHeight
+1.1.1.2.3.1,http://data.europa.eu/949/pantographHead
+1.1.1.2.3.2,http://data.europa.eu/949/pantographHead
+1.1.1.2.3.3,http://data.europa.eu/949/raisedPantographsDistanceAndSpeed
+1.1.1.2.3.4,http://data.europa.eu/949/contactStripMaterial
+1.1.1.2.4.1.1,http://data.europa.eu/949/phaseSeparation
+1.1.1.2.4.1.2,http://data.europa.eu/949/phaseInfo
+1.1.1.2.4.2.1,http://data.europa.eu/949/hasSystemSeparation
+1.1.1.2.4.2.2,http://data.europa.eu/949/systemSeparationInfo
+1.1.1.2.4.3,http://data.europa.eu/949/distSignToPhaseEnd
+1.1.1.2.5.1,http://data.europa.eu/949/currentLimitationRequired
+1.1.1.2.5.2,http://data.europa.eu/949/permittedContactForce
+1.1.1.2.5.3,http://data.europa.eu/949/automaticDroppingDeviceRequired
+1.1.1.3.1.1,http://data.europa.eu/949/verificationCSS
+1.1.1.3.2.1,http://data.europa.eu/949/etcsLevelType
+1.1.1.3.2.2,http://data.europa.eu/949/etcsBaseline
+1.1.1.3.2.3,http://data.europa.eu/949/etcsInfillLineAccess
+1.1.1.3.2.4,http://data.europa.eu/949/etcsInfill
+1.1.1.3.2.5,http://data.europa.eu/949/etcsNationalPacket44
+1.1.1.3.2.6,http://data.europa.eu/949/hasETCSRestrictionsConditions
+1.1.1.3.2.7,http://data.europa.eu/949/etcsOptionalFunctions
+1.1.1.3.2.8,http://data.europa.eu/949/trainIntegrityOnBoardRequired
+1.1.1.3.2.9,http://data.europa.eu/949/etcsSystemCompatibility
+1.1.1.3.2.10,http://data.europa.eu/949/etcsMVersion
+1.1.1.3.3.1,http://data.europa.eu/949/gsmRVersion
+1.1.1.3.3.2,http://data.europa.eu/949/gsmRActiveMobiles
+1.1.1.3.3.3,http://data.europa.eu/949/gsmROptionalFunctions
+1.1.1.3.3.3.1,http://data.europa.eu/949/gsmRAdditionalInfo
+1.1.1.3.3.3.2,http://data.europa.eu/949/gprsForETCS
+1.1.1.3.3.3.3,http://data.europa.eu/949/gprsImplementationArea
+1.1.1.3.3.4,http://data.europa.eu/949/usesGroup555
+1.1.1.3.3.5,http://data.europa.eu/949/gsmrNetworkCoverage
+1.1.1.3.3.6,http://data.europa.eu/949/publicNetworkRoaming
+1.1.1.3.3.7,http://data.europa.eu/949/publicNetworkRoamingDetails
+1.1.1.3.3.8,http://data.europa.eu/949/gsmRNoCoverage
+1.1.1.3.3.9,http://data.europa.eu/949/voiceRadioCompatible
+1.1.1.3.3.10,http://data.europa.eu/949/dataRadioCompatible
+1.1.1.3.4.1,http://data.europa.eu/949/hasTSITrainDetection
+1.1.1.3.5.1,http://data.europa.eu/949/hasOtherTrainProtection
+1.1.1.3.5.2,http://data.europa.eu/949/multipleTrainProtectionRequired
+1.1.1.3.5.3,http://data.europa.eu/949/protectionLegacySystem
+1.1.1.3.6.1,http://data.europa.eu/949/legacyRadioSystem
+1.1.1.3.7.1.1,http://data.europa.eu/949/trainDetectionSystemType
+1.1.1.3.7.1.2,http://data.europa.eu/949/trainDetectionSystemSpecificCheck
+1.1.1.3.7.1.3,http://data.europa.eu/949/trainDetectionSystemSpecificCheckDocument
+1.1.1.3.7.1.4,http://data.europa.eu/949/frenchTrainDetectionSystemLimitation
+1.1.1.3.7.2.1,http://data.europa.eu/949/tsiCompliantMaxDistConsecutiveAxles
+1.1.1.3.7.2.2,http://data.europa.eu/949/maxDistConsecutiveAxles
+1.1.1.3.7.3,http://data.europa.eu/949/minDistConsecutiveAxles
+1.1.1.3.7.4,http://data.europa.eu/949/minDistFirstLastAxle
+1.1.1.3.7.5,http://data.europa.eu/949/maxDistEndTrainFirstAxle
+1.1.1.3.7.6,http://data.europa.eu/949/minRimWidth
+1.1.1.3.7.7,http://data.europa.eu/949/minWheelDiameter
+1.1.1.3.7.8,http://data.europa.eu/949/minFlangeThickness
+1.1.1.3.7.9,http://data.europa.eu/949/minFlangeHeight
+1.1.1.3.7.10,http://data.europa.eu/949/maxFlangeHeight
+1.1.1.3.7.11,http://data.europa.eu/949/minAxleLoad
+1.1.1.3.7.11.1,http://data.europa.eu/949/minAxleLoadVehicleCategory
+1.1.1.3.7.12,http://data.europa.eu/949/tsiCompliantMetalFreeSpace
+1.1.1.3.7.13,http://data.europa.eu/949/tsiCompliantMetalConstruction
+1.1.1.3.7.14,http://data.europa.eu/949/tsiCompliantFerromagneticWheel
+1.1.1.3.7.15.1,http://data.europa.eu/949/tsiCompliantMaxImpedanceWheelset
+1.1.1.3.7.15.2,http://data.europa.eu/949/maxImpedanceWheelset
+1.1.1.3.7.16,http://data.europa.eu/949/tsiCompliantSanding
+1.1.1.3.7.17,http://data.europa.eu/949/maxSandingOutput
+1.1.1.3.7.18,http://data.europa.eu/949/requiredSandingOverride
+1.1.1.3.7.19,http://data.europa.eu/949/tsiCompliantSandCharacteristics
+1.1.1.3.7.20,http://data.europa.eu/949/flangeLubeRules
+1.1.1.3.7.21,http://data.europa.eu/949/tsiCompliantCompositeBrakeBlocks
+1.1.1.3.7.22,http://data.europa.eu/949/tsiCompliantShuntDevices
+1.1.1.3.7.23,http://data.europa.eu/949/tsiCompliantRSTShuntImpedance
+1.1.1.3.8.1,http://data.europa.eu/949/switchProtectControlWarning
+1.1.1.3.8.2,http://data.europa.eu/949/switchRadioSystem
+1.1.1.3.9.1,http://data.europa.eu/949/TSIMagneticFields
+1.1.1.3.9.2,http://data.europa.eu/949/TSITractionHarmonics
+1.1.1.3.10.1,http://data.europa.eu/949/etcsDegradedSituation
+1.1.1.3.10.2,http://data.europa.eu/949/otherTrainProtection
+1.1.1.3.11.1,http://data.europa.eu/949/maximumBrakingDistance
+1.1.1.3.11.2,http://data.europa.eu/949/hasAdditionalBrakingInformation
+1.1.1.3.11.3,http://data.europa.eu/949/additionalBrakingInformationDocument
+1.1.1.3.12.1,http://data.europa.eu/949/tiltingSupported
+1.1.1.4.1,http://data.europa.eu/949/localRulesOrRestrictions
+1.1.1.4.2,http://data.europa.eu/949/localRulesOrRestrictionsDoc
+1.2.0.0.0.1,http://data.europa.eu/949/opName
+1.2.0.0.0.2,http://data.europa.eu/949/uopid
+1.2.0.0.0.3,http://data.europa.eu/949/tafTAPCode
+1.2.0.0.0.4,http://data.europa.eu/949/opType
+1.2.0.0.0.4.1,http://data.europa.eu/949/opTypeGaugeChangeover
+1.2.0.0.0.6,http://data.europa.eu/949/lineReference
+1.2.1.0.0.1,http://data.europa.eu/949/imCode
+1.2.1.0.0.2,http://data.europa.eu/949/trackId
+1.2.1.0.1.1,http://data.europa.eu/949/verificationINF
+1.2.1.0.1.2,http://data.europa.eu/949/demonstrationINF
+1.2.1.0.2.1,http://data.europa.eu/949/tenClassification
+1.2.1.0.2.2,http://data.europa.eu/949/lineCategory
+1.2.1.0.2.3,http://data.europa.eu/949/freightCorridor
+1.2.1.0.3.4,http://data.europa.eu/949/gaugingProfile
+1.2.1.0.3.5,http://data.europa.eu/949/gaugingCheckLocation
+1.2.1.0.3.6,http://data.europa.eu/949/gaugingTransversalDocument
+1.2.1.0.4.1,http://data.europa.eu/949/wheelSetGauge
+1.2.1.0.5.1,http://data.europa.eu/949/imCode
+1.2.1.0.5.2,http://data.europa.eu/949/tunnelIdentification
+1.2.1.0.5.3,http://data.europa.eu/949/verificationSRT
+1.2.1.0.5.4,http://data.europa.eu/949/demonstrationSRT
+1.2.1.0.5.5,http://data.europa.eu/949/length
+1.2.1.0.5.6,http://data.europa.eu/949/hasEmergencyPlan
+1.2.1.0.5.7,http://data.europa.eu/949/rollingStockFireCategory
+1.2.1.0.5.8,http://data.europa.eu/949/nationalRollingStockFireCategory
+1.2.1.0.5.9,http://data.europa.eu/949/dieselThermalAllowed
+1.2.1.0.6.1,http://data.europa.eu/949/imCode
+1.2.1.0.6.2,http://data.europa.eu/949/platformId
+1.2.1.0.6.3,http://data.europa.eu/949/tenClassification
+1.2.1.0.6.4,http://data.europa.eu/949/length
+1.2.1.0.6.5,http://data.europa.eu/949/platformHeight
+1.2.1.0.6.6,http://data.europa.eu/949/assistanceStartingTrain
+1.2.1.0.6.7,http://data.europa.eu/949/areaBoardingAid
+1.2.2.0.0.1,http://data.europa.eu/949/imCode
+1.2.2.0.0.2,http://data.europa.eu/949/sidingId
+1.2.2.0.0.3,http://data.europa.eu/949/tenClassification
+1.2.2.0.1.1,http://data.europa.eu/949/verificationINF
+1.2.2.0.1.2,http://data.europa.eu/949/demonstrationINF
+1.2.2.0.2.1,http://data.europa.eu/949/length
+1.2.2.0.3.1,http://data.europa.eu/949/gradient
+1.2.2.0.3.2,http://data.europa.eu/949/minimumHorizontalRadius
+1.2.2.0.3.3,http://data.europa.eu/949/minimumVerticalRadius
+1.2.2.0.4.1,http://data.europa.eu/949/hasToiletDischarge
+1.2.2.0.4.2,http://data.europa.eu/949/hasExternalCleaning
+1.2.2.0.4.3,http://data.europa.eu/949/hasWaterRestocking
+1.2.2.0.4.4,http://data.europa.eu/949/hasRefuelling
+1.2.2.0.4.5,http://data.europa.eu/949/hasSandRestocking
+1.2.2.0.4.6,http://data.europa.eu/949/hasElectricShoreSupply
+1.2.2.0.5.1,http://data.europa.eu/949/imCode
+1.2.2.0.5.2,http://data.europa.eu/949/tunnelIdentification
+1.2.2.0.5.3,http://data.europa.eu/949/verificationSRT
+1.2.2.0.5.4,http://data.europa.eu/949/demonstrationSRT
+1.2.2.0.5.5,http://data.europa.eu/949/length
+1.2.2.0.5.6,http://data.europa.eu/949/hasEmergencyPlan
+1.2.2.0.5.7,http://data.europa.eu/949/rollingStockFireCategory
+1.2.2.0.5.8,http://data.europa.eu/949/nationalRollingStockFireCategory
+1.2.2.0.6.1,http://data.europa.eu/949/maxCurrentStandstillPantograph
+1.2.3.1,http://data.europa.eu/949/localRulesOrRestrictions
+1.2.3.2,http://data.europa.eu/949/localRulesOrRestrictionsDoc
diff --git a/map-turtle.sh b/map-turtle.sh
@@ -42,12 +42,19 @@ mapRML() {
     local file_path=$1
     local file=${file_path##*/}
     local output_file="knowledge-graph/${file%_rml*}.nq"
+    local format="nquads"
 
     if [ $(stat -c %s $output_file 2>/dev/null || echo -e 0) -gt 0 ]; then
         echo "$file_path has already been mapped"
     else
+        # Map SKOS terms to turtle
+        if [ "${file%_rml*}" = "RINF-ERATV-skos-concepts" ]; then
+            format="turtle"
+            output_file="knowledge-graph/RINF-ERATV-skos-concepts.ttl"
+        fi
+        # Map the rest to N-Quads
         echo "Mapping '$file_path' and storing output in '$output_file'"
-        time java -Xmx4096m -cp rmlmapper-4.10.0.jar:mssql-jdbc-8.2.0.jre11.jar be.ugent.rml.cli.Main -m $file_path > $output_file
+        time java -Xmx4096m -cp rmlmapper-4.10.0.jar:mssql-jdbc-8.2.0.jre11.jar be.ugent.rml.cli.Main -s $format -m $file_path > $output_file
     fi
 }
 # Export the mapRML function so it can be seen by parallel
@@ -70,7 +77,7 @@ ls ${rml_directory}/*.ttl | parallel -j+0 'mapRML {}'
 
 # Merge resulting RDF (nquads) files into one
 echo "Merging mapped ERA RDF files into a single file for version $1"
-find ${output_directory}/ -iname '*.nq' -not -name 'RINF-ERATV-skos-concepts.nq' -exec cat {} +> ${output_directory}/${knowledge_graph}$1.nq
+find ${output_directory}/ -iname '*.nq' -exec cat {} +> ${output_directory}/${knowledge_graph}$1.nq
 #cat ${output_directory}/* > ${output_directory}/${knowledge_graph}$1.nq
 echo "Compressing resulting RDF file"
 gzip ${output_directory}/${knowledge_graph}$1.nq

diff --git a/mappings/ERATV-manufacturers.yml b/mappings/ERATV-manufacturers.yml
@@ -3,8 +3,8 @@ prefixes:
   grel: "http://users.ugent.be/~bjdmeest/function/grel.ttl#"
   rdfs: "http://www.w3.org/2000/01/rdf-schema#"
   schema: "https://schema.org/"
-  era: "http://era.europa.eu/ns#"
-  era-manufacturers: "http://era.europa.eu/manufacturers#"
+  era: "http://data.europa.eu/949/"
+  era-manufacturers: "http://data.europa.eu/949/manufacturers/"
   xsd: "http://www.w3.org/2001/XMLSchema#"
 variables:
   connection: 
@@ -28,27 +28,27 @@ mappings:
     s: era-manufacturers:$(UriName)
     po:
       - [a, era:Manufacturer]
-      - [schema:name, $(Name)]
-      - [rdfs:label, $(Name)]
-      - p: schema:email
+      - [schema:name, $(Name)] # 1.3.1.1
+      - [rdfs:label, $(Name)] # 1.3.1.1
+      - p: schema:email # 1.3.2.5
         o: $(EmailAddress)
         condition:
           function: idlab-fn:notEqual
           parameters:
             - [grel:valueParameter, $(EmailAddress)]
             - [grel:valueParameter2, ""]
-      - p: schema:address
+      - p: schema:address # 1.3.2.1
         o: $(PostAddress)
         condition:
           function: idlab-fn:notEqual
           parameters:
             - [grel:valueParameter, $(PostAddress)]
             - [grel:valueParameter2, ""]
-      - p: schema:taxID
+      - p: schema:taxID # 1.3.1.2
         o: $(RegisteredBusinessNumber)
         condition:
           function: idlab-fn:notEqual
           parameters:
             - [grel:valueParameter, $(RegisteredBusinessNumber)]
             - [grel:valueParameter2, ""]
-    graphs: ${NAMED_GRAPH}
+    graph: ${NAMED_GRAPH}