Skip to content

Commit

Permalink
Merge pull request #35 from BROprogramma/Versie_0_99
Browse files Browse the repository at this point in the history 
Versie 0.99v2
  • Loading branch information
@RHuismn
RHuismn authored Nov 22, 2023
2 parents 6da867d + 3392b06 commit 6df2659
Show file tree
Hide file tree
Showing 27 changed files with 5,897 additions and 5,971 deletions.
Binary file modified ....99/SAD Uitwisselberichten/Afbeeldingen UML/brondocument SAD_CompleteReport.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Versie 0.99/SAD Uitwisselberichten/Afbeeldingen UML/correctionRequest.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 38 additions & 2 deletions Versie 0.99/SAD Uitwisselberichten/Controle XSLT/SIKB_SAD IMBROA.xslt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,19 @@
<xsl:variable name="message" select="'In het xml-bestand moet minimaal en maximaal 1 Project zijn opgenomen.'"/>
<xsl:copy-of select="sikb:createRecord('ERROR', 'xml-bestand', $message)"/>
</xsl:if>
<xsl:if test="not(//imsikb0101:Project) or not(count(//imsikb0101:Project) = 1)">
<!-- Check existence Project -->
<xsl:variable name="message" select="'In het xml-bestand moet minimaal en maximaal 1 Project zijn opgenomen.'"/>
<xsl:copy-of select="sikb:createRecord('ERROR', 'xml-bestand', $message)"/>
</xsl:if>
<xsl:if test="not(//immetingen:Organization[contains('|64|', concat('|', substring-after(immetingen:organisationType, ':id:'), '|'))]) or not(count(//imsikb0101:Project) = 1)">
<!-- Check existence Adviesbureau -->
<xsl:variable name="message" select="'In het xml-bestand moet minimaal een Adviesbureau organisatie zijn opgenomen.'"/>
<xsl:copy-of select="sikb:createRecord('ERROR', 'xml-bestand', $message)"/>
</xsl:if>
<xsl:apply-templates select="//imsikb0101:SoilLocation"/>
<xsl:apply-templates select="//imsikb0101:Project"/>
<xsl:apply-templates select="//imsikb0101:Project"/>
<xsl:apply-templates select="//immetingen:Organization"/>
<xsl:apply-templates select="//imsikb0101:Filter"/>
<xsl:apply-templates select="//immetingen:MeasurementObject"/>
<xsl:apply-templates select="//imsikb0101:Borehole" mode="twee"/>
Expand All @@ -43,6 +54,7 @@
<xsl:copy-of select="sikb:checkFilled(., $prGUID, 'name', 'ERROR')"/>
<xsl:copy-of select="sikb:checkFilled(., $prGUID, 'geometry', 'ERROR')"/>
<xsl:copy-of select="sikb:checkFilled(., $prGUID, 'reportNumber', 'WARNING')"/>
<xsl:copy-of select="sikb:checkFilled(., $prGUID, 'investigationReason', 'WARNING')"/>
<!--> Lengte checks voor bepaalde velden-->
<xsl:copy-of select="sikb:checkLength(., $prGUID, 'reportNumber', 40, 'ERROR')"/>
<xsl:copy-of select="sikb:checkLength(., $prGUID, 'investigationConclusion', 4000, 'ERROR')"/>
Expand Down Expand Up @@ -74,6 +86,7 @@
<xsl:variable name="message" select="'In het xml-bestand moet een Analysis zijn opgenomen.'"/>
<xsl:copy-of select="sikb:createRecord('ERROR', 'xml-bestand', $message)"/>
</xsl:if>

</xsl:template>
<!--> Check of er een locatie is meegeleverd -->
<xsl:template match="imsikb0101:SoilLocation">
Expand All @@ -82,6 +95,21 @@
<xsl:copy-of select="sikb:checkGeometryElements(.,$prGUID,'gml:Polygon','gml:MultiSurface','ERROR')"/>
<xsl:copy-of select="sikb:checkGeometryElement(.,$prGUID,'gml:MultiSurface','ERROR')"/>
</xsl:template>
<!-- check organizations -->
<xsl:template match="immetingen:Organization">
<xsl:variable name="prGUID" select="@gml:id"/>
<!-- Check adviesbureau -->
<xsl:if test="contains('|64|', concat('|', substring-after(immetingen:organisationType, ':id:'), '|'))">
<xsl:copy-of select="sikb:checkExistence(., $prGUID, 'name', 'WARNING')"/>
<xsl:if test="(not(immetingen:chamberOfCommerceNumber) and not(immetingen:chamberOfCommerceNumber))">
<xsl:variable name="message" select="'In het xml-bestand moet een Adviesbureau (id:64) met een chamberOfCommerceNumber of europeanCompanyRegistryNumber zijn opgenomen.'"/>
<xsl:copy-of select="sikb:createRecord('WARNING', 'xml-bestand', $message)"/>
</xsl:if>
<xsl:copy-of select="sikb:checkLength(., $prGUID,'name', 40, 'WARNING')"/>
<xsl:copy-of select="sikb:checkLength(., $prGUID, 'chamberOfCommerceNumber', 40, 'ERROR')"/>
<xsl:copy-of select="sikb:checkLength(., $prGUID, 'europeanCompanyRegistryNumber', 40, 'ERROR')"/>
</xsl:if>
</xsl:template>
<!-- Sample -->
<xsl:template match="immetingen:Sample" mode="een">
<xsl:variable name="prGUID" select="@gml:id"/>
Expand All @@ -98,14 +126,22 @@
<xsl:copy-of select="sikb:checkLength(., $prGUID, 'name', 24, 'ERROR')"/>
<xsl:for-each select=".//immetingen:Analysis">

</xsl:for-each>
</xsl:for-each>
<xsl:copy-of select="sikb:checkExistence(., $prGUID, 'specimenType', 'ERROR')"/>
<xsl:copy-of select="sikb:checkExistence(., $prGUID, 'samplingTime', 'ERROR')"/>
<xsl:copy-of select="sikb:checkExistence(., $prGUID, 'startTime', 'WARNING')"/>
<xsl:copy-of select="sikb:checkLookupId(., $prGUID, 'specimenType', 'MonsterType', 'ERROR')"/>
<xsl:copy-of select="sikb:checkExistence(., $prGUID, 'materialClass', 'ERROR')"/>
<xsl:copy-of select="sikb:checkLookupId(., $prGUID, 'materialClass', 'Compartiment', 'ERROR')"/>
<!-- check nog aanpassen in verband met check op attribuut ipv element -->
<!-- veldmonsters (niet grond)-->
<xsl:if test="spec:specimenType/@xlink:href = 'urn:immetingen:MonsterType:id:1' and not(spec:materialClass/@xlink:href = 'urn:immetingen:compartiment:id:1')">
<xsl:copy-of select="sikb:checkExistence(., $prGUID, 'relatedObservation', 'WARNING')"/>
</xsl:if>
<!-- analysemonsters-->
<xsl:if test="spec:specimenType/@xlink:href = 'urn:immetingen:MonsterType:id:10'">
<xsl:copy-of select="sikb:checkExistence(., $prGUID, 'relatedObservation', 'WARNING')"/>
</xsl:if>
</xsl:template>
<!-- Analysis-->
<xsl:template match="immetingen:Analysis">
Expand Down
16 changes: 11 additions & 5 deletions ...D en voorbeeld XML/Voorbeeldberichten innameservice/1. SAD_registrationRequest IMBROA.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<registrationRequest xmlns="http://www.broservices.nl/xsd/issad/1.0" xmlns:sadcom="http://www.broservices.nl/xsd/sadcommon/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.broservices.nl/xsd/issad/1.0 ../issad-messages.xsd">
<!--Disclaimer: dit voorbeeldbericht is gemaakt voor increment 0.9 van de SAD en valideert tegen de XSD van de innameservice.
<!--Disclaimer: dit voorbeeldbericht is gemaakt voor increment 0.99 van de SAD en valideert tegen de XSD van de innameservice.
Het is niet gevalideerd door de innameservice en de inhoud is fictief en vaktechnisch/inhoudelijk niet voorbeeldig.
-->
<!--KVK nummer van de aanleverende partij-->
Expand All @@ -9,7 +9,10 @@
<sadcom:qualityRegime>IMBRO/A</sadcom:qualityRegime>
<sadcom:requestReference>Verzoek1</sadcom:requestReference>
<sourceDocument>
<SAD_CompleteReport>
<SAD_CompleteReport>
<deliveryContext codeSpace="urn:bro:sad:DeliveryContext">archiefoverdracht</deliveryContext>
<objectIdAccountableParty>MijnReferentieSADUpload</objectIdAccountableParty>
<reportDate>2018-12-08</reportDate>
<featureCollection>
<!-- Hier tussen kan de volledige SIKB XML geplakt worden-->
<imsikb0101:FeatureCollectionIMSIKB0101 gml:id="_9e0c2e47-5019-4846-bf80-050c79a09ff2" xmlns:imsikb0101="http://www.sikb.nl/imsikb0101" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gsr="http://www.isotc211.org/2005/gsr" xmlns:gss="http://www.isotc211.org/2005/gss" xmlns:gts="http://www.isotc211.org/2005/gts" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:om="http://www.opengis.net/om/2.0" xmlns:sam="http://www.opengis.net/sampling/2.0" xmlns:sams="http://www.opengis.net/samplingSpatial/2.0" xmlns:spec="http://www.opengis.net/samplingSpecimen/2.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:immetingen="http://www.sikb.nl/immetingen" xsi:schemaLocation="http://www.sikb.nl/imsikb0101 ../imsikb0101_v14.8.0.xsd">
Expand All @@ -22,16 +25,16 @@
<imsikb0101:dataflow>urn:imsikb0101:DatastroomType:id:4</imsikb0101:dataflow>
</imsikb0101:metaData>
<imsikb0101:featureMember>
<imsikb0101:Project gml:id="_daa6c99f-4eee-44c6-b78e-6b1826057114">
<imsikb0101:Project gml:id="_daa6c99f-4eee-44c6-b78e-6b1826057114">
<imsikb0101:asbestos>urn:imsikb0101:AsbestAanwezigheid:id:4</imsikb0101:asbestos>
<imsikb0101:assesorConclusion>xxxxxxxxxxx</imsikb0101:assesorConclusion>
<imsikb0101:assignmentCode>xxxxxxxxxxx</imsikb0101:assignmentCode>
<imsikb0101:investigationConclusion>Dit is de conclusie van het onderzoek.</imsikb0101:investigationConclusion>
<imsikb0101:investigationReason>urn:imsikb0101:OnderzoekAanleidingen:id:2</imsikb0101:investigationReason>
<imsikb0101:geometry>
<gml:MultiSurface gml:id="_e604d147-bb50-469c-bd5c-60cef435f9cb">
<gml:MultiSurface gml:id="_e604d147-bb50-469c-bd5c-60cef435f9cb" srsName="urn:ogc:def:crs:EPSG::4326">
<gml:surfaceMember>
<gml:Polygon gml:id="_d604d147-bb50-469c-bd5c-60cef435f9db" srsName="urn:ogc:def:crs:EPSG::4326">
<gml:Polygon gml:id="_d604d147-bb50-469c-bd5c-60cef435f9db">
<gml:exterior>
<gml:LinearRing>
<gml:posList srsDimension="2">52.00439274920983 4.358917081981024 52.00402618781154 4.358289445071539 52.003560551436216 4.358455742030462 52.003874278604464 4.359217489390692 52.00439274920983 4.358917081981024</gml:posList>
Expand Down Expand Up @@ -2295,6 +2298,7 @@
</immetingen:NEN3610ID>
</immetingen:identification>
<immetingen:name>MM1</immetingen:name>
<immetingen:startTime>2018-03-09T11:00:00+01:00</immetingen:startTime>
<imsikb0101:inProject xlink:href="#_9e0c2e47-5019-4846-bf80-050c79a09ff2"/>
</imsikb0101:Sample>
</imsikb0101:featureMember>
Expand Down Expand Up @@ -2427,6 +2431,7 @@
</immetingen:NEN3610ID>
</immetingen:identification>
<immetingen:name>WA1</immetingen:name>
<immetingen:startTime>2018-04-09T11:00:00</immetingen:startTime>
<imsikb0101:inProject xlink:href="#_015c6207-2bed-4f3b-bb40-8ab94079bff5"/>
</imsikb0101:Sample>
</imsikb0101:featureMember>
Expand Down Expand Up @@ -2518,6 +2523,7 @@
</immetingen:NEN3610ID>
</immetingen:identification>
<immetingen:name>PB01-POT3</immetingen:name>
<immetingen:startTime>2018-03-19T11:00:00+01:00</immetingen:startTime>
<imsikb0101:inProject xlink:href="#_9e0c2e47-5019-4846-bf80-050c79a09ff2"/>
</imsikb0101:Sample>
</imsikb0101:featureMember>
Expand Down
Loading

0 comments on commit 6df2659

Please sign in to comment.