From 669f78b8d4503a35e06ffaa60b22c3915b4f35ea Mon Sep 17 00:00:00 2001 From: arjan Date: Fri, 5 Apr 2024 11:10:57 +0200 Subject: [PATCH 01/75] Release van Development opgehoogd --- src/main/resources/static/release/release.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/static/release/release.xml b/src/main/resources/static/release/release.xml index 0e3c6afc..5f3b7d7a 100644 --- a/src/main/resources/static/release/release.xml +++ b/src/main/resources/static/release/release.xml @@ -2,7 +2,7 @@ Imvertor Nightly-build - 13 + 14 Copyright (C) 2016-2022 Dienst voor het Kadaster en de openbare registers. This program comes with ABSOLUTELY NO WARRANTY; for details pass -help program. From ffa26affa1719d8a2d9f3dec17c3175898daf91d Mon Sep 17 00:00:00 2001 From: arjan Date: Fri, 5 Apr 2024 11:11:38 +0200 Subject: [PATCH 02/75] Bugfix op RDF output van MIM compiler --- .../xsl/MIMCompiler/v2/MIMCompiler-RDF.xsl | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIMCompiler-RDF.xsl b/src/main/resources/xsl/MIMCompiler/v2/MIMCompiler-RDF.xsl index 598b9b87..955a03ef 100644 --- a/src/main/resources/xsl/MIMCompiler/v2/MIMCompiler-RDF.xsl +++ b/src/main/resources/xsl/MIMCompiler/v2/MIMCompiler-RDF.xsl @@ -199,16 +199,12 @@ Zie: https://docs.geostandaarden.nl/mim/mim/ voor de laatste versie van de stand - - - - - - - - - - + + + + + + From ed428ce9ce8349229f140a29f32d23bce26f5d0c Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 8 Apr 2024 13:51:48 +0200 Subject: [PATCH 03/75] Bugfix samenstellen EA toollbox Vanaf nu is ook informatiemodel stereotype onderdeel van de packages sectie in de toolbox view. Bugfix. --- src/main/resources/input/MIM/cfg/visuals/MIM10.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/input/MIM/cfg/visuals/MIM10.xml b/src/main/resources/input/MIM/cfg/visuals/MIM10.xml index df34fda3..05af863f 100644 --- a/src/main/resources/input/MIM/cfg/visuals/MIM10.xml +++ b/src/main/resources/input/MIM/cfg/visuals/MIM10.xml @@ -123,6 +123,9 @@ + + + From ce9a87dedf08efb1a6b258b8631bc86097c4b5d2 Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 8 Apr 2024 13:52:30 +0200 Subject: [PATCH 04/75] Logius: Verbeterde naamgeving toolbox. --- .../input/Logius/cfg/metamodels/Logius-CONCEPTUAL.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/input/Logius/cfg/metamodels/Logius-CONCEPTUAL.xml b/src/main/resources/input/Logius/cfg/metamodels/Logius-CONCEPTUAL.xml index df858132..30477387 100644 --- a/src/main/resources/input/Logius/cfg/metamodels/Logius-CONCEPTUAL.xml +++ b/src/main/resources/input/Logius/cfg/metamodels/Logius-CONCEPTUAL.xml @@ -12,14 +12,14 @@ - MEGNL + Logius-C-NL - MIM 1.1.1 Logius NL + MIM 1.1.1 Logius Conceptueel NL - MEGEN + Logius-C-EN - MIM 1.1.1 Logius EN + MIM 1.1.1 Logius Conceptual EN From be347df26a954122e03457127fb09d2f2983021f Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 9 Apr 2024 11:08:38 +0200 Subject: [PATCH 05/75] EIGENAAR wordt gekoppeld aan Imvertor metamodel. --- .../EIGENAAR/cfg/metamodels/EIGENAAR-CONCEPTUAL.xml | 3 ++- .../input/EIGENAAR/cfg/tvsets/EIGENAAR-CONCEPTUAL.xml | 3 ++- .../input/EIGENAAR/cfg/visuals/EIGENAAR-CONCEPTUAL.xml | 5 +++-- .../input/EIGENAAR/cfg/visuals/EIGENAAR-LOGICAL.xml | 10 +++++----- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/resources/input/EIGENAAR/cfg/metamodels/EIGENAAR-CONCEPTUAL.xml b/src/main/resources/input/EIGENAAR/cfg/metamodels/EIGENAAR-CONCEPTUAL.xml index b42e12dc..04dd3b24 100644 --- a/src/main/resources/input/EIGENAAR/cfg/metamodels/EIGENAAR-CONCEPTUAL.xml +++ b/src/main/resources/input/EIGENAAR/cfg/metamodels/EIGENAAR-CONCEPTUAL.xml @@ -4,8 +4,9 @@ --> - + + EIGENAAR CONCEPTUEEL diff --git a/src/main/resources/input/EIGENAAR/cfg/tvsets/EIGENAAR-CONCEPTUAL.xml b/src/main/resources/input/EIGENAAR/cfg/tvsets/EIGENAAR-CONCEPTUAL.xml index a2ed4c89..554e2a38 100644 --- a/src/main/resources/input/EIGENAAR/cfg/tvsets/EIGENAAR-CONCEPTUAL.xml +++ b/src/main/resources/input/EIGENAAR/cfg/tvsets/EIGENAAR-CONCEPTUAL.xml @@ -4,8 +4,9 @@ --> - + + EIGENAAR CONCEPTUEEL diff --git a/src/main/resources/input/EIGENAAR/cfg/visuals/EIGENAAR-CONCEPTUAL.xml b/src/main/resources/input/EIGENAAR/cfg/visuals/EIGENAAR-CONCEPTUAL.xml index 407d0d7b..524279b1 100644 --- a/src/main/resources/input/EIGENAAR/cfg/visuals/EIGENAAR-CONCEPTUAL.xml +++ b/src/main/resources/input/EIGENAAR/cfg/visuals/EIGENAAR-CONCEPTUAL.xml @@ -4,12 +4,13 @@ --> - + + - BRO MIM 1.1 + EIGENAAR MIM 1.1.1 Visuals for EIGENAAR modellen Visuele aspecten van EIGENAAR modellen diff --git a/src/main/resources/input/EIGENAAR/cfg/visuals/EIGENAAR-LOGICAL.xml b/src/main/resources/input/EIGENAAR/cfg/visuals/EIGENAAR-LOGICAL.xml index 08bb78ae..8a8e5947 100644 --- a/src/main/resources/input/EIGENAAR/cfg/visuals/EIGENAAR-LOGICAL.xml +++ b/src/main/resources/input/EIGENAAR/cfg/visuals/EIGENAAR-LOGICAL.xml @@ -4,11 +4,11 @@ --> - - + + BRO logical Visuals for BRO logical models @@ -17,7 +17,7 @@ - + @@ -25,5 +25,5 @@ - + From a0a8ad1110aa19177fd271707697115ab0582773 Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 9 Apr 2024 11:08:56 +0200 Subject: [PATCH 06/75] Logius wordt gekoppeld aan Imvertor metamodel. --- .../input/Logius/cfg/metamodels/Logius-CONCEPTUAL.xml | 3 ++- .../input/Logius/cfg/tvsets/Logius-CONCEPTUAL.xml | 3 ++- .../input/Logius/cfg/visuals/Logius-CONCEPTUAL.xml | 5 +++-- .../input/Logius/cfg/visuals/Logius-LOGICAL.xml | 11 ++++++----- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/resources/input/Logius/cfg/metamodels/Logius-CONCEPTUAL.xml b/src/main/resources/input/Logius/cfg/metamodels/Logius-CONCEPTUAL.xml index 30477387..25875e9b 100644 --- a/src/main/resources/input/Logius/cfg/metamodels/Logius-CONCEPTUAL.xml +++ b/src/main/resources/input/Logius/cfg/metamodels/Logius-CONCEPTUAL.xml @@ -4,8 +4,9 @@ --> - + + Logius CONCEPTUEEL diff --git a/src/main/resources/input/Logius/cfg/tvsets/Logius-CONCEPTUAL.xml b/src/main/resources/input/Logius/cfg/tvsets/Logius-CONCEPTUAL.xml index a0ada0af..aaac0239 100644 --- a/src/main/resources/input/Logius/cfg/tvsets/Logius-CONCEPTUAL.xml +++ b/src/main/resources/input/Logius/cfg/tvsets/Logius-CONCEPTUAL.xml @@ -4,8 +4,9 @@ --> - + + Logius CONCEPTUEEL diff --git a/src/main/resources/input/Logius/cfg/visuals/Logius-CONCEPTUAL.xml b/src/main/resources/input/Logius/cfg/visuals/Logius-CONCEPTUAL.xml index d6d17838..747b122c 100644 --- a/src/main/resources/input/Logius/cfg/visuals/Logius-CONCEPTUAL.xml +++ b/src/main/resources/input/Logius/cfg/visuals/Logius-CONCEPTUAL.xml @@ -4,12 +4,13 @@ --> - + + - BRO MIM 1.1 + BRO MIM 1.1.1 Visuals for Logius modellen Visuele aspecten van Logius modellen diff --git a/src/main/resources/input/Logius/cfg/visuals/Logius-LOGICAL.xml b/src/main/resources/input/Logius/cfg/visuals/Logius-LOGICAL.xml index 08bb78ae..8ec9dfb0 100644 --- a/src/main/resources/input/Logius/cfg/visuals/Logius-LOGICAL.xml +++ b/src/main/resources/input/Logius/cfg/visuals/Logius-LOGICAL.xml @@ -4,11 +4,12 @@ --> - - + + + BRO logical Visuals for BRO logical models @@ -17,13 +18,13 @@ - + - + From ad8a97a8f317eb6bf7b7851bc4349fcfe809e40b Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 9 Apr 2024 11:24:55 +0200 Subject: [PATCH 07/75] Gebruik van streaming XMI reader voor extraheren van images. In een vroeg stadium worden alle base64 images van EA afgekoppeld zodat de XMI verwerking niet te veel geheugen zal gaan innemen. Optimalisatie. --- .../XmiCompiler/XMIImageExporter.java | 131 ++++++++++++++++++ .../nl/imvertor/XmiCompiler/XmiCompiler.java | 29 ++++ .../xsl/XmiTranslator/XMI1Imvert.xsl | 9 +- 3 files changed, 165 insertions(+), 4 deletions(-) create mode 100644 src/main/java/nl/imvertor/XmiCompiler/XMIImageExporter.java diff --git a/src/main/java/nl/imvertor/XmiCompiler/XMIImageExporter.java b/src/main/java/nl/imvertor/XmiCompiler/XMIImageExporter.java new file mode 100644 index 00000000..3ed85b99 --- /dev/null +++ b/src/main/java/nl/imvertor/XmiCompiler/XMIImageExporter.java @@ -0,0 +1,131 @@ +package nl.imvertor.XmiCompiler; + +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Base64; +import java.util.Base64.Decoder; +import java.util.List; + +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLOutputFactory; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; + +public class XMIImageExporter { + + public List export(InputStream xmiStreamIn, OutputStream xmiStreamOut) throws Exception { + String name = null; + String imageID = null; + boolean isImage = false; + List imageList = new ArrayList<>(); + StringBuffer imageDataBuffer = new StringBuffer(); + Decoder base64Decoder = Base64.getDecoder(); + XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance(); + xmlInputFactory.setProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES, Boolean.FALSE); + XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(xmiStreamIn); + XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter(xmiStreamOut); + boolean hasNext; + do { + switch (reader.getEventType()) { + case XMLStreamConstants.START_DOCUMENT: + writer.writeStartDocument(reader.getEncoding(), reader.getVersion()); + break; + case XMLStreamConstants.END_DOCUMENT: + writer.writeEndDocument(); + break; + case XMLStreamConstants.START_ELEMENT: + writer.writeStartElement(reader.getPrefix(), reader.getLocalName(), def(reader.getNamespaceURI(), "")); + for (int i = 0; i < reader.getNamespaceCount(); i++) + writer.writeNamespace(reader.getNamespacePrefix(i), reader.getNamespaceURI(i)); + for (int i = 0; i < reader.getAttributeCount(); i++) + writer.writeAttribute(reader.getAttributePrefix(i), def(reader.getAttributeNamespace(i), ""), + reader.getAttributeLocalName(i), reader.getAttributeValue(i)); + if (reader.getLocalName().equals("EAImage")) { + isImage = true; + name = reader.getAttributeValue(null, "name"); + imageID = reader.getAttributeValue(null, "imageID"); + } + break; + case XMLStreamConstants.END_ELEMENT: + if (isImage) { + byte[] imageData = base64Decoder.decode(imageDataBuffer.toString()); + imageDataBuffer.setLength(0); + imageList.add(new Image(name, imageID, imageData)); + writer.writeComment("Image data removed"); + isImage = false; + } + writer.writeEndElement(); + break; + case XMLStreamConstants.CHARACTERS: + if (isImage) { + imageDataBuffer.append(reader.getText().replaceAll("\\s+", "")); + } else { + writer.writeCharacters(reader.getText()); + } + break; + case XMLStreamConstants.CDATA: + writer.writeCData(reader.getText()); + break; + case XMLStreamConstants.COMMENT: + writer.writeComment(reader.getText()); + break; + case XMLStreamConstants.PROCESSING_INSTRUCTION: + writer.writeProcessingInstruction(reader.getPITarget(), reader.getPIData()); + break; + } + hasNext = reader.hasNext(); + if (hasNext) + reader.next(); + } while (hasNext); + return imageList; + } + + public static final class Image { + + private String name; + private String imageID; + private byte[] data; + + public Image(String name, String imageID, byte[] data) { + this.name = name; + this.imageID = imageID; + this.data = data; + } + + public String getName() { + return name; + } + + public String getImageID() { + return imageID; + } + + public byte[] getData() { + return data; + } + + } + + private String def(String text, String def) { + return text == null ? def : text; + } + + /* + public static void main(String[] args) throws Exception { + XMIImageExporter exporter = new XMIImageExporter(); + try (FileInputStream xmiFis = new FileInputStream(new File("D:\\Projects\\validprojects\\Kadaster-Imvertor\\Imvertor-OS-work\\Tasks-GIThub\\xmi\\GIThub-issues.qea.xmi")); + FileOutputStream xmiFos = new FileOutputStream(new File("D:\\Projects\\validprojects\\Kadaster-Imvertor\\Imvertor-OS-work\\Tasks-GIThub\\xmi\\GIThub-issues.qea.out.xmi"))) { + List images = exporter.export(xmiFis, xmiFos); + for (Image image: images) { + System.out.println(image.name); + System.out.println(image.imageID); + try (FileOutputStream imgFos = new FileOutputStream(new File("D:\\Projects\\validprojects\\Kadaster-Imvertor\\Imvertor-OS-work\\Tasks-GIThub\\xmi\\Images\\" + image.imageID + "_" + image.name))) { + imgFos.write(image.data); + } + } + } + } + */ +} diff --git a/src/main/java/nl/imvertor/XmiCompiler/XmiCompiler.java b/src/main/java/nl/imvertor/XmiCompiler/XmiCompiler.java index 0793ea5d..6e3ff56e 100644 --- a/src/main/java/nl/imvertor/XmiCompiler/XmiCompiler.java +++ b/src/main/java/nl/imvertor/XmiCompiler/XmiCompiler.java @@ -21,13 +21,18 @@ package nl.imvertor.XmiCompiler; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.util.List; import javax.xml.xpath.XPathConstants; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.w3c.dom.NodeList; +import nl.imvertor.XmiCompiler.XMIImageExporter.Image; import nl.imvertor.common.Step; import nl.imvertor.common.Transformer; import nl.imvertor.common.file.AnyFile; @@ -273,11 +278,35 @@ private XmlFile exportEapToXmi(EapFile eapFile, XmlFile xmifile, String projectN */ private void cleanXMI(XmlFile xmiFile) throws Exception { + // decode alle images uit content naar de Images folder + extractImages(xmiFile); + + // Probeer character fix String c = xmiFile.getContent(); if (c.contains("")) xmiFile.setContent(StringUtils.replacePattern(c, "[0-9]{4};", "?")); } + private void extractImages(XmlFile xmiFile) throws Exception { + XMIImageExporter exporter = new XMIImageExporter(); + AnyFile tempFile = new AnyFile(File.createTempFile("extractImages.", ".xmi")); + tempFile.deleteOnExit(); + File imageFolder = new File(xmiFile.getParentFile(),"Images"); + try (FileInputStream xmiFis = new FileInputStream(xmiFile); + FileOutputStream xmiFos = new FileOutputStream(tempFile)) { + List images = exporter.export(xmiFis, xmiFos); + for (Image image: images) { + try (FileOutputStream imgFos = new FileOutputStream(new File(imageFolder, image.getImageID() + "_" + image.getName()))) { + imgFos.write(image.getData()); + imgFos.close(); + } + } + xmiFis.close(); + xmiFos.close(); + tempFile.copyFile(xmiFile); + } + } + private void migrateXMI(XmlFile xmiFile, String mode) throws Exception { runner.warn(logger,"This model is subject to migration rules, please consider aligning the model with the metamodel",null,"TMISTMR"); AnyFile outFile = new AnyFile(File.createTempFile("migrateXMI.", ".xmi")); diff --git a/src/main/resources/xsl/XmiTranslator/XMI1Imvert.xsl b/src/main/resources/xsl/XmiTranslator/XMI1Imvert.xsl index aacfa802..e591b6ed 100644 --- a/src/main/resources/xsl/XmiTranslator/XMI1Imvert.xsl +++ b/src/main/resources/xsl/XmiTranslator/XMI1Imvert.xsl @@ -268,10 +268,9 @@ - - - - + + x?> @@ -519,6 +518,7 @@ + @@ -526,6 +526,7 @@ + x?> From 176cbf28c6da92eceb6c65400c4f30bc1649e41b Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 9 Apr 2024 12:46:27 +0200 Subject: [PATCH 08/75] Toevoeging van "keuzes" in EA toolbox. Deze waren niet alle vertegenwoordigd. Bugfix. --- .../resources/input/MIM/cfg/visuals/MIM10.xml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/resources/input/MIM/cfg/visuals/MIM10.xml b/src/main/resources/input/MIM/cfg/visuals/MIM10.xml index 05af863f..218879a4 100644 --- a/src/main/resources/input/MIM/cfg/visuals/MIM10.xml +++ b/src/main/resources/input/MIM/cfg/visuals/MIM10.xml @@ -74,13 +74,28 @@ - + + + + + + + + + + + + + + + + From 3dd4b33048ce3196efd27efadf3a0f7aafadc3ce Mon Sep 17 00:00:00 2001 From: arjan Date: Thu, 11 Apr 2024 12:30:51 +0200 Subject: [PATCH 09/75] Forceer UTF-8 bij uitlezen van XMI. De image encoder ging uit van getEncoding() die niet altijd de juiste codering oplevert. Uitgangspunt is dat de XMI altijd in UTF-8 wordt aangeleverd. Bugfix. --- src/main/java/nl/imvertor/XmiCompiler/XMIImageExporter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/nl/imvertor/XmiCompiler/XMIImageExporter.java b/src/main/java/nl/imvertor/XmiCompiler/XMIImageExporter.java index 3ed85b99..a3709800 100644 --- a/src/main/java/nl/imvertor/XmiCompiler/XMIImageExporter.java +++ b/src/main/java/nl/imvertor/XmiCompiler/XMIImageExporter.java @@ -7,12 +7,15 @@ import java.util.Base64.Decoder; import java.util.List; +import javax.sound.sampled.AudioFormat.Encoding; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; +import org.apache.commons.lang.CharEncoding; + public class XMIImageExporter { public List export(InputStream xmiStreamIn, OutputStream xmiStreamOut) throws Exception { @@ -30,7 +33,7 @@ public List export(InputStream xmiStreamIn, OutputStream xmiStreamOut) th do { switch (reader.getEventType()) { case XMLStreamConstants.START_DOCUMENT: - writer.writeStartDocument(reader.getEncoding(), reader.getVersion()); + writer.writeStartDocument(CharEncoding.UTF_8, reader.getVersion()); break; case XMLStreamConstants.END_DOCUMENT: writer.writeEndDocument(); From 4676d10e62f30ab370a9b486e5466a99d7ee4b27 Mon Sep 17 00:00:00 2001 From: arjan Date: Thu, 11 Apr 2024 12:39:35 +0200 Subject: [PATCH 10/75] BRO: In ISO19136 toevoeging keuze tussen Objecttypen (MIM) Zie #473 Minor, het is een uitbreiding van de schema module. --- .../xsl/XsdCompiler/Imvert2XSD-ISO19136.xsl | 63 ++++++++++++++----- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136.xsl b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136.xsl index fe18c413..6c6edb68 100644 --- a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136.xsl +++ b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136.xsl @@ -372,6 +372,7 @@ + @@ -416,9 +417,9 @@ - - - + + + @@ -427,18 +428,18 @@ - + - + - + @@ -449,12 +450,33 @@ - + + + + + + + + + + + + + + + + + + + + + + @@ -478,16 +500,16 @@ - + - + - + @@ -569,6 +591,13 @@ + + + + + + + @@ -649,8 +678,13 @@ - + + + + @@ -1271,13 +1305,8 @@ - - - + From e409404cc8fbc22172dcec9dcdf4ed9bae26fc4c Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 15 Apr 2024 10:57:44 +0200 Subject: [PATCH 11/75] Keuzen tussen Objecttype vereisen geen naam van de relatie meer Bugfix --- src/main/resources/xsl/Validator/Imvert2validation.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/xsl/Validator/Imvert2validation.xsl b/src/main/resources/xsl/Validator/Imvert2validation.xsl index 0e5e4dcd..d5cfcc45 100644 --- a/src/main/resources/xsl/Validator/Imvert2validation.xsl +++ b/src/main/resources/xsl/Validator/Imvert2validation.xsl @@ -969,7 +969,7 @@ - + @@ -983,7 +983,7 @@ not($is-collection) and $this/imvert:name and not(imf:test-name-convention($this)), 'Association name does not obey convention')"/> - : + : Name - : + : Version + + : Imvertor - : + : At

diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl index 4143ceb4..9d53fd06 100644 --- a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl +++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl @@ -77,7 +77,7 @@ - + @@ -1619,6 +1619,7 @@ + From 8fdda0eacf6f63fc2e0205115f04f53d7eeb531e Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 16 Apr 2024 11:28:03 +0200 Subject: [PATCH 13/75] Extra MIM info toegevoegd aan report. Minor. Uitbreiding. --- src/main/resources/xsl/MIMCompiler/MIMCompiler-report.xsl | 1 + src/main/resources/xsl/MIMCompiler/v2/MIMCompiler.xsl | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/resources/xsl/MIMCompiler/MIMCompiler-report.xsl b/src/main/resources/xsl/MIMCompiler/MIMCompiler-report.xsl index 7af45cf8..aeba9a90 100644 --- a/src/main/resources/xsl/MIMCompiler/MIMCompiler-report.xsl +++ b/src/main/resources/xsl/MIMCompiler/MIMCompiler-report.xsl @@ -43,6 +43,7 @@ + diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIMCompiler.xsl b/src/main/resources/xsl/MIMCompiler/v2/MIMCompiler.xsl index 62c81795..109f00aa 100644 --- a/src/main/resources/xsl/MIMCompiler/v2/MIMCompiler.xsl +++ b/src/main/resources/xsl/MIMCompiler/v2/MIMCompiler.xsl @@ -215,6 +215,11 @@ + + + @@ -571,7 +576,7 @@ - + From 9b92105608c0ec69278d63190ce4cf814942ca58 Mon Sep 17 00:00:00 2001 From: arjan Date: Wed, 17 Apr 2024 11:23:28 +0200 Subject: [PATCH 14/75] String trimming nu gebruik van apache commons Minor, improvement. --- src/main/java/nl/imvertor/OfficeCompiler/OfficeCompiler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/nl/imvertor/OfficeCompiler/OfficeCompiler.java b/src/main/java/nl/imvertor/OfficeCompiler/OfficeCompiler.java index b3cfd34a..a6788e8e 100644 --- a/src/main/java/nl/imvertor/OfficeCompiler/OfficeCompiler.java +++ b/src/main/java/nl/imvertor/OfficeCompiler/OfficeCompiler.java @@ -25,9 +25,9 @@ import java.util.Iterator; import java.util.Vector; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.eclipse.jgit.transport.PushResult; -import org.springframework.util.StringUtils; import nl.imvertor.common.Configurator; import nl.imvertor.common.Step; @@ -146,7 +146,7 @@ public void generateOfficeReport() throws Exception { } } private String trim(String urlfrag) { - return StringUtils.trimTrailingCharacter(StringUtils.trimLeadingCharacter(urlfrag,'/'),'/'); + return StringUtils.removeEnd(StringUtils.removeStart(urlfrag,"/"),"/"); } /* From d273a683de6e63bde3f9af0bda67bd9278467fe6 Mon Sep 17 00:00:00 2001 From: arjan Date: Wed, 17 Apr 2024 11:39:16 +0200 Subject: [PATCH 15/75] RemovePattern verplaatst naar RegExUtils Minor, upgrade. --- src/main/java/nl/imvertor/common/file/AnyFolder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/nl/imvertor/common/file/AnyFolder.java b/src/main/java/nl/imvertor/common/file/AnyFolder.java index 5ce06aaa..2203947f 100644 --- a/src/main/java/nl/imvertor/common/file/AnyFolder.java +++ b/src/main/java/nl/imvertor/common/file/AnyFolder.java @@ -29,7 +29,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.output.FileWriterWithEncoding; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.RegExUtils; import nl.imvertor.common.Configurator; import nl.imvertor.common.Transformer; @@ -349,7 +349,7 @@ private String getSpecs(AnyFile file) throws IOException { } private String cleanXmlPI(String xmlString) { - return StringUtils.removePattern(xmlString, XmlFile.xmlPiRegex); + return RegExUtils.removePattern(xmlString, XmlFile.xmlPiRegex); } /* From 742fc984367318845caa1f8710565a8327df460c Mon Sep 17 00:00:00 2001 From: arjan Date: Wed, 17 Apr 2024 12:42:15 +0200 Subject: [PATCH 16/75] RDF Validatie met behulp van Shacl opnieuw geimplementeerd De validator onderscheid fouten in Shacl (schema) van fouten in de RDF (instance). Zie #476 Bugfix. Eerdere versie voldeed niet. --- .../nl/imvertor/common/file/ShaclFile.java | 121 +++++++++--------- 1 file changed, 57 insertions(+), 64 deletions(-) diff --git a/src/main/java/nl/imvertor/common/file/ShaclFile.java b/src/main/java/nl/imvertor/common/file/ShaclFile.java index 7b063f36..3ae513b4 100644 --- a/src/main/java/nl/imvertor/common/file/ShaclFile.java +++ b/src/main/java/nl/imvertor/common/file/ShaclFile.java @@ -21,16 +21,24 @@ package nl.imvertor.common.file; import java.io.File; +import java.io.StringReader; -import org.apache.jena.atlas.RuntimeIOException; -import org.apache.jena.rdf.model.Model; -import org.apache.jena.riot.RiotException; -import org.apache.jena.util.FileUtils; import org.apache.log4j.Logger; -import org.topbraid.shacl.validation.ValidationUtil; -import org.topbraid.spin.util.JenaUtil; +import org.eclipse.rdf4j.common.exception.ValidationException; +import org.eclipse.rdf4j.model.Model; +import org.eclipse.rdf4j.model.vocabulary.RDF4J; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.sail.SailRepository; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.Rio; +import org.eclipse.rdf4j.rio.WriterConfig; +import org.eclipse.rdf4j.rio.helpers.BasicWriterSettings; +import org.eclipse.rdf4j.sail.memory.MemoryStore; +import org.eclipse.rdf4j.sail.shacl.ShaclSail; import nl.imvertor.common.Configurator; +import nl.imvertor.common.Runner; /** * A representation of a Shacl file. @@ -44,8 +52,8 @@ public class ShaclFile extends RdfFile { private static final long serialVersionUID = 1L; protected static final Logger logger = Logger.getLogger(ShaclFile.class); - private Model dataShape; - private Model dataModel; + /*private Model dataShape; + private Model dataModel;*/ public ShaclFile(String pathname) { super(pathname); @@ -62,66 +70,51 @@ public void validate(Configurator configurator) throws Exception { } public void parse(Configurator configurator) throws Exception { - - try { - // Load the main data model - dataShape = JenaUtil.createMemoryModel(); - dataShape.read(this.getFileInputStream(), "", - FileUtils.langTurtle); - - } catch (RuntimeIOException ie) { - configurator.getRunner().error(logger,"Jena IO error: " + ie.getMessage()); - - } catch (RiotException re) { - configurator.getRunner().error(logger,re.getMessage()); - - } catch (Exception e) { - throw e; - } - + this.parse(configurator, ""); } - + public void parse(Configurator configurator, String ttlDataFilePath) throws Exception { - parse(configurator); - // if the model is read okay, parse the TTL data file passed. + Runner runner = Configurator.getInstance().getRunner(); - if (configurator.getRunner().succeeds()) { - try { - - dataModel = JenaUtil.createMemoryModel(); - RdfFile dataFile = new RdfFile(ttlDataFilePath); - dataModel.read(dataFile.getFileInputStream(), "", - FileUtils.langTurtle); - - // Perform the validation of everything, using the data model - // also as the shapes model - you may have them separated - Configurator.getInstance().getRunner().warn(logger,"Cannot yet validate SKOS result"); - - //ValidationUtil.validateModel(dataModel, dataShape, true); // returns Resource report - - /* This will return a small report on the status of the model. Format: - - @base . - @prefix ex: . - @prefix owl: . - @prefix uml: . - @prefix sh: . - @prefix kkg: . - @prefix rdfs: . - - [ a sh:ValidationReport ; - sh:conforms true - ] . - */ - //ModelPrinter.get().print(report.getModel()); - - } catch (RiotException re) { - configurator.getRunner().error(logger,re.getMessage()); - - } catch (Exception e) { - throw e; - } + // Create a SHACL-enabled repository + ShaclSail shaclSail = new ShaclSail(new MemoryStore()); + + SailRepository sailRepository = new SailRepository(shaclSail); + sailRepository.init(); + + // Load data into the repository + try (RepositoryConnection connection = sailRepository.getConnection()) { + connection.begin(); + + // Load shapes + StringReader shaclRules = new StringReader(getContent()); + + connection.add(shaclRules, "", RDFFormat.TURTLE, RDF4J.SHACL_SHAPE_GRAPH); + connection.commit(); + + if (!ttlDataFilePath.equals("")) { + + // Load RDF data + AnyFile dataFile = new AnyFile(ttlDataFilePath); + + StringReader invalidSampleData = new StringReader(dataFile.getContent()); + + connection.begin(); + connection.add(invalidSampleData, "", RDFFormat.TURTLE); + try { + connection.commit(); + } catch (RepositoryException exception) { + Throwable cause = exception.getCause(); + if (cause instanceof ValidationException) { + runner.error(logger, "Shacl validator reports RDF error: " + exception.getMessage()); + } else + throw exception; + } + } + + } catch (Exception e) { + runner.warn(logger, "Shacl validator scheme invalid, cannot validate RDF: " + e.getMessage(),"rdf-parse","some-wiki-ref"); } } From 966f38681345f720ad89fa3592480be8e57bc22b Mon Sep 17 00:00:00 2001 From: arjan Date: Wed, 17 Apr 2024 12:42:39 +0200 Subject: [PATCH 17/75] TODO verwijderd. --- src/main/java/nl/imvertor/SkosCompiler/SkosCompiler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/nl/imvertor/SkosCompiler/SkosCompiler.java b/src/main/java/nl/imvertor/SkosCompiler/SkosCompiler.java index c894bf95..f0336275 100644 --- a/src/main/java/nl/imvertor/SkosCompiler/SkosCompiler.java +++ b/src/main/java/nl/imvertor/SkosCompiler/SkosCompiler.java @@ -93,7 +93,7 @@ public boolean generateSKOS() throws Exception { String skosSchemaUrl = configurator.getXParm("system/skos-schema-url"); // wordt gezet bij het genereren van een SKOS file. if (skosSchemaUrl != null) { ShaclFile skosSchema = shaclFileByCatalog(skosSchemaUrl); - skosFile.validate(configurator, skosSchema); // TODO + skosFile.validate(configurator, skosSchema); } else skosFile.validate(configurator); From 24c1027cfc26398138485db4f68dbfe8384e4bb5 Mon Sep 17 00:00:00 2001 From: arjan Date: Wed, 17 Apr 2024 12:43:27 +0200 Subject: [PATCH 18/75] Noodzakelijke switch naar rdf4j versie 5 Upgrade. --- pom.xml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index a4b4274f..2c286f71 100644 --- a/pom.xml +++ b/pom.xml @@ -192,18 +192,27 @@ org.eclipse.rdf4j rdf4j-runtime - 2.4.1 + 5.0.0-M2 + pom org.eclipse.rdf4j rdf4j-rio-rdfxml - 2.4.1 + 5.0.0-M2 org.eclipse.rdf4j rdf4j-rio-turtle - 2.4.1 + 5.0.0-M2 + + + + org.eclipse.rdf4j + rdf4j-model + 5.0.0-M2 + + org.slf4j From 860f176b2d49f4c85d379b1e619175ae205a8829 Mon Sep 17 00:00:00 2001 From: arjan Date: Wed, 17 Apr 2024 19:46:52 +0200 Subject: [PATCH 19/75] Commentaar toegevoegd. --- .../java/nl/imvertor/common/file/ShaclFile.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/nl/imvertor/common/file/ShaclFile.java b/src/main/java/nl/imvertor/common/file/ShaclFile.java index 3ae513b4..e5c7fa72 100644 --- a/src/main/java/nl/imvertor/common/file/ShaclFile.java +++ b/src/main/java/nl/imvertor/common/file/ShaclFile.java @@ -69,10 +69,24 @@ public void validate(Configurator configurator) throws Exception { this.parse(configurator); } + /** + * Valideer een turtle file (well-formedness check). + * + * @param configurator De Configurator instance + **/ public void parse(Configurator configurator) throws Exception { this.parse(configurator, ""); } + /** + * Valideer een turtle file en lever de fouten op in de vorm van error messages. + * + *

Zie ook https://rdf4j.org/documentation/programming/shacl/ + * + * @param configurator De Configurator instance + * @param ttlDataFilePath Pad naar het Turtle file + * @throws Exception Een fout die niet betrekking heeft op de validatie van Turtle zelf. + */ public void parse(Configurator configurator, String ttlDataFilePath) throws Exception { Runner runner = Configurator.getInstance().getRunner(); From fe17a089e180f11018808ba4031f07c75e62f977 Mon Sep 17 00:00:00 2001 From: arjan Date: Wed, 17 Apr 2024 20:23:00 +0200 Subject: [PATCH 20/75] Laatste SBB SKOS shapes opgehaald. Vanuit https://raw.githubusercontent.com/pldn/nederlands-profiel-voor-stelselcatalogi/main/profiles/skos-ap-nl.ttl Zie #476 Minor. Update. --- .../etc/skos/skos-ap-nl/skos-ap-nl.ttl | 334 +++++++++++++++--- 1 file changed, 279 insertions(+), 55 deletions(-) diff --git a/src/main/resources/etc/skos/skos-ap-nl/skos-ap-nl.ttl b/src/main/resources/etc/skos/skos-ap-nl/skos-ap-nl.ttl index 670d93bd..8c4fab69 100644 --- a/src/main/resources/etc/skos/skos-ap-nl/skos-ap-nl.ttl +++ b/src/main/resources/etc/skos/skos-ap-nl/skos-ap-nl.ttl @@ -13,22 +13,22 @@ @prefix dcat: . @prefix adms: . @prefix prov: . -@prefix vcard: . skosapnl: a owl:Ontology ; - rdfs:label "Toepassingsprofiel Nederlandse standaard voor het beschrijven van begrippen in LD"@nl ; - owl:versionInfo "0.0.1" . + rdfs:label "Toepassingsprofiel Nederlandse standaard voor het beschrijven van begrippen in RDF"@nl ; + owl:versionInfo "1.0.0" ; + sh:declare [ + sh:prefix "skos" ; + sh:namespace "http://www.w3.org/2004/02/skos/core#"^^xsd:anyURI ; + ] . skosapnl:Concept a sh:NodeShape ; rdfs:comment "Een abstract idee of notie."@nl, "An idea or notion; a unit of thought."@en ; rdfs:label "Begrip"@nl ; - sh:property - skosapnl:Concept-exactMatch , - skosapnl:Concept-narrowMatch , + sh:property skosapnl:Concept-example , - skosapnl:Concept-relatedMatch , skosapnl:Concept-comment , skosapnl:Concept-source , skosapnl:Concept-hiddenLabel , @@ -40,20 +40,28 @@ skosapnl:Concept skosapnl:Concept-topConceptOf , skosapnl:Concept-closeMatch , skosapnl:Concept-label , - skosapnl:Concept-narrowerInstantial , - skosapnl:Concept-narrowerPartitive , skosapnl:Concept-editorialNote , - skosapnl:Concept-broaderPartitive , skosapnl:Concept-prefLabel , skosapnl:Concept-historyNote , skosapnl:Concept-altLabel , skosapnl:Concept-changeNote , skosapnl:Concept-scopeNote , - skosapnl:Concept-broaderGeneric , skosapnl:Concept-definition , + skosapnl:Concept-narrowerInstantial , + skosapnl:Concept-exactMatch , + skosapnl:Concept-narrowMatch , + skosapnl:Concept-relatedMatch , + skosapnl:Concept-narrowerPartitive , + skosapnl:Concept-broaderPartitive , + skosapnl:Concept-broaderGeneric , skosapnl:Concept-broaderInstantial , skosapnl:Concept-narrowerGeneric , skosapnl:Concept-broadMatch ; + sh:sparql + skosapnl:OrphanConcept , + skosapnl:TopConceptHavingBroader , + skosapnl:UnambiguousNotations , + skosapnl:UniquePreflabelWithinConceptScheme ; sh:targetClass skos:Concept . skosapnl:SourceDocument @@ -65,8 +73,7 @@ skosapnl:SourceDocument skosapnl:SourceDocument-label , skosapnl:SourceDocument-comment , skosapnl:SourceDocument-page , - skosapnl:SourceDocument-bibliographicCitation , - skosapnl:SourceDocument-type . + skosapnl:SourceDocument-bibliographicCitation . skosapnl:Collection a sh:NodeShape ; @@ -128,12 +135,14 @@ skosapnl:Concept-related rdfs:label "is gerelateerd aan"@nl ; sh:class skos:Concept ; sh:description "Een concept met een associatieve semantische relatie"@nl, "Relates a concept to a concept with which there is an associative semantic relationship."@en ; - sh:disjoint skos:broaderTransitive ; + sh:disjoint skos:broader ; + sh:disjoint skos:narrower ; sh:group skosapnl:SemanticRelationPropertyGroup ; sh:name "has related"@en, "is gerelateerd aan"@nl ; sh:order 22 ; sh:nodeKind sh:IRI ; - sh:path skos:related . + sh:severity sh:Warning ; + sh:path skos:related . skosapnl:Concept-definition a sh:PropertyShape ; @@ -147,7 +156,8 @@ skosapnl:Concept-definition sh:name "definitie"@nl ; sh:order 10 ; sh:nodeKind sh:Literal ; - sh:path skos:definition . + sh:path skos:definition ; + sh:severity sh:Violation . skosapnl:Concept-narrowerInstantial a sh:PropertyShape ; @@ -158,7 +168,8 @@ skosapnl:Concept-narrowerInstantial sh:name "is categorie van"@nl ; sh:order 56 ; sh:nodeKind sh:IRI ; - sh:path isothes:narrowerInstantial . + sh:severity sh:Warning ; + sh:path isothes:narrowerInstantial . skosapnl:Concept-changeNote a sh:PropertyShape ; @@ -169,6 +180,7 @@ skosapnl:Concept-changeNote sh:order 31 ; sh:nodeKind sh:Literal ; sh:path skos:changeNote ; + sh:severity sh:Warning ; sh:datatype rdf:langString . skosapnl:Concept-broadMatch @@ -178,22 +190,30 @@ skosapnl:Concept-broadMatch sh:description "skos:broadMatch is used to state a hierarchical mapping link between two conceptual resources in different concept schemes."@en , "Used to state a hierarchical mapping link between two conceptual resources in different concept schemes."@en ; + sh:disjoint skos:narrowMatch ; + sh:disjoint skos:closeMatch ; + sh:disjoint skos:exactMatch ; sh:disjoint skos:relatedMatch ; sh:group skosapnl:MatchingRelationshipsPropertyGroup ; sh:name "heeft overeenkomstig bovenliggend"@nl ; sh:order 40 ; sh:nodeKind sh:IRI ; + sh:severity sh:Warning ; sh:path skos:broadMatch . skosapnl:Concept-narrowMatch a sh:PropertyShape ; rdfs:label "heeft overeenkomstig onderliggend"@nl ; sh:class skos:Concept ; + sh:disjoint skos:broadMatch ; + sh:disjoint skos:closeMatch ; + sh:disjoint skos:exactMatch ; sh:disjoint skos:relatedMatch ; sh:group skosapnl:MatchingRelationshipsPropertyGroup ; sh:name "heeft overeenkomstig onderliggend"@nl ; sh:order 41 ; sh:nodeKind sh:IRI ; + sh:severity sh:Warning ; sh:path skos:narrowMatch . skosapnl:Concept-broader @@ -207,6 +227,8 @@ skosapnl:Concept-broader sh:name "heeft bovenliggend begrip"@nl ; sh:order 20 ; sh:nodeKind sh:IRI ; + sh:disjoint skos:related ; + sh:severity sh:Warning ; sh:path skos:broader . skosapnl:Concept-narrower @@ -220,6 +242,8 @@ skosapnl:Concept-narrower sh:name "heeft onderliggend begrip"@nl ; sh:order 21 ; sh:nodeKind sh:IRI ; + sh:disjoint skos:related ; + sh:severity sh:Warning ; sh:path skos:narrower . skosapnl:Concept-example @@ -231,7 +255,9 @@ skosapnl:Concept-example sh:name "example"@en, "voorbeeld"@nl ; rdfs:label "voorbeeld"@nl ; sh:order 35 ; - sh:nodeKind sh:IRIOrLiteral ; + sh:or ([ sh:datatype rdf:langString ] [ sh:datatype xsd:string ]); + sh:nodeKind sh:Literal ; + sh:severity sh:Warning ; sh:path skos:example . skosapnl:Concept-narrowerPartitive @@ -243,6 +269,7 @@ skosapnl:Concept-narrowerPartitive sh:name "omvat"@nl ; sh:order 54 ; sh:nodeKind sh:IRI ; + sh:severity sh:Warning ; sh:path isothes:narrowerPartitive . skosapnl:Concept-hiddenLabel @@ -252,8 +279,13 @@ skosapnl:Concept-hiddenLabel sh:group skosapnl:LabelsAndDescriptionPropertyGroup ; sh:name "zoekterm"@nl ; sh:order 2 ; + sh:datatype rdf:langString ; sh:nodeKind sh:Literal ; - sh:path skos:hiddenLabel . + sh:severity sh:Warning ; + sh:path skos:hiddenLabel ; + sh:disjoint + skos:altLabel , + skos:prefLabel . skosapnl:Concept-relatedMatch a sh:PropertyShape ; @@ -263,8 +295,13 @@ skosapnl:Concept-relatedMatch sh:description "Used to state an associative mapping link between two conceptual resources in different concept schemes."@en ; sh:group skosapnl:MatchingRelationshipsPropertyGroup ; sh:name "is overeenkomstig verwant"@nl ; + sh:disjoint skos:broadMatch ; + sh:disjoint skos:closeMatch ; + sh:disjoint skos:exactMatch ; + sh:disjoint skos:narrowMatch ; sh:order 44 ; sh:nodeKind sh:IRI ; + sh:severity sh:Warning ; sh:path skos:relatedMatch . skosapnl:Concept-prefLabel @@ -272,16 +309,17 @@ skosapnl:Concept-prefLabel rdfs:label "Voorkeursterm"@nl ; sh:datatype rdf:langString ; sh:description "The preferred lexical label for a resource, in a given language."@en ; - sh:disjoint skos:altLabel, skos:hiddenLabel ; + sh:disjoint + skos:altLabel , + skos:hiddenLabel ; sh:group skosapnl:LabelsAndDescriptionPropertyGroup ; sh:minCount 1 ; sh:name "voorkeursterm"@nl ; sh:order 0 ; sh:path skos:prefLabel ; sh:nodeKind sh:Literal ; - sh:severity sh:Violation ; - sh:message "Een begrip heeft altijd 1 voorkeursterm."@nl ; - sh:uniqueLang true . + sh:uniqueLang true ; + sh:severity sh:Violation . skosapnl:Concept-broaderPartitive a sh:PropertyShape ; @@ -292,6 +330,7 @@ skosapnl:Concept-broaderPartitive sh:name "is onderdeel van"@nl ; sh:order 53 ; sh:nodeKind sh:IRI ; + sh:severity sh:Warning ; sh:path isothes:broaderPartitive . skosapnl:Concept-exactMatch @@ -299,11 +338,15 @@ skosapnl:Concept-exactMatch rdfs:label "is exact overeenkomstig"@nl ; sh:class skos:Concept ; sh:description "Used to link two concepts, indicating a high degree of confidence that the concepts can be used interchangeably across a wide range of information retrieval applications. skos:exactMatch is a transitive property, and is a sub-property of skos:closeMatch."@en ; - sh:disjoint skos:broadMatch, skos:relatedMatch ; + sh:disjoint skos:broadMatch ; + sh:disjoint skos:closeMatch ; + sh:disjoint skos:narrowMatch ; + sh:disjoint skos:relatedMatch ; sh:group skosapnl:MatchingRelationshipsPropertyGroup ; sh:name "is exact overeenkomstig"@nl ; sh:order 43 ; sh:nodeKind sh:IRI ; + sh:severity sh:Warning ; sh:path skos:exactMatch . skosapnl:Concept-inScheme @@ -315,6 +358,7 @@ skosapnl:Concept-inScheme sh:name "in kader"@nl ; sh:order 6 ; sh:nodeKind sh:IRI ; + sh:severity sh:Violation ; sh:path skos:inScheme . skosapnl:Concept-topConceptOf @@ -325,18 +369,24 @@ skosapnl:Concept-topConceptOf sh:name "is topbegrip van"@nl ; sh:order 23 ; sh:nodeKind sh:IRI ; + sh:severity sh:Warning ; sh:path skos:topConceptOf . skosapnl:Concept-altLabel a sh:PropertyShape ; rdfs:label "alternatieve term"@nl ; - sh:description "An alternative lexical label for a resource."@en, "Een alternatieve term voor een begrip is een term die gebruikt kan worden als alternatief voor de voorkeursterm van dit begrip, maar niet de voorkeur heeft."@nl ; - sh:disjoint skos:hiddenLabel ; + sh:description + "An alternative lexical label for a resource."@en, + "Een alternatieve term voor een begrip is een term die gebruikt kan worden als alternatief voor de voorkeursterm van dit begrip, maar niet de voorkeur heeft."@nl ; + sh:disjoint + skos:hiddenLabel , + skos:prefLabel ; sh:group skosapnl:LabelsAndDescriptionPropertyGroup ; sh:name "alternatieve term"@nl ; sh:datatype rdf:langString ; sh:order 1 ; sh:nodeKind sh:Literal ; + sh:severity sh:Warning ; sh:path skos:altLabel . skosapnl:Concept-broaderGeneric @@ -348,6 +398,7 @@ skosapnl:Concept-broaderGeneric sh:name "is specialisatie van"@nl ; sh:order 51 ; sh:nodeKind sh:IRI ; + sh:severity sh:Warning ; sh:path isothes:broaderGeneric . skosapnl:Concept-narrowerGeneric @@ -359,6 +410,7 @@ skosapnl:Concept-narrowerGeneric sh:name "is generalisatie van"@nl ; sh:order 52 ; sh:nodeKind sh:IRI ; + sh:severity sh:Warning ; sh:path isothes:narrowerGeneric . skosapnl:Concept-historyNote @@ -370,6 +422,7 @@ skosapnl:Concept-historyNote sh:order 33 ; sh:datatype rdf:langString ; sh:nodeKind sh:Literal ; + sh:severity sh:Warning ; sh:path skos:historyNote . skosapnl:Concept-source @@ -380,6 +433,7 @@ skosapnl:Concept-source sh:name "bron"@nl ; sh:order 11 ; sh:nodeKind sh:BlankNodeOrIRI ; + sh:severity sh:Warning ; sh:node skosapnl:SourceDocument ; sh:path dct:source . @@ -392,6 +446,7 @@ skosapnl:Concept-comment sh:order 5 ; sh:datatype rdf:langString ; sh:nodeKind sh:Literal ; + sh:severity sh:Warning ; sh:path rdfs:comment . skosapnl:Concept-editorialNote @@ -403,6 +458,7 @@ skosapnl:Concept-editorialNote sh:datatype rdf:langString ; sh:order 32 ; sh:nodeKind sh:Literal ; + sh:severity sh:Warning ; sh:path skos:editorialNote . skosapnl:Concept-broaderInstantial @@ -414,6 +470,7 @@ skosapnl:Concept-broaderInstantial sh:name "is exemplaar van"@nl ; sh:order 55 ; sh:nodeKind sh:IRI ; + sh:severity sh:Warning ; sh:path isothes:broaderInstantial . skosapnl:Concept-scopeNote @@ -425,6 +482,7 @@ skosapnl:Concept-scopeNote sh:datatype rdf:langString ; sh:order 34 ; sh:nodeKind sh:Literal ; + sh:severity sh:Warning ; sh:path skos:scopeNote . skosapnl:Concept-closeMatch @@ -433,9 +491,14 @@ skosapnl:Concept-closeMatch sh:class skos:Concept ; sh:description "Used to link two concepts that are sufficiently similar that they can be used interchangeably in some information retrieval applications. In order to avoid the possibility of \"compound errors\" when combining mappings across more than two concept schemes, skos:closeMatch is not declared to be a transitive property."@en ; sh:group skosapnl:MatchingRelationshipsPropertyGroup ; + sh:disjoint skos:broadMatch ; + sh:disjoint skos:exactMatch ; + sh:disjoint skos:narrowMatch ; + sh:disjoint skos:relatedMatch ; sh:name "is vrijwel overeenkomstig"@nl ; sh:order 42 ; sh:nodeKind sh:IRI ; + sh:severity sh:Warning ; sh:path skos:closeMatch . skosapnl:Concept-notation @@ -446,30 +509,33 @@ skosapnl:Concept-notation sh:name "code"@nl ; sh:order 3 ; sh:nodeKind sh:Literal ; + sh:severity sh:Warning ; sh:path skos:notation . skosapnl:Concept-label a sh:PropertyShape ; - rdfs:label "label"@nl ; - sh:datatype rdf:langString ; - sh:description "Een label voor een object is een voor mensen leesbare naam ter aanduiding van een object."@nl ; + rdfs:label "naam"@nl ; + sh:datatype xsd:string ; + sh:description "Een naam is een voor mensen leesbare term ter aanduiding van het begrip."@nl ; sh:group skosapnl:LabelsAndDescriptionPropertyGroup ; - sh:name "label"@nl ; + sh:name "naam"@nl ; sh:order 4 ; sh:nodeKind sh:Literal ; + sh:severity sh:Warning ; sh:path rdfs:label . skosapnl:SourceDocument-label a sh:PropertyShape ; - rdfs:label "label"@nl ; + rdfs:label "naam"@nl ; sh:datatype rdf:langString ; - sh:description "Compacte, voor de mens leesbare aanduiding van de bron."@nl ; + sh:description "Een naam is een voor mensen leesbare term ter aanduiding van het brondocument."@nl ; sh:group skosapnl:LabelsAndDescriptionPropertyGroup ; sh:minCount 1 ; - sh:name "label"@nl ; + sh:name "naam"@nl ; sh:order 4 ; sh:nodeKind sh:Literal ; - sh:path rdfs:label . + sh:severity sh:Info ; + sh:path dct:title . skosapnl:SourceDocument-comment a sh:PropertyShape ; @@ -480,6 +546,7 @@ skosapnl:SourceDocument-comment sh:name "uitleg"@nl ; sh:order 5 ; sh:nodeKind sh:Literal ; + sh:severity sh:Warning ; sh:path rdfs:comment . skosapnl:SourceDocument-page @@ -490,42 +557,34 @@ skosapnl:SourceDocument-page sh:name "url"@nl ; sh:order 7 ; sh:nodeKind sh:IRI ; + sh:severity sh:Warning ; sh:path foaf:page . skosapnl:SourceDocument-bibliographicCitation a sh:PropertyShape ; - rdfs:label "citeertitel"@nl ; + rdfs:label "bronverwijzing"@nl ; sh:description "Een reeks gegevens waarmee een document of fragment daarvan gevonden kan worden. Er bestaan verschillende citeerstijlen zoals IEEE, APA of MLA."@nl ; sh:group skosapnl:LabelsAndDescriptionPropertyGroup ; - sh:name "citeertitel"@nl ; + sh:name "bronverwijzing"@nl ; sh:order 8 ; sh:nodeKind sh:Literal ; sh:datatype xsd:string ; + sh:severity sh:Warning ; sh:path dct:bibliographicCitation . -skosapnl:SourceDocument-type - a sh:PropertyShape ; - rdfs:label "soort bron"@nl ; - sh:description "Aanduiding van het type of genre van het brondocument."@nl ; - sh:group skosapnl:LabelsAndDescriptionPropertyGroup ; - sh:name "soort bron"@nl ; - sh:order 9 ; - sh:nodeKind sh:IRI ; - sh:path dct:type ; - sh:class skos:Concept . - skosapnl:Collection-label a sh:PropertyShape ; - rdfs:label "label"@nl ; + rdfs:label "naam"@nl ; sh:datatype rdf:langString ; - sh:description "Een label voor een object is een voor mensen leesbare naam ter aanduiding van een object."@nl ; + sh:description "Een naam is een voor mensen leesbare term ter aanduiding van de collectie."@nl ; sh:group skosapnl:LabelsAndDescriptionPropertyGroup ; sh:minCount 1 ; - sh:name "label"@nl ; + sh:name "naam"@nl ; sh:order 4 ; sh:nodeKind sh:Literal ; - sh:path rdfs:label . + sh:severity sh:Warning ; + sh:path skos:prefLabel . skosapnl:Collection-member a sh:PropertyShape ; @@ -536,6 +595,7 @@ skosapnl:Collection-member "Relateert een collectie aan een begrip dat onderdeel is van deze collectie."@nl ; sh:name "bevat"@nl ; sh:nodeKind sh:IRI ; + sh:severity sh:Warning ; sh:path skos:member . skosapnl:Collection-comment @@ -544,6 +604,7 @@ skosapnl:Collection-comment sh:name "uitleg"@nl, "comment"@en ; sh:order 5 ; sh:datatype rdf:langString ; + sh:severity sh:Warning ; sh:path rdfs:comment . skosapnl:ConceptScheme-hasTopConcept @@ -557,6 +618,7 @@ skosapnl:ConceptScheme-hasTopConcept sh:group skosapnl:SemanticRelationPropertyGroup ; sh:order 20 ; sh:nodeKind sh:IRI ; + sh:severity sh:Warning ; sh:path skos:hasTopConcept . skosapnl:ConceptScheme-comment @@ -565,16 +627,178 @@ skosapnl:ConceptScheme-comment sh:name "uitleg"@nl, "comment"@en ; sh:order 5 ; sh:datatype rdf:langString ; + sh:severity sh:Warning ; sh:path rdfs:comment . skosapnl:ConceptScheme-label a sh:PropertyShape ; - rdfs:label "label"@nl ; + rdfs:label "naam"@nl ; sh:datatype rdf:langString ; - sh:description "Een label voor een object is een voor mensen leesbare naam ter aanduiding van een object."@nl ; + sh:description "Een naam is een voor mensen leesbare term ter aanduiding van het begrippenkader."@nl ; sh:group skosapnl:LabelsAndDescriptionPropertyGroup ; sh:minCount 1 ; - sh:name "label"@nl ; + sh:name "naam"@nl ; sh:order 4 ; sh:nodeKind sh:Literal ; - sh:path rdfs:label . \ No newline at end of file + sh:severity sh:Warning ; + sh:path dct:title . + + + +## logical constraints + +skosapnl:DisjointConceptAndConceptScheme + a sh:NodeShape ; + sh:targetClass skos:Concept ; + sh:sparql [ + sh:prefixes skosapnl: ; + sh:message "Een begrip kan niet ook een begrippenkader zijn."@nl ; + sh:select """ + SELECT $this + WHERE { + $this a skos:ConceptScheme + }""" ; + ] ; +. +skosapnl::DisjointConceptAndCollection + a sh:NodeShape ; + sh:targetSubjectsOf skos:narrower ; + sh:targetSubjectsOf skos:broader ; + sh:targetSubjectsOf skos:related ; + sh:sparql [ + sh:prefixes skosapnl: ; + sh:message "Een begrip kan niet ook een collectie zijn." ; + sh:select """ + SELECT $this + WHERE { + $this a skos:Collection . + }""" ; + ] ; +. + +skosapnl:DisjointConceptSchemeAndCollection + a sh:NodeShape ; + sh:targetObjectsOf skos:topConceptOf ; + sh:targetObjectsOf skos:inScheme ; + sh:sparql [ + sh:prefixes skosapnl: ; + sh:message "Een begrippenkader kan niet ook een collectie zijn." ; + sh:select """ + SELECT $this + WHERE { + $this a skos:Collection + }""" ; + ] ; +. + +skosapnl:MappingRelationsMisuse + a sh:NodeShape ; + sh:targetSubjectsOf skos:broadMatch ; + sh:targetSubjectsOf skos:closeMatch ; + sh:targetSubjectsOf skos:exactMatch ; + sh:targetSubjectsOf skos:narrowMatch ; + sh:targetSubjectsOf skos:relatedMatch ; + sh:sparql [ + sh:prefixes skosapnl: ; + sh:message "Harmonisatierelaties mogen niet gebruikt worden tussen begrippen die tot hetzelfde begrippenkader behoren."@nl ; + sh:message "Mapping relations should be asserted to concepts being members of different concept schemes"@en ; + sh:select """ + SELECT $this + WHERE { + $this skos:broadMatch | skos:closeMatch | skos:exactMatch | skos:narrowMatch | skos:relatedMatch ?concept ; + skos:inScheme ?cs . + ?concept skos:inScheme ?cs . + + }""" ; + ] ; +. + +skosapnl:SemanticRelations + a sh:NodeShape ; + sh:targetObjectsOf skos:broader ; + sh:targetObjectsOf skos:narrower ; + sh:targetObjectsOf skos:related ; + sh:targetSubjectsOf skos:broader ; + sh:targetSubjectsOf skos:narrower ; + sh:targetSubjectsOf skos:related ; + sh:targetObjectsOf skos:broadMatch ; + sh:targetObjectsOf skos:closeMatch ; + sh:targetObjectsOf skos:exactMatch ; + sh:targetObjectsOf skos:narrowMatch ; + sh:targetObjectsOf skos:relatedMatch ; + sh:targetSubjectsOf skos:broadMatch ; + sh:targetSubjectsOf skos:closeMatch ; + sh:targetSubjectsOf skos:exactMatch ; + sh:targetSubjectsOf skos:narrowMatch ; + sh:targetSubjectsOf skos:relatedMatch ; + sh:sparql [ + sh:prefixes skosapnl: ; + sh:message "Semantische relaties verwijzen altijd van en naar begrippen." ; + sh:select """ + SELECT $this + WHERE { + FILTER NOT EXISTS { $this a skos:Concept } + }""" ; + ] ; +. + +skosapnl:UnambiguousNotations + a sh:SPARQLConstraint ; + sh:message + "Begrippen binnen een begrippenkader mogen geen codes delen."@nl , + "Duplicate notations within concept scheme"@en ; + sh:severity sh:Violation ; + sh:prefixes skosapnl: ; + sh:select """SELECT $this + WHERE { + $this skos:notation ?value . + ?other skos:notation ?value . + ?this skos:inScheme ?cs . + ?other skos:inScheme ?cs . + FILTER (?this != ?other) + } + """ . + +skosapnl:UniquePreflabelWithinConceptScheme + a sh:SPARQLConstraint ; + sh:message + "Duplicate preffered labels within concept scheme."@en , + "meerdere begrippen met dezelfde voorkeursterm binnen een begrippenkader"@en ; + sh:severity sh:Violation ; + sh:prefixes skosapnl: ; + sh:select """SELECT $this + WHERE { + $this skos:prefLabel ?value . + ?other skos:prefLabel ?value . + ?this skos:inScheme ?cs . + ?other skos:inScheme ?cs . + FILTER (?this != ?other) + } + """ . +skosapnl:TopConceptHavingBroader + a sh:SPARQLConstraint ; + sh:prefixes skosapnl: ; + sh:message "Een topbegrip mag geen bovenliggende begrippen kennen." ; + sh:severity sh:Violation ; + sh:select """SELECT $this + WHERE { + ?this skos:topConceptOf|^skos:hasTopConcept ?cs ; + skos:broader ?other . + } + """ . + +skosapnl:OrphanConcept + a sh:SPARQLConstraint ; + sh:prefixes skosapnl: ; + sh:message "Het begrip is geen topbegrip maar heeft ook geen bovenliggende of gerelateerde begrippen."@nl ; + sh:select """SELECT $this + WHERE { + $this a skos:Concept . + FILTER NOT EXISTS { + ?this skos:topConceptOf|^skos:hasTopConcept ?cs . + } + FILTER NOT EXISTS { + ?this skos:broader | ^skos:broader | skos:narrower | ^skos:narrower | skos:related | ^skos:related ?other . + } + }""" ; + sh:severity sh:Warning . \ No newline at end of file From 2662305fb76c8d08d2c04ea2542a8bbca56abf83 Mon Sep 17 00:00:00 2001 From: arjan Date: Wed, 17 Apr 2024 20:24:06 +0200 Subject: [PATCH 21/75] Kleine technische aanpassingen in ShaclFile. --- .../nl/imvertor/common/file/ShaclFile.java | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/main/java/nl/imvertor/common/file/ShaclFile.java b/src/main/java/nl/imvertor/common/file/ShaclFile.java index e5c7fa72..a655e309 100644 --- a/src/main/java/nl/imvertor/common/file/ShaclFile.java +++ b/src/main/java/nl/imvertor/common/file/ShaclFile.java @@ -21,19 +21,15 @@ package nl.imvertor.common.file; import java.io.File; -import java.io.StringReader; +import java.io.InputStreamReader; import org.apache.log4j.Logger; import org.eclipse.rdf4j.common.exception.ValidationException; -import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.vocabulary.RDF4J; import org.eclipse.rdf4j.repository.RepositoryConnection; import org.eclipse.rdf4j.repository.RepositoryException; import org.eclipse.rdf4j.repository.sail.SailRepository; import org.eclipse.rdf4j.rio.RDFFormat; -import org.eclipse.rdf4j.rio.Rio; -import org.eclipse.rdf4j.rio.WriterConfig; -import org.eclipse.rdf4j.rio.helpers.BasicWriterSettings; import org.eclipse.rdf4j.sail.memory.MemoryStore; import org.eclipse.rdf4j.sail.shacl.ShaclSail; @@ -91,31 +87,27 @@ public void parse(Configurator configurator, String ttlDataFilePath) throws Exce Runner runner = Configurator.getInstance().getRunner(); - // Create a SHACL-enabled repository - ShaclSail shaclSail = new ShaclSail(new MemoryStore()); + ShaclSail shaclSail = new ShaclSail(new MemoryStore()); SailRepository sailRepository = new SailRepository(shaclSail); sailRepository.init(); - // Load data into the repository try (RepositoryConnection connection = sailRepository.getConnection()) { connection.begin(); - // Load shapes - StringReader shaclRules = new StringReader(getContent()); + InputStreamReader shaclRulesReader = getReader(); - connection.add(shaclRules, "", RDFFormat.TURTLE, RDF4J.SHACL_SHAPE_GRAPH); + connection.add(shaclRulesReader, "", RDFFormat.TURTLE, RDF4J.SHACL_SHAPE_GRAPH); connection.commit(); if (!ttlDataFilePath.equals("")) { - // Load RDF data - AnyFile dataFile = new AnyFile(ttlDataFilePath); + AnyFile dataFile = new AnyFile(ttlDataFilePath); - StringReader invalidSampleData = new StringReader(dataFile.getContent()); + InputStreamReader dataReader = dataFile.getReader(); connection.begin(); - connection.add(invalidSampleData, "", RDFFormat.TURTLE); + connection.add(dataReader, "", RDFFormat.TURTLE); try { connection.commit(); } catch (RepositoryException exception) { @@ -128,7 +120,7 @@ public void parse(Configurator configurator, String ttlDataFilePath) throws Exce } } catch (Exception e) { - runner.warn(logger, "Shacl validator scheme invalid, cannot validate RDF: " + e.getMessage(),"rdf-parse","some-wiki-ref"); + runner.warn(logger, "Shacl validator schema file \"" + getName() + "\" invalid, cannot validate RDF. " + e.getMessage(),"rdf-parse","some-wiki-ref"); } } From 4412b40426c4f1e4c06b604d3b3537ff1a8f5971 Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 23 Apr 2024 09:33:25 +0200 Subject: [PATCH 22/75] Kadaster: bp-by-reference-encodings wordt /req/by-reference-uri Zie #462 Config. Minor. --- .../input/Kadaster/cfg/schemarules/JSON-OGC-Kadaster.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/resources/input/Kadaster/cfg/schemarules/JSON-OGC-Kadaster.xml b/src/main/resources/input/Kadaster/cfg/schemarules/JSON-OGC-Kadaster.xml index 471e1758..8563a9ef 100644 --- a/src/main/resources/input/Kadaster/cfg/schemarules/JSON-OGC-Kadaster.xml +++ b/src/main/resources/input/Kadaster/cfg/schemarules/JSON-OGC-Kadaster.xml @@ -43,4 +43,13 @@ --> single + + /req/by-reference-uri + From 7a9e9f84536a5c7968fedeafeeea35a81374de8d Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 23 Apr 2024 09:37:08 +0200 Subject: [PATCH 23/75] Introductie Waterschapshuis Minor. Uitbreiding. --- .../resources/cfg/OfficeCompiler/parms.xml | 4 + src/main/resources/cfg/Validator/parms.xml | 23 + .../cfg/comparerules/Waterschapshuis.xml | 15 + .../docrules/Waterschapshuis-CONCEPTUAL.xml | 14 + .../cfg/docrules/Waterschapshuis-LOGICAL.xml | 13 + .../cfg/docrules/Waterschapshuis.xml | 487 ++++++++++++++++++ .../Waterschapshuis/cfg/i3n/translation.xml | 10 + .../cfg/local/respec/css/default.css | 27 + .../cfg/local/respec/data/abstract.xhtml | 5 + .../cfg/local/respec/data/sotd.xhtml | 5 + .../metamodels/Waterschapshuis-CONCEPTUAL.xml | 33 ++ .../metamodels/Waterschapshuis-LOGICAL.xml | 11 + .../notesrules/Waterschapshuis-CONCEPTUAL.xml | 17 + .../notesrules/Waterschapshuis-LOGICAL.xml | 11 + .../cfg/owners/Waterschapshuis.xml | 100 ++++ .../cfg/owners/web/css/report.css | 157 ++++++ .../cfg/owners/web/img/logo-big.jpg | Bin 0 -> 28346 bytes .../cfg/owners/web/img/logo-small.jpg | Bin 0 -> 5118 bytes .../owners/web/script/jquery/jquery-latest.js | 154 ++++++ .../tablesorter/jquery.tablesorter.min.js | 4 + .../cfg/owners/web/themes/blue/asc.gif | Bin 0 -> 54 bytes .../cfg/owners/web/themes/blue/bg.gif | Bin 0 -> 64 bytes .../cfg/owners/web/themes/blue/desc.gif | Bin 0 -> 54 bytes .../cfg/owners/web/themes/blue/style.css | 13 + .../cfg/schemarules/XML-ISO19136.xml | 30 ++ .../cfg/skosrules/Waterschapshuis.xml | 83 +++ .../cfg/tvsets/Waterschapshuis-CONCEPTUAL.xml | 14 + .../cfg/tvsets/Waterschapshuis-LOGICAL.xml | 14 + .../cfg/versionrules/Waterschapshuis.xml | 101 ++++ .../visuals/Waterschapshuis-CONCEPTUAL.xml | 30 ++ .../cfg/visuals/Waterschapshuis-LOGICAL.xml | 30 ++ .../props/Waterschapshuis.xlsx | Bin 0 -> 23226 bytes .../xsd/conceptual-schemas.xml | 38 ++ .../Waterschapshuis/xsd/local-schemas.xml | 12 + ...Waterschapshuis-CONCEPTUAL-html-msword.xsl | 73 +++ ...Waterschapshuis-CONCEPTUAL-html-respec.xsl | 85 +++ ...rt2modeldoc-Waterschapshuis-CONCEPTUAL.xsl | 55 ++ 37 files changed, 1668 insertions(+) create mode 100644 src/main/resources/input/Waterschapshuis/cfg/comparerules/Waterschapshuis.xml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/docrules/Waterschapshuis-CONCEPTUAL.xml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/docrules/Waterschapshuis-LOGICAL.xml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/docrules/Waterschapshuis.xml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/i3n/translation.xml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/local/respec/css/default.css create mode 100644 src/main/resources/input/Waterschapshuis/cfg/local/respec/data/abstract.xhtml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/local/respec/data/sotd.xhtml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/metamodels/Waterschapshuis-CONCEPTUAL.xml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/metamodels/Waterschapshuis-LOGICAL.xml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/notesrules/Waterschapshuis-CONCEPTUAL.xml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/notesrules/Waterschapshuis-LOGICAL.xml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/owners/Waterschapshuis.xml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/owners/web/css/report.css create mode 100644 src/main/resources/input/Waterschapshuis/cfg/owners/web/img/logo-big.jpg create mode 100644 src/main/resources/input/Waterschapshuis/cfg/owners/web/img/logo-small.jpg create mode 100644 src/main/resources/input/Waterschapshuis/cfg/owners/web/script/jquery/jquery-latest.js create mode 100644 src/main/resources/input/Waterschapshuis/cfg/owners/web/script/tablesorter/jquery.tablesorter.min.js create mode 100644 src/main/resources/input/Waterschapshuis/cfg/owners/web/themes/blue/asc.gif create mode 100644 src/main/resources/input/Waterschapshuis/cfg/owners/web/themes/blue/bg.gif create mode 100644 src/main/resources/input/Waterschapshuis/cfg/owners/web/themes/blue/desc.gif create mode 100644 src/main/resources/input/Waterschapshuis/cfg/owners/web/themes/blue/style.css create mode 100644 src/main/resources/input/Waterschapshuis/cfg/schemarules/XML-ISO19136.xml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/skosrules/Waterschapshuis.xml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/tvsets/Waterschapshuis-CONCEPTUAL.xml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/tvsets/Waterschapshuis-LOGICAL.xml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/versionrules/Waterschapshuis.xml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/visuals/Waterschapshuis-CONCEPTUAL.xml create mode 100644 src/main/resources/input/Waterschapshuis/cfg/visuals/Waterschapshuis-LOGICAL.xml create mode 100644 src/main/resources/input/Waterschapshuis/props/Waterschapshuis.xlsx create mode 100644 src/main/resources/input/Waterschapshuis/xsd/conceptual-schemas.xml create mode 100644 src/main/resources/input/Waterschapshuis/xsd/local-schemas.xml create mode 100644 src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Waterschapshuis-CONCEPTUAL-html-msword.xsl create mode 100644 src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Waterschapshuis-CONCEPTUAL-html-respec.xsl create mode 100644 src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Waterschapshuis-CONCEPTUAL.xsl diff --git a/src/main/resources/cfg/OfficeCompiler/parms.xml b/src/main/resources/cfg/OfficeCompiler/parms.xml index 80d58ea0..8e6b6ebb 100644 --- a/src/main/resources/cfg/OfficeCompiler/parms.xml +++ b/src/main/resources/cfg/OfficeCompiler/parms.xml @@ -293,6 +293,10 @@ Imvert2modeldoc-EIGENAAR-LOGICAL.xsl Imvert2modeldoc-EIGENAAR-LOGICAL-html-respec.xsl + Imvert2modeldoc-Waterschapshuis-CONCEPTUAL.xsl + Imvert2modeldoc-Waterschapshuis-CONCEPTUAL-html-respec.xsl + Imvert2modeldoc-Waterschapshuis-CONCEPTUAL-html-msword.xsl + Imvert2modeldoc-KOOP-CONCEPTUAL.xsl Imvert2modeldoc-KOOP-CONCEPTUAL-html-respec.xsl diff --git a/src/main/resources/cfg/Validator/parms.xml b/src/main/resources/cfg/Validator/parms.xml index 64dbecef..477edc77 100644 --- a/src/main/resources/cfg/Validator/parms.xml +++ b/src/main/resources/cfg/Validator/parms.xml @@ -478,6 +478,29 @@ Imvert2validation-MIM11.xsl Imvert2validation-MIM111.xsl + + + + Imvert2canonical.xsl + Imvert2canonical-MIM11.xsl + + Imvert2validation.xsl + Imvert2validation-MIM11.xsl + Imvert2validation-MIM111.xsl + + + Imvert2canonical.xsl + Imvert2canonical-MIM11.xsl + Imvert2canonical-MIM111.xsl + + Imvert2validation.xsl + Imvert2validation-MIM11.xsl + Imvert2validation-MIM111.xsl + + + + + + Waterschapshuis + + + + diff --git a/src/main/resources/input/Waterschapshuis/cfg/docrules/Waterschapshuis-CONCEPTUAL.xml b/src/main/resources/input/Waterschapshuis/cfg/docrules/Waterschapshuis-CONCEPTUAL.xml new file mode 100644 index 00000000..df85bd06 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/docrules/Waterschapshuis-CONCEPTUAL.xml @@ -0,0 +1,14 @@ + + + + + + + Waterschapshuis CONCEPTUAL + + Waterschapshuis specific requirements on conceptual documentation. + + + \ No newline at end of file diff --git a/src/main/resources/input/Waterschapshuis/cfg/docrules/Waterschapshuis-LOGICAL.xml b/src/main/resources/input/Waterschapshuis/cfg/docrules/Waterschapshuis-LOGICAL.xml new file mode 100644 index 00000000..4c40dc46 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/docrules/Waterschapshuis-LOGICAL.xml @@ -0,0 +1,13 @@ + + + + + + + Waterschapshuis LOGICAL + + Waterschapshuis specific requirements on logical documentation. + + \ No newline at end of file diff --git a/src/main/resources/input/Waterschapshuis/cfg/docrules/Waterschapshuis.xml b/src/main/resources/input/Waterschapshuis/cfg/docrules/Waterschapshuis.xml new file mode 100644 index 00000000..12a363d7 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/docrules/Waterschapshuis.xml @@ -0,0 +1,487 @@ + + + + + Waterschapshuis + + Waterschapshuis specific requirements on documentation. + + NAME + + + as-row + + + no + + + suffix + + + yes + + + yes + + + true + + + no + yes + yes + yes + + + https://armatiek.nl/respec-profiles/w3c/profile/respec-w3c-common.js + + + Overzichtsdiagram + Overview diagram + + overzicht + overview + yes + + + + Detaildiagram + Detail diagram + detail + detail + yes + + + + Naam (genormaliseerd) + Name (normalized) + + + + + + + + Naam + Name + + + DISPLAY-GLOBAL-OBJECTTYPE + DISPLAY-GLOBAL-ASSOCIATIONCLASS + DISPLAY-GLOBAL-REFERENCELIST + DISPLAY-GLOBAL-CODELIST + DISPLAY-GLOBAL-UNION + DISPLAY-GLOBAL-STRUCTUREDDATATYPE + DISPLAY-GLOBAL-PRIMITIVEDATATYPE + DISPLAY-GLOBAL-COMPOSITE + + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-UNIONELEMENT + DISPLAY-DETAIL-DATAELEMENT + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + DISPLAY-DETAIL-ENUMERATION + + + + + + Alternatieve naam + Alternative name + + DISPLAY-GLOBAL-OBJECTTYPE + DISPLAY-GLOBAL-ASSOCIATIONCLASS + DISPLAY-GLOBAL-REFERENCELIST + DISPLAY-GLOBAL-CODELIST + DISPLAY-GLOBAL-UNION + DISPLAY-GLOBAL-STRUCTUREDDATATYPE + DISPLAY-GLOBAL-PRIMITIVEDATATYPE + DISPLAY-GLOBAL-COMPOSITE + + + + Mnemonic + Mnemonic + + DISPLAY-GLOBAL-ASSOCIATIONCLASS + DISPLAY-GLOBAL-REFERENCELIST + DISPLAY-GLOBAL-CODELIST + + + + Herkomst + Origin + + DISPLAY-GLOBAL-OBJECTTYPE + DISPLAY-GLOBAL-ASSOCIATIONCLASS + DISPLAY-GLOBAL-REFERENCELIST + DISPLAY-GLOBAL-CODELIST + DISPLAY-GLOBAL-UNION + DISPLAY-GLOBAL-STRUCTUREDDATATYPE + DISPLAY-GLOBAL-PRIMITIVEDATATYPE + + DISPLAY-GLOBAL-COMPOSITE + + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + + + + Definitie + Definition + + DISPLAY-GLOBAL-OBJECTTYPE + DISPLAY-GLOBAL-ASSOCIATIONCLASS + DISPLAY-GLOBAL-REFERENCELIST + DISPLAY-GLOBAL-CODELIST + DISPLAY-GLOBAL-UNION + DISPLAY-GLOBAL-STRUCTUREDDATATYPE + DISPLAY-GLOBAL-PRIMITIVEDATATYPE + DISPLAY-GLOBAL-COMPOSITE + DISPLAY-GLOBAL-REGISTRATIEOBJECT + + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-UNIONELEMENT + DISPLAY-DETAIL-DATAELEMENT + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + DISPLAY-DETAIL-ENUMERATION + + + + Herkomst definitie + Origin of definition + + DISPLAY-GLOBAL-OBJECTTYPE + DISPLAY-GLOBAL-ASSOCIATIONCLASS + DISPLAY-GLOBAL-REFERENCELIST + DISPLAY-GLOBAL-CODELIST + DISPLAY-GLOBAL-UNION + DISPLAY-GLOBAL-STRUCTUREDDATATYPE + DISPLAY-GLOBAL-PRIMITIVEDATATYPE + DISPLAY-GLOBAL-COMPOSITE + + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-UNIONELEMENT + DISPLAY-DETAIL-DATAELEMENT + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + DISPLAY-DETAIL-ENUMERATION + + + + Toelichting + Explanation + + DISPLAY-GLOBAL-OBJECTTYPE + DISPLAY-GLOBAL-ASSOCIATIONCLASS + DISPLAY-GLOBAL-REFERENCELIST + DISPLAY-GLOBAL-CODELIST + DISPLAY-GLOBAL-UNION + DISPLAY-GLOBAL-STRUCTUREDDATATYPE + DISPLAY-GLOBAL-PRIMITIVEDATATYPE + DISPLAY-GLOBAL-COMPOSITE + + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-UNIONELEMENT + DISPLAY-DETAIL-DATAELEMENT + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + DISPLAY-DETAIL-ENUMERATION + + + + + Mogelijk geen waarde + Voidable + + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + + + + Reden geen waarde + Void reason + + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + + + + + Materiële geschiedenis + Material history + + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + + + + Formele geschiedenis + Formal history + + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + + + + Indicatie in onderzoek + Indication under investigation + + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + + + + Aanduiding strijdigheid/nietigheid + + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + + + + Kardinaliteit + Multiplicity + + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT + DISPLAY-DETAIL-UNIONELEMENT + + + + Juridische status + Legal status + + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + + + + + Regels + Rules + + DISPLAY-GLOBAL-OBJECTTYPE + + DISPLAY-DETAIL-OBJECTTYPE + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + + + + Regels IMBRO/A + Rules IMBRO/A + + DISPLAY-GLOBAL-OBJECTTYPE + + DISPLAY-DETAIL-OBJECTTYPE + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + + + + Patroon + Pattern + + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT + DISPLAY-DETAIL-UNIONELEMENT + + DISPLAY-GLOBAL-STRUCTUREDDATATYPE + DISPLAY-GLOBAL-PRIMITIVEDATATYPE + + + + Formeel patroon + Formal pattern + + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT + DISPLAY-DETAIL-UNIONELEMENT + + DISPLAY-GLOBAL-STRUCTUREDDATATYPE + DISPLAY-GLOBAL-PRIMITIVEDATATYPE + + + + Formaat + Format + + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT + DISPLAY-DETAIL-UNIONELEMENT + + + + Lengte + Length + + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-GLOBAL-STRUCTUREDDATATYPE + DISPLAY-GLOBAL-PRIMITIVEDATATYPE + + + + Formaat IMBRO/A + Format IMBRO/A + + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + + + + Relatiesoort + + DISPLAY-GLOBAL-ASSOCIATIONCLASS + + + + Gerelateerd objecttype + Associated objecttype + + DISPLAY-DETAIL-ASSOCIATION + + + + Is afgeleid + Is derived + + DISPLAY-DETAIL-ATTRIBUTE + + + + Meeteenheid + Unit of measure + + DISPLAY-DETAIL-ATTRIBUTE + + + + Minimumwaarde + MinInclusive + + DISPLAY-DETAIL-ATTRIBUTE + + + + Maximumwaarde + MaxInclusive + + DISPLAY-DETAIL-ATTRIBUTE + + + + Onderliggende constructies + Underlying constructs + + DISPLAY-GLOBAL-OBJECTTYPE + DISPLAY-GLOBAL-ASSOCIATIONCLASS + DISPLAY-GLOBAL-REFERENCELIST + DISPLAY-GLOBAL-CODELIST + DISPLAY-GLOBAL-UNION + DISPLAY-GLOBAL-STRUCTUREDDATATYPE + DISPLAY-GLOBAL-PRIMITIVEDATATYPE + DISPLAY-GLOBAL-COMPOSITE + + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-UNIONELEMENT + DISPLAY-DETAIL-DATAELEMENT + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + + + + Populatie + Population + + DISPLAY-GLOBAL-REGISTRATIEOBJECT + + + + + \ No newline at end of file diff --git a/src/main/resources/input/Waterschapshuis/cfg/i3n/translation.xml b/src/main/resources/input/Waterschapshuis/cfg/i3n/translation.xml new file mode 100644 index 00000000..bc55fc1e --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/i3n/translation.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/main/resources/input/Waterschapshuis/cfg/local/respec/css/default.css b/src/main/resources/input/Waterschapshuis/cfg/local/respec/css/default.css new file mode 100644 index 00000000..766252f5 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/local/respec/css/default.css @@ -0,0 +1,27 @@ +span.TODO { + background-color: yellow; + color: black; + font-weight: bold; +} +span.code { + font-family: monospace; +} +span.underline { + text-decoration: underline; +} +div.box_note { + background-color: #fafaac; + padding: 1em; +} +div.box_warning { + background-color: #f6d99e; + padding: 1em; +} +div.box_quote { + background-color: #f0e9da; + padding: 1em; +} +div.box_quote_href { + text-align: right; + color: gray; +} \ No newline at end of file diff --git a/src/main/resources/input/Waterschapshuis/cfg/local/respec/data/abstract.xhtml b/src/main/resources/input/Waterschapshuis/cfg/local/respec/data/abstract.xhtml new file mode 100644 index 00000000..5b444458 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/local/respec/data/abstract.xhtml @@ -0,0 +1,5 @@ +

+

+ This is the abstract. +

+
\ No newline at end of file diff --git a/src/main/resources/input/Waterschapshuis/cfg/local/respec/data/sotd.xhtml b/src/main/resources/input/Waterschapshuis/cfg/local/respec/data/sotd.xhtml new file mode 100644 index 00000000..c945fccf --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/local/respec/data/sotd.xhtml @@ -0,0 +1,5 @@ +
+

+ This documentation is updated at ..... +

+
\ No newline at end of file diff --git a/src/main/resources/input/Waterschapshuis/cfg/metamodels/Waterschapshuis-CONCEPTUAL.xml b/src/main/resources/input/Waterschapshuis/cfg/metamodels/Waterschapshuis-CONCEPTUAL.xml new file mode 100644 index 00000000..47172abe --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/metamodels/Waterschapshuis-CONCEPTUAL.xml @@ -0,0 +1,33 @@ + + + + + + + + + + Waterschapshuis CONCEPTUEEL + + + + Waterschapshuis-C-NL + + MIM 1.1.1 Waterschapshuis Conceptueel NL + + + Waterschapshuis-C-EN + + MIM 1.1.1 Waterschapshuis Conceptual EN + + + + + false + false + true + + + diff --git a/src/main/resources/input/Waterschapshuis/cfg/metamodels/Waterschapshuis-LOGICAL.xml b/src/main/resources/input/Waterschapshuis/cfg/metamodels/Waterschapshuis-LOGICAL.xml new file mode 100644 index 00000000..0fcf4b7e --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/metamodels/Waterschapshuis-LOGICAL.xml @@ -0,0 +1,11 @@ + + + + + + + Waterschapshuis LOGISCH + + diff --git a/src/main/resources/input/Waterschapshuis/cfg/notesrules/Waterschapshuis-CONCEPTUAL.xml b/src/main/resources/input/Waterschapshuis/cfg/notesrules/Waterschapshuis-CONCEPTUAL.xml new file mode 100644 index 00000000..c1a3f2d6 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/notesrules/Waterschapshuis-CONCEPTUAL.xml @@ -0,0 +1,17 @@ + + + + + + + Waterschapshuis CONCEPTUEEL + + +
+ +
+ + + \ No newline at end of file diff --git a/src/main/resources/input/Waterschapshuis/cfg/notesrules/Waterschapshuis-LOGICAL.xml b/src/main/resources/input/Waterschapshuis/cfg/notesrules/Waterschapshuis-LOGICAL.xml new file mode 100644 index 00000000..03588e67 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/notesrules/Waterschapshuis-LOGICAL.xml @@ -0,0 +1,11 @@ + + + + + + + Waterschapshuis LOGISCH + + \ No newline at end of file diff --git a/src/main/resources/input/Waterschapshuis/cfg/owners/Waterschapshuis.xml b/src/main/resources/input/Waterschapshuis/cfg/owners/Waterschapshuis.xml new file mode 100644 index 00000000..bad3abd8 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/owners/Waterschapshuis.xml @@ -0,0 +1,100 @@ + + + + + Waterschapshuis + + + ../web/css/report.css; + ../web/themes/blue/style.css; + + + + ../web/script/jquery/jquery-latest.js; + ../web/script/tablesorter/jquery.tablesorter.min.js; + + + + ../web/img/logo-small.jpg + ../web/img/logo-big.jpg + + + This schema is based on an UML specification, which is transformed by the Imvertor software. Imvertor modules are in the public domain, see http://www.imvertor.org. + + + + + + + http://www.geonovum.nl/conceptual-schemas/ + http://www.waterschapshuis.nl/conceptual-schemas/ + http://www.kadaster.nl/conceptual-schemas/ + + http://www.waterschapshuis.nl/schemas/waardelijsten/ + Waardelijst + + + _R + Ref + -ref + + system + Typen + components + Components + false + + + + inspire + + --- + --- + + http://www.waterschapshuis.nl/id/lifecycle/afgekeurd + + + yes + + + no + + + This schema is provided by Waterschapshuis as a local copy, as a convenience to the user. + This schema may itself reference a local copy of the schema originally referenced by URI. + The local reference takes the form of a relative path, and is introduced by Waterschapshuis. + + + PNG + + https://unknown-concept-server/[concept] + + + false + + + + + TV1NSBRF2 NAFFA NAFF1 TCBR1 + \ No newline at end of file diff --git a/src/main/resources/input/Waterschapshuis/cfg/owners/web/css/report.css b/src/main/resources/input/Waterschapshuis/cfg/owners/web/css/report.css new file mode 100644 index 00000000..94e1a685 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/owners/web/css/report.css @@ -0,0 +1,157 @@ +/* + * standard color blueish = #164273 + */ +body { + background-color: #FFFFFF; + font-family: "Arial", sans-serif; +} +table { + border-collapse: collapse; + border: #dcdcdc 1px solid; + width: 100%; +} +.info { + +} +.intro { + +} +.content { + +} +.warning { + color: orange; + font-weight: bold; +} +.error { + color: red; + font-weight: bold; +} +p.supplierMark { + color: gray; +} +.tid { + display: inline; + font-size: 70%; + color: gray; +} +tr.tableHeader th { + background-color: #A5B1D5; + font-weight: bold; + font-style: italic; +} +td { + border-collapse: collapse; + border: #dcdcdc 1px solid; + padding: 0.15em; + text-align: left; + vertical-align: top; +} +td.vert_spacer { + padding-top: 2em; +} +td.package { + background-color: #CCCCCC; +} +td.class { + background-color: #EEEEEE; +} +td.ix { + color: gray; + font-size: 70%; + padding: 0.6em; +} +span.label { + +} +span.value { + font-weight: bold; +} +h1 { + font-size: 1.5em; + color: #164273; +} +h2 { + font-size: 1em; + color: #164273; +} +a { + color: #164273; + text-decoration: none; +} +a:hover { + color: black; + text-decoration: underline; +} +/* compare */ +table.compare tr:nth-child(even) { + background-color:#FFF; +} +table.compare tr:nth-child(odd) { + background-color:#EEE; +} +tr.cmp-system { + color: #999; + font-style: oblique; +} +.overview { + font-weight: bold; + color: white; + background-color: #164273; + padding: 0.5em 2em; + border-radius: 0.5em; +} +img.overview-logo { + display: block; + margin: auto; +} +.overview-title { + font-weight: bold; + color: gray; + margin: 2em; +} +.app { + font-size: 150%; +} +.home { + width: 50%; + margin-left: 25%; + text-align: center; +} +.home-block { + font-weight: bold; + color: white; + background-color: #164273; + padding: 2em 2em; + border-radius: 1em; +} +img.home-logo { + display: block; + margin: auto; +} +.home-title { + font-weight: bold; + color: gray; + margin: 2em; +} +.subpath { + font-size: 120%; + font-style: italic; + padding-bottom: 2em; +} +.readme-block { + font-weight: normal; + color: black; + background-color: white; + padding: 2em 2em; + width: 80%; + margin-left: 10%; +} +.processing-status-okay { + font-weight:bold; + color: black; +} +.processing-status-not-okay { + font-weight:bold; + color: red; +} diff --git a/src/main/resources/input/Waterschapshuis/cfg/owners/web/img/logo-big.jpg b/src/main/resources/input/Waterschapshuis/cfg/owners/web/img/logo-big.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5020befadbc138813b89f3ea2c138679876e714d GIT binary patch literal 28346 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 C7d%=3 literal 0 HcmV?d00001 diff --git a/src/main/resources/input/Waterschapshuis/cfg/owners/web/img/logo-small.jpg b/src/main/resources/input/Waterschapshuis/cfg/owners/web/img/logo-small.jpg new file mode 100644 index 0000000000000000000000000000000000000000..8e3e20e3df26727a2a074e7455fe8ea8816cc938 GIT binary patch literal 5118 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 AGynhq literal 0 HcmV?d00001 diff --git a/src/main/resources/input/Waterschapshuis/cfg/owners/web/script/jquery/jquery-latest.js b/src/main/resources/input/Waterschapshuis/cfg/owners/web/script/jquery/jquery-latest.js new file mode 100644 index 00000000..7c243080 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/owners/web/script/jquery/jquery-latest.js @@ -0,0 +1,154 @@ +/*! + * jQuery JavaScript Library v1.4.2 + * http://jquery.com/ + * + * Copyright 2010, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2010, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * + * Date: Sat Feb 13 22:33:48 2010 -0500 + */ +(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/, +Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&& +(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this, +a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b=== +"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this, +function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b
a"; +var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected, +parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent= +false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n= +s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true, +applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando]; +else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this, +a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b=== +w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i, +cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected= +c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed"); +a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g, +function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split("."); +k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a), +C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B=0){a.type= +e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&& +f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive; +if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data", +e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a, +"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a, +d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, +e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift(); +t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D|| +g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()}, +CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m, +g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)}, +text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}}, +setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return hl[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h= +h[3];l=0;for(m=h.length;l=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m=== +"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g, +h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&& +q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML=""; +if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="

";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}(); +(function(){var g=s.createElement("div");g.innerHTML="
";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}: +function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f0)for(var j=d;j0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j= +{},i;if(f&&a.length){e=0;for(var o=a.length;e-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a=== +"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode", +d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")? +a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType=== +1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/"},F={option:[1,""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div
","
"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d= +c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this}, +wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})}, +prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b, +this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild); +return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja, +""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]); +return this}else{e=0;for(var j=d.length;e0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["", +""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]===""&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e= +c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]? +c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja= +function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter= +Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a, +"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f= +a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b= +a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=//gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!== +"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("
").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this}, +serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), +function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href, +global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&& +e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)? +"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache=== +false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B= +false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since", +c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E|| +d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x); +g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status=== +1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b=== +"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional; +if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration=== +"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]|| +c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start; +this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now= +this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem, +e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b
"; +a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b); +c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a, +d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top- +f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset": +"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in +e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window); diff --git a/src/main/resources/input/Waterschapshuis/cfg/owners/web/script/tablesorter/jquery.tablesorter.min.js b/src/main/resources/input/Waterschapshuis/cfg/owners/web/script/tablesorter/jquery.tablesorter.min.js new file mode 100644 index 00000000..b8605df1 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/owners/web/script/tablesorter/jquery.tablesorter.min.js @@ -0,0 +1,4 @@ + +(function($){$.extend({tablesorter:new +function(){var parsers=[],widgets=[];this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",cssChildRow:"expand-child",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,sortLocaleCompare:true,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",decimal:'/\.|\,/g',onRenderHeader:null,selectorHeaders:'thead th',debug:false};function benchmark(s,d){log(s+","+(new Date().getTime()-d.getTime())+"ms");}this.benchmark=benchmark;function log(s){if(typeof console!="undefined"&&typeof console.debug!="undefined"){console.log(s);}else{alert(s);}}function buildParserCache(table,$headers){if(table.config.debug){var parsersDebug="";}if(table.tBodies.length==0)return;var rows=table.tBodies[0].rows;if(rows[0]){var list=[],cells=rows[0].cells,l=cells.length;for(var i=0;i1){arr=arr.concat(checkCellColSpan(table,headerArr,row++));}else{if(table.tHead.length==1||(cell.rowSpan>1||!r[row+1])){arr.push(cell);}}}return arr;};function checkHeaderMetadata(cell){if(($.metadata)&&($(cell).metadata().sorter===false)){return true;};return false;}function checkHeaderOptions(table,i){if((table.config.headers[i])&&(table.config.headers[i].sorter===false)){return true;};return false;}function checkHeaderOptionsSortingLocked(table,i){if((table.config.headers[i])&&(table.config.headers[i].lockedOrder))return table.config.headers[i].lockedOrder;return false;}function applyWidget(table){var c=table.config.widgets;var l=c.length;for(var i=0;i');$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($('').css('width',$(this).width()));});$(table).prepend(colgroup);};}function updateHeaderSortCount(table,sortList){var c=table.config,l=sortList.length;for(var i=0;i b["+i+"]) ? 1 : 0));";};function makeSortTextDesc(i){return"((b["+i+"] < a["+i+"]) ? -1 : ((b["+i+"] > a["+i+"]) ? 1 : 0));";};function makeSortNumeric(i){return"a["+i+"]-b["+i+"];";};function makeSortNumericDesc(i){return"b["+i+"]-a["+i+"];";};function sortText(a,b){if(table.config.sortLocaleCompare)return a.localeCompare(b);return((ab)?1:0));};function sortTextDesc(a,b){if(table.config.sortLocaleCompare)return b.localeCompare(a);return((ba)?1:0));};function sortNumeric(a,b){return a-b;};function sortNumericDesc(a,b){return b-a;};function getCachedSortType(parsers,i){return parsers[i].type;};this.construct=function(settings){return this.each(function(){if(!this.tHead||!this.tBodies)return;var $this,$document,$headers,cache,config,shiftDown=0,sortOrder;this.config={};config=$.extend(this.config,$.tablesorter.defaults,settings);$this=$(this);$.data(this,"tablesorter",config);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$headers.click(function(e){var totalRows=($this[0].tBodies[0]&&$this[0].tBodies[0].rows.length)||0;if(!this.sortDisabled&&totalRows>0){$this.trigger("sortStart");var $cell=$(this);var i=this.column;this.order=this.count++%2;if(this.lockedOrder)this.order=this.lockedOrder;if(!e[config.sortMultiSortKey]){config.sortList=[];if(config.sortForce!=null){var a=config.sortForce;for(var j=0;j0){$this.trigger("sorton",[config.sortList]);}applyWidget(this);});};this.addParser=function(parser){var l=parsers.length,a=true;for(var i=0;iEGoD<#VNP?1QCB1* GgEatI(+xQQ literal 0 HcmV?d00001 diff --git a/src/main/resources/input/Waterschapshuis/cfg/owners/web/themes/blue/style.css b/src/main/resources/input/Waterschapshuis/cfg/owners/web/themes/blue/style.css new file mode 100644 index 00000000..ecc6e463 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/owners/web/themes/blue/style.css @@ -0,0 +1,13 @@ +/* tables */ +table.tablesorter thead tr .header { + background-image: url(bg.gif); + background-repeat: no-repeat; + background-position: center right; + cursor: pointer; +} +table.tablesorter thead tr .headerSortUp { + background-image: url(asc.gif); +} +table.tablesorter thead tr .headerSortDown { + background-image: url(desc.gif); +} diff --git a/src/main/resources/input/Waterschapshuis/cfg/schemarules/XML-ISO19136.xml b/src/main/resources/input/Waterschapshuis/cfg/schemarules/XML-ISO19136.xml new file mode 100644 index 00000000..9c027503 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/schemarules/XML-ISO19136.xml @@ -0,0 +1,30 @@ + + + + + + + Waterschapshuis ISO19136 + + + + diff --git a/src/main/resources/input/Waterschapshuis/cfg/skosrules/Waterschapshuis.xml b/src/main/resources/input/Waterschapshuis/cfg/skosrules/Waterschapshuis.xml new file mode 100644 index 00000000..b401037c --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/skosrules/Waterschapshuis.xml @@ -0,0 +1,83 @@ + + + + + Waterschapshuis + + + + + http://definities.geostandaarden.nl/[afkorting]/id/[type]/[naam] + + + + rdf + http://www.w3.org/1999/02/22-rdf-syntax-ns# + + + rdfs + http://www.w3.org/2000/01/rdf-schema# + + + skos + http://www.w3.org/2004/02/skos/core# + + + skosthes + http://purl.org/iso25964/skos-thes# + + + dct + http://purl.org/dc/terms/ + + + xsd + http://www.w3.org/2001/XMLSchema# + + + + + + https://github.com/pldn/nederlands-profiel-voor-stelselcatalogi/blob/main/profiles/skos-ap-nl.ttl + + + + skos:definition + skos:scopeNote + dct:source + + + + + diff --git a/src/main/resources/input/Waterschapshuis/cfg/tvsets/Waterschapshuis-CONCEPTUAL.xml b/src/main/resources/input/Waterschapshuis/cfg/tvsets/Waterschapshuis-CONCEPTUAL.xml new file mode 100644 index 00000000..d73ad335 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/tvsets/Waterschapshuis-CONCEPTUAL.xml @@ -0,0 +1,14 @@ + + + + + + + + + + Waterschapshuis CONCEPTUEEL + + \ No newline at end of file diff --git a/src/main/resources/input/Waterschapshuis/cfg/tvsets/Waterschapshuis-LOGICAL.xml b/src/main/resources/input/Waterschapshuis/cfg/tvsets/Waterschapshuis-LOGICAL.xml new file mode 100644 index 00000000..9fd05816 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/tvsets/Waterschapshuis-LOGICAL.xml @@ -0,0 +1,14 @@ + + + + + + + + Waterschapshuis LOGISCH + + \ No newline at end of file diff --git a/src/main/resources/input/Waterschapshuis/cfg/versionrules/Waterschapshuis.xml b/src/main/resources/input/Waterschapshuis/cfg/versionrules/Waterschapshuis.xml new file mode 100644 index 00000000..0379edd2 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/versionrules/Waterschapshuis.xml @@ -0,0 +1,101 @@ + + + + + Waterschapshuis + + Waterschapshuis specific version and phase rules + + + + + + MajorMinorBugfix + Versions must be specified as 99.99.99 or 99.99 (major, minor, bugfix). + (\d+)\.(\d+)(.(\d+))? + + Major version + + + + Minor version + + + + Bugfix version + + + + + + + + Werkversie + Work version + 0 + Werkversies zijn in ontwikkeling en worden niet intern verspreid. + + 0 + + no + yes + + + + + Consultatieversie + Consultation version + 1 + Consultatieversies zijn in ontwikkeling en kunnen intern worden verspreid. + + 1 + + no + yes + + + + + Ter vaststelling + For acceptance + 2 + Versies ter vaststelling zijn in ontwikkeling en kunnen extern worden verspreid, met het doel deze te laten vaststellen. + + 2 + + no + yes + + + Vastgesteld + Final + 3 + Vastgestelde versies zijn gereed, kunnen extern worden verspreid, en dienen niet meer te worden vervangen. + + 3 + + yes + yes + + Server-BRO-Release.properties + + + + Vervallen + Rejected + 4 + Deze versie is vervallen en mag niet meer worden gebruikt, ook niet als supplier. + -1 + + + \ No newline at end of file diff --git a/src/main/resources/input/Waterschapshuis/cfg/visuals/Waterschapshuis-CONCEPTUAL.xml b/src/main/resources/input/Waterschapshuis/cfg/visuals/Waterschapshuis-CONCEPTUAL.xml new file mode 100644 index 00000000..fcdbf5ef --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/visuals/Waterschapshuis-CONCEPTUAL.xml @@ -0,0 +1,30 @@ + + + + + + + + + BRO MIM 1.1.1 + + Visuals for Waterschapshuis modellen + Visuele aspecten van Waterschapshuis modellen + + + + + + + + + + + + + + diff --git a/src/main/resources/input/Waterschapshuis/cfg/visuals/Waterschapshuis-LOGICAL.xml b/src/main/resources/input/Waterschapshuis/cfg/visuals/Waterschapshuis-LOGICAL.xml new file mode 100644 index 00000000..4ea1d38c --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/visuals/Waterschapshuis-LOGICAL.xml @@ -0,0 +1,30 @@ + + + + + + + + + BRO logical + + Visuals for BRO logical models + Visuele aspecten van BRO logische modellen + + + + + + + + + + + + + + diff --git a/src/main/resources/input/Waterschapshuis/props/Waterschapshuis.xlsx b/src/main/resources/input/Waterschapshuis/props/Waterschapshuis.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..c2e0516586625aeeb4780d8faf22b9ce24e65724 GIT binary patch literal 23226 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

Rpn$_BX|)MklmsjJpphi$H4E1A?5U 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 MO4tnYCO^*p14smED*ylh literal 0 HcmV?d00001 diff --git a/src/main/resources/input/Waterschapshuis/xsd/conceptual-schemas.xml b/src/main/resources/input/Waterschapshuis/xsd/conceptual-schemas.xml new file mode 100644 index 00000000..c913a6b9 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/xsd/conceptual-schemas.xml @@ -0,0 +1,38 @@ + + + + + NEN3610_GML322 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/input/Waterschapshuis/xsd/local-schemas.xml b/src/main/resources/input/Waterschapshuis/xsd/local-schemas.xml new file mode 100644 index 00000000..2b52dc84 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/xsd/local-schemas.xml @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Waterschapshuis-CONCEPTUAL-html-msword.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Waterschapshuis-CONCEPTUAL-html-msword.xsl new file mode 100644 index 00000000..44aeae28 --- /dev/null +++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Waterschapshuis-CONCEPTUAL-html-msword.xsl @@ -0,0 +1,73 @@ + + + + + + + + + <xsl:value-of select="$subpath"/> + + + + + +

+

Imvertor:

+

Model release:

+
+ + + + + + + + + imvertor + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Waterschapshuis-CONCEPTUAL-html-respec.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Waterschapshuis-CONCEPTUAL-html-respec.xsl new file mode 100644 index 00000000..793be076 --- /dev/null +++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Waterschapshuis-CONCEPTUAL-html-respec.xsl @@ -0,0 +1,85 @@ + + + + + + + + + + + + <xsl:value-of select="concat('Catalogus: ',@name)"/> + + + + + +
+

+ Samenvatting..... INSERT HERE +

+
+
+

+ This documentation is updated at .... INSERT HERE +

+
+
+

Prologue

+

+ Intro here........ +

+
+ +
+

Epilogue

+

+ Last remarks here........ +

+
+ + + + + + +

+ Deze tekst is normatief. + + imvertor + +

+ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Waterschapshuis-CONCEPTUAL.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Waterschapshuis-CONCEPTUAL.xsl new file mode 100644 index 00000000..9b9885cc --- /dev/null +++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Waterschapshuis-CONCEPTUAL.xsl @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 2d62155368f93680e4e7cd726dc0cbb0785d5b23 Mon Sep 17 00:00:00 2001 From: arjan Date: Sat, 27 Apr 2024 16:41:38 +0200 Subject: [PATCH 24/75] Introductie van DiagramProfile in EA toolbox Zie #480 Minor, verbetering. --- .../xsl/ConfigCompiler/Imvert2ea-profile.xsl | 54 +++++++++++++++---- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/src/main/resources/xsl/ConfigCompiler/Imvert2ea-profile.xsl b/src/main/resources/xsl/ConfigCompiler/Imvert2ea-profile.xsl index afb93e5b..435cd78f 100644 --- a/src/main/resources/xsl/ConfigCompiler/Imvert2ea-profile.xsl +++ b/src/main/resources/xsl/ConfigCompiler/Imvert2ea-profile.xsl @@ -50,10 +50,11 @@ - - - - + + + + + @@ -64,9 +65,9 @@ Enterprise Architect profile/toolbox generated by Imvertor {$imvertor-version} dd. {imf:format-dateTime(current-dateTime())}. This file may be imported into EA and aligns fully with the metamodel named {imf:get-xparm('cli/metamodel')} - + - + @@ -140,9 +141,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -164,7 +193,7 @@ - + @@ -177,10 +206,13 @@ - + - + + + + @@ -188,7 +220,7 @@ - + From d9ce250d081c9e25cbf3d6fcd6ef419f892bd4f0 Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 7 May 2024 13:11:37 +0200 Subject: [PATCH 25/75] IHW: Toegevoegd HydroNetwork / INSPIRE Zie #482 Minor. --- .../input/BRO/xsd/conceptual-schemas.xml | 2 + .../INSPIRE/xsd/cm-INSPIRE-HYDRONETWORK.xml | 96 ++++++ .../schemas/hy-n/4.0/HydroNetwork.xsd | 307 ++++++++++++++++++ 3 files changed, 405 insertions(+) create mode 100644 src/main/resources/input/INSPIRE/xsd/cm-INSPIRE-HYDRONETWORK.xml create mode 100644 src/main/resources/input/INSPIRE/xsd/inspire.ec.europa.eu/INSPIRE-HYDRONETWORK-4.0/schemas/hy-n/4.0/HydroNetwork.xsd diff --git a/src/main/resources/input/BRO/xsd/conceptual-schemas.xml b/src/main/resources/input/BRO/xsd/conceptual-schemas.xml index 71154fca..0b0b5328 100644 --- a/src/main/resources/input/BRO/xsd/conceptual-schemas.xml +++ b/src/main/resources/input/BRO/xsd/conceptual-schemas.xml @@ -20,6 +20,7 @@ + @@ -93,6 +94,7 @@ + diff --git a/src/main/resources/input/INSPIRE/xsd/cm-INSPIRE-HYDRONETWORK.xml b/src/main/resources/input/INSPIRE/xsd/cm-INSPIRE-HYDRONETWORK.xml new file mode 100644 index 00000000..b5489524 --- /dev/null +++ b/src/main/resources/input/INSPIRE/xsd/cm-INSPIRE-HYDRONETWORK.xml @@ -0,0 +1,96 @@ + + + + INSPIRE-HYDRONETWORK + http://inspire.ec.europa.eu/schemas/hy-n/4.0 + Links to the INSPIRE Hydrographic Networks cataloque and schemas. + https://inspire.ec.europa.eu/schemas/hy-n/4.0/HydroNetwork.xsd + 3 + 1.0 + 4.0 + + + + INSPIRE + + + HydroNode + false + + + HydroNode + + + + + HydroNode + HydroNodeType + complextype + false + false + + + + + WatercourseLink + false + + + WatercourseLink + + + + + WatercourseLink + WatercourseLinkType + complextype + false + false + + + + + WatercourseLinkSequence + false + + + WatercourseLinkSequence + + + + + WatercourseLinkSequence + WatercourseLinkSequenceType + complextype + false + false + + + + + WatercourseSeparatedCrossing + false + + + WatercourseSeparatedCrossing + + + + + WatercourseSeparatedCrossing + WatercourseSeparatedCrossingType + complextype + false + false + + + + + + \ No newline at end of file diff --git a/src/main/resources/input/INSPIRE/xsd/inspire.ec.europa.eu/INSPIRE-HYDRONETWORK-4.0/schemas/hy-n/4.0/HydroNetwork.xsd b/src/main/resources/input/INSPIRE/xsd/inspire.ec.europa.eu/INSPIRE-HYDRONETWORK-4.0/schemas/hy-n/4.0/HydroNetwork.xsd new file mode 100644 index 00000000..ca56bc60 --- /dev/null +++ b/src/main/resources/input/INSPIRE/xsd/inspire.ec.europa.eu/INSPIRE-HYDRONETWORK-4.0/schemas/hy-n/4.0/HydroNetwork.xsd @@ -0,0 +1,307 @@ + + + -- Definition -- +The Network application schema contains spatial objects associated with a connected hydrographic network representation of waterways, lakes etc. This is required primarily for the 'spatial analysis and modelling' Use Case. + + + + + + + + + -- Definition -- +A node within the hydrographic network. + +-- Description -- +NOTE May represent a physical confluence, bifurcation/confluence/vanishing point etc, or it may be associated with a hydrographic point of interest or facility. + + + + + + + + + -- Definition -- +A geographical name that is used to identify a hydrographic object in the real world. It provides a 'key' for implicitly associating different representations of the object. + +-- Description -- +EXAMPLE A standing water in a mapping view may share the same geographical name as a WFD lake in a reporting view, implying they are both representations of the same real world object. + + + + + + + + + + + -- Definition -- +An identifier that is used to identify a hydrographic object in the real world. It provides a 'key' for implicitly associating different representations of the object. + +-- Description -- +NOTE 1 The identifier may be a national hydrological identification code. + +NOTE 2 More than one identifier may be required, for instance a watercourse may be assigned different identifying codes under national and European schemes. + +EXAMPLE A lock in a mapping view may share the same identifier as a hydro node in a network view, implying they are both representations of the same real world object. + + + + + + + + + + + -- Definition -- +A related hydrographic object representing the same real-world entity. + + hy:HydroObject + + + + + + -- Definition -- +Nature of the hydro node. + + + + + + + + + + + + + + + + -- Definition -- +A segment of a watercourse within a hydrographic network. + +-- Description -- +NOTE A watercourse link may be fictitious, with no direct correspondence to a real-world object and included only to ensure a closed network. + +EXAMPLE Fictitious examples: +- virtual network segment in coastal water area +- virtual network segment in lake area +- virtual network segment in river to connect tributary +- virtual network segment in transitional water area + + + + + + + + + -- Definition -- +A geographical name that is used to identify a hydrographic object in the real world. It provides a 'key' for implicitly associating different representations of the object. + +-- Description -- +EXAMPLE A standing water in a mapping view may share the same geographical name as a WFD lake in a reporting view, implying they are both representations of the same real world object. + + + + + + + + + + + -- Definition -- +An identifier that is used to identify a hydrographic object in the real world. It provides a 'key' for implicitly associating different representations of the object. + +-- Description -- +NOTE 1 The identifier may be a national hydrological identification code. + +NOTE 2 More than one identifier may be required, for instance a watercourse may be assigned different identifying codes under national and European schemes. + +EXAMPLE A lock in a mapping view may share the same identifier as a hydro node in a network view, implying they are both representations of the same real world object. + + + + + + + + + + + -- Definition -- +A related hydrographic object representing the same real-world entity. + + hy:HydroObject + + + + + + -- Definition -- +Direction of water flow in the segment relative to digitisation of segment geometry. + + + + + -- Definition -- +Length of network segment. + + + + + + + + + + + + + + + + + + + + + + + -- Definition -- +A sequence of watercourse links representing a non-branching path through a hydrographic network. + + + + + + + + + -- Definition -- +A geographical name that is used to identify a hydrographic object in the real world. It provides a 'key' for implicitly associating different representations of the object. + +-- Description -- +EXAMPLE A standing water in a mapping view may share the same geographical name as a WFD lake in a reporting view, implying they are both representations of the same real world object. + + + + + + + + + + + -- Definition -- +An identifier that is used to identify a hydrographic object in the real world. It provides a 'key' for implicitly associating different representations of the object. + +-- Description -- +NOTE 1 The identifier may be a national hydrological identification code. + +NOTE 2 More than one identifier may be required, for instance a watercourse may be assigned different identifying codes under national and European schemes. + +EXAMPLE A lock in a mapping view may share the same identifier as a hydro node in a network view, implying they are both representations of the same real world object. + + + + + + + + + + + -- Definition -- +A related hydrographic object representing the same real-world entity. + + hy:HydroObject + + + + + + + + + + + + + + + + + -- Definition -- +An element in the hydrographic network used to indicate non-interacting crossing of watercourse links separated by level. + +-- Description -- +NOTE The crossing may legitimately break a no-intersection quality rule. + + + + + + + + + -- Definition -- +A geographical name that is used to identify a hydrographic object in the real world. It provides a 'key' for implicitly associating different representations of the object. + +-- Description -- +EXAMPLE A standing water in a mapping view may share the same geographical name as a WFD lake in a reporting view, implying they are both representations of the same real world object. + + + + + + + + + + + -- Definition -- +An identifier that is used to identify a hydrographic object in the real world. It provides a 'key' for implicitly associating different representations of the object. + +-- Description -- +NOTE 1 The identifier may be a national hydrological identification code. + +NOTE 2 More than one identifier may be required, for instance a watercourse may be assigned different identifying codes under national and European schemes. + +EXAMPLE A lock in a mapping view may share the same identifier as a hydro node in a network view, implying they are both representations of the same real world object. + + + + + + + + + + + -- Definition -- +A related hydrographic object representing the same real-world entity. + + hy:HydroObject + + + + + + + + + + + + + + + From cbc994c3fce21ad6d8c6f4da7cb10fe124171f95 Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 7 May 2024 14:31:19 +0200 Subject: [PATCH 26/75] Logius: visuals en figcaption aangepast Minor. --- .../input/Logius/cfg/owners/Logius.xml | 8 ++++++ .../Logius/cfg/visuals/Logius-CONCEPTUAL.xml | 28 ++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/main/resources/input/Logius/cfg/owners/Logius.xml b/src/main/resources/input/Logius/cfg/owners/Logius.xml index 056ed332..1ab7f144 100644 --- a/src/main/resources/input/Logius/cfg/owners/Logius.xml +++ b/src/main/resources/input/Logius/cfg/owners/Logius.xml @@ -97,4 +97,12 @@ This is a set defined by this owner which may be referenced as [system/collapse-key-set] as the value of -messagecollapsekeys --> TV1NSBRF2 NAFFA NAFF1 TCBR1 + + + figure \ No newline at end of file diff --git a/src/main/resources/input/Logius/cfg/visuals/Logius-CONCEPTUAL.xml b/src/main/resources/input/Logius/cfg/visuals/Logius-CONCEPTUAL.xml index 747b122c..160624a5 100644 --- a/src/main/resources/input/Logius/cfg/visuals/Logius-CONCEPTUAL.xml +++ b/src/main/resources/input/Logius/cfg/visuals/Logius-CONCEPTUAL.xml @@ -24,7 +24,33 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + From b1e0a1d77fdc47eba0ed3e54695738e0bbdf7d6c Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 10 Jun 2024 09:59:50 +0200 Subject: [PATCH 27/75] Correcties op configuratie van validatie De manier waarop opeenvolgende canonisering en validatie stylesheets worden aangeroepen is aangepast. Dit was niet overal correct doorgevoerd. Nu hersteld. Alleen VNG/Kennisnet BSM modellen runs bemerken deze fix. Bugfix. --- src/main/resources/cfg/Validator/parms.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/resources/cfg/Validator/parms.xml b/src/main/resources/cfg/Validator/parms.xml index 477edc77..eecc8f8a 100644 --- a/src/main/resources/cfg/Validator/parms.xml +++ b/src/main/resources/cfg/Validator/parms.xml @@ -241,7 +241,7 @@ Imvert2validation-KINGUGM.xsl - Imvert2canonical.xsl + Imvert2canonical.xsl Imvert2canonical-KING.xsl Imvert2canonical-KINGBSM.xsl @@ -394,21 +394,21 @@ Imvert2canonical-KING.xsl Imvert2canonical-KINGSIM.xsl - Imvert2validation-KINGSIM.xsl + Imvert2validation-KINGSIM.xsl - Imvert2canonical.xsl + Imvert2canonical.xsl Imvert2canonical-KING.xsl Imvert2canonical-KINGUGM.xsl - Imvert2validation-KINGUGM.xsl + Imvert2validation-KINGUGM.xsl - Imvert2canonical.xsl + Imvert2canonical.xsl Imvert2canonical-KING.xsl Imvert2canonical-KINGBSM.xsl - Imvert2validation-KINGBSM.xsl + Imvert2validation-KINGBSM.xsl Imvert2canonical.xsl - Imvert2canonical-MIM10ISO.xsl - Imvert2canonical-MIM11.xsl + Imvert2canonical-MIM10ISO.xsl + Imvert2canonical-MIM11.xsl Imvert2canonical-BRO.xsl Imvert2validation.xsl From 7d49468f50b944502cc28e90e1ea712e463e1299 Mon Sep 17 00:00:00 2001 From: arjan Date: Wed, 12 Jun 2024 15:18:32 +0200 Subject: [PATCH 28/75] IHW: aankoppeling INSPIRE HYDRONETWORK minor. --- src/main/resources/input/IHW/xsd/conceptual-schemas.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/resources/input/IHW/xsd/conceptual-schemas.xml b/src/main/resources/input/IHW/xsd/conceptual-schemas.xml index 318921fb..fce881bd 100644 --- a/src/main/resources/input/IHW/xsd/conceptual-schemas.xml +++ b/src/main/resources/input/IHW/xsd/conceptual-schemas.xml @@ -14,7 +14,7 @@ - x?> + @@ -26,7 +26,7 @@ - x?> + IHW @@ -41,7 +41,7 @@ - x?> + IHW-GENERIEK @@ -117,6 +117,7 @@ + From 604bce11441028384d8e20441bb15f5f33f5259d Mon Sep 17 00:00:00 2001 From: arjan Date: Thu, 13 Jun 2024 14:01:45 +0200 Subject: [PATCH 29/75] Wanneer createxmlschemavariant niet bekend is, alleen foutmelding Dat was fatal, wordt gewone fout, en breekt het proces niet af. Bugfix. --- src/main/resources/xsl/XsdCompiler/XsdCompiler-report.xsl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/resources/xsl/XsdCompiler/XsdCompiler-report.xsl b/src/main/resources/xsl/XsdCompiler/XsdCompiler-report.xsl index 516439af..11690cba 100644 --- a/src/main/resources/xsl/XsdCompiler/XsdCompiler-report.xsl +++ b/src/main/resources/xsl/XsdCompiler/XsdCompiler-report.xsl @@ -25,7 +25,7 @@ xmlns:imf="http://www.imvertor.org/xsl/functions" exclude-result-prefixes="#all" - version="2.0"> + version="3.0"> + + + + + MIM 1.2 + + Visuals for MIM 1.2 models + Visuele aspecten van MIM 1.2 modellen + + diff --git a/src/main/resources/input/MIM/xsd/cm-MIM12.xml b/src/main/resources/input/MIM/xsd/cm-MIM12.xml new file mode 100644 index 00000000..4df1913c --- /dev/null +++ b/src/main/resources/input/MIM/xsd/cm-MIM12.xml @@ -0,0 +1,296 @@ + + + + MIM12 + http://www.geonovum.nl/MIM12 + http://schemas.geonovum.nl/mim12.xsd + 3 + 1.0.0 + 20240408 + + + + MIM + + + CharacterString + false + EAID_18BFBA8D_E3F4_4d8c_9A8F_4429FA54B041 + EAID_B1953163_0287_430c_B5D9_179028F43297 + + + #primitive-datatypes + + + + + xs:string + xs:string + simpletype + true + + + + + string + true + + + + + Integer + false + EAID_F38912FB_7856_4a9d_AF96_CB2238371C04 + EAID_2BBE4547_2439_4013_9D40_1C2780EFD529 + + + #primitive-datatypes + + + + + xs:integer + xs:integer + simpletype + true + + + + + integer + true + + + + + Real + false + EAID_3C4BBF7A_20EC_4a62_A172_F00A6D73FD5E + EAID_16EBF44D_B891_4e4a_A736_DDAACC540C2B + + + #primitive-datatypes + + + + + xs:float + xs:float + simpletype + true + + + + + real + true + + + + + Decimal + false + EAID_4B14AA67_7035_465b_B4A5_AACAB944175E + + + #primitive-datatypes + + + + + xs:decimal + xs:decimal + simpletype + true + + + + + decimal + true + + + + + Boolean + false + EAID_70FBDB70_4B81_46ab_97BB_058195812ECB + EAID_CC54BACB_6454_4393_B54D_18A9B1197BE7 + + + #primitive-datatypes + + + + + xs:boolean + xs:boolean + simpletype + true + + + + + boolean + true + + + + + Date + false + EAID_3E6F5023_BF71_4da0_8747_0B8D334A8D04 + EAID_C9777762_0321_46bc_9966_D5BD6F7826F1 + + + #primitive-datatypes + + + + + xs:date + xs:date + simpletype + true + + + + + date + true + + + + + DateTime + false + EAID_366435A3_6E41_4add_A833_21873B97D7C7 + EAID_772DBA4B_DD3A_4e12_97A9_E5085B8BD840 + + + #primitive-datatypes + + + + + xs:dateTime + xs:dateTime + simpletype + true + + + + + datetime + true + + + + + Year + false + EAID_4DA242C6_3972_4f1e_86F0_BBB8046F4BC9 + EAID_003D6B85_BF53_4e51_ACB3_CD818F987D56 + + + #primitive-datatypes + + + + + xs:gYear + xs:gYear + simpletype + true + + + + + year + true + + + + + Day + false + EAID_427C0973_E12D_47f8_A326_AACBADEE5AE6 + EAID_C52F8099_A9C0_4f31_AB6F_A0B1F6669EFD + + + #primitive-datatypes + + + + + xs:gDay + xs:gDay + simpletype + true + + + + + day + true + + + + + Month + false + EAID_FC8CFD1F_45A2_4507_90DA_82453E61834B + EAID_8712C86F_2032_41ff_9D17_992B0ED46AFD + + + #primitive-datatypes + + + + + xs:gMonth + xs:gMonth + simpletype + true + + + + + month + true + + + + + URI + false + EAID_DAB6A78C_1FE9_4ecf_9DB3_45B541679D62 + EAID_147BFB75_5103_4cd9_B535_3CE1C023BDA1 + + + #primitive-datatypes + + + + + xs:anyURI + xs:anyURI + simpletype + true + + + + + uri + true + + + + + \ No newline at end of file diff --git a/src/main/resources/input/MIM/xsd/cs-MIM12.xml b/src/main/resources/input/MIM/xsd/cs-MIM12.xml new file mode 100644 index 00000000..faaaf6b1 --- /dev/null +++ b/src/main/resources/input/MIM/xsd/cs-MIM12.xml @@ -0,0 +1,23 @@ + + + + + MIM12 + mim12 + 1.2 + 3 + De primitieve datatypen zoals vastgesteld in de MIM 1.2 specificatie + MIM + https://docs.geostandaarden.nl/mim/ + + http://www.geonovum.nl/conceptual-schemas/MIM12 + https://docs.geostandaarden.nl/mim/vv-st-mim-20240408/[entry] + + + \ No newline at end of file diff --git a/src/main/resources/input/MIM/xsd/www.geonovum.nl/MIM12-20240408/mim12.xsd b/src/main/resources/input/MIM/xsd/www.geonovum.nl/MIM12-20240408/mim12.xsd new file mode 100644 index 00000000..67687860 --- /dev/null +++ b/src/main/resources/input/MIM/xsd/www.geonovum.nl/MIM12-20240408/mim12.xsd @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/input/MIM/xsd/www.geonovum.nl/MIM12-20240408/readme.txt b/src/main/resources/input/MIM/xsd/www.geonovum.nl/MIM12-20240408/readme.txt new file mode 100644 index 00000000..50f152af --- /dev/null +++ b/src/main/resources/input/MIM/xsd/www.geonovum.nl/MIM12-20240408/readme.txt @@ -0,0 +1,3 @@ +Op dit moment is er nog geen apart schema voor MIM 1.2 +Alle constructies waarnaar vanuit de conceptuele schemas verwezen wordt vallen binnen de xs: namespace. +Wanneer aparte MIM 1.2 constructies een eigen schema definitie hebben, worden deze op deze plek toegevoegd. \ No newline at end of file From cefdc52ea32052fc3dc7d5f907b87340dae5957b Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 17 Jun 2024 19:29:04 +0200 Subject: [PATCH 34/75] MIM 1.2 beschikbaar gesteld voor Geonovum modellen. Minor. --- .../cfg/metamodels/Geonovum-MIM12.xml | 57 ------------------- .../cfg/metamodels/Geonovum-MIMCM.xml | 4 +- .../Geonovum/cfg/tvsets/Geonovum-MIM12.xml | 22 ------- .../Geonovum/cfg/tvsets/Geonovum-MIMCM.xml | 10 ++-- 4 files changed, 7 insertions(+), 86 deletions(-) delete mode 100644 src/main/resources/input/Geonovum/cfg/metamodels/Geonovum-MIM12.xml delete mode 100644 src/main/resources/input/Geonovum/cfg/tvsets/Geonovum-MIM12.xml diff --git a/src/main/resources/input/Geonovum/cfg/metamodels/Geonovum-MIM12.xml b/src/main/resources/input/Geonovum/cfg/metamodels/Geonovum-MIM12.xml deleted file mode 100644 index 19c5d018..00000000 --- a/src/main/resources/input/Geonovum/cfg/metamodels/Geonovum-MIM12.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - Geonovum NEN3610-2022/GML1.2 - - - Metamodel for Geonovum NEN3610-2022/GML1.2 extensions. - - - - - M12G22NL - - NEN3610-2022/GML1.2 Geonovum Grouping NL - - - M12G22EN - - NEN3610-2022/GML1.2 Geonovum Grouping EN - - - - - true - - - - - - - - - diff --git a/src/main/resources/input/Geonovum/cfg/metamodels/Geonovum-MIMCM.xml b/src/main/resources/input/Geonovum/cfg/metamodels/Geonovum-MIMCM.xml index f8321470..e67485c2 100644 --- a/src/main/resources/input/Geonovum/cfg/metamodels/Geonovum-MIMCM.xml +++ b/src/main/resources/input/Geonovum/cfg/metamodels/Geonovum-MIMCM.xml @@ -4,9 +4,9 @@ --> - + - + Geonovum MIMCM diff --git a/src/main/resources/input/Geonovum/cfg/tvsets/Geonovum-MIM12.xml b/src/main/resources/input/Geonovum/cfg/tvsets/Geonovum-MIM12.xml deleted file mode 100644 index c4776834..00000000 --- a/src/main/resources/input/Geonovum/cfg/tvsets/Geonovum-MIM12.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - Geonovum NEN3610-2022/GML1.2 - - Tagset for Geonovum NEN3610:2022/MIM1.2 models - Tags voor Geonovum NEN3610:2022/MIM1.2 modellen - - - - - - - - diff --git a/src/main/resources/input/Geonovum/cfg/tvsets/Geonovum-MIMCM.xml b/src/main/resources/input/Geonovum/cfg/tvsets/Geonovum-MIMCM.xml index c83f52f9..768ef4fa 100644 --- a/src/main/resources/input/Geonovum/cfg/tvsets/Geonovum-MIMCM.xml +++ b/src/main/resources/input/Geonovum/cfg/tvsets/Geonovum-MIMCM.xml @@ -4,16 +4,16 @@ --> - + - + - Geonovum MIM111 CM + Geonovum MIM12 CM - Tagset for Geonovum extensions in CM - Tags voor Geonovum uitbreidingen in CM + Tags voor Geonovum uitbreidingen op MIM 1.2 + Tagset for Geonovum extensions on MIM 1.2 From 12090554277989856262512054b9068efdfef989 Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 17 Jun 2024 19:29:25 +0200 Subject: [PATCH 35/75] Imvertor Grouping voorbereid op MIM 1.2. Minor. --- .../Imvertor/cfg/metamodels/Grouping-MIM12.xml | 14 ++++++++++++++ .../input/Imvertor/cfg/tvsets/Grouping-MIM12.xml | 13 +++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 src/main/resources/input/Imvertor/cfg/metamodels/Grouping-MIM12.xml create mode 100644 src/main/resources/input/Imvertor/cfg/tvsets/Grouping-MIM12.xml diff --git a/src/main/resources/input/Imvertor/cfg/metamodels/Grouping-MIM12.xml b/src/main/resources/input/Imvertor/cfg/metamodels/Grouping-MIM12.xml new file mode 100644 index 00000000..220bc70f --- /dev/null +++ b/src/main/resources/input/Imvertor/cfg/metamodels/Grouping-MIM12.xml @@ -0,0 +1,14 @@ + + + + + + + Grouping for MIM12 + + Metamodel voor Grouping passend bij MIM 1.2 + Metamodel for Grouping under MIM 1.2 + + diff --git a/src/main/resources/input/Imvertor/cfg/tvsets/Grouping-MIM12.xml b/src/main/resources/input/Imvertor/cfg/tvsets/Grouping-MIM12.xml new file mode 100644 index 00000000..3e74928c --- /dev/null +++ b/src/main/resources/input/Imvertor/cfg/tvsets/Grouping-MIM12.xml @@ -0,0 +1,13 @@ + + + + + + + Grouping for MIM 1.2 + + Deviations and additions to generic grouping for MIM 1.2 metamodel. + + \ No newline at end of file From 1064dc0986e7fb5ea6fac1c2593b9ac0edf4d4c3 Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 17 Jun 2024 19:30:49 +0200 Subject: [PATCH 36/75] MIM 1.2 eenheid opgenomen als alternatief voor meeteenheid Zie https://github.com/Imvertor/Imvertor-Maven/issues/447 Minor. --- src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl index 9d53fd06..4c1048fc 100644 --- a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl +++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl @@ -1244,7 +1244,8 @@ - + + From ef851015acb05bd1b837b64a45e33de00c7170f3 Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 17 Jun 2024 19:31:02 +0200 Subject: [PATCH 37/75] idem --- src/main/resources/xsl/XmiCompiler/XmiCompiler-report.xsl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/resources/xsl/XmiCompiler/XmiCompiler-report.xsl b/src/main/resources/xsl/XmiCompiler/XmiCompiler-report.xsl index 936c968a..366f7dfd 100644 --- a/src/main/resources/xsl/XmiCompiler/XmiCompiler-report.xsl +++ b/src/main/resources/xsl/XmiCompiler/XmiCompiler-report.xsl @@ -51,12 +51,10 @@ - + - - From 7610f9e1de36b321e301d329b31d6d64ca1230ce Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 17 Jun 2024 19:32:02 +0200 Subject: [PATCH 38/75] =?UTF-8?q?MIM=201.2=20basis-URI=20n=C3=A1=C3=A1st?= =?UTF-8?q?=20alias=20van=20packages=20opgenomen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Zie #450 Minor. --- src/main/resources/xsl/XmiTranslator/XMI1Imvert.xsl | 7 ++++--- .../resources/xsl/XmiTranslator/XmiTranslator-report.xsl | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/resources/xsl/XmiTranslator/XMI1Imvert.xsl b/src/main/resources/xsl/XmiTranslator/XMI1Imvert.xsl index e591b6ed..08154885 100644 --- a/src/main/resources/xsl/XmiTranslator/XMI1Imvert.xsl +++ b/src/main/resources/xsl/XmiTranslator/XMI1Imvert.xsl @@ -287,7 +287,9 @@ - + + + @@ -297,7 +299,7 @@ - + @@ -319,7 +321,6 @@ - diff --git a/src/main/resources/xsl/XmiTranslator/XmiTranslator-report.xsl b/src/main/resources/xsl/XmiTranslator/XmiTranslator-report.xsl index 47e8cda5..316f25c5 100644 --- a/src/main/resources/xsl/XmiTranslator/XmiTranslator-report.xsl +++ b/src/main/resources/xsl/XmiTranslator/XmiTranslator-report.xsl @@ -45,6 +45,7 @@ + From ba6ed2e70f4e206a2aa4898bac5058ba71ef0d5c Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 17 Jun 2024 19:32:51 +0200 Subject: [PATCH 39/75] =?UTF-8?q?XML=20schema=20herkent=20Meeteenheid=20?= =?UTF-8?q?=C3=A9n=20eenheid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Zie #447 Minor. --- src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136.xsl b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136.xsl index 6c6edb68..1276cd0d 100644 --- a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136.xsl +++ b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136.xsl @@ -1017,7 +1017,7 @@ - + From c84523facb554e2274f6b6a442b517d12f4de327 Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 17 Jun 2024 19:34:00 +0200 Subject: [PATCH 40/75] Configs voor EIGENAAR ingericht op MIM 1.2 --- .../EIGENAAR/cfg/metamodels/EIGENAAR-CONCEPTUAL.xml | 12 ++++++------ .../EIGENAAR/cfg/tvsets/EIGENAAR-CONCEPTUAL.xml | 8 ++++---- .../EIGENAAR/cfg/visuals/EIGENAAR-CONCEPTUAL.xml | 4 ++-- .../input/EIGENAAR/xsd/conceptual-schemas.xml | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/resources/input/EIGENAAR/cfg/metamodels/EIGENAAR-CONCEPTUAL.xml b/src/main/resources/input/EIGENAAR/cfg/metamodels/EIGENAAR-CONCEPTUAL.xml index 04dd3b24..86cfc14d 100644 --- a/src/main/resources/input/EIGENAAR/cfg/metamodels/EIGENAAR-CONCEPTUAL.xml +++ b/src/main/resources/input/EIGENAAR/cfg/metamodels/EIGENAAR-CONCEPTUAL.xml @@ -4,23 +4,23 @@ --> - + - - + + - EIGENAAR CONCEPTUEEL + EIGENAAR CONCEPTUEEL MIM1.2 MEGNL - MIM 1.1.1 EIGENAAR NL + MIM 1.2 EIGENAAR NL MEGEN - MIM 1.1.1 EIGENAAR EN + MIM 1.2 EIGENAAR EN diff --git a/src/main/resources/input/EIGENAAR/cfg/tvsets/EIGENAAR-CONCEPTUAL.xml b/src/main/resources/input/EIGENAAR/cfg/tvsets/EIGENAAR-CONCEPTUAL.xml index 554e2a38..d10d22e9 100644 --- a/src/main/resources/input/EIGENAAR/cfg/tvsets/EIGENAAR-CONCEPTUAL.xml +++ b/src/main/resources/input/EIGENAAR/cfg/tvsets/EIGENAAR-CONCEPTUAL.xml @@ -4,11 +4,11 @@ --> - + - - + + - EIGENAAR CONCEPTUEEL + EIGENAAR CONCEPTUEEL MIM 1.2 \ No newline at end of file diff --git a/src/main/resources/input/EIGENAAR/cfg/visuals/EIGENAAR-CONCEPTUAL.xml b/src/main/resources/input/EIGENAAR/cfg/visuals/EIGENAAR-CONCEPTUAL.xml index 524279b1..3bb80c4e 100644 --- a/src/main/resources/input/EIGENAAR/cfg/visuals/EIGENAAR-CONCEPTUAL.xml +++ b/src/main/resources/input/EIGENAAR/cfg/visuals/EIGENAAR-CONCEPTUAL.xml @@ -5,12 +5,12 @@ - + - EIGENAAR MIM 1.1.1 + EIGENAAR MIM 1.2 Visuals for EIGENAAR modellen Visuele aspecten van EIGENAAR modellen diff --git a/src/main/resources/input/EIGENAAR/xsd/conceptual-schemas.xml b/src/main/resources/input/EIGENAAR/xsd/conceptual-schemas.xml index c913a6b9..a5885c59 100644 --- a/src/main/resources/input/EIGENAAR/xsd/conceptual-schemas.xml +++ b/src/main/resources/input/EIGENAAR/xsd/conceptual-schemas.xml @@ -10,7 +10,7 @@ NEN3610_GML322 - + @@ -21,14 +21,14 @@ - + - + From 5dfac2d1c818819ca3a168675b9b5f0c76ecd5f1 Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 17 Jun 2024 19:34:18 +0200 Subject: [PATCH 41/75] Waterschapshuis ondersteunt multiple inheritance. --- .../cfg/metamodels/Waterschapshuis-CONCEPTUAL.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/input/Waterschapshuis/cfg/metamodels/Waterschapshuis-CONCEPTUAL.xml b/src/main/resources/input/Waterschapshuis/cfg/metamodels/Waterschapshuis-CONCEPTUAL.xml index 47172abe..5e74ff2e 100644 --- a/src/main/resources/input/Waterschapshuis/cfg/metamodels/Waterschapshuis-CONCEPTUAL.xml +++ b/src/main/resources/input/Waterschapshuis/cfg/metamodels/Waterschapshuis-CONCEPTUAL.xml @@ -26,7 +26,7 @@ false - false + true true From 845cd967a32b4fca261f777dce22faf4f3e5ff8d Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 17 Jun 2024 19:37:38 +0200 Subject: [PATCH 42/75] MIM 1.2 aanpassing van metamodel specificatie tbv mim serialisatie --- .../xsl/MIMCompiler/v2/MIM1.2-model.xml | 1030 +++++++++++++++++ .../xsl/MIMCompiler/v2/MIM1.2-readme.xml | 16 + 2 files changed, 1046 insertions(+) create mode 100644 src/main/resources/xsl/MIMCompiler/v2/MIM1.2-model.xml create mode 100644 src/main/resources/xsl/MIMCompiler/v2/MIM1.2-readme.xml diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2-model.xml b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2-model.xml new file mode 100644 index 00000000..05447589 --- /dev/null +++ b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2-model.xml @@ -0,0 +1,1030 @@ + + + + + Attribuutsoort + Naam + Begrip + Alias + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Type + Lengte + Patroon + Formeel patroon + Indicatie materiële historie + Indicatie formele historie + Kardinaliteit + Authentiek + Locatie + Indicatie afleidbaar + Indicatie classificerend + Mogelijk geen waarde + Identificerend + + + Regels + Eigenaar + + jsonPrimaryGeometry + jsonPrimaryPlace + jsonPrimaryInstant + jsonPrimaryInterval + inlineOrByReference + Eenheid + Heeft tijdlijn geldigheid + Heeft tijdlijn registratie + Identificatie + Maximumwaarde exclusief + Minimumwaarde exclusief + Maximumwaarde inclusief + Minimumwaarde inclusief + + + Codelijst + Naam + Begrip + Alias + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Locatie + + literalEncodingType + Doelformaat + Identificatie + Profielspecificatie + Waarde-item + + + Constraint + Naam + Specificatie tekst + Specificatie formeel + + + Data element + Naam + Begrip + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Type + Lengte + Patroon + Formeel patroon + Kardinaliteit + + + Identificatie + Maximumwaarde exclusief + Minimumwaarde exclusief + Maximumwaarde inclusief + Minimumwaarde inclusief + + + Datatype + + + Domein + Naam + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Beheerder + Basis-URI + Identificatie + + + Enumeratie + Naam + Begrip + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + + literalEncodingType + Identificatie + + + Enumeratiewaarde + Naam + Definitie + Datum opname + Code + Identificatie + + + Extensie + Aggregatietype + Alias + Authentiek + Begrip + Code + Datum opname + Definitie + Formeel patroon + Herkomst + Herkomst definitie + Identificerend + Indicatie abstract object + Indicatie afleidbaar + Indicatie classificerend + Indicatie formele historie + Indicatie materiële historie + Informatiedomein + Informatiemodel type + Kardinaliteit + Kwaliteit + Lengte + Locatie + MIM extensie + MIM extensie versie + MIM taal + MIM versie + Mogelijk geen waarde + Naam + Patroon + Populatie + Relatie eigenaar + Relatiemodelleringtype + Specificatie formeel + Specificatie tekst + Subtype + Supertype + Toelichting + Unidirectioneel + + + Extern + Naam + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Locatie + Beheerder + Basis-URI + Identificatie + + + Externe koppeling + Naam + Begrip + Alias + Datum opname + Unidirectioneel + Aggregatietype + Kardinaliteit + Heeft tijdlijn geldigheid + Heeft tijdlijn registratie + Identificatie + + + Gegevensgroep + Naam + Begrip + Alias + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Indicatie materiële historie + Indicatie formele historie + Kardinaliteit + Authentiek + Gegevensgroeptype + Identificatie + + + Gegevensgroeptype + Naam + Begrip + Alias + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Regels + Eigenaar + Identificatie + + + Generalisatie Datatypes + + + + Datum opname + Supertype + Subtype + Identificatie + + + Generalisatie Objecttypes + Datum opname + Type supertype + Supertype + Subtype + Identificatie + Mixin + + + Gestructureerd datatype + Naam + Begrip + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Patroon + Formeel patroon + + + Identificatie + + + Informatiemodel + Naam + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Informatiemodel type + Informatiedomein + Relatiemodelleringtype + MIM versie + MIM extensie + MIM extensie versie + MIM taal + Beheerder + Basis-URI + Identificatie + Tekstopmaak + + + Isid + + + Keuze + Naam + Begrip + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + + Identificatie + + + Keuze attributen + + + Keuze attribuut + + + Keuze datatypen + + + Keuze element + + + Keuze relatie + + + Keuze relaties + + + Keuze zonder betekenis + + + Koppelklasse + Naam + Begrip + Definitie + Herkomst + Herkomst definitie + Toelichting + Datum opname + Kwaliteit + Populatie + Eigenaar + + + Objecttype + Naam + Begrip + Alias + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Populatie + Kwaliteit + Indicatie abstract object + Eigenaar + Identificatie + + + Primitief datatype + Naam + Begrip + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Lengte + Patroon + Formeel patroon + + + Identificatie + + + Referentie element + Naam + Begrip + Alias + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Type + Lengte + Patroon + Formeel patroon + Kardinaliteit + Identificerend + Eenheid + Identificatie + + + Referentielijst + Naam + Begrip + Alias + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Locatie + Doelformaat + Identificatie + + + Relatieklasse + Naam + Begrip + Alias + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Indicatie materiële historie + Indicatie formele historie + Kardinaliteit + Authentiek + Indicatie afleidbaar + Mogelijk geen waarde + Aggregatietype + Heeft tijdlijn geldigheid + Heeft tijdlijn registratie + Identificatie + + + + Relatierol - Relatierol leidend + Naam + Begrip + Alias + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Indicatie materiële historie + Indicatie formele historie + Kardinaliteit + Kardinaliteit bron + Authentiek + Mogelijk geen waarde + Identificerend + Aggregatietype + + inlineOrByReference + Heeft tijdlijn geldigheid + Heeft tijdlijn registratie + Identificatie + + + Relatierol - Relatiesoort leidend + Naam + Begrip + Alias + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Identificatie + + + Relatiesoort - Relatierol leidend + Naam + Begrip + Alias + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + + inlineOrByReference + Identificatie + + + Relatiesoort - Relatiesoort leidend + Naam + Begrip + Alias + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Indicatie materiële historie + Indicatie formele historie + Kardinaliteit + Kardinaliteit bron + Authentiek + Indicatie afleidbaar + Mogelijk geen waarde + Identificerend + Unidirectioneel + Aggregatietype + Relatie eigenaar + + inlineOrByReference + Heeft tijdlijn geldigheid + Heeft tijdlijn registratie + Identificatie + + + Static liskov + + + View + Naam + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Locatie + Beheerder + Basis-URI + Identificatie + + + + + Aggregatietype + Externe koppeling + Relatiesoort - Relatiesoort leidend + + + Alias + Attribuutsoort + Codelijst + Externe koppeling + Gegevensgroep + Gegevensgroeptype + + Objecttype + Referentie element + Referentielijst + Relatieklasse + Relatierol - Relatierol leidend + Relatierol - Relatiesoort leidend + Relatiesoort - Relatierol leidend + Relatiesoort - Relatiesoort leidend + + + Authentiek + Attribuutsoort + Gegevensgroep + Relatieklasse + Relatierol - Relatiesoort leidend + Relatiesoort - Relatiesoort leidend + + + Basis-URI + Informatiemodel + Domein + View + Extern + + + Begrip + Attribuutsoort + Codelijst + Data element + Enumeratie + Externe koppeling + Gegevensgroep + Gegevensgroeptype + + Gestructureerd datatype + Keuze + Koppelklasse + Objecttype + Primitief datatype + Referentie element + Referentielijst + Relatieklasse + Relatierol - Relatierol leidend + Relatierol - Relatiesoort leidend + Relatiesoort - Relatierol leidend + Relatiesoort - Relatiesoort leidend + + + Beheerder + Domein + Extern + Informatiemodel + View + + + Code + Enumeratiewaarde + + + Datum opname + Attribuutsoort + Codelijst + Data element + Domein + Enumeratie + Enumeratiewaarde + Extern + Externe koppeling + Gegevensgroep + Gegevensgroeptype + Generalisatie Datatypes + Generalisatie Objecttypes + Gestructureerd datatype + Informatiemodel + Keuze + Koppelklasse + Objecttype + Primitief datatype + Referentie element + Referentielijst + Relatieklasse + Relatierol - Relatiesoort leidend + Relatiesoort - Relatiesoort leidend + View + + + Definitie + Attribuutsoort + Codelijst + Data element + Domein + Enumeratie + Enumeratiewaarde + Extern + Gegevensgroep + Gegevensgroeptype + Gestructureerd datatype + Informatiemodel + Keuze + Koppelklasse + Objecttype + Primitief datatype + Referentie element + Referentielijst + Relatieklasse + Relatierol - Relatierol leidend + Relatierol - Relatiesoort leidend + Relatiesoort - Relatierol leidend + Relatiesoort - Relatiesoort leidend + View + + + Doelformaat + Codelijst + Referentielijst + + + Eenheid + Attribuutsoort + Referentie element + + + Eigenaar + Attribuutsoort + Gegevensgroeptype + Koppelklasse + Objecttype + + + Formeel patroon + Attribuutsoort + Data element + Gestructureerd datatype + Primitief datatype + Referentie element + + + Gegevensgroeptype + Gegevensgroep + + + Heeft tijdlijn geldigheid + Gegevensgroep + Attribuutsoort + Externe koppeling + Relatieklasse + Relatiesoort - Relatiesoort leidend + Relatierol - Relatierol leidend + + + Heeft tijdlijn registratie + Gegevensgroep + Attribuutsoort + Externe koppeling + Relatieklasse + Relatiesoort - Relatiesoort leidend + Relatierol - Relatierol leidend + + + Herkomst + Attribuutsoort + Codelijst + Data element + Domein + Enumeratie + Enumeratiewaarde + Extern + Gegevensgroep + Gegevensgroeptype + Gestructureerd datatype + Informatiemodel + Keuze + Koppelklasse + Objecttype + Primitief datatype + Referentie element + Referentielijst + Relatieklasse + Relatierol - Relatiesoort leidend + Relatiesoort - Relatiesoort leidend + View + + + Herkomst definitie + Attribuutsoort + Codelijst + Data element + Domein + Enumeratie + Enumeratiewaarde + Extern + Gegevensgroep + Gegevensgroeptype + Gestructureerd datatype + Informatiemodel + Keuze + Koppelklasse + Objecttype + Primitief datatype + Referentie element + Referentielijst + Relatieklasse + Relatierol - Relatiesoort leidend + Relatiesoort - Relatiesoort leidend + View + + + Identificatie + Attribuutsoort + Codelijst + Data element + Domein + Enumeratie + Enumeratiewaarde + Extern + Externe koppeling + Gegevensgroep + Gegevensgroeptype + Generalisatie Datatypes + Generalisatie Objecttypes + Gestructureerd datatype + Informatiemodel + Keuze + Koppelklasse + Objecttype + Primitief datatype + Referentie element + Referentielijst + Relatieklasse + Relatierol - Relatierol leidend + Relatierol - Relatiesoort leidend + Relatiesoort - Relatierol leidend + Relatiesoort - Relatiesoort leidend + View + + + Identificerend + Attribuutsoort + Referentie element + + + Indicatie abstract object + Objecttype + + + Indicatie classificerend + Attribuutsoort + + + Indicatie formele historie + Attribuutsoort + Gegevensgroep + Relatieklasse + Relatierol - Relatiesoort leidend + Relatiesoort - Relatiesoort leidend + + + Indicatie materiële historie + Attribuutsoort + Gegevensgroep + Relatieklasse + Relatierol - Relatiesoort leidend + Relatiesoort - Relatiesoort leidend + + + Informatiedomein + Informatiemodel + + + Informatiemodel type + Informatiemodel + + + inlineOrByReference + Attribuutsoort + Relatiesoort - Relatierol leidend + Relatiesoort - Relatiesoort leidend + + + Kardinaliteit + Attribuutsoort + Data element + Gegevensgroep + Referentie element + Relatierol - Relatierol leidend + Relatiesoort - Relatiesoort leidend + Externe koppeling + + + Kwaliteit + Koppelklasse + Objecttype + + + Lengte + Attribuutsoort + Data element + Primitief datatype + Referentie element + + + Locatie + Attribuutsoort + Codelijst + Extern + Referentielijst + View + + + + MIM extensie + Informatiemodel + + + MIM extensie versie + Informatiemodel + + + MIM taal + Informatiemodel + + + MIM versie + Informatiemodel + + + + Mogelijk geen waarde + Attribuutsoort + Relatieklasse + Relatierol - Relatiesoort leidend + Relatiesoort - Relatiesoort leidend + + + Mixin + Generalisatie Objecttypes + + + Naam + Attribuutsoort + Codelijst + Constraint + Data element + Domein + Enumeratie + Enumeratiewaarde + Extern + Externe koppeling + Gegevensgroep + Gegevensgroeptype + + + Gestructureerd datatype + Informatiemodel + Keuze + Objecttype + Primitief datatype + Referentie element + Referentielijst + Relatieklasse + Relatierol - Relatierol leidend + Relatierol - Relatiesoort leidend + Relatiesoort - Relatierol leidend + Relatiesoort - Relatiesoort leidend + View + + + Patroon + Attribuutsoort + Data element + Gestructureerd datatype + Primitief datatype + Referentie element + + + Populatie + Koppelklasse + Objecttype + + + jsonPrimaryGeometry + Attribuutsoort + + + jsonPrimaryPlace + Attribuutsoort + + + jsonPrimaryInstant + Attribuutsoort + + + jsonPrimaryInterval + Attribuutsoort + + + Profielspecificatie + Codelijst + + + Relatie doel + Externe koppeling + Relatiesoort - Relatiesoort leidend + + + Relatie eigenaar + Externe koppeling + Relatiesoort - Relatiesoort leidend + + + Regels + Attribuutsoort + Gegevensgroeptype + Relatierol - Relatiesoort leidend + Relatiesoort - Relatiesoort leidend + + + Relatiemodelleringtype + Informatiemodel + + + Specificatie formeel + Constraint + + + Specificatie tekst + Constraint + + + Subtype + Generalisatie Datatypes + Generalisatie Objecttypes + + + Supertype + Generalisatie Datatypes + Generalisatie Objecttypes + + + Tekstopmaak + Informatiemodel + + + Toelichting + Attribuutsoort + Codelijst + Data element + Domein + Enumeratie + Enumeratiewaarde + Extern + Gegevensgroep + Gegevensgroeptype + Gestructureerd datatype + Informatiemodel + Keuze + Koppelklasse + Objecttype + Primitief datatype + Referentie element + Referentielijst + Relatieklasse + Relatierol - Relatiesoort leidend + Relatiesoort - Relatiesoort leidend + View + + + Type + Attribuutsoort + Data element + Referentie element + + + Unidirectioneel + Externe koppeling + Relatiesoort - Relatierol leidend + Relatiesoort - Relatiesoort leidend + + + literalEncodingType + Codelijst + Enumeratie + + + Waarde-item + Codelijst + + + diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2-readme.xml b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2-readme.xml new file mode 100644 index 00000000..0b6a698e --- /dev/null +++ b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2-readme.xml @@ -0,0 +1,16 @@ + +============================================================================================= +Dit bestand bevat een XML serialisatie van een informatiemodel dat is gemodelleerd volgens de +"Metamodel Informatie Modellering (MIM)" standaard versie 1.2. +Zie: https://docs.geostandaarden.nl/mim/mim/ voor de laatste versie van de standaard. + +In deze serialisatie komen <mim-ref:xRef> elementen voor, zoals <mim-ref:ObjecttypeRef>. +Deze elementen zijn verwijzingen naar een type modelelement X elders in deze serialisatie. +Via xlink:href attribuut wordt naar betreffende ID verwezen, voorafgegaan door een # teken. +Ook kan men de naam van het modelelement zelf gebruiken, zoals deze in de inhoud van het +element is opgenomen. + +Waar mogelijk is een referentie naar de officiele uitleg (met name de MIM standaard) als +commentaar toegevoegd. Dat is alleen bij de éérste opkomst van een contructie gedaan. +============================================================================================= + \ No newline at end of file From f5cc328be3a2c0e631945c0b17b5a5a216e952a1 Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 18 Jun 2024 15:14:37 +0200 Subject: [PATCH 43/75] Documentatie regels (docrules) aangepast In deze regels zijn de nieuwe MIM 1.2 tagged values opgenomen mbt. min/maxwaarde Zie #448 Minor. --- .../resources/input/BRO/cfg/docrules/BRO.xml | 22 +++++++++++++++ .../input/EIGENAAR/cfg/docrules/EIGENAAR.xml | 26 ++++++++++++++++-- .../input/KING/cfg/docrules/KINGSIM.xml | 20 ++++++++++++++ .../input/Logius/cfg/docrules/Logius.xml | 26 ++++++++++++++++-- .../cfg/docrules/Waterschapshuis.xml | 27 +++++++++++++++++-- 5 files changed, 115 insertions(+), 6 deletions(-) diff --git a/src/main/resources/input/BRO/cfg/docrules/BRO.xml b/src/main/resources/input/BRO/cfg/docrules/BRO.xml index 6ff416b6..f476d0ec 100644 --- a/src/main/resources/input/BRO/cfg/docrules/BRO.xml +++ b/src/main/resources/input/BRO/cfg/docrules/BRO.xml @@ -447,6 +447,17 @@ MinInclusive DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT + + + + Minimumwaarde (excl) + MinExclusive + + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT @@ -454,6 +465,17 @@ MaxInclusive DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT + + + + Maximumwaarde + MaxExclusive + + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT diff --git a/src/main/resources/input/EIGENAAR/cfg/docrules/EIGENAAR.xml b/src/main/resources/input/EIGENAAR/cfg/docrules/EIGENAAR.xml index 32005461..eb4d2015 100644 --- a/src/main/resources/input/EIGENAAR/cfg/docrules/EIGENAAR.xml +++ b/src/main/resources/input/EIGENAAR/cfg/docrules/EIGENAAR.xml @@ -442,14 +442,36 @@ Minimumwaarde MinInclusive - DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT + + + + Minimumwaarde (excl) + MinExclusive + + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT Maximumwaarde MaxInclusive - DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT + + + + Maximumwaarde + MaxExclusive + + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT diff --git a/src/main/resources/input/KING/cfg/docrules/KINGSIM.xml b/src/main/resources/input/KING/cfg/docrules/KINGSIM.xml index 393646cf..caa59a08 100644 --- a/src/main/resources/input/KING/cfg/docrules/KINGSIM.xml +++ b/src/main/resources/input/KING/cfg/docrules/KINGSIM.xml @@ -383,6 +383,16 @@ MinInclusive DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT + + + + Minimumwaarde (excl) + MinExclusive + + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT DISPLAY-DETAIL-DATAELEMENT @@ -391,6 +401,16 @@ MaxInclusive DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT + + + + Maximumwaarde + MaxExclusive + + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT DISPLAY-DETAIL-DATAELEMENT diff --git a/src/main/resources/input/Logius/cfg/docrules/Logius.xml b/src/main/resources/input/Logius/cfg/docrules/Logius.xml index 99774043..38e378ad 100644 --- a/src/main/resources/input/Logius/cfg/docrules/Logius.xml +++ b/src/main/resources/input/Logius/cfg/docrules/Logius.xml @@ -442,14 +442,36 @@ Minimumwaarde MinInclusive - DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT + + + + Minimumwaarde (excl) + MinExclusive + + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT Maximumwaarde MaxInclusive - DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT + + + + Maximumwaarde + MaxExclusive + + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT diff --git a/src/main/resources/input/Waterschapshuis/cfg/docrules/Waterschapshuis.xml b/src/main/resources/input/Waterschapshuis/cfg/docrules/Waterschapshuis.xml index 12a363d7..599e57cb 100644 --- a/src/main/resources/input/Waterschapshuis/cfg/docrules/Waterschapshuis.xml +++ b/src/main/resources/input/Waterschapshuis/cfg/docrules/Waterschapshuis.xml @@ -442,16 +442,39 @@ Minimumwaarde MinInclusive - DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT + + + + Minimumwaarde (excl) + MinExclusive + + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT Maximumwaarde MaxInclusive - DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT + + Maximumwaarde + MaxExclusive + + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT + + + Onderliggende constructies Underlying constructs From 815b186393bcd14a0ebfb6efafa3708c955137cb Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 18 Jun 2024 15:16:11 +0200 Subject: [PATCH 44/75] Min/max waarden opgenomen in respec / officecompiler. Zie #448 --- src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl index 4c1048fc..d6adbb85 100644 --- a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl +++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl @@ -1250,9 +1250,15 @@ + + + + + + From 4cc36e28c85e5fe15bbb93f744591596706f37ea Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 18 Jun 2024 15:23:50 +0200 Subject: [PATCH 45/75] Diverse reorganisaties voor introductiue ven MIM 1.2 In de code is de noodzaak ontstaan om MIM 1.2 apart te behandelen van bijv. MIM 1.1. Er worden hiervoor aparte folders gemaakt, waarin betrefende code is opgenomen. In de MIM serialisatie is MIM 1.2 nu opgenomen. Zie #446 Minor. --- .../nl/imvertor/EpCompiler/EpCompiler.java | 7 +- .../nl/imvertor/MIMCompiler/MIMCompiler.java | 21 +- src/main/resources/cfg/EpCompiler/parms.xml | 10 +- src/main/resources/cfg/MIMCompiler/parms.xml | 16 +- .../MIMformat/v2/1.1.0/MIMFORMAT_MimExt.xsd | 2 +- .../xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd | 835 +++++++ .../xsd/MIMformat/v2/1.2/MIMFORMAT_MimExt.xsd | 68 + .../xsd/MIMformat/v2/1.2/MIMFORMAT_MimRef.xsd | 43 + .../v2/1.2/MIMFORMAT_Mim_relatierol.xsd | 101 + .../v2/1.2/MIMFORMAT_Mim_relatiesoort.xsd | 96 + .../v2/1.2/Samples/Fietsenwinkel.xml | 2036 +++++++++++++++++ .../MIMformat/v2/1.2/Samples/relatierol1.xml | 57 + .../v2/1.2/Samples/relatiesoort1.xml | 53 + .../etc/xsd/MIMformat/v2/1.2/xlink.xsd | 31 + .../ConfigCompiler/Imvert2configuration.xsl | 7 +- .../resources/xsl/EpCompiler/Imvert2EP.xsl | 20 +- .../EpCompiler/{ => MIM1.1}/MIM2EP-core.xsl | 6 +- .../EpCompiler/{ => MIM1.1}/MIM2EP-post.xsl | 2 +- .../EpCompiler/{ => MIM1.1}/MIM2EP-pre.xsl | 4 +- .../xsl/EpCompiler/MIM1.2/MIM2EP-core.xsl | 1115 +++++++++ .../xsl/EpCompiler/MIM1.2/MIM2EP-post.xsl | 169 ++ .../xsl/EpCompiler/MIM1.2/MIM2EP-pre.xsl | 165 ++ .../v2/{ => MIM1.1}/MIM1.1.0-model.xml | 0 .../v2/{ => MIM1.1}/MIM1.1.0-readme.xml | 0 .../v2/{ => MIM1.1}/MIM1.1.1-model.xml | 0 .../v2/{ => MIM1.1}/MIM1.1.1-readme.xml | 0 .../v2/{ => MIM1.1}/MIMCompiler-RDF.xsl | 0 .../v2/{ => MIM1.1}/MIMCompiler.xsl | 4 +- .../v2/{ => MIM1.2}/MIM1.2-model.xml | 47 +- .../v2/{ => MIM1.2}/MIM1.2-readme.xml | 0 .../MIMCompiler/v2/MIM1.2/MIMCompiler-RDF.xsl | 264 +++ .../xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl | 1528 +++++++++++++ .../xsl/Validator/Imvert2validation.xsl | 16 +- 33 files changed, 6668 insertions(+), 55 deletions(-) create mode 100644 src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd create mode 100644 src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_MimExt.xsd create mode 100644 src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_MimRef.xsd create mode 100644 src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim_relatierol.xsd create mode 100644 src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim_relatiesoort.xsd create mode 100644 src/main/resources/etc/xsd/MIMformat/v2/1.2/Samples/Fietsenwinkel.xml create mode 100644 src/main/resources/etc/xsd/MIMformat/v2/1.2/Samples/relatierol1.xml create mode 100644 src/main/resources/etc/xsd/MIMformat/v2/1.2/Samples/relatiesoort1.xml create mode 100644 src/main/resources/etc/xsd/MIMformat/v2/1.2/xlink.xsd rename src/main/resources/xsl/EpCompiler/{ => MIM1.1}/MIM2EP-core.xsl (99%) rename src/main/resources/xsl/EpCompiler/{ => MIM1.1}/MIM2EP-post.xsl (99%) rename src/main/resources/xsl/EpCompiler/{ => MIM1.1}/MIM2EP-pre.xsl (98%) create mode 100644 src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-core.xsl create mode 100644 src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-post.xsl create mode 100644 src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-pre.xsl rename src/main/resources/xsl/MIMCompiler/v2/{ => MIM1.1}/MIM1.1.0-model.xml (100%) rename src/main/resources/xsl/MIMCompiler/v2/{ => MIM1.1}/MIM1.1.0-readme.xml (100%) rename src/main/resources/xsl/MIMCompiler/v2/{ => MIM1.1}/MIM1.1.1-model.xml (100%) rename src/main/resources/xsl/MIMCompiler/v2/{ => MIM1.1}/MIM1.1.1-readme.xml (100%) rename src/main/resources/xsl/MIMCompiler/v2/{ => MIM1.1}/MIMCompiler-RDF.xsl (100%) rename src/main/resources/xsl/MIMCompiler/v2/{ => MIM1.1}/MIMCompiler.xsl (99%) rename src/main/resources/xsl/MIMCompiler/v2/{ => MIM1.2}/MIM1.2-model.xml (97%) rename src/main/resources/xsl/MIMCompiler/v2/{ => MIM1.2}/MIM1.2-readme.xml (100%) create mode 100644 src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler-RDF.xsl create mode 100644 src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl diff --git a/src/main/java/nl/imvertor/EpCompiler/EpCompiler.java b/src/main/java/nl/imvertor/EpCompiler/EpCompiler.java index 9dca5989..73a7e1d4 100644 --- a/src/main/java/nl/imvertor/EpCompiler/EpCompiler.java +++ b/src/main/java/nl/imvertor/EpCompiler/EpCompiler.java @@ -84,12 +84,13 @@ public boolean generate() throws Exception { // Create EP if (requiresMIM()) { + String mimVersion = configurator.getXParm("system/mim-compiler-mim-version"); // check of MIM resultaat beschikbaar is succeeds = succeeds && AnyFile.exists(configurator.getXParm("properties/WORK_MIMFORMAT_XMLPATH",false)); // verwerk MIM naar EP - succeeds = succeeds && transformer.transformStep("properties/WORK_MIMFORMAT_XMLPATH","properties/WORK_EP_XMLPATH_PRE", "properties/IMVERTOR_EP2_XSLPATH_PRE"); - succeeds = succeeds && transformer.transformStep("properties/WORK_EP_XMLPATH_PRE","properties/WORK_EP_XMLPATH_CORE", "properties/IMVERTOR_EP2_XSLPATH_CORE"); - succeeds = succeeds && transformer.transformStep("properties/WORK_EP_XMLPATH_CORE","properties/WORK_EP_XMLPATH_FINAL", "properties/IMVERTOR_EP2_XSLPATH_POST"); + succeeds = succeeds && transformer.transformStep("properties/WORK_MIMFORMAT_XMLPATH","properties/WORK_EP_XMLPATH_PRE", "properties/IMVERTOR_EP2_" + mimVersion + "_XSLPATH_PRE"); + succeeds = succeeds && transformer.transformStep("properties/WORK_EP_XMLPATH_PRE","properties/WORK_EP_XMLPATH_CORE", "properties/IMVERTOR_EP2_" + mimVersion + "_XSLPATH_CORE"); + succeeds = succeeds && transformer.transformStep("properties/WORK_EP_XMLPATH_CORE","properties/WORK_EP_XMLPATH_FINAL", "properties/IMVERTOR_EP2_" + mimVersion + "_XSLPATH_POST"); } else succeeds = succeeds && transformer.transformStep("properties/WORK_EMBELLISH_FILE","properties/WORK_EP_XMLPATH_FINAL", "properties/IMVERTOR_EP_XSLPATH"); diff --git a/src/main/java/nl/imvertor/MIMCompiler/MIMCompiler.java b/src/main/java/nl/imvertor/MIMCompiler/MIMCompiler.java index 4a69c7ad..d056bc4b 100644 --- a/src/main/java/nl/imvertor/MIMCompiler/MIMCompiler.java +++ b/src/main/java/nl/imvertor/MIMCompiler/MIMCompiler.java @@ -91,6 +91,12 @@ public boolean generateDefault() throws Exception { runner.debug(logger,"CHAIN","Generating MIM format"); + String mcv = configurator.getXParm("system/mim-compliancy-version", false); // major.minor: wordt bepaald op basis van de actieve configuratie. + String mv = configurator.getXParm("appinfo/mim-model-version", false); // major.minor: wordt bepaald op basis van de actieve configuratie. + String mimVersion = (mv != null && mv.startsWith("1.1")) ? "1.1" : mv; // de versie opgegeven in het model is bepalend voor het mim serialisatie formaat + + transformer.setXslParm("mim-version", mimVersion); + String mfv = configurator.getXParm("cli/mimformatversion", false); String mimFormatterVersion = (mfv != null && mfv.equals("v1")) ? "v1" : "v2"; @@ -105,10 +111,10 @@ public boolean generateDefault() throws Exception { String xslFileParam; switch (mimFormatType) { case "legacy": - xslFileParam = "properties/IMVERTOR_MIMFORMAT_" + mimFormatterVersion + "_LEGACY_XSLPATH"; + xslFileParam = "properties/IMVERTOR_MIMFORMAT_" + mimFormatterVersion + "_" + mimVersion + "_LEGACY_XSLPATH"; break; default: - xslFileParam = "properties/IMVERTOR_MIMFORMAT_" + mimFormatterVersion + "_XSLPATH"; + xslFileParam = "properties/IMVERTOR_MIMFORMAT_" + mimFormatterVersion + "_" + mimVersion + "_XSLPATH"; break; } @@ -117,11 +123,6 @@ public boolean generateDefault() throws Exception { transformer.setXslParm("generate-all-ids", "true"); } - String mv = configurator.getXParm("cli/mimversion", false); - String mimVersion = (mv != null && mv.equals("1.1")) ? "1.1" : "1.1"; // TODO implementeer 1.1.1 - - transformer.setXslParm("mim-version", mimVersion); - succeeds = succeeds && transformer.transformStep("properties/WORK_EMBELLISH_FILE", "properties/WORK_MIMFORMAT_XMLPATH", xslFileParam); //TODO must relocate generation of WORK_LISTS_FILE to a EMBELLISH step. /* @@ -130,7 +131,7 @@ public boolean generateDefault() throws Exception { */ if (isRDFType) { - succeeds = succeeds && transformer.transformStep("properties/WORK_MIMFORMAT_XMLPATH", "properties/WORK_MIMFORMAT_RDFPATH", "properties/IMVERTOR_MIMFORMAT_" + mimFormatterVersion + "_RDF_XSLPATH"); + succeeds = succeeds && transformer.transformStep("properties/WORK_MIMFORMAT_XMLPATH", "properties/WORK_MIMFORMAT_RDFPATH", "properties/IMVERTOR_MIMFORMAT_" + mimFormatterVersion + "_" + mimVersion + "_RDF_XSLPATH"); } // store to mim folder @@ -147,8 +148,8 @@ public boolean generateDefault() throws Exception { if (!mimFormatType.equals("legacy")) { /* Copy the MIM XML Schema directory: */ - File xslDir = new File(configurator.getXslPath(configurator.getParm("properties", "IMVERTOR_MIMFORMAT_" + mimFormatterVersion + "_XSLPATH"))).getParentFile(); - File xsdSourceFolder = new File(xslDir, "../../../etc/xsd/MIMformat/" + mimFormatterVersion); + File xslDir = new File(configurator.getXslPath(configurator.getParm("properties", "IMVERTOR_MIMFORMAT_" + mimFormatterVersion + "_" + mimVersion + "_XSLPATH"))).getParentFile(); + File xsdSourceFolder = new File(xslDir, "../../../../etc/xsd/MIMformat/" + mimFormatterVersion); File xsdTargetFolder = new File(xmlFolder, "xsd"); FileUtils.copyDirectory(xsdSourceFolder, xsdTargetFolder); diff --git a/src/main/resources/cfg/EpCompiler/parms.xml b/src/main/resources/cfg/EpCompiler/parms.xml index c13af2be..a861ec83 100644 --- a/src/main/resources/cfg/EpCompiler/parms.xml +++ b/src/main/resources/cfg/EpCompiler/parms.xml @@ -37,9 +37,13 @@ Imvert2EP.xsl - MIM2EP-pre.xsl - MIM2EP-core.xsl - MIM2EP-post.xsl + MIM1.1/MIM2EP-pre.xsl + MIM1.1/MIM2EP-core.xsl + MIM1.1/MIM2EP-post.xsl + + MIM1.2/MIM2EP-pre.xsl + MIM1.2/MIM2EP-core.xsl + MIM1.2/MIM2EP-post.xsl diff --git a/src/main/resources/cfg/MIMCompiler/parms.xml b/src/main/resources/cfg/MIMCompiler/parms.xml index c619ece4..48679cbb 100644 --- a/src/main/resources/cfg/MIMCompiler/parms.xml +++ b/src/main/resources/cfg/MIMCompiler/parms.xml @@ -55,13 +55,17 @@ ${system/work-imvert-folder-path}/imvertor.27.mimformat.xml ${system/work-imvert-folder-path}/imvertor.27.mimformat.rdf - v1/MIMCompiler.xsl - v1/MIMCompiler-legacy.xsl - v1/MIMCompiler-RDF.xsl + v1/MIMCompiler.xsl + v1/MIMCompiler-legacy.xsl + v1/MIMCompiler-RDF.xsl - v2/MIMCompiler.xsl - v2/MIMCompiler-legacy.xsl - v2/MIMCompiler-RDF.xsl + v2/MIM1.1/MIMCompiler.xsl + v2/MIM1.1/MIMCompiler-legacy.xsl + v2/MIM1.1/MIMCompiler-RDF.xsl + + v2/MIM1.2/MIMCompiler.xsl + v2/MIM1.2/MIMCompiler-legacy.xsl + v2/MIM1.2/MIMCompiler-RDF.xsl diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.1.0/MIMFORMAT_MimExt.xsd b/src/main/resources/etc/xsd/MIMformat/v2/1.1.0/MIMFORMAT_MimExt.xsd index 0f8b3ea2..df93450a 100644 --- a/src/main/resources/etc/xsd/MIMformat/v2/1.1.0/MIMFORMAT_MimExt.xsd +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.1.0/MIMFORMAT_MimExt.xsd @@ -45,7 +45,7 @@ diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd new file mode 100644 index 00000000..39db96fb --- /dev/null +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd @@ -0,0 +1,835 @@ + + + + + + + + https://docs.geostandaarden.nl/mim/vv-st-mim-20240408/ + 1.2 + https://docs.geostandaarden.nl/mim/TODO-schemainfo-1.0.0 + 1.0.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Een inhoudelijke toelichting op de type gegevensgroep. + + + + + De datum waarop de type gegevensgroep is opgenomen in het informatiemodel. + + + + + Indicatie of de materiële historie van de type gegevensgroep te bevragen is. Materiële historie geeft aan wanneer een verandering is opgetreden in de werkelijkheid die heeft geleid tot verandering van de attribuutwaarde. + + + + + Indicatie of de formele historie van de type gegevensgroep te bevragen is. Formele historie geeft aan wanneer in de administratie een verandering is verwerkt van de attribuutwaarde (wanneer was de verandering bekend en is deze verwerkt). + + + + + + Aanduiding of het een authentiek gegeven betreft. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Specifiek benoemd datatype dat de structuur van een gegeven beschrijft, samengesteld uit minimaal twee elementen die in samenhang betekenisvol zijn. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_MimExt.xsd b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_MimExt.xsd new file mode 100644 index 00000000..a87f6b00 --- /dev/null +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_MimExt.xsd @@ -0,0 +1,68 @@ + + + + + https://docs.geostandaarden.nl/mim/TODO-schemainfo-1.0.0 + 1.0.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_MimRef.xsd b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_MimRef.xsd new file mode 100644 index 00000000..9349541c --- /dev/null +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_MimRef.xsd @@ -0,0 +1,43 @@ + + + + + https://docs.geostandaarden.nl/mim/TODO-schemainfo-1.0.0 + 1.0.0 + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim_relatierol.xsd b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim_relatierol.xsd new file mode 100644 index 00000000..39465da8 --- /dev/null +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim_relatierol.xsd @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim_relatiesoort.xsd b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim_relatiesoort.xsd new file mode 100644 index 00000000..850e5f16 --- /dev/null +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim_relatiesoort.xsd @@ -0,0 +1,96 @@ + + + + + + + + + + + + + De typering van het structurele verband tussen een object van een objecttype en een (ander) object van een ander (of hetzelfde) objecttype. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/Samples/Fietsenwinkel.xml b/src/main/resources/etc/xsd/MIMformat/v2/1.2/Samples/Fietsenwinkel.xml new file mode 100644 index 00000000..72c3817d --- /dev/null +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/Samples/Fietsenwinkel.xml @@ -0,0 +1,2036 @@ + + + + + Fietsenwinkel + + + + + + + + + + Conceptueel + + detailhandel + + Relatierol leidend + + 1.1.1 + + NL + + + Contacten + + + + Dit is een submodel voor baksteen productie. + + + + + + + + + + + CharacterString + + + 100 + + + + IBAN + IMFW + + + International Bank Account Number + + + 2021-01-08 + + IBAN nummer zoals beschreven in https://en.wikipedia.org/wiki/International_Bank_Account_Number + + [a-zA-Z]{2}[0-9]{2}[a-zA-Z0-9]{4}[0-9]{7}([a-zA-Z0-9]?){0,16} + + Zie package + 1.0 + + + + + KVK lijst + IMFW + + + Lijst van KVK nummers met daaraan gekoppeld de bedrijfsnaam. + + + + 2020-12-01 + + https://services.kvk.nl/zoeken/handelsregister/ + + + nummer + + + + + + + CharacterString + + + 1 + + true + + Zie package + 100 + + + + bedrijfsnaam + + + + + + CharacterString + + 1 + false + + Zie package + 100 + + + + vestigingsadres + + + + + + CharacterString + + 1 + false + + Zie package + 100 + + + + + Zie package + 1.0 + + + + + + Bankrekening + IMFW + + + Rekening bij een bank. + + + IMFW + 14-12-2021 + + false + + + Rekeningnummer + IMFW + + + Nummer van de rekening. + + + IMFW + 14-12-2021 + + IBAN + + + false + + false + 1 + + Overig + + false + + false + + false + true + + Zie package + 100 + + + + + Zie package + 1.0 + + + + Contact + IFO + + + Een persoon of instelling waar mee wordt gecommuniceerd. + + + IMFW + 14-12-2021 + true + + + naam + IMFW + + + De naam van het contact. + + + IMFW + + + + Dit is de naam waaronder het contact uniek geindentificeerd kan worden. Het is niet een-op-een afgeleid van de naam van de Persoon (wanneer het een persoon betreft) maar kan daar wel op zijn gebaseerd. + + + 14-12-2021 + + CharacterString + + false + false + 1 + Overig + false + false + false + true + + Zie package + 100 + + + + + + postadres + IMFW + + + Het postadres van dit contact. + + + IMFW + 14-12-2021 + false + true + 1 + Overig + + Adres + + + Zie package + 100 + + + + + + betaling + IFO + + + Een contact doet een betaling met een betaalmiddel. + + + IMFW + 14-12-2021 + + Betaalmiddel + + + + + + + + + false + false + 1 + TODO + + false + false + + Geen + + + betaalmiddel + + + + + false + false + 1..* + TODO + + false + false + Geen + + + + Zie package + 200 + 1 + + + + + Zie package + 1.0 + + + + Creditcard + IMFW + + + Kaart waarmee op basis van kredieten een betaling wordt gedaan. + + + IMFW + 14-12-2021 + false + + + Kaartnummer + IMFW + + + Nummer van de kaart. + + + IMFW + 14-12-2021 + + CharacterString + + + 16 + false + false + 1 + Overig + false + false + false + true + + Zie package + 100 + + + + Verloopdatum + IMFW + + + Verloopdatum van de kaart (jaar, maand) + + + IMFW + 14-12-2021 + + CharacterString + + \d{2}/\d{2} + false + false + 1 + Overig + false + false + false + false + + Zie package + 100 + + + + + Zie package + 1.0 + + + + Klant + IMFW + + + Een persoon die een fiets heeft gekocht. + + + IMFW + 14-12-2021 + false + + + + + Contact + + + 100 + + + + + + nieuwsbrief + IFO + + + Indicatie dat de klant de nieuwsbrief wenst te ontvangen. + + + IMFW + 14-12-2021 + + Boolean + + false + false + 1 + Overig + false + false + false + false + + Zie package + 100 + + + + + + betreft + 14-12-2021 + + true + Compositie + 0..* + + + Persoon + + + 200 + 1 + + + + + Zie package + 1.0 + + + + Leverancier + IMFW + + + Een instelling die een fietsen levert. + + + IMFW + 14-12-2021 + false + + + + + Contact + + + 100 + + + + + + kvk nummer + IMFW + + + Het nummer uit de KVK lijst. + + + IMFW + 14-12-2021 + + KVK lijst + + false + false + 1 + Overig + false + false + false + false + + Zie package + 100 + + + + + Zie package + 1.0 + + + + + + Adres + IMFW + + + Het adres van een contact. + + + + 14-12-2021 + + + postcode + IMFW + + + Postcode in een adres. + + + IMFW + 14-12-2021 + + CharacterString + + Vier cijfers, en dan twee letters in kapitaal, opgenomen in de post-nl postcodelijst + [0-9]{4}[A-Z]{2} + false + false + 1 + Overig + false + false + false + false + + Zie package + 100 + + + + huisnummer + IMFW + + + Huisnummer met eventuele toevoegingen. + + + IMFW + 14-12-2021 + + CharacterString + + false + false + 1 + Overig + false + false + true + false + + Zie package + 100 + + + + locatie + IMFW + + + De geografische plek waar het adres is geregistreerd. + + + IMFW + 14-12-2021 + + Geografische locatie + + false + false + 0..1 + Overig + false + false + false + false + + Zie package + 100 + + + + + Zie package + 1.0 + + + + + + Betaalmiddel + IFO + + + Middel waarmee de financiering wordt gerealiseerd. + + + 14-12-2021 + + + Bankrekening + + + Creditcard + + + + Zie package + 1.0 + + + + Geografische locatie + IMFW + + + De locatie van een aan het aardoppervlak geboden object. + + + 14-12-2021 + + GM_Point + GM_Polygon + + + Zie package + 1.0 + + + + + Zie package + 20210901 + 1.0.0 + 20210901 + 1.0 + https://docs.geostandaarden.nl/mim/primer/Fietsenwinkel/Contacten + + + + Gemeenschappelijke typen + + + + Dit is de omschrijving van "Gemeenschappelijke typen". Het betreft typen die over meerdere submodellen kunnen worden hergebruiikt. + + + + + + + Dimensies + IMFW + + + De dimensies van een 3-dimensionaal object. + + + 2021-10-14 + + + lengte + + + + Lengte van het object in mm. + + + + + Integer + + 1 + + Zie package + 100 + + + + breedte + + + + Breedte van het object in mm. + + + + + Integer + + 1 + + Zie package + 100 + + + + hoogte + + + + Hoogte van het object in mm. + + + + + Integer + + 1 + + Zie package + 100 + + + + + Zie package + 1.0 + + + + Garantienummer + IMFW + + + Nummer van de Garantie van Fiets zoals uitgegeven door producent. + + + 2021-01-10 + Een willekeurige combinatie van tekens; nummers verschillen per Producent. Kan niet leeg zijn. + \S+ + + Zie package + 1.0 + + + + + Zie package + 20210901 + 1.0.0 + https://docs.geostandaarden.nl/mim/primer/Fietsenwinkel/Typen + + + + Inventaris + + + + Een submodel voor klanten van de fabriek. + + + + + + + Ketting lijst + IMFW + + + Lijst van ketting-typen voor fietsen met ketting aandrijving. + + + + 2021-01-01 + https://detailhandel.nl/lijsten/Kettingen + + 1.0 + + + + Snaar lijst + IMFW + + + Lijst van snaar-typen voor fietsen met snaaraandrijving. + + + + 2021-01-01 + https://detailhandel.nl/lijsten/Snaren + + 1.0 + + + + + Sportfiets typen + + + + Dit is een lijst van alle typen sportfietsen. + + + + + + + Cube + + + Een sportfiets van type Cube + + + + + cube + + Zie package + 100 + + + + Bianchi + + + Een sportfiets van type Bianchi + + + + bianchi + + Zie package + 100 + + + + Giant + + + Een sportfiets van type Giant + + + + giant + + Zie package + 100 + + + + Canondale + + + Een sportfiets van type Canondale + + + + canondale + + Zie package + 100 + + + + + Zie package + 1.0 + + + + + + Batterij + IMFW + + + De batterij van de E-Bike. + + + IMFW + 14-12-2021 + false + + + garantienummer + IFO + + + Garantienummer op de Batterij (wanneer e-bike). + + + IMFW + 14-12-2021 + + Garantienummer + + false + false + 1 + Overig + false + false + false + false + + Zie package + 100 + + + + omvang + IFO + + + De omvang van de batterij. + + + IMFW + 14-12-2021 + + Dimensies + + false + false + 1 + Overig + false + false + false + false + + Zie package + 100 + + + + + Zie package + 1.0 + + + + Fiets + IMFW + + + Een tweewieler. + + + IMFW + 14-12-2021 + true + + + id + IFO + + + De identificatie van de fiets. + + + IMFW + + + Deze identificatie is afgeleid van typenummer + leveringsdatum + volgnummer + + + 14-12-2021 + + CharacterString + + false + false + 1 + Overig + true + false + false + true + + Zie package + 100 + true + + + + leveringsdatum + IFO + + + Datum waarop de fiets is geleverd aan de winkel. + + + IMFW + 14-12-2021 + + Date + + false + false + 1 + Overig + false + false + false + false + + Zie package + 100 + + + + omvang + IFO + + + De omvang van de fiets in dimensies vanaf voor tot achterband (opgepompt), uitersten van trappers of bak of bagagedrager, en hoogste punt vanaf de weg (stuur, zadel). + + + IMFW + 14-12-2021 + + Dimensies + + false + false + 1 + Overig + false + false + false + false + + Zie package + 100 + + + + typenummer + IFO + + + Het type nummer van de fiets. + + + IMFW + + + Onttrokken aan de lijst van fietstypen. + + + 14-12-2021 + + CharacterString + + false + false + 1 + Overig + false + false + false + false + + Zie package + 100 + + + + verkoopprijs + IFO + + + De verkoopprijs van de fiets, met twee decimalen, in Euro. + + + IMFW + 14-12-2021 + + Decimal + + false + false + 1 + Overig + false + false + false + false + + Zie package + 100 + + + + versnellingen + IFO + + + Het aantal versnellingen van de fiets. + + + IMFW + + + Wordt niet opgenomen als zonder versnellingen. + + + 14-12-2021 + + Integer + + false + false + 0..1 + Overig + false + false + false + false + + Zie package + 100 + + + + volgnummer + IFO + + + Het volgummer van de fiets in één levering. + + + IMFW + 14-12-2021 + + Integer + + false + false + 1 + Overig + false + false + false + false + + Zie package + 100 + + + + + + aangestuurd door + IFO + + + Een fiets kan zijn aangestuurd door een motor. Wanneer electrische fiets, dan spreken we over "aansturing door Batterij". + + + IMFW + 14-12-2021 + + Batterij + + + + + + + + + false + false + 1 + TODO + + false + false + Geen + + + powerunit + + + + + false + false + 0..1 + TODO + + false + false + Geen + + + + Zie package + 200 + 1 + + + + geleverd door + IFO + + + De Fiets is geleverd door een Leverancier. + + + IMFW + 14-12-2021 + + Leverancier + + + + + + + + + false + false + 1 + TODO + + false + false + Geen + + + aanleveraar + + + + + false + false + 1 + TODO + + false + false + Geen + + + + Zie package + 200 + 1 + + + + verkocht aan + IFO + + + Overdracht van geld heeft plaatsgevonden waarmee een relatie is opgebouwd met de Klant, w.o. garantieverplichtingen. + + + IMFW + + + De verkoop heeft eigenschappen, zoals vastgelegd in Verkoop. + + + 14-12-2021 + + Klant + + + + + + + + + false + false + 1 + TODO + + false + false + Geen + + + ontvanger + + + + + false + false + 0..1 + TODO + + false + false + Geen + + + + + Verkoop + + + + Details omtrent de verkoop van een Fiets aan een Klant. + + + + + + false + false + 1 + + false + false + Geen + + + verkoopdatum + IMFW + + + Datum van verkoop van de Fiets. + + + IMFW + 14-12-2021 + + Date + + false + false + 1 + Overig + false + false + false + false + + Zie package + 100 + + + + garantienummer + IMFW + + + Garantienummer van de Fiets. Wanneer E-Bike, dan heeft de Batterij een apart garantienummer. + + + IMFW + 14-12-2021 + + Garantienummer + + false + false + 1 + Overig + false + false + false + false + + Zie package + 100 + + + + + Zie package + 1.0 + + + + + Zie package + 200 + 1 + + + + + Aandrijving + + + Zie package + 1.0 + + + + Sportfiets + IMFW + + + Een fiets bedoeld voor gebruik in sportieve toepassingen. + + + IMFW + + + Een sportfiets heeft over het algemeen geen licht of spatborden, en is zo licht als mogelijk uitgevoerd. +Voorbeeld: Racefiets, mountainbike. + + + 14-12-2021 + false + + + + + Fiets + + + 100 + + + + + + type + IFO + + + Het type van de sportfiets, een waarde uit een enumeratieve lijst. + + + IMFW + 14-12-2021 + + Sportfiets typen + + false + false + 1 + Overig + false + true + false + false + + Zie package + 100 + + + + + Zie package + 1.0 + + + + Stadsfiets + IMFW + + + Een fiets die is ingericht op gebruik in het stadsverkeer. + + + IMFW + + + Een stadsfiets heeft typisch een bagagedrager, spatborden en verlichting. + + + 14-12-2021 + false + + + + + Fiets + + + 100 + + + + + Zie package + 1.0 + + + + Winkel + IMFW + + + Een locatie waar fietsen worden verkocht. + + + IMFW + + + Hierbij worden groothandels uitgesloten. Ook webwinkels zijn geen onderdeel van dit infomatiemodel. + + + 20210901 + + Winkels die bij de landelijke keten Fietsenhandel zijn aangesloten. + + 99% van alle data voor dit kenmerk is actueel juist. De informatie wordt maandelijks gecontroleerd en verwerkt voor de 1e van de maand. + false + + + naam + IFO + + + Naam van de winkel. + + + IMFW + 14-12-2021 + + CharacterString + + false + false + 1 + Overig + false + false + false + true + + Zie package + 100 + + + + locatie + IFO + + + De (geografische) locatie van de winkel. + + + IMFW + 14-12-2021 + + Geografische locatie + + false + false + 1 + Overig + false + false + false + false + + Zie package + 100 + + + + + + verhandelt + IFO + + + De handelswaar van een fietsenwinkel. + + + IMFW + 14-12-2021 + + Fiets + + + + + + + + + false + false + 1 + TODO + + false + false + Geen + + + handelswaar + + + + + false + false + 0..* + TODO + + false + false + Geen + + + + Zie package + 200 + 1 + + + + + Zie package + 1.0 + + + + + + Aandrijving + IFO + + + De aandrijving van een fiets. + + + 14-12-2021 + + + kettingaandrijving + IFO + + + De code van het type kettingaandrijving. + + + IMFW + + + notes test + + + 14-12-2021 + + Ketting lijst + + false + false + 1 + Overig + false + false + false + false + + Zie package + 100 + + + + snaaraandrijving + IFO + + + De code van het type snaaraandrijving. + + + IMFW + 14-12-2021 + + Snaar lijst + + false + false + 1 + Overig + false + false + false + false + + Zie package + 100 + + + + + Zie package + 1.0 + + + + + Zie package + 20210901 + 1.0.0 + 20210901 + 1.0 + https://docs.geostandaarden.nl/mim/primer/Fietsenwinkel/Inventaris + + + + Testmateriaal + + + + + + + Parcel + + + + + false + + + extent + + + + + + GM_Polygon + + false + false + 1 + Authentiek + false + false + false + false + + Zie package + 100 + + + + + Zie package + 1.0 + + + + Parcel border + + + + + false + + + top + + + + + + GM_LineString + + false + false + 1 + Authentiek + false + false + false + false + + Zie package + 100 + + + + center + + + + + + GM_Point + + false + false + 1 + Authentiek + false + false + false + false + + Zie package + 100 + + + + + Zie package + 1.0 + + + + + Zie package + 20210901 + 1.0 + https://docs.geostandaarden.nl/mim/primer/Fietsenwinkel/Testmateriaal + + + + + Personen + BRP + + + Domein gebaseerd op een extern informatiemodel Personen (View). + + + + + https://www.amsterdam.nl/stelselpedia/brp-index/ + + + Persoon + IFO + + + Een natuurlijk persoon. + + + IMFW + 14-12-2021 + false + + + voornaam + IFO + + + De roepnaam van een Persoon, vol uitgeschreven. + + + IMFW + 14-12-2021 + + CharacterString + + false + false + 0..1 + Overig + false + false + false + false + + Zie package + 100 + + + + achternaam + IFO + + + De achternaam van de Persoon. + + + IMFW + 14-12-2021 + + CharacterString + + false + false + 1 + Overig + false + false + false + false + + Zie package + 100 + + + + + Zie package + 1.0 + + + + + 20180101 + 20180101 + 1.0 + https://docs.geostandaarden.nl/mim/primer/Fietsenwinkel/Personen + + + + + GML + + + + + + + + INTERFACE + GM_LineString + + linestringGeoJSON + + + + INTERFACE + GM_Point + + pointGeoJSON + + + + INTERFACE + GM_Polygon + + polygonGeoJSON + + + + + 3.2.2 + http://www.opengis.net/gml/3.2 + + + + GMLSF + + + + + + + 2.0 + http://www.opengis.net/gmlsf/2.0 + + + + + IMFW + model + Nee + specifiek + 20210901 + 1.0.0 + https://docs.geostandaarden.nl/mim/primer/Fietsenwinkel + FB-336.0 + + diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/Samples/relatierol1.xml b/src/main/resources/etc/xsd/MIMformat/v2/1.2/Samples/relatierol1.xml new file mode 100644 index 00000000..0204a5b6 --- /dev/null +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/Samples/relatierol1.xml @@ -0,0 +1,57 @@ + + + naam + herkomst + definitie + herkomstDefinitie + 2022-01-01 + false + + + relatiesoort + alias + definitie + herkomst definitie + 2023-04-04 + + + + + + naam, + herkomst + definitie + herkomst definitie + 2022-01-01 + false + false + 0..1 + 1 + false + false + Gedeeld + + + naam + herkomst + definitie + herkomstDefinitie + 2022-01-01 + false + false + 0..1 + 1 + false + false + Gedeeld + + + + + diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/Samples/relatiesoort1.xml b/src/main/resources/etc/xsd/MIMformat/v2/1.2/Samples/relatiesoort1.xml new file mode 100644 index 00000000..da8be0b5 --- /dev/null +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/Samples/relatiesoort1.xml @@ -0,0 +1,53 @@ + + + naam + herkomst + definitie + herkomstDefinitie + 2022-01-01 + false + + + relatiesoort + herkomst + definitie + herkomstDefinitie + 2022-01-01 + false + false + 0..1 + 1 + false + false + false + false + true + Gedeeld + + + + + + naam + + definitie + + + + + naam + + definitie + + + + + + + diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/xlink.xsd b/src/main/resources/etc/xsd/MIMformat/v2/1.2/xlink.xsd new file mode 100644 index 00000000..44cdba45 --- /dev/null +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/xlink.xsd @@ -0,0 +1,31 @@ + + + + + This is the Xlinks Kadaster profile. It constrains the xlinks schema by + 1/ reducing attributes of simple types to @href only, and + 2/ allowing only @href to appear on elements. + 3/ removing reference to xml.xsd + Kadaster also uses GML, and GML uses Xlinks; this profile covers the GML case as well. + + + + + + + see https://www.geonovum.nl/nieuws/belangrijke-informatie-over-wijziging-ogc-standaarden + + + + + + + + + + + diff --git a/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl b/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl index 47b2a346..5303df56 100644 --- a/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl +++ b/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl @@ -102,10 +102,12 @@ - + + + @@ -116,6 +118,9 @@ + + + diff --git a/src/main/resources/xsl/EpCompiler/Imvert2EP.xsl b/src/main/resources/xsl/EpCompiler/Imvert2EP.xsl index d9c62589..0ed06e42 100644 --- a/src/main/resources/xsl/EpCompiler/Imvert2EP.xsl +++ b/src/main/resources/xsl/EpCompiler/Imvert2EP.xsl @@ -453,8 +453,10 @@ ep:seq | ep:min-length | ep:max-length | - ep:min-value | - ep:max-value | + ep:min-value-inclusive | + ep:max-value-inclusive | + ep:min-value-exclusive | + ep:max-value-exclusive | ep:pattern | ep:formal-pattern | ep:alias | @@ -598,12 +600,18 @@ - + - - + + + + + - + + + + diff --git a/src/main/resources/xsl/EpCompiler/MIM2EP-core.xsl b/src/main/resources/xsl/EpCompiler/MIM1.1/MIM2EP-core.xsl similarity index 99% rename from src/main/resources/xsl/EpCompiler/MIM2EP-core.xsl rename to src/main/resources/xsl/EpCompiler/MIM1.1/MIM2EP-core.xsl index d87c7dfd..2a4d141e 100644 --- a/src/main/resources/xsl/EpCompiler/MIM2EP-core.xsl +++ b/src/main/resources/xsl/EpCompiler/MIM1.1/MIM2EP-core.xsl @@ -21,9 +21,9 @@ Deze stylesheet wwrkt op MIM serialisatie formaat. --> - - - + + + diff --git a/src/main/resources/xsl/EpCompiler/MIM2EP-post.xsl b/src/main/resources/xsl/EpCompiler/MIM1.1/MIM2EP-post.xsl similarity index 99% rename from src/main/resources/xsl/EpCompiler/MIM2EP-post.xsl rename to src/main/resources/xsl/EpCompiler/MIM1.1/MIM2EP-post.xsl index 5c324b19..5d6d394b 100644 --- a/src/main/resources/xsl/EpCompiler/MIM2EP-post.xsl +++ b/src/main/resources/xsl/EpCompiler/MIM1.1/MIM2EP-post.xsl @@ -18,7 +18,7 @@ expand-text="yes" > - + diff --git a/src/main/resources/xsl/EpCompiler/MIM2EP-pre.xsl b/src/main/resources/xsl/EpCompiler/MIM1.1/MIM2EP-pre.xsl similarity index 98% rename from src/main/resources/xsl/EpCompiler/MIM2EP-pre.xsl rename to src/main/resources/xsl/EpCompiler/MIM1.1/MIM2EP-pre.xsl index 8d75484c..272c725e 100644 --- a/src/main/resources/xsl/EpCompiler/MIM2EP-pre.xsl +++ b/src/main/resources/xsl/EpCompiler/MIM1.1/MIM2EP-pre.xsl @@ -27,8 +27,8 @@ - Copy-down van enumeratiewaarden in overerving --> - - + + diff --git a/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-core.xsl b/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-core.xsl new file mode 100644 index 00000000..4fd7b4d7 --- /dev/null +++ b/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-core.xsl @@ -0,0 +1,1115 @@ + + + + + + + + + + + somewhere + + EP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LinkObject + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {$jtype} + + + + + + + + + + + + + + + + {$jtype} + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + geometry + place + time + time + {imf:get-name(.)} + + + + + + + + + + + + + ep:number + + + Measure + + + + + + + + + + + + + + + + + geometry + + + + + + + + + + + + + place + + + + + + req?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {imf:get-ep-datatype(.)} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + x?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GM_Feature + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ep:string + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ep:string + + + ep:{$lc} + + + + + + + + + {root($this)//*[@id = $id]/mim:naam} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + https://geojson.org/schema/Point.json + https://geojson.org/schema/LineString.json + https://geojson.org/schema/Polygon.json + https://geojson.org/schema/Polygon.json + https://beta.schemas.opengis.net/json-fg/geometry-objects.json#/$defs/Polyhedron + https://geojson.org/schema/MultiPoint.json + https://geojson.org/schema/MultiLineString.json + https://geojson.org/schema/MultiPolygon.json + https://geojson.org/schema/GeometryCollection.json + https://geojson.org/schema/Geometry.json + https://geojson.org/schema/Feature.json + + https://beta.schemas.opengis.net/json-fg/geometry-objects.json#/$defs/Point + https://beta.schemas.opengis.net/json-fg/geometry-objects.json#/$defs/LineString + https://beta.schemas.opengis.net/json-fg/geometry-objects.json#/$defs/Polygon + https://beta.schemas.opengis.net/json-fg/geometry-objects.json#/$defs/Polygon + https://beta.schemas.opengis.net/json-fg/geometry-objects.json#/$defs/Polyhedron + https://beta.schemas.opengis.net/json-fg/geometry-objects.json#/$defs/MultiPoint + https://beta.schemas.opengis.net/json-fg/geometry-objects.json#/$defs/MultiLineString + https://beta.schemas.opengis.net/json-fg/geometry-objects.json#/$defs/MultiPolygon + https://beta.schemas.opengis.net/json-fg/geometry-objects.json#/$defs/MultiPolyhedron + https://beta.schemas.opengis.net/json-fg/geometry-objects.json#/$defs/GeometryCollection + https://beta.schemas.opengis.net/json-fg/geometry-objects.json#/$defs/Geometry.json + https://beta.schemas.opengis.net/json-fg/geometry-objects.json#/$defs/Feature.json + + + + + + + + + + + + + + + + + + + + + + {$type} : {name($this)} : {$ctext} + + + + + + + + + + + + + + + +

+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + entitytype + 0 + + entityType + ep:string + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-post.xsl b/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-post.xsl new file mode 100644 index 00000000..9d20c89c --- /dev/null +++ b/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-post.xsl @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + geometry + place + time + time + {.} + + + + + + + + + + + + + + + + + + ByReference + + + + LinkObject + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Unknown ref requirement for {$bp-req-by-reference-encodings} + + + + + + + + + + + + + + + + + added-properties + + properties + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-pre.xsl b/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-pre.xsl new file mode 100644 index 00000000..272c725e --- /dev/null +++ b/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-pre.xsl @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {$relatieklasse/mim:naam} + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIM1.1.0-model.xml b/src/main/resources/xsl/MIMCompiler/v2/MIM1.1/MIM1.1.0-model.xml similarity index 100% rename from src/main/resources/xsl/MIMCompiler/v2/MIM1.1.0-model.xml rename to src/main/resources/xsl/MIMCompiler/v2/MIM1.1/MIM1.1.0-model.xml diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIM1.1.0-readme.xml b/src/main/resources/xsl/MIMCompiler/v2/MIM1.1/MIM1.1.0-readme.xml similarity index 100% rename from src/main/resources/xsl/MIMCompiler/v2/MIM1.1.0-readme.xml rename to src/main/resources/xsl/MIMCompiler/v2/MIM1.1/MIM1.1.0-readme.xml diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIM1.1.1-model.xml b/src/main/resources/xsl/MIMCompiler/v2/MIM1.1/MIM1.1.1-model.xml similarity index 100% rename from src/main/resources/xsl/MIMCompiler/v2/MIM1.1.1-model.xml rename to src/main/resources/xsl/MIMCompiler/v2/MIM1.1/MIM1.1.1-model.xml diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIM1.1.1-readme.xml b/src/main/resources/xsl/MIMCompiler/v2/MIM1.1/MIM1.1.1-readme.xml similarity index 100% rename from src/main/resources/xsl/MIMCompiler/v2/MIM1.1.1-readme.xml rename to src/main/resources/xsl/MIMCompiler/v2/MIM1.1/MIM1.1.1-readme.xml diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIMCompiler-RDF.xsl b/src/main/resources/xsl/MIMCompiler/v2/MIM1.1/MIMCompiler-RDF.xsl similarity index 100% rename from src/main/resources/xsl/MIMCompiler/v2/MIMCompiler-RDF.xsl rename to src/main/resources/xsl/MIMCompiler/v2/MIM1.1/MIMCompiler-RDF.xsl diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIMCompiler.xsl b/src/main/resources/xsl/MIMCompiler/v2/MIM1.1/MIMCompiler.xsl similarity index 99% rename from src/main/resources/xsl/MIMCompiler/v2/MIMCompiler.xsl rename to src/main/resources/xsl/MIMCompiler/v2/MIM1.1/MIMCompiler.xsl index 109f00aa..79f16dd0 100644 --- a/src/main/resources/xsl/MIMCompiler/v2/MIMCompiler.xsl +++ b/src/main/resources/xsl/MIMCompiler/v2/MIM1.1/MIMCompiler.xsl @@ -57,8 +57,8 @@ - - + + diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2-model.xml b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIM1.2-model.xml similarity index 97% rename from src/main/resources/xsl/MIMCompiler/v2/MIM1.2-model.xml rename to src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIM1.2-model.xml index 05447589..670632a5 100644 --- a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2-model.xml +++ b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIM1.2-model.xml @@ -1,7 +1,7 @@ + xsi:noNamespaceSchemaLocation="../../../../etc/xsd/metamodel/metamodel.xsd"> Attribuutsoort @@ -17,6 +17,10 @@ Lengte Patroon Formeel patroon + Maximumwaarde exclusief + Minimumwaarde exclusief + Maximumwaarde inclusief + Minimumwaarde inclusief Indicatie materiële historie Indicatie formele historie Kardinaliteit @@ -40,10 +44,6 @@ Heeft tijdlijn geldigheid Heeft tijdlijn registratie Identificatie - Maximumwaarde exclusief - Minimumwaarde exclusief - Maximumwaarde inclusief - Minimumwaarde inclusief Codelijst @@ -82,14 +82,14 @@ Lengte Patroon Formeel patroon - Kardinaliteit - - - Identificatie Maximumwaarde exclusief Minimumwaarde exclusief Maximumwaarde inclusief Minimumwaarde inclusief + Kardinaliteit + + + Identificatie Datatype @@ -374,10 +374,15 @@ Lengte Patroon Formeel patroon + Maximumwaarde exclusief + Minimumwaarde exclusief + Maximumwaarde inclusief + Minimumwaarde inclusief Kardinaliteit Identificerend Eenheid Identificatie + Identificatie Referentielijst @@ -840,6 +845,18 @@ Primitief datatype --> + + Maximumwaarde inclusief + Attribuutsoort + Data element + Referentie element + + + Maximumwaarde exclusief + Attribuutsoort + Data element + Referentie element + MIM extensie Informatiemodel @@ -865,6 +882,18 @@ Primitief datatype --> + + Minimumwaarde inclusief + Attribuutsoort + Data element + Referentie element + + + Minimumwaarde exclusief + Attribuutsoort + Data element + Referentie element + Mogelijk geen waarde Attribuutsoort diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2-readme.xml b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIM1.2-readme.xml similarity index 100% rename from src/main/resources/xsl/MIMCompiler/v2/MIM1.2-readme.xml rename to src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIM1.2-readme.xml diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler-RDF.xsl b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler-RDF.xsl new file mode 100644 index 00000000..b27b071d --- /dev/null +++ b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler-RDF.xsl @@ -0,0 +1,264 @@ + + + + + + + + + + + + uuid: + + + + + + + + + + ========================================================================================= +Dit bestand bevat een RDF/XML serialisatie van een informatiemodel dat is gemodelleerd +volgens de "Metamodel Informatie Modellering (MIM)" standaard versie 1.2. + +NB. Het formaat van deze RDF/XML serialisatie is nog in ontwikkeling en zal pas definitief +worden gemaakt na het verschijnen van volgende versie van de MIM standaard. De kans is dus +groot dat er de komende tijd wijzigingen zullen worden doorgevoerd in dit formaat. + +Zie: https://docs.geostandaarden.nl/mim/mim/ voor de laatste versie van de standaard. +============================================================================================= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {serialize($html, $output-parameters)} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl new file mode 100644 index 00000000..ee8908a3 --- /dev/null +++ b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl @@ -0,0 +1,1528 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MIMCOMPILER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + xsd/{$mim-version}/MIMFORMAT_Mim_relatierol.xsd + xsd/{$mim-version}/MIMFORMAT_Mim_relatiesoort.xsd + + + http://www.geostandaarden.nl/mim/mim-core/1.2 {$schema} + + + + + Informatiemodel + Informatiemodel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Attribuutsoort + + + + + + + + + + + + + + + + + + + Relatiesoort - Relatiesoort leidend + Relatierol - Relatiesoort leidend + + + + + + + + + Relatiesoort - Relatierol leidend + Relatierol - Relatierol leidend + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {imvert:stereotype} + {$name} + + + + + + {$oas} + + + + + + + + + + + {imvert:stereotype} + + + + + + + + + + + + + + + + + + + + + + + + + + Doel + + + + + + + + + + + + + + + + + + Compositie + Gedeeld + {$value} + + + + + + {$mapped-value} + + + + + {$context/imvert:alias} + + + + + + + + + {$value} + + + + + + {$mapped-value} + + + + + + {.} + + + + + + {$context/imvert:name} + + + + + {imf:tagged-values($context, 'CFG-TV-DATERECORDED')} + + + + + + + + + + + + {imf:tagged-values($context, 'CFG-TV-FORMALPATTERN')} + + + + + + + + + + + + + + {imf:tagged-values($context, 'CFG-TV-SOURCE')} + + + + + {imf:tagged-values($context, 'CFG-TV-SOURCEOFDEFINITION')} + + + + + {imf:mim-boolean($context/imvert:is-id)} + + + + + {imf:mim-boolean($context/imvert:abstract)} + + + + + {imf:mim-boolean($context/imvert:is-value-derived)} + + + + + {imf:mim-boolean(imf:tagged-values($context, 'CFG-TV-INDICATIONCLASSIFICATION'))} + + + + + {(imf:mim-boolean(imf:tagged-values($context, 'CFG-TV-INDICATIONFORMALHISTORY')[1]))} + + + + + {(imf:mim-boolean(imf:tagged-values($context, 'CFG-TV-INDICATIONMATERIALHISTORY')[1]))} + + + + + {imf:tagged-values-not-traced($context, 'CFG-TV-IMDOMAIN')} + + + + + {imf:tagged-values-not-traced($context, 'CFG-TV-IMTYPE')} + + + + + + + + + {imf:kardinaliteit($context/imvert:min-occurs-source, $context/imvert:max-occurs-source)} + + + + {imf:kardinaliteit($context/imvert:min-occurs, $context/imvert:max-occurs)} + + + {imf:kardinaliteit($context/imvert:min-occurs, $context/imvert:max-occurs)} + + + + + + + TODO + + + + {imf:kardinaliteit($context/imvert:min-occurs-source, $context/imvert:max-occurs-source)} + + + + {imf:kardinaliteit($context/imvert:min-occurs, $context/imvert:max-occurs)} + + + {imf:kardinaliteit($context/imvert:min-occurs, $context/imvert:max-occurs)} + + + x?> + + + + + {imf:tagged-values($context, 'CFG-TV-QUALITY')} + + + + + {imf:tagged-values($context, 'CFG-TV-LENGTH')} + + + + + {imf:tagged-values($context, 'CFG-TV-DATALOCATION')} + + + + + {imf:tagged-values-not-traced($context, 'CFG-TV-MIMEXTENSION')} + + + + + {imf:tagged-values-not-traced($context, 'CFG-TV-MIMEXTENSIONVERSION')} + + + + + {imf:tagged-values-not-traced($context, 'CFG-TV-MIMLANGUAGE')} + + + + + {$mim-version} + + + + + {imf:tagged-values($context, 'CFG-TV-MINVALUEINCLUSIVE')} + + + + {imf:tagged-values($context, 'CFG-TV-MINVALUEEXCLUSIVE')} + + + + {imf:tagged-values($context, 'CFG-TV-MAXVALUEINCLUSIVE')} + + + + {imf:tagged-values($context, 'CFG-TV-MAXVALUEEXCLUSIVE')} + + + + + {imf:mim-boolean(imf:tagged-values($context, 'CFG-TV-VOIDABLE')[1])} + + + + + + + + + + + + + + + + + + + + + + {imf:tagged-values($context, 'CFG-TV-PATTERN')} + + + + + {imf:tagged-values($context, 'CFG-TV-POPULATION')} + + + + + + + + + + {$relatiemodelleringtype} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Generalisatie Objecttypes + + + + + + + + + + + + + + + + + + + + + Generalisatie Datatypes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {imf:mim-boolean(xs:string($context/imvert:source/imvert:navigable = 'false'))} + + + + + + + + + + + FOUT: De waarde voor dit verplichte metagegeven is niet gespecificeerd in het model + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {$label} + + {$mim12-scalar/name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + * + {$occurs} + + + + + + + + + + {$min} + {$min}..{$max} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + mim-ref:DatatypeRef + + + mim-ref:ObjecttypeRef + mim-ref:GegevensgroeptypeRef + mim-ref:KeuzeRef + mim-ext:ConstructieRef + + + mim-ref:UnsupportedRef + + + + + + + + + + + + + {$label} + + + + + + + + + {$label} + + + #{$ref-id} + + + + + + + + + {$label} + + + #{$ref-id} + + + + + + + + + + + + {imvert:value/@original} + + + + {imvert:position/@original} + + + {imf:kardinaliteit(imvert:min-occurs-source, imvert:max-occurs-source)} + + + {imvert:version} + + + {imvert:base-namespace} + + + {imvert:namespace} + + + true + + + {imvert:stereotype} + + + {imvert:generator} + + + + {imvert:initial-value} + + + + + {imvert:read-only} + + + + + + + + + + + + + + + + + + + + + + {count($construct/preceding::*)} + + + \ No newline at end of file diff --git a/src/main/resources/xsl/Validator/Imvert2validation.xsl b/src/main/resources/xsl/Validator/Imvert2validation.xsl index e5059ffc..2714e964 100644 --- a/src/main/resources/xsl/Validator/Imvert2validation.xsl +++ b/src/main/resources/xsl/Validator/Imvert2validation.xsl @@ -171,10 +171,10 @@ + + - - - + + @@ -1614,12 +1615,11 @@ --> - - - + + + not($mim-version and starts-with($model-version,$compliancy-version)), + 'MIM version [1] does not match the configured version [2]',($model-version,$compliancy-version))"/> From 1899b51e0cae18a88e84da76fb193453ad73cc83 Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 18 Jun 2024 15:25:17 +0200 Subject: [PATCH 46/75] Introductie van mim/max waarde in/exclusief. Zie #448 Minor. --- .../ComplyCompiler/ComplyCompiler-flat.xsl | 6 ++-- .../xsl/JsonSchemaCompiler/EP2Json.xsl | 4 +-- .../xsl/JsonSchemaCompiler/EP2Json2.xsl | 6 ++-- .../resources/xsl/XsdCompiler/common-xsd.xsl | 28 ++++++++++++++++--- .../xsl/common/Imvert-common-derivation.xsl | 9 ++++++ 5 files changed, 43 insertions(+), 10 deletions(-) diff --git a/src/main/resources/xsl/ComplyCompiler/ComplyCompiler-flat.xsl b/src/main/resources/xsl/ComplyCompiler/ComplyCompiler-flat.xsl index fa119696..7f87b2f2 100644 --- a/src/main/resources/xsl/ComplyCompiler/ComplyCompiler-flat.xsl +++ b/src/main/resources/xsl/ComplyCompiler/ComplyCompiler-flat.xsl @@ -161,8 +161,10 @@ - - + + + + diff --git a/src/main/resources/xsl/JsonSchemaCompiler/EP2Json.xsl b/src/main/resources/xsl/JsonSchemaCompiler/EP2Json.xsl index f6b0e52d..c7630b20 100644 --- a/src/main/resources/xsl/JsonSchemaCompiler/EP2Json.xsl +++ b/src/main/resources/xsl/JsonSchemaCompiler/EP2Json.xsl @@ -221,8 +221,8 @@ - - + + diff --git a/src/main/resources/xsl/JsonSchemaCompiler/EP2Json2.xsl b/src/main/resources/xsl/JsonSchemaCompiler/EP2Json2.xsl index 7c52418c..2b37656b 100644 --- a/src/main/resources/xsl/JsonSchemaCompiler/EP2Json2.xsl +++ b/src/main/resources/xsl/JsonSchemaCompiler/EP2Json2.xsl @@ -426,8 +426,10 @@ - - + + + + diff --git a/src/main/resources/xsl/XsdCompiler/common-xsd.xsl b/src/main/resources/xsl/XsdCompiler/common-xsd.xsl index 7d98ec31..47aacf1b 100644 --- a/src/main/resources/xsl/XsdCompiler/common-xsd.xsl +++ b/src/main/resources/xsl/XsdCompiler/common-xsd.xsl @@ -141,6 +141,8 @@ + + @@ -167,11 +169,20 @@ - + + + + + + - + + + + + x?> @@ -186,11 +197,20 @@ - + + + + + + - + + + + + diff --git a/src/main/resources/xsl/common/Imvert-common-derivation.xsl b/src/main/resources/xsl/common/Imvert-common-derivation.xsl index d0090531..58452223 100644 --- a/src/main/resources/xsl/common/Imvert-common-derivation.xsl +++ b/src/main/resources/xsl/common/Imvert-common-derivation.xsl @@ -384,6 +384,7 @@ + @@ -392,4 +393,12 @@ + + + + + + + + \ No newline at end of file From f0703a88f4fb8ec68f11e84ea9c837092270dbfe Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 18 Jun 2024 15:25:37 +0200 Subject: [PATCH 47/75] Uitwerken Json configs voor EIGENAAR. --- .../cfg/schemarules/JSON-EIGENAAR.xml | 41 +++++++++++++++++++ .../EIGENAAR/cfg/schemarules/JSON-geojson.xml | 31 ++++++++++++++ .../EIGENAAR/cfg/schemarules/JSON-jsonfg.xml | 31 ++++++++++++++ .../cfg/schemarules/JSON-plainjson.xml | 31 ++++++++++++++ 4 files changed, 134 insertions(+) create mode 100644 src/main/resources/input/EIGENAAR/cfg/schemarules/JSON-EIGENAAR.xml create mode 100644 src/main/resources/input/EIGENAAR/cfg/schemarules/JSON-geojson.xml create mode 100644 src/main/resources/input/EIGENAAR/cfg/schemarules/JSON-jsonfg.xml create mode 100644 src/main/resources/input/EIGENAAR/cfg/schemarules/JSON-plainjson.xml diff --git a/src/main/resources/input/EIGENAAR/cfg/schemarules/JSON-EIGENAAR.xml b/src/main/resources/input/EIGENAAR/cfg/schemarules/JSON-EIGENAAR.xml new file mode 100644 index 00000000..939389b8 --- /dev/null +++ b/src/main/resources/input/EIGENAAR/cfg/schemarules/JSON-EIGENAAR.xml @@ -0,0 +1,41 @@ + + + + EIGENAAR standard settings for Json schema's + + Standaard instellingen voor het verwerken van EIGENAAR MIM modellen tot JSON schema's + Standard settings for processing EIGENAAR MIM models to JSON schemas + + none + + + + + single + + diff --git a/src/main/resources/input/EIGENAAR/cfg/schemarules/JSON-geojson.xml b/src/main/resources/input/EIGENAAR/cfg/schemarules/JSON-geojson.xml new file mode 100644 index 00000000..1a162a4c --- /dev/null +++ b/src/main/resources/input/EIGENAAR/cfg/schemarules/JSON-geojson.xml @@ -0,0 +1,31 @@ + + + + + + + EIGENAAR OGC GeoJSON schema's + + Regels voor het verwerken van EIGENAAR MIM modellen tot OGC GeoJSON schema's + Rules for processing EIGENAAR MIM models to OGC GeoJSON schemas + + + + diff --git a/src/main/resources/input/EIGENAAR/cfg/schemarules/JSON-jsonfg.xml b/src/main/resources/input/EIGENAAR/cfg/schemarules/JSON-jsonfg.xml new file mode 100644 index 00000000..e9083e73 --- /dev/null +++ b/src/main/resources/input/EIGENAAR/cfg/schemarules/JSON-jsonfg.xml @@ -0,0 +1,31 @@ + + + + + + + EIGENAAR OGC JSON-FG schema's + + Regels voor het verwerken van EIGENAAR MIM modellen tot OGC JSON-FG schema's + Rules for processing EIGENAAR MIM models to OGC JSON-FG schemas + + + + diff --git a/src/main/resources/input/EIGENAAR/cfg/schemarules/JSON-plainjson.xml b/src/main/resources/input/EIGENAAR/cfg/schemarules/JSON-plainjson.xml new file mode 100644 index 00000000..bf31fdf9 --- /dev/null +++ b/src/main/resources/input/EIGENAAR/cfg/schemarules/JSON-plainjson.xml @@ -0,0 +1,31 @@ + + + + + + + EIGENAAR OGC Plain Json schema's + + Regels voor het verwerken van EIGENAAR MIM modellen tot OGC Plain JSON schema's + Rules for processing EIGENAAR MIM models to OGC Plain JSON schemas + + + + From 8b3475053cc69520dc2b22a5de15ae3353e6bf51 Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 18 Jun 2024 15:52:51 +0200 Subject: [PATCH 48/75] Waardenlijst wordt als Waardelijst geschreven. Zie #455 Minor. --- .../etc/xsd/MIMformat/v2/1.1.0/MIMFORMAT_Mim.xsd | 8 ++++---- .../input/Imvertor/cfg/i3n/translation-common.xml | 2 +- src/main/resources/input/Imvertor/cfg/tvsets/Grouping.xml | 2 +- src/main/resources/input/MIM/cfg/metamodels/MIM11.xml | 4 ++-- src/main/resources/input/MIM/cfg/tvsets/MIM11.xml | 4 ++-- .../xsl/GenericTransformer/SMAE-transformer-simple.xsl | 2 +- .../xsl/ImvertCompiler/Imvert2report-valuelists.xsl | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.1.0/MIMFORMAT_Mim.xsd b/src/main/resources/etc/xsd/MIMformat/v2/1.1.0/MIMFORMAT_Mim.xsd index dcbefc93..9cee27c1 100644 --- a/src/main/resources/etc/xsd/MIMformat/v2/1.1.0/MIMFORMAT_Mim.xsd +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.1.0/MIMFORMAT_Mim.xsd @@ -826,7 +826,7 @@ - Een lijst met een opsomming van de toegestane/mogelijke domeinwaarden, welke buiten het model in een externe waardenlijst worden beheerd. De domeinwaarden in de lijst kunnen in de loop van de tijd aangepast worden of uitgebreid worden of verwijderd worden, zonder dat het informatiemodel aangepast wordt (in tegenstelling tot bij een enumeratie). + Een lijst met een opsomming van de toegestane/mogelijke domeinwaarden, welke buiten het model in een externe waardelijst worden beheerd. De domeinwaarden in de lijst kunnen in de loop van de tijd aangepast worden of uitgebreid worden of verwijderd worden, zonder dat het informatiemodel aangepast wordt (in tegenstelling tot bij een enumeratie). @@ -870,7 +870,7 @@ - De verwijzing (URL) naar de locatie van de bijbehorende schema’s met waardenlijsten. + De verwijzing (URL) naar de locatie van de bijbehorende schema’s met waardelijsten. @@ -882,7 +882,7 @@ - De representatie van een lijst met een opsomming van de mogelijke domeinwaarden van een attribuutsoort, die buiten het model in een externe waardenlijst worden beheerd. De domeinwaarden in de lijst kunnen in de loop van de tijd aangepast, uitgebreid, of verwijderd worden, zonder dat het informatiemodel aangepast wordt (in tegenstelling tot bij een enumeratie). De representatie bevat een aantal kenmerken, die overgenomen zijn van de specificatie van de externe waardelijst. + De representatie van een lijst met een opsomming van de mogelijke domeinwaarden van een attribuutsoort, die buiten het model in een externe waardelijst worden beheerd. De domeinwaarden in de lijst kunnen in de loop van de tijd aangepast, uitgebreid, of verwijderd worden, zonder dat het informatiemodel aangepast wordt (in tegenstelling tot bij een enumeratie). De representatie bevat een aantal kenmerken, die overgenomen zijn van de specificatie van de externe waardelijst. @@ -926,7 +926,7 @@ - De verwijzing (URL) naar de locatie van de bijbehorende schema’s met waardenlijsten. + De verwijzing (URL) naar de locatie van de bijbehorende schema’s met waardelijsten. diff --git a/src/main/resources/input/Imvertor/cfg/i3n/translation-common.xml b/src/main/resources/input/Imvertor/cfg/i3n/translation-common.xml index 6f518663..9d5b9ba3 100644 --- a/src/main/resources/input/Imvertor/cfg/i3n/translation-common.xml +++ b/src/main/resources/input/Imvertor/cfg/i3n/translation-common.xml @@ -295,7 +295,7 @@ CHAPTER-LISTS - Inhoud van waardenlijsten + Inhoud van waardelijsten Contents of value lists diff --git a/src/main/resources/input/Imvertor/cfg/tvsets/Grouping.xml b/src/main/resources/input/Imvertor/cfg/tvsets/Grouping.xml index 0e8a9788..ffe500ec 100644 --- a/src/main/resources/input/Imvertor/cfg/tvsets/Grouping.xml +++ b/src/main/resources/input/Imvertor/cfg/tvsets/Grouping.xml @@ -91,7 +91,7 @@ De locatie waar informatie over de gegevens van een construct te vinden zijn. Wanneer het een external of view package betreft: De verwijzing naar de locatie van het bijbehorende informatiemodel - waar dit package een representatie van is. In alle andere gevallen moet het een waardenlijst betreffen. + waar dit package een representatie van is. In alle andere gevallen moet het een waardelijst betreffen. Het gaat dan om de verwijzing naar de plek waar de waarden beschikbaar worden gesteld. De verwijzing heeft de vorm van een URI conform een gekozen URI strategie. diff --git a/src/main/resources/input/MIM/cfg/metamodels/MIM11.xml b/src/main/resources/input/MIM/cfg/metamodels/MIM11.xml index 1523e636..5faa27ab 100644 --- a/src/main/resources/input/MIM/cfg/metamodels/MIM11.xml +++ b/src/main/resources/input/MIM/cfg/metamodels/MIM11.xml @@ -102,7 +102,7 @@ Codelijst Codelist TODO - MIM11: De representatie van een lijst met een opsomming van de mogelijke domeinwaarden van een attribuutsoort, die buiten het model in een externe waardenlijst worden beheerd. De domeinwaarden in de lijst kunnen in de loop van de tijd aangepast, uitgebreid, of verwijderd worden, zonder dat het informatiemodel aangepast wordt (in tegenstelling tot bij een enumeratie). De representatie bevat geen kenmerken, voor alle kenmerken wordt verwezen naar de specificatie van de externe waardelijst. + MIM11: De representatie van een lijst met een opsomming van de mogelijke domeinwaarden van een attribuutsoort, die buiten het model in een externe waardelijst worden beheerd. De domeinwaarden in de lijst kunnen in de loop van de tijd aangepast, uitgebreid, of verwijderd worden, zonder dat het informatiemodel aangepast wordt (in tegenstelling tot bij een enumeratie). De representatie bevat geen kenmerken, voor alle kenmerken wordt verwezen naar de specificatie van de externe waardelijst. MIM-1.1.0 https://docs.geostandaarden.nl/mim/mim/#codelijst datatype @@ -258,7 +258,7 @@ Referentielijst Referencelist TODO - MIM11: De representatie van een lijst met een opsomming van de mogelijke domeinwaarden van een attribuutsoort, die buiten het model in een externe waardenlijst worden beheerd. De domeinwaarden in de lijst kunnen in de loop van de tijd aangepast, uitgebreid, of verwijderd worden, zonder dat het informatiemodel aangepast wordt (in tegenstelling tot bij een enumeratie). De representatie bevat een aantal kenmerken, die overgenomen zijn van de specificatie van de externe waardelijst. + MIM11: De representatie van een lijst met een opsomming van de mogelijke domeinwaarden van een attribuutsoort, die buiten het model in een externe waardelijst worden beheerd. De domeinwaarden in de lijst kunnen in de loop van de tijd aangepast, uitgebreid, of verwijderd worden, zonder dat het informatiemodel aangepast wordt (in tegenstelling tot bij een enumeratie). De representatie bevat een aantal kenmerken, die overgenomen zijn van de specificatie van de externe waardelijst. MIM-1.1.0 https://docs.geostandaarden.nl/mim/mim/#referentielijst datatype diff --git a/src/main/resources/input/MIM/cfg/tvsets/MIM11.xml b/src/main/resources/input/MIM/cfg/tvsets/MIM11.xml index 9090bd03..72bdfb44 100644 --- a/src/main/resources/input/MIM/cfg/tvsets/MIM11.xml +++ b/src/main/resources/input/MIM/cfg/tvsets/MIM11.xml @@ -44,7 +44,7 @@ Locatie Location - MIM 1.1: Als het type van het attribuutsoort een waardenlijst is, dan wordt hier de locatie waar deze te vinden is opgegeven. + MIM 1.1: Als het type van het attribuutsoort een waardelijst is, dan wordt hier de locatie waar deze te vinden is opgegeven. MIM 1.1: If the type of the attribute type is a list of values, the location where it can be found is specified here. MIM-1.1.0 https://docs.geostandaarden.nl/mim/mim/#metagegeven-locatie @@ -52,7 +52,7 @@ stereotype-name-view-package stereotype-name-external-package - stereotype-name-codelist + stereotype-name-codelist stereotype-name-referentielijst stereotype-name-attribute diff --git a/src/main/resources/xsl/GenericTransformer/SMAE-transformer-simple.xsl b/src/main/resources/xsl/GenericTransformer/SMAE-transformer-simple.xsl index 21962040..d241ddb6 100644 --- a/src/main/resources/xsl/GenericTransformer/SMAE-transformer-simple.xsl +++ b/src/main/resources/xsl/GenericTransformer/SMAE-transformer-simple.xsl @@ -93,7 +93,7 @@ - +
  • diff --git a/src/main/resources/xsl/ImvertCompiler/Imvert2report-valuelists.xsl b/src/main/resources/xsl/ImvertCompiler/Imvert2report-valuelists.xsl index ded82434..23de0a2b 100644 --- a/src/main/resources/xsl/ImvertCompiler/Imvert2report-valuelists.xsl +++ b/src/main/resources/xsl/ImvertCompiler/Imvert2report-valuelists.xsl @@ -69,7 +69,7 @@ - + From 01575deb76c1b2608458404ffa4451593ab90965 Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 18 Jun 2024 16:25:47 +0200 Subject: [PATCH 49/75] Introductie van drie nieuwe tagged values op Codelijst Zie #454 Minor. --- .../etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd | 3 +++ .../xsl/EpCompiler/MIM1.2/MIM2EP-core.xsl | 3 +++ .../xsl/MIMCompiler/v2/MIM1.2/MIM1.2-model.xml | 4 ++-- .../xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl | 15 +++++++++++++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd index 39db96fb..8f79c4d7 100644 --- a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd @@ -512,6 +512,9 @@ + + + diff --git a/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-core.xsl b/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-core.xsl index 4fd7b4d7..5325d358 100644 --- a/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-core.xsl +++ b/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-core.xsl @@ -319,6 +319,9 @@ + + + diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIM1.2-model.xml b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIM1.2-model.xml index 670632a5..1c622a96 100644 --- a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIM1.2-model.xml +++ b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIM1.2-model.xml @@ -59,9 +59,9 @@ literalEncodingType Doelformaat - Identificatie - Profielspecificatie Waarde-item + Profielspecificatie + Identificatie Constraint diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl index ee8908a3..2532ec72 100644 --- a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl +++ b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl @@ -751,6 +751,11 @@ + + + {imf:tagged-values($context, 'CFG-TV-DOELFORMAAT')} + + {imf:tagged-values($context, 'CFG-TV-FORMALPATTERN')} @@ -936,6 +941,11 @@ {imf:tagged-values($context, 'CFG-TV-POPULATION')} + + + + {imf:tagged-values($context, 'CFG-TV-PROFIELSPECIFICATIE')} + @@ -1044,6 +1054,11 @@ + + + {imf:tagged-values($context, 'CFG-TV-WAARDEITEM')} + + From 1a5239eb32f4d46644b6146e888ecc55112ea71f Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 18 Jun 2024 17:10:44 +0200 Subject: [PATCH 50/75] Kadaster setting createjsonschemavariant gezet op "plainjson". Was "Kadaster", maar dat is onjuist. Bugfix. --- .../input/Kadaster/props/Kadaster.xlsx | Bin 24587 -> 24596 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/input/Kadaster/props/Kadaster.xlsx b/src/main/resources/input/Kadaster/props/Kadaster.xlsx index c2828f3bd828b52473517ff09d21f8fead7b0b3e..6cdf253be0292256ab60b9c1f4b1e3cc5fda84c8 100644 GIT binary patch delta 13418 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 Date: Wed, 19 Jun 2024 09:33:35 +0200 Subject: [PATCH 51/75] Bugfix. --- .../xsl/ConfigCompiler/Imvert2configuration.xsl | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl b/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl index 5303df56..10d13c35 100644 --- a/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl +++ b/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl @@ -107,13 +107,11 @@ - - - + @@ -121,14 +119,6 @@ - - - - - - x?> - From 590a30a7ee619fab8dacce815e4831aaf320d79a Mon Sep 17 00:00:00 2001 From: arjan Date: Wed, 19 Jun 2024 09:57:42 +0200 Subject: [PATCH 52/75] EIGENAAR: default properties ingesteld. Minor. --- .../input/EIGENAAR/props/EIGENAAR.xlsx | Bin 23218 -> 23359 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/input/EIGENAAR/props/EIGENAAR.xlsx b/src/main/resources/input/EIGENAAR/props/EIGENAAR.xlsx index ca350be130eecccbf34067c1e0d3974583cdefab..63d6cdb380a6257216b737705e25c364d4145ba5 100644 GIT binary patch delta 15104 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 HfA{_uuL-R1 delta 14941 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 Date: Wed, 19 Jun 2024 17:08:23 +0200 Subject: [PATCH 53/75] VNG: versie moet voldoen aan semantic version number Voorbeelden: 0.1 1.0 1.1.1 Minor. --- src/main/resources/input/KING/cfg/versionrules/KING.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/input/KING/cfg/versionrules/KING.xml b/src/main/resources/input/KING/cfg/versionrules/KING.xml index a516400c..4bd1173d 100644 --- a/src/main/resources/input/KING/cfg/versionrules/KING.xml +++ b/src/main/resources/input/KING/cfg/versionrules/KING.xml @@ -36,7 +36,8 @@ Nonempty Versions must be non-empty. - .+ + (([1-9]+[0-9]*)*[0-9])\.(([1-9]+[0-9]*)*[0-9])(\.(([1-9]+[0-9]*)*[0-9]))? + 0.1 1.0 2.2.1 From 113f9f2a5a92bb85e8bbf4cd716fcbb8d521cabb Mon Sep 17 00:00:00 2001 From: arjan Date: Thu, 20 Jun 2024 14:36:23 +0200 Subject: [PATCH 54/75] MIM: Alias toegevoegd aan docrules. Dit wordt opgenomen als "Alias" in de eigenschappen van alle elementen waar deze is gespecificeerd. Dus alleen bij de documentatie die gebaseerd is op de MIM (1.1 en hoger) regels. Tevens MIM12 docrules overgenomen. EIGENAAR volgt vanaf nu deze MIM regels. Minor, verbetering. --- .../input/EIGENAAR/cfg/docrules/EIGENAAR.xml | 441 +----------------- .../input/EIGENAAR/props/EIGENAAR.xlsx | Bin 23359 -> 23361 bytes .../input/MIM/cfg/docrules/MIM11.xml | 25 +- .../input/MIM/cfg/docrules/MIM12.xml | 16 + .../xsl/OfficeCompiler/Imvert2modeldoc.xsl | 3 + 5 files changed, 45 insertions(+), 440 deletions(-) create mode 100644 src/main/resources/input/MIM/cfg/docrules/MIM12.xml diff --git a/src/main/resources/input/EIGENAAR/cfg/docrules/EIGENAAR.xml b/src/main/resources/input/EIGENAAR/cfg/docrules/EIGENAAR.xml index eb4d2015..7f4e3c7a 100644 --- a/src/main/resources/input/EIGENAAR/cfg/docrules/EIGENAAR.xml +++ b/src/main/resources/input/EIGENAAR/cfg/docrules/EIGENAAR.xml @@ -3,7 +3,8 @@ * Copyright (C) --> - + + EIGENAAR EIGENAAR specific requirements on documentation. @@ -67,443 +68,5 @@ detail yes - - - Naam (genormaliseerd) - Name (normalized) - - - - - - - - Naam - Name - - - DISPLAY-GLOBAL-OBJECTTYPE - DISPLAY-GLOBAL-ASSOCIATIONCLASS - DISPLAY-GLOBAL-REFERENCELIST - DISPLAY-GLOBAL-CODELIST - DISPLAY-GLOBAL-UNION - DISPLAY-GLOBAL-STRUCTUREDDATATYPE - DISPLAY-GLOBAL-PRIMITIVEDATATYPE - DISPLAY-GLOBAL-COMPOSITE - - DISPLAY-DETAIL-COMPOSITE - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-REFERENCEELEMENT - DISPLAY-DETAIL-UNIONELEMENT - DISPLAY-DETAIL-DATAELEMENT - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - DISPLAY-DETAIL-ENUMERATION - - - - - Alternatieve naam - Alternative name - - DISPLAY-GLOBAL-OBJECTTYPE - DISPLAY-GLOBAL-ASSOCIATIONCLASS - DISPLAY-GLOBAL-REFERENCELIST - DISPLAY-GLOBAL-CODELIST - DISPLAY-GLOBAL-UNION - DISPLAY-GLOBAL-STRUCTUREDDATATYPE - DISPLAY-GLOBAL-PRIMITIVEDATATYPE - DISPLAY-GLOBAL-COMPOSITE - - - - Mnemonic - Mnemonic - - DISPLAY-GLOBAL-ASSOCIATIONCLASS - DISPLAY-GLOBAL-REFERENCELIST - DISPLAY-GLOBAL-CODELIST - - - - Herkomst - Origin - - DISPLAY-GLOBAL-OBJECTTYPE - DISPLAY-GLOBAL-ASSOCIATIONCLASS - DISPLAY-GLOBAL-REFERENCELIST - DISPLAY-GLOBAL-CODELIST - DISPLAY-GLOBAL-UNION - DISPLAY-GLOBAL-STRUCTUREDDATATYPE - DISPLAY-GLOBAL-PRIMITIVEDATATYPE - - DISPLAY-GLOBAL-COMPOSITE - - DISPLAY-DETAIL-COMPOSITE - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-REFERENCEELEMENT - DISPLAY-DETAIL-DATAELEMENT - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - - - - Definitie - Definition - - DISPLAY-GLOBAL-OBJECTTYPE - DISPLAY-GLOBAL-ASSOCIATIONCLASS - DISPLAY-GLOBAL-REFERENCELIST - DISPLAY-GLOBAL-CODELIST - DISPLAY-GLOBAL-UNION - DISPLAY-GLOBAL-STRUCTUREDDATATYPE - DISPLAY-GLOBAL-PRIMITIVEDATATYPE - DISPLAY-GLOBAL-COMPOSITE - DISPLAY-GLOBAL-REGISTRATIEOBJECT - - DISPLAY-DETAIL-COMPOSITE - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-REFERENCEELEMENT - DISPLAY-DETAIL-UNIONELEMENT - DISPLAY-DETAIL-DATAELEMENT - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - DISPLAY-DETAIL-ENUMERATION - - - - Herkomst definitie - Origin of definition - - DISPLAY-GLOBAL-OBJECTTYPE - DISPLAY-GLOBAL-ASSOCIATIONCLASS - DISPLAY-GLOBAL-REFERENCELIST - DISPLAY-GLOBAL-CODELIST - DISPLAY-GLOBAL-UNION - DISPLAY-GLOBAL-STRUCTUREDDATATYPE - DISPLAY-GLOBAL-PRIMITIVEDATATYPE - DISPLAY-GLOBAL-COMPOSITE - - DISPLAY-DETAIL-COMPOSITE - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-REFERENCEELEMENT - DISPLAY-DETAIL-UNIONELEMENT - DISPLAY-DETAIL-DATAELEMENT - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - DISPLAY-DETAIL-ENUMERATION - - - - Toelichting - Explanation - - DISPLAY-GLOBAL-OBJECTTYPE - DISPLAY-GLOBAL-ASSOCIATIONCLASS - DISPLAY-GLOBAL-REFERENCELIST - DISPLAY-GLOBAL-CODELIST - DISPLAY-GLOBAL-UNION - DISPLAY-GLOBAL-STRUCTUREDDATATYPE - DISPLAY-GLOBAL-PRIMITIVEDATATYPE - DISPLAY-GLOBAL-COMPOSITE - - DISPLAY-DETAIL-COMPOSITE - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-REFERENCEELEMENT - DISPLAY-DETAIL-UNIONELEMENT - DISPLAY-DETAIL-DATAELEMENT - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - DISPLAY-DETAIL-ENUMERATION - - - - - Mogelijk geen waarde - Voidable - - DISPLAY-DETAIL-COMPOSITE - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - - - - Reden geen waarde - Void reason - - DISPLAY-DETAIL-COMPOSITE - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - - - - - Materiële geschiedenis - Material history - - DISPLAY-DETAIL-COMPOSITE - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - - - - Formele geschiedenis - Formal history - - DISPLAY-DETAIL-COMPOSITE - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - - - - Indicatie in onderzoek - Indication under investigation - - DISPLAY-DETAIL-COMPOSITE - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - - - - Aanduiding strijdigheid/nietigheid - - DISPLAY-DETAIL-COMPOSITE - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - - - - Kardinaliteit - Multiplicity - - DISPLAY-DETAIL-COMPOSITE - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - DISPLAY-DETAIL-REFERENCEELEMENT - DISPLAY-DETAIL-DATAELEMENT - DISPLAY-DETAIL-UNIONELEMENT - - - - Juridische status - Legal status - - DISPLAY-DETAIL-COMPOSITE - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - - - - - Regels - Rules - - DISPLAY-GLOBAL-OBJECTTYPE - - DISPLAY-DETAIL-OBJECTTYPE - DISPLAY-DETAIL-COMPOSITE - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - - - - Regels IMBRO/A - Rules IMBRO/A - - DISPLAY-GLOBAL-OBJECTTYPE - - DISPLAY-DETAIL-OBJECTTYPE - DISPLAY-DETAIL-COMPOSITE - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - - - - Patroon - Pattern - - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-REFERENCEELEMENT - DISPLAY-DETAIL-DATAELEMENT - DISPLAY-DETAIL-UNIONELEMENT - - DISPLAY-GLOBAL-STRUCTUREDDATATYPE - DISPLAY-GLOBAL-PRIMITIVEDATATYPE - - - - Formeel patroon - Formal pattern - - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-REFERENCEELEMENT - DISPLAY-DETAIL-DATAELEMENT - DISPLAY-DETAIL-UNIONELEMENT - - DISPLAY-GLOBAL-STRUCTUREDDATATYPE - DISPLAY-GLOBAL-PRIMITIVEDATATYPE - - - - Formaat - Format - - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-REFERENCEELEMENT - DISPLAY-DETAIL-DATAELEMENT - DISPLAY-DETAIL-UNIONELEMENT - - - - Lengte - Length - - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-GLOBAL-STRUCTUREDDATATYPE - DISPLAY-GLOBAL-PRIMITIVEDATATYPE - - - - Formaat IMBRO/A - Format IMBRO/A - - DISPLAY-DETAIL-COMPOSITE - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - - - - Relatiesoort - - DISPLAY-GLOBAL-ASSOCIATIONCLASS - - - - Gerelateerd objecttype - Associated objecttype - - DISPLAY-DETAIL-ASSOCIATION - - - - Is afgeleid - Is derived - - DISPLAY-DETAIL-ATTRIBUTE - - - - Meeteenheid - Unit of measure - - DISPLAY-DETAIL-ATTRIBUTE - - - - Minimumwaarde - MinInclusive - - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-REFERENCEELEMENT - DISPLAY-DETAIL-DATAELEMENT - - - - Minimumwaarde (excl) - MinExclusive - - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-REFERENCEELEMENT - DISPLAY-DETAIL-DATAELEMENT - - - - Maximumwaarde - MaxInclusive - - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-REFERENCEELEMENT - DISPLAY-DETAIL-DATAELEMENT - - - - Maximumwaarde - MaxExclusive - - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-REFERENCEELEMENT - DISPLAY-DETAIL-DATAELEMENT - - - - Onderliggende constructies - Underlying constructs - - DISPLAY-GLOBAL-OBJECTTYPE - DISPLAY-GLOBAL-ASSOCIATIONCLASS - DISPLAY-GLOBAL-REFERENCELIST - DISPLAY-GLOBAL-CODELIST - DISPLAY-GLOBAL-UNION - DISPLAY-GLOBAL-STRUCTUREDDATATYPE - DISPLAY-GLOBAL-PRIMITIVEDATATYPE - DISPLAY-GLOBAL-COMPOSITE - - DISPLAY-DETAIL-COMPOSITE - DISPLAY-DETAIL-ATTRIBUTE - DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE - DISPLAY-DETAIL-REFERENCEELEMENT - DISPLAY-DETAIL-UNIONELEMENT - DISPLAY-DETAIL-DATAELEMENT - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - - - - Populatie - Population - - DISPLAY-GLOBAL-REGISTRATIEOBJECT - - - - \ No newline at end of file diff --git a/src/main/resources/input/EIGENAAR/props/EIGENAAR.xlsx b/src/main/resources/input/EIGENAAR/props/EIGENAAR.xlsx index 63d6cdb380a6257216b737705e25c364d4145ba5..b5fc6655e147d09f7781e2927322e31a6702bc18 100644 GIT binary patch delta 9279 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 + + Alias + Alias + + DISPLAY-GLOBAL-OBJECTTYPE + DISPLAY-GLOBAL-ASSOCIATIONCLASS + DISPLAY-GLOBAL-REFERENCELIST + DISPLAY-GLOBAL-CODELIST + DISPLAY-GLOBAL-PRIMITIVEDATATYPE + DISPLAY-GLOBAL-STRUCTUREDDATATYPE + DISPLAY-GLOBAL-COMPOSITE + DISPLAY-GLOBAL-UNION + + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-DATAELEMENT + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + DISPLAY-DETAIL-UNION + DISPLAY-DETAIL-EXTERNEKOPPELING + + Begrip Concept @@ -150,7 +174,6 @@ DISPLAY-DETAIL-EXTERNEKOPPELING - Alternatieve naam Alternative name diff --git a/src/main/resources/input/MIM/cfg/docrules/MIM12.xml b/src/main/resources/input/MIM/cfg/docrules/MIM12.xml new file mode 100644 index 00000000..2bcc8621 --- /dev/null +++ b/src/main/resources/input/MIM/cfg/docrules/MIM12.xml @@ -0,0 +1,16 @@ + + + + + + + MIM12 + + MIM 1.2 requirements on documentation. + See also the MIM 1.2 standard. + + + + \ No newline at end of file diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl index d6adbb85..ecb72bfd 100644 --- a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl +++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl @@ -1178,6 +1178,9 @@ + + + From 90a5feb3e07b2525cdd8d44ef282b91e463ef0ac Mon Sep 17 00:00:00 2001 From: arjan Date: Thu, 20 Jun 2024 15:20:14 +0200 Subject: [PATCH 55/75] Geonovum: SKOS URI wordt alias. Zie #500 Major. De aanpak voor eerder geproduceerde SKOS modellen wijkt af en resultaten zijn in die zin niet meer backward compatible. --- .../input/Geonovum/cfg/skosrules/Geonovum.xml | 2 +- .../xsl/SkosCompiler/Imvert2Skos-BRO.xsl | 5 +++- .../resources/xsl/common/Imvert-common.xsl | 26 +++++++++---------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/main/resources/input/Geonovum/cfg/skosrules/Geonovum.xml b/src/main/resources/input/Geonovum/cfg/skosrules/Geonovum.xml index 9caa652b..93ab085a 100644 --- a/src/main/resources/input/Geonovum/cfg/skosrules/Geonovum.xml +++ b/src/main/resources/input/Geonovum/cfg/skosrules/Geonovum.xml @@ -26,7 +26,7 @@ --> - http://definities.geostandaarden.nl/[afkorting]/id/[type]/[naam] + http://definities.geostandaarden.nl/[afkorting]/id/[type]/[alias-or-name] + - + + + diff --git a/src/main/resources/xsl/common/Imvert-common.xsl b/src/main/resources/xsl/common/Imvert-common.xsl index b0ff1843..3b6fcef4 100644 --- a/src/main/resources/xsl/common/Imvert-common.xsl +++ b/src/main/resources/xsl/common/Imvert-common.xsl @@ -282,7 +282,7 @@ @@ -294,40 +294,40 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -1130,7 +1130,7 @@ - + + + EIGENAAR - - - http://definities.geostandaarden.nl/[afkorting]/id/[type]/[naam] - - - - rdf - http://www.w3.org/1999/02/22-rdf-syntax-ns# - - - rdfs - http://www.w3.org/2000/01/rdf-schema# - - - skos - http://www.w3.org/2004/02/skos/core# - - - skosthes - http://purl.org/iso25964/skos-thes# - - - dct - http://purl.org/dc/terms/ - - - xsd - http://www.w3.org/2001/XMLSchema# - - - - - - https://github.com/pldn/nederlands-profiel-voor-stelselcatalogi/blob/main/profiles/skos-ap-nl.ttl - - - - skos:definition - skos:scopeNote - dct:source - - - - + diff --git a/src/main/resources/input/EIGENAAR/props/EIGENAAR.xlsx b/src/main/resources/input/EIGENAAR/props/EIGENAAR.xlsx index b5fc6655e147d09f7781e2927322e31a6702bc18..8b84caa6dcfbffaa5f891fbaf736af527d068180 100644 GIT binary patch delta 2134 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 Date: Thu, 20 Jun 2024 17:11:57 +0200 Subject: [PATCH 57/75] Introductie van cli/skosusealias Zie #500 Minor. Dit draait ook de impact van de vorige commit terug, waarin de alias als uitgangspunt werd geforceerd voor opbouw van de concept URI. --- src/main/resources/cfg/SkosCompiler/parms.xml | 6 ++++++ .../resources/xsl/SkosCompiler/Imvert2Skos-BRO.xsl | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/resources/cfg/SkosCompiler/parms.xml b/src/main/resources/cfg/SkosCompiler/parms.xml index a35c9a70..de60f89a 100644 --- a/src/main/resources/cfg/SkosCompiler/parms.xml +++ b/src/main/resources/cfg/SkosCompiler/parms.xml @@ -42,6 +42,12 @@ Yes if SKOS RDF must be validated after it has been generated false + + skosusealias + yes|no + Yes if the alias should be used, when available, to create the SKOS concept URI + false + diff --git a/src/main/resources/xsl/SkosCompiler/Imvert2Skos-BRO.xsl b/src/main/resources/xsl/SkosCompiler/Imvert2Skos-BRO.xsl index 1c8c1d1c..6de1e6b3 100644 --- a/src/main/resources/xsl/SkosCompiler/Imvert2Skos-BRO.xsl +++ b/src/main/resources/xsl/SkosCompiler/Imvert2Skos-BRO.xsl @@ -47,6 +47,7 @@ ' ' + @@ -63,6 +64,8 @@ + + @@ -341,9 +344,11 @@ - + - + + + @@ -355,7 +360,7 @@ - + From 58ea539ab11af8e9278db04995d022b5359b9520 Mon Sep 17 00:00:00 2001 From: arjan Date: Fri, 21 Jun 2024 10:26:28 +0200 Subject: [PATCH 58/75] MIM-versie wordt getest in MIM 1.2 validatie De opgegeven versie in MIM1-versie wordt niet meer vergeleken in de algemene validatie (die ook niet-MIM modellen omvat) maar alleen in MIM12. Bugfix. --- src/main/resources/cfg/Validator/parms.xml | 17 +++++----- .../xsl/Validator/Imvert2validation-MIM12.xsl | 31 +++++++++++++++++++ .../xsl/Validator/Imvert2validation.xsl | 18 ----------- 3 files changed, 38 insertions(+), 28 deletions(-) diff --git a/src/main/resources/cfg/Validator/parms.xml b/src/main/resources/cfg/Validator/parms.xml index eecc8f8a..01328d20 100644 --- a/src/main/resources/cfg/Validator/parms.xml +++ b/src/main/resources/cfg/Validator/parms.xml @@ -439,21 +439,18 @@ EIGENAAR ====================================================== --> - + Imvert2canonical.xsl - Imvert2canonical-MIM11.xsl + Imvert2canonical-MIM10.xsl + Imvert2canonical-MIM11.xsl + Imvert2canonical-MIM10ISO.xsl + Imvert2canonical-MIM12.xsl Imvert2validation.xsl Imvert2validation-MIM11.xsl - - - Imvert2canonical.xsl - Imvert2canonical-MIM11.xsl - Imvert2canonical-MIM10ISO.xsl - - Imvert2validation.xsl - Imvert2validation-MIM11.xsl + Imvert2validation-MIM111.xsl + Imvert2validation-MIM12.xsl @@ -38,4 +56,17 @@ + + + + + + + + diff --git a/src/main/resources/xsl/Validator/Imvert2validation.xsl b/src/main/resources/xsl/Validator/Imvert2validation.xsl index 2714e964..d04c1fda 100644 --- a/src/main/resources/xsl/Validator/Imvert2validation.xsl +++ b/src/main/resources/xsl/Validator/Imvert2validation.xsl @@ -171,8 +171,6 @@ - - - @@ -231,8 +228,6 @@ not(normalize-space(imvert:namespace)), 'No root namespace defined for application')"/> - - @@ -1609,19 +1604,6 @@ 'Release must be specified and takes the form YYYYMMDD')"/> - - - - - - - - From 94b4e54ef22c1d535a406c325112a9d4a74e9ee9 Mon Sep 17 00:00:00 2001 From: arjan Date: Fri, 21 Jun 2024 10:26:44 +0200 Subject: [PATCH 59/75] Eigenaar props bijgewerkt. --- .../input/EIGENAAR/props/EIGENAAR.xlsx | Bin 23362 -> 23452 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/input/EIGENAAR/props/EIGENAAR.xlsx b/src/main/resources/input/EIGENAAR/props/EIGENAAR.xlsx index 8b84caa6dcfbffaa5f891fbaf736af527d068180..24c86c29599e61942d972ed06fbb2fb1f309120e 100644 GIT binary patch delta 13197 zcmY*=V{oOx)^%*>#5O0kt%)_UJ(<`#u`|JmZDXQ|?TKyMoETr`-m16m*T0^s?&|8^ zd+oK?v%9wQ6MOsbOddaMD>ZcO zGgttAISn8FuZle=Xn}IYg|baDs{q#~oWc=K#VZ7^dIgZp3UHH^&bqDL1t;;bwj8x$#{r6QyIHU>>@$od97N}9F<4~Q{lOIMp95rRo&&3#3cvJZIgw3HR8P$K&Y;^pau^WH63)0@;Cs+Mewf52v zTJ-4jKDjgV4^DOs@nAX{TN_n+b`v zkN23hsiZ6Sz>&f}qC-V>IyBkfHVpFzr0t*-Cb{zua!_afTCH}L#Eh!Pw5Q{@F^24$ z{~Tn|;D5h@XrIyNzm!1MWK)!h3_Mnu_>PP@{8sr}@2kyI2rvP=&`s&h(0tz1P#rFOH{2S0TJ4I4kDnV(+PLEg z-{hck%M{t|5Xe?1ut(=l_g|LJ%Kek7=!j*LvloU)!jsu>>cMtguJ&2p1ueD`CSZ)K ztL}~3b=pJre1Kppybz*^4@vETdRx=qMqEO>-n&Pa&0D)EfSLWy!g8~O=-aw%7j)t+K>9{pv)Isv+y-gV4jqTmjZZ9$6zo>0(nE&6xm{S#F*o0qHUffp|Y zd(D(y4Z(M1B=;r_7T?cXswa)*P1b^LI()yM-4S|C)q&+W044^vDR27rX+tX&!*ir4 zb_^vD>)4`)MhBdT+bUaMC|^iQYz$SG9aMOevF7g!iqBxGn;1IN)F9c;j$yhn)dhZ` zglfzhg0|JMKw(-a^~?y25GdhiPx2%rU|>@7U|_glAXaUx1Z`+wruzScjX`&?9+s+W zRjWdJajA8aW(Saa9pR~TA=(-hS1u{Habcbk4xnEjNNcEG z8O#k#i-VrN`c@60AuFYdNPk0$&?l;lW{{t5Os=$zraeg4hVG*FOLdVlVP8W0)n=Sw ze+j`0L0@!lx41PoztrDk#JTz*8Q=+>oV!4`ia3>(^u&FWeE?;qo z3ilm2gJWk%FA1)-8Cr2Q@}-R~H;^;@HhRuW|H{1kY%pdF*$^4H%weTeLGyG;#K)w4!Uk9w0KTY9yjZ_D%y# zRyG)~Sjj^SiU#^u@aj0v6)vKcKO3tB7mZvnYn}H?Y-cWZGr$#t_uh1M1DjvN`~0FB zfh)ZkbCqfS z4_CL}5$Yfh3hcCTienJesowqT5g@1gyKkVY4DD3F*;W;_zpG@x*Jm)JC9rN_Yvrp4 z+Rq<&NgEk2$bF-bfUWLls8yKbUB5a0m8j1NR>}H|3AathyIFv)596d8q90mnwU`OonFJlP7#ID399_3FGjnW9Y+`=nw1Ji${+Mk=v&Sz* z?lbH+d^LB9j*qA#S=59jyla>d7iTllioO=x2euwZ*zjlje+fWwr~sh8XzW zayDgMbB23D{*#Bz%gsw^5w-T07w0vP;P6RlXwzI2b{}J{d@5j=M&R0Dd4`?u_xqzw z>m~L%Lhm<=Bp+|HhFzTu8*g`iCzZN@jUNxry!F7>=W4Hq*~5?L=kr+L#mD1mPEMz5 z>gJj7{LP!w^+kz&*Bfy67RUvBU0!Yj+P)u&eyEKJ`@TPIez-sEpB^%IW&F7Jt4(eB z7~k}L-FMc#++2wS`hH9AGTij#Jna&i@O!$diS6=v6d>h_rWG(54WFTKgHT}-JkT+U z3>iA}j%IbX`Jt`nIhHpB*l$Da!(0njjrx<)I^MlzZgj!Uf(pb-r4Sr2l`1Pi8gqs@ zpn|+j4=6jPOV2+~M&&wD65kx$_!ynqY{F_17mfyr+tZfc4#UUYdQ>3bzBM60?tUm5 z8$oR_jIG7azy{EPI~SICsAq4Fd#U1j)MsPCZ0z8KXg`&BXefc7|C_eDU~RaT$Dd*d zCKDqn5 zj)Q1T#dep)a>-z?@$a^0NI;V@)Xg6_!cdmSRQqosKi@^E$lLE-q0sT&dOi8p6)fFjOoLW#cmXxOv9#nD!=DRkA-_n*j2>AC z8!y2QRN5nRg-|7RMF^VXjrQC1mf6IO;6Vxx=dYVHvrg_`w}H6OAt7=%X00O|O=je; zBlP+T6d?XLjrKHqRY?|%jyntTm?OCn5)9)$bl?cn;898>I&NJvF$NwaB|iVZC00fp z=FfYPzHSgU@X??(RvW>$qLc1@dk(N$;f=G<5{Wa>#zJT@fE^0*q{U9N;o`Iqi&tro zgYrn_t-Jx2i-dOO9Z7WaAx4Mqi>4M zmpQIebJRUv{PoXBt=R(SDt>ajr|wN60Xxskf!eJl5$r%RSi2%pA5Ys(S5e4mb@(bZ zTR4kiNcNRJkz2pWFB&uJ4{D`^`-D>9gi1g?PE{WG7&&cXB%USS+*iLzk7BgeW?*_l z=a6Sj=4`13DY;I7GEB<}hD0nP*|OEqtT@;}ZQwjwLHfJvmAWND{+U)!0wiWc1{WR} z14h1Hb6%ccb)23;#1f-TekFB9;TA9PY9$CsvPYY?h$I~eHUxdrgp`UK+Eh;Oi2kaJL*IItn{TlQ%eh;%;Lk4Cv45m;=dIcYB!W#LSzUp2cmEuM$`GRA<s+f_LLjMU0%xt4G1?(S#xnP?+G#1BP)3o8zLHT}cunWziL;SJGVmb|n~S6f;fX@1SRQ1S)##gh>o-?$QNNdZdKc736@Gkc0zzzJG$0;ihk5+wJL?RE)qa1kbI8I-lKdoSM zC&h^-w##ZX(Q%uqQh8t!lUCXmeE$}|r?AY>$K$D{T4{;on&}`O4-^_a;*9*Ru!Fpv zP75i}95KspTfRJ(8UZ({-kq|ET10M*fVEqLeiAB5G2%&Ui8cUCpcyps0NE0mt{wf71i2Y8!2^oC^>oj$5H4zOAcbUcNF)GZ6aYk5<3YMn%QZjb^03 zdh@$GZbvI#*qNk4zf-qF1(0jr)@DqC(b8spl(8a9l`n3HlyE%hCa6LNcBVjE#35E! zJ*1XKWP)R}6lUiHm=h&v0jOxvGNnGLmXGmiY16t*_K>krV-0Wp`qY!Q{v_+N*vyDs zm3Ki7?n5Crt&Yy3;$x!rIXsfi#d)B$rM-8q2yD8C@fhxbl!$g3XSY{dU1OY899_gQ z8Y9eLpzK?6`#fN^BMXz~Kz&-ho4v|bjJcHN z=Z+91(~)N;`TDTMi{i|oMDu+0#pRAv+bzd zOgzu%(PH$W^J_;j(kM3aFkK6^x)3I#jv-6Gvp>=30&CCq-BUvdV4oTA&AX zAO42&@SRDdICK^!kPIy2x9v*pF-z)>aer~TLQLAxHrvCEGq*Ih3BO-NO*PbZTZITi zVmV5o^c>F~8tHU!-+zXMPtm!p;+RknvHwMYv@Z(W5+wv5#gW`#QihNS{;jexwWSuqL_AEUU_epnz_WiS+MLs!xkx+Sjawatbrevzh-oS;)D-D;K4;Y2T6bc2mct3+$ z9YRQp4!v`4#Yt73|7-N+S-i~S$7Jy*>D8lE36mFNca+~o&kB@?G*f&LG`1NEz{ng* zqT)HcPxJ`eGcNt}Wm>D3?Gy90LIVdMf!rTB4UCw$dMa>m7jrG;7#y+ouTd}{JLFUk zSy9#B7V4(dCfY}uzznsG-zrU8Z}xnYbSwbTU;_Caes1{WA?{~M)71SQg)z3Ylda?E zfBbV^YLI2LQY*}aNwMC96Hw>F8Dest z*&UXyn_&ocoAAoK5=K?zuf*qRCszy7raoa)GLe@PJ|d!vyV~&n+kO zo&s-)40?@nXw^DYaNnv>5^)h7qcASZY&Zs_HXev3_RZRX8?G3bjNqW~R(>D*+ z8?2xO7vCDE;3f)wY4~DOVfbQi8KCs=)y#CjOGaKboa<;YKi7Kwae%^555RSmq9A+e zZmbxGtD~;$0H1(;8dy3EIBC%?WGGrzS)@fXys8w)YjDiQpfFQ!B!OYBKbpa&+%U}h*nfEqn~MHEKC)PmwqvD$wCM%T0U=4=y4e;_U01& zbv(=|#C8&)Flp;$Jj;+_^R2+p#oXroY`V9#qZ=ORTqN=+83HwJ;-kK4$S=$XO8>V7`?gafoWpXBx>WYI1oK~DupI|wFR_1X2 zRc7%SfIFT$fbN+A5&VUVN!piH;ot1}h`!(D31QT^wW-28De3i}{B)79fd2hZs6V3a ziT+sv4*TWUegS>dfUzx_Y+@1tGAgaAcS{|3&f>JtjEyFsL}{~gD*;K1g8SdR?~yHr z&pbZj2`?e5{a~pBA!8yz0_$UDC<2$b&=2n3=N^o_@`{iu}hRYMm@fD=PM)X-5glphZtbqp8%*!k= z!n11#!ULHbA4@8MhbqGc>KZ%kUU0cQ6DZZYJYS0k5ikzLWI8=RzVpKUqD5eI#A9X= z2oE9AOW_rU&o<@u(x=u@a||{r!}~KJfccrdt}|OQG6a8nO8?H)%}YiIUY3E+H^;wR z+j$t6P$Exu@Rn;W9x3p!9^Ic9QBfgS4kC5ts{7J~MC9fZ?9J;Ow zPZ5)&x3|b&x5{J=X=*{uB=UNER&a3g3t?apJK+B{fe?Gq%>d=8ob8WUR3dmZN$_L1 zZ=)!Qq>etZdg>Z8_!Ryo#oFxriKBH@8&`r(6Jd&3!tE~z?wXWvi&z-JrwFieEP{SW z`Whj#AR|&yV6%XlorCKEi&q&bY3e09=QMgPIA)3Wf2Ae#ZUncP3B>K=G9J1g#)~MKc~XxeY8#BGI-AF& zS>>7?KszPPMi%*MD{q;ib)@&A8X*04PNLcv2VN5fSh1mEDxwFQs6_gI=AH1H2sJ1M z&DBTOhfme!xD5j`oKV>5ARH$>lQeaRA`{us4h2E}BSs&kOhT>NQo|WIOC)9$JaH0{ z)>aIPOlQc)ziL+)@EX@>jOxxJ?!37#gj3=uN5hjhw4-^-i^AG9?L)f&Vn219Xz0FQe8G*<(Thf2yd=k^XriRy7c`Lp#2C7HCDT!3R zmnV*ReK)S75@F)!Clxm@s{{XGH9os#Kik{SZ@lf2${G@!-eF-)PN~$Dh*s2Vjr@u0 zOhW@YTa-}5uGE=6;9oBNOE-h?eFArin;)W&O!Bd3FZC7#N0+JAT_k;l@kLMqlHv9D z8yBog3S{dfxZs}u&sWCSa>BZ|L`bg*@Qyuy17{IV;jgCD_zmPh?b`$W-MFZ|M{!-f$`0YDa!4zm@zIE@lm;zN82=;!^+_J+gZSA@XM-cKs+ZA#abgp%9_%Eh53+ zb2N{@a{$zR(*SPch(iu4_$R`b{bLVWck5WcynFFP)F&`d*P&rS(Po(*A|RegaN6fc z8GZ#CraqxuGSMC(*JDNCNob#HvO4hir^17+m-3J93TMazALmO7Z!eQs_6&oiyY%Vc zbZx6K3CPiXcSQt|&e5oOZ{2#mwN`CsozUNo(4iCjQuM;9O3tbME}ZEb%N6NHcf=6X z+0~DGu>ZEZ%|sSY{mM3;8AAJXel9urK3*}(60OJ zwDq;3iRgf_3EM+w@I@x(M{0n7*A}P)S-B%+s(D?8{p$Mz9b^v+=pSOLNjj$P# zUFYkr@QO-q7BS_)gFJk~gpuj`6Okf+H`jYN1 z`IR=jfokLmi-L3cSO=Vsf!NlWq>-fl*am6Y?E?3S0F*)b>^DSkxXUdK(x}W%iZ4g8 ze-6Hf7(aUp+eOlOC@86}By%&?gp5C02I!9!D=&56@a%qF>|#iS6JT^<0P5}I9T(_6 zN%5Jc-VtMh48E`s`P}Tm2wpxSX2vrWet$9kyC^LDw&5rD=@epj(Vy9cE_CbW7oyPM^x@SOs0)u1c6?|uKN@ivezlFpK7 zG?BeHlXah!UXs`Jia(mX0k~RA2SvXdtw5$6B_F`oOMR-4!Q?P;cG7G7bMXxaA;i(* zP$j}V`j(P+b9CkC{SNa_?F7Lqgk>e7hK_ud9DkU|7XztwIzXg)f{SDYc9`6?aOWw| zMm3Q^V|tD2i0uTSMyl2%&?OtyR6WvVkmXn}gFMTnqoYLZqkep+Y3f6=_?-mr zc!yD>r=GgN136z{8%S(2-N@IDLO1aw0LJ_x@uU507nMv5az_of*CO#Y&p&?{@J^A4 z7%y*_b>|wh*VKC79UUcnXI>i;!cXj_f?J%qs<6T~w~tLHw#q(%i?h=CmUaw}y&^U> zd)Wri*Efx3P-FW|}6q&?|jXzF0%V9)-7z1|o7A%I6>OGxM-{LYU`G z7)ze%q$G+u{w*q02u;N~w-}WDy$Lw+BqP*rC<**cPq3NT)L9U?;7(3w#Qmt40XQNQ zwnoa-zZDduW-ky0W#vPlML z7HyiQm1FyA*s#8%9FdgLJ!SK4UW%axd=CJ#TFKsz4QySOSx8D7i5z99nLwP7^Jr~D zqeZc7|89`@I1uxYm@iN9BmWjffB7E>QQn(xuI(3cCN&r@k9PC zEP(~0oF+UV%YCt$R(D^o=xCA$hm7DSiFMY>-Vx3SXls0$Ie}(>4wiy1?3Z7;%=}k? zUzLUo0I@e(KJqpZ|0A<$`}?Hg4<{m0MX6wXeOQT>L{vlI%gz4k#cY!j$;aop`A5AP zeJ~n)!`Kfu762I73uue)lai>$k5sNLh*n!74bt>aRfu^b7Wd^GWyX*wgs7o-Zwl{r zFOOkFRKcw1+MeR9!eIlX3SRDxEet-cs3!ZRH0i%YaTf$#zsn4hGl3ekI`Mp)1vg*p zDAkFuWD}D@eArjyIG?xAH{TB%RU5mP#5(Y*PQ2c1*i^3N4&w1sfZw%q%~do#)pso$ zGfQ2m3M8ruD{pO`n!7%n5~QtJF&vixe>0{>`wHT%BJX0QvX5w_H{X5l?i=McJF7Ph zBwKt0%Qic+r|jR(nsw+OmX}jpL$%k3RFab(Wa}qpc*@N?99L_Lx(mYcU2^;qO@)eq)ce zqA%g4OJYVLOSHscC1UjYkmbuo zO3BJJ(;l;U#gJ=wXgSxvoY>90Ab2B$dt5c|vKfm1jnavDX)rJzT{lA$ss{gQFqs}F z(plOM^zIz&72Gz}c}NrN50kTCQ^l}3a_8$wkU=Yq@Jt(yP7Lr{nrBz{>Fq`-h+hr96SDpe;5nSxMapo`dzTCuJ2$ zZy5OXy!k#|L`!pV68FX`tF~Wl>7O-1MJrJq`hAo5!3~pd4tN(%N6X@>gBQ1$8{CN` zKa`cd*?{fBdgD2E%$w7$&FWpFUBVUeK=chPFRJD*l3VFlXEs;^;;lR{ z$B%ni9zd@R{7_BsK8z|Vb)0A3O6x+(-zhcHqK(9w)o$cte3jZiYK-S?Zje?CH5=Qm zvea4udsZNvURsztB!j?eM3~@UO4;5Vz~UvijHv+Lk+d4$i1p zdmx3a1J#GsjGWg`45Bcz_v_uE(a~8ocQTfO!Q-CbI$s*h%QYZ7&5M2B0-GWZ-Om9b zMF<>azksjwV9VusZFb%sUgo6m1}vMAsF%JT!H9;Vy`{U|@LJ}a)r^1CWwE{ThMp7p zk|LJ1VaDEg8%1gNXhvo*OXX4|;h}1ol7Mo@e@4pbeb?YY#B7V)f>mFmT!Umt)p}Px zrouNzJx{Xk=lI8W#pIRvGhlwHmN~e*OyLP%@gG3KRG0HFkIlJ`73LA)<3_ps2pEHNZf>+0@0dz#vGDRTFXYoVu_pt5;e>Q zYVbQFdT+HjQxnPk(KHJhLT)Z6bs&(#n^7nkS=wg`=Gt0-7#NCGP0Egov?-YM0G4aG zn%Uz?zBJ7tWZJ$8P0?iwIXK#X^6>DmYp%^yOQHqs?$B-3ks`8WMmtr^T&m6)(nP0T zL2sr|q8<#%k1HYLWX=@hJ_ijwe1U$ArUwVDJQDTs4OoEpV z9rHa{c5YJae>s#GdR`=HKT}7xg(;C(p0>+1kA%|kVl01IAe4uO0|i7TA5TxrX6h@K zV4+IZSg!1#JC#{)N#M#L^00k^Yw`@uP^zEyt>5YGK{~77pgj&j^6lfdI(Z2upyk9h zxB41iSK+uAytU_98j_E3(y}@T1^5wfps&~=i)9r67F_!ccEev@PS)01awEBi)+mY} z-J?6v<=omr{G~H_)d+|okp{h}@ui zGR-_Oz7_x1aGXdR>MQ!?SJA5+;1(F#9;<=$h-jTr~aSs`CAm!dg1;H7^1dnznoj2I0clYXI+7ig3jL`l(Ox-(pQ=KoCcwsR(im{qBH(P1#F}XNrP5G9fnWpUl;GMqq!_DM!b2iw8rf2ToBw zO8|-TCt`8SYL;AT`d5aLV>GYKwsGog-~=YR6=4s%k*6~Kjcw;Pv@aH9l~fr{;7wl# zt*is2z^-CDm^)fAWSd-MLWCc9Ahq^6+LO8MA|j|;+ytBfL?NLM9s>%Hz`-_+4*kVt{O#=Q^&TklK&XN%U}lV#IHfm>LiNJ{=}eJ1tbdm&lmVRBWUr$`BAop*Ju%@=&}3T5{K2<&wyrML1TrdQoAbL-~HIc>;9}id~1BCpfS#SmaU4 z)%E14$N{;*u2+I}vHfx)p6Q4!ham9T zdJPVn2=^iVvH-*+?d?UPWV`s{rc7=!$ncxxAZ%%R8O6YTwI@qJsa8~&{i^{lQX2N( zXYi8a31_KN$>=FQwnPejU18yMtS?gx4OH@IRBBgJ-h5ph%UBfc-SV@Q#`ni(%ntYC zYif+3Mbu@SD86F{7oWnDFETFWlYye4L4D?j06aD=GjX7@yEq=MnEj6qf6EOpcG{sE z9wR8dleA2NYEGjS+|I=MPJ&==TkEva9}1b1!ZYazhN9tuH>XAYKSykTpd(bBo+ER)4(suYoyrGJoA9KOx;9m4`1D@(w~kOr&L`0usy)lHsfuJXj@V>ZRyM z42O<{W`;NqlY?Zv#tmq)-1xF^aK)oQ*mZ699q)I!Xl2j%!l;4pOQbh3Jj-)YIC?DK z0gj;z^y8LFE~h)q8q=)=W%U}e?Yp}S2fpcK%Fm(((d8+=>Z2r2Sy6uasJf-?>JD7$ z0PX{jQA7`e_=HA$C6$mGeGtziFsep5%=1Ve79U~b+cycfXtfNSxq+Nk!oDU=j`Rxg zMxg)VOqc&KU$lJ$1GF%_Chhd4v$=c7vveIQ!A`Qy=4gxLq!yl}7|T1T>k9(=-t5@5v>Cwm}b7^^>WWM z9P~IIX8*1)hevxCCH1F4KtjTfhO`&flNs_q3F2w7gVI9JRIoA|1$tpN?$uAnJsy=G zj|=+LRf7|xcYwWdIuEF-Le_$M%FDtr{3CG-x~V@ruy0>qU$J^Tzub1|$XI`S zU$S}|eEWK#26<6>#HGU!L9Q{G3slv;5_;-)S+DnfD6LQ7Y)y@C-eJif1*9jcBoJ*H z1dqWVZ`NR{CR}i8&NRM=T)d$P3-_u5lO(8nRt3(-(J>nCu`_*&w(WZ4TiWJC8zA(u z`1j1Sv4ukxEwkmYPt9r4ND(-CI)wS31TzDvs(rUOS8k9j!v7XmtE_h{a$Wemm`SVM93 znF(egLTXD1XBELdYt8R>DV(EbHBp&>IqafFq_$#6d)5xA2KY1BpJYIWzMSPHev`PS zr*N4hWGoA>V}?Ef2M7j;D6&gKG`7XR!P!15Rvj~%D{3Ezx5yH@rGL!ORcc>*+C73qWfd#&n2W%CV)enY&D5BtlaOCrR;WYGraUP5K7ps@dle3Ao|+_&d+C?b6IqU>jr(E;>hJJjSvPvFiMcE zzY^T9fwcWO&_}Ho&_+vRAeyzRR_qX|qW-p7UP)(7TyA@oB)kH=*d?#eVQOX1R$!i} z{u#T8D!9qt(#gl$*7D|XhUJ-~hl1ke?#n88E!}=AY*#gD>V=Jv6^cOzmf~g!KB7^vKL&MA(JTi0p7usk~d&A-YClU5-=7oY;@?58g^M( zLj!8~R_ERHU5+s{BVC|FqSFl*$PhKg{eKoQ3mvaU7hh?5ySlmF-57mvFLf65funmQncu=^zOhLIi+lcF~;O8Jf?*Uz{wf&^V2!TQhFlvMVk0<_03t&K11eJ@aIR6VDPTzWhx`%D^j2;t9GMnDWK?e7i=bf0C8C7(m!cI_q?~y4Port_ zmd^Ci^wB@vgX)~PDM85Xvbs#CxaXM_ykwdexd68<`13GrbGdEcYsqqg&MyQLq369*js25Sx*$QnVt;4kwXXsGHiN_6|J5X*|R~AYbb0Ic^ za&+85C07?h`uT(0JuZREjOOUExTw+_52jtmt{BOOM<4iM=*6Z2g>(dte7m+j#%EBn z1kW$JazfxBQDs2=y}CLi^nc#9fRwaUp)e4@KJVot;Dfrf&-wLr`oAWR^xw<- z%;0$-7HvuJN06Jg2zWcFNt=}5|H^tIU|^rsz5i(spc`#b2yG=0p%N8HM~5Cf7Zjqy nNAMr7gM)#kLV$sx|IctRuzb*pju3>H1_)o590p(OU*G=&WwHxR delta 13077 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 GoBKaJV#`GU From 614b23c36e418d7f28b6c9a2d7c2232f4e17ff8d Mon Sep 17 00:00:00 2001 From: arjan Date: Fri, 21 Jun 2024 10:51:40 +0200 Subject: [PATCH 60/75] Weergave van SKOS properties in report. Bugfix. --- src/main/java/nl/imvertor/ChainTranslateAndReport.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/nl/imvertor/ChainTranslateAndReport.java b/src/main/java/nl/imvertor/ChainTranslateAndReport.java index 4d77b33e..e97f9ced 100644 --- a/src/main/java/nl/imvertor/ChainTranslateAndReport.java +++ b/src/main/java/nl/imvertor/ChainTranslateAndReport.java @@ -95,6 +95,7 @@ public static void main(String[] args) { configurator.getCli(ConceptCollector.STEP_NAME); configurator.getCli(ImvertCompiler.STEP_NAME); configurator.getCli(MIMCompiler.STEP_NAME); + configurator.getCli(SkosCompiler.STEP_NAME); configurator.getCli(StcCompiler.STEP_NAME); configurator.getCli(XsdCompiler.STEP_NAME); configurator.getCli(ShaclCompiler.STEP_NAME); From 74c110fdc40810ae2d80688c69c67ddb6496d451 Mon Sep 17 00:00:00 2001 From: arjan Date: Fri, 21 Jun 2024 15:16:55 +0200 Subject: [PATCH 61/75] Nieuwe MIM 1.2 tagged values opgenomen in MIM conforme documentatie Deze hebben nu een plek gekregen tusen de tagged values in de Respec. Zie #490. Minor. --- .../input/MIM/cfg/docrules/MIM12.xml | 111 +++++++++++++++++- .../resources/input/MIM/cfg/tvsets/MIM12.xml | 4 +- .../xsl/OfficeCompiler/Imvert2modeldoc.xsl | 36 +++++- 3 files changed, 146 insertions(+), 5 deletions(-) diff --git a/src/main/resources/input/MIM/cfg/docrules/MIM12.xml b/src/main/resources/input/MIM/cfg/docrules/MIM12.xml index 2bcc8621..98a03e8b 100644 --- a/src/main/resources/input/MIM/cfg/docrules/MIM12.xml +++ b/src/main/resources/input/MIM/cfg/docrules/MIM12.xml @@ -11,6 +11,115 @@ MIM 1.2 requirements on documentation. See also the MIM 1.2 standard. - + + Doelformaat + Target format + + DISPLAY-GLOBAL-REFERENCELIST + DISPLAY-GLOBAL-CODELIST + + + + + Eenheid + Unit + + DISPLAY-GLOBAL-REFERENCEELEMENT + DISPLAY-GLOBAL-ATTRIBUTE + + + + + Identificatie + Identification + + DISPLAY-GLOBAL-OBJECTTYPE + DISPLAY-GLOBAL-ASSOCIATIONCLASS + DISPLAY-GLOBAL-REFERENCELIST + DISPLAY-GLOBAL-ENUMERATION + DISPLAY-GLOBAL-CODELIST + DISPLAY-GLOBAL-UNION + DISPLAY-GLOBAL-PRIMITIVEDATATYPE + DISPLAY-GLOBAL-STRUCTUREDDATATYPE + DISPLAY-GLOBAL-COMPOSITE + + DISPLAY-DETAIL-COMPOSITE + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-REFERENCEELEMENT + DISPLAY-DETAIL-UNION + DISPLAY-DETAIL-UNIONELEMENT + DISPLAY-DETAIL-DATAELEMENT + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + DISPLAY-DETAIL-ENUMERATION + + + + + Heeft tijdlijn geldigheid + Has timeline validity + + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + + + + + Heeft tijdlijn registratie + Has timeline registration + + DISPLAY-DETAIL-ATTRIBUTE + DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE + DISPLAY-DETAIL-ASSOCIATION + DISPLAY-DETAIL-COMPOSITE-ASSOCIATION + + + + + Minimum waarde (exclusief) + Minimum value (eclusive) + + DISPLAY-GLOBAL-REFERENCEELEMENT + DISPLAY-GLOBAL-DATAELEMENT + DISPLAY-GLOBAL-ATTRIBUTE + + + + + Maximum waarde (exclusief) + Maximum value (eclusive) + + DISPLAY-GLOBAL-REFERENCEELEMENT + DISPLAY-GLOBAL-DATAELEMENT + DISPLAY-GLOBAL-ATTRIBUTE + + + + + Mixin + Mixin + + DISPLAY-GLOBAL-GENERALISATION + + + + + Profielspecificatie + Profile specification + + DISPLAY-GLOBAL-CODELIST + + + + + Waarde-item + Value-item + + DISPLAY-GLOBAL-CODELIST + + \ No newline at end of file diff --git a/src/main/resources/input/MIM/cfg/tvsets/MIM12.xml b/src/main/resources/input/MIM/cfg/tvsets/MIM12.xml index d8059e5f..bb0658c6 100644 --- a/src/main/resources/input/MIM/cfg/tvsets/MIM12.xml +++ b/src/main/resources/input/MIM/cfg/tvsets/MIM12.xml @@ -97,7 +97,7 @@ - + Heeft tijdlijn geldigheid Indicatie of voor dit kenmerk een tijdlijn geldigheid bijgehouden wordt en te bevragen is. MIM-1.2 @@ -114,7 +114,7 @@ Nee - + Heeft tijdlijn registratie Indicatie of voor dit kenmerk een tijdlijn registratie bijgehouden wordt en te bevragen is. MIM-1.2 diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl index ecb72bfd..0ca9801e 100644 --- a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl +++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl @@ -67,8 +67,8 @@ - - + + @@ -1240,6 +1240,12 @@ + + + + + + @@ -1400,6 +1406,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + From a8117794997bb74239d5a2693184b5a5a51541c2 Mon Sep 17 00:00:00 2001 From: arjan Date: Fri, 21 Jun 2024 15:17:16 +0200 Subject: [PATCH 62/75] Correctie MIM 1.2 XSD Bugfix. --- src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd index 8f79c4d7..05c9e74a 100644 --- a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd @@ -536,6 +536,7 @@ + From 90ba2886c08fe5aecc671cdf1b8b7c0d803294e0 Mon Sep 17 00:00:00 2001 From: arjan Date: Fri, 21 Jun 2024 16:44:44 +0200 Subject: [PATCH 63/75] IHW: Proloog en epiloog verwijderd uit Respec Zie #497 Bugfix. --- .../Imvert2modeldoc-IHW-SIM-html-respec.xsl | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-IHW-SIM-html-respec.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-IHW-SIM-html-respec.xsl index b7012ffd..0cab592c 100644 --- a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-IHW-SIM-html-respec.xsl +++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-IHW-SIM-html-respec.xsl @@ -50,7 +50,7 @@

    - Samenvatting conceptueel model..... INSERT HERE + Dit is een conceptueel model van IHW.

    @@ -58,19 +58,7 @@ Deze documentatie van het conceptueel model is laatst bijgewerkt op .

    -
    -

    Proloog

    -

    - Proloog conceptueel model hier. -

    -
    -
    -

    Epiloog

    -

    - Epiloog conceptueel model hier. -

    -
    From 5c9dc0467b0c58e2922ddca7c4c026ce71471966 Mon Sep 17 00:00:00 2001 From: arjan Date: Fri, 21 Jun 2024 16:59:24 +0200 Subject: [PATCH 64/75] IHW: "Attribuut- en relatiesoort details" in Respec is vervallen Zie #498 Minor. --- .../resources/cfg/OfficeCompiler/parms.xml | 3 +++ .../Imvert2modeldoc-IHW-SIM-POSTPROC.xsl | 22 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-IHW-SIM-POSTPROC.xsl diff --git a/src/main/resources/cfg/OfficeCompiler/parms.xml b/src/main/resources/cfg/OfficeCompiler/parms.xml index 8e6b6ebb..5ba299b4 100644 --- a/src/main/resources/cfg/OfficeCompiler/parms.xml +++ b/src/main/resources/cfg/OfficeCompiler/parms.xml @@ -191,9 +191,12 @@ Imvert2modeldoc-IHW-SIM.xsl + Imvert2modeldoc-IHW-SIM-POSTPROC.xsl Imvert2modeldoc-IHW-SIM-html-respec.xsl + Imvert2modeldoc-IHW-SIM.xsl Imvert2modeldoc-IHW-SIM-html-respec.xsl + Imvert2modeldoc-IHW-SIM.xsl Imvert2modeldoc-IHW-SIM-html-respec.xsl diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-IHW-SIM-POSTPROC.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-IHW-SIM-POSTPROC.xsl new file mode 100644 index 00000000..933c9903 --- /dev/null +++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-IHW-SIM-POSTPROC.xsl @@ -0,0 +1,22 @@ + + + + + + + + + + Verwijderd: detailinformatie + + + + + + + + + + + From b379e884cda26b46d0508aa5b9831537667ded31 Mon Sep 17 00:00:00 2001 From: arjan Date: Fri, 21 Jun 2024 17:15:12 +0200 Subject: [PATCH 65/75] IHW: Introductie van logisch model. Dit is doorgevoerd in - Properties file (xlsx), unu gebaseerd op UGM settings - Metamodel en tagged value set - notesrules - visuals voor Toolbox. De details moeten nog verder worden uitgewerkt, in overleg met IHW. Zie #499 Minor. --- .../input/IHW/cfg/metamodels/IHWLM.xml | 54 ++++++++++++++++++ .../input/IHW/cfg/notesrules/IHWLM.xml | 41 +++++++++++++ .../resources/input/IHW/cfg/tvsets/IHWLM.xml | 18 ++++++ .../resources/input/IHW/cfg/visuals/IHWLM.xml | 29 ++++++++++ src/main/resources/input/IHW/props/IHW.xlsx | Bin 23226 -> 24347 bytes 5 files changed, 142 insertions(+) create mode 100644 src/main/resources/input/IHW/cfg/metamodels/IHWLM.xml create mode 100644 src/main/resources/input/IHW/cfg/notesrules/IHWLM.xml create mode 100644 src/main/resources/input/IHW/cfg/tvsets/IHWLM.xml create mode 100644 src/main/resources/input/IHW/cfg/visuals/IHWLM.xml diff --git a/src/main/resources/input/IHW/cfg/metamodels/IHWLM.xml b/src/main/resources/input/IHW/cfg/metamodels/IHWLM.xml new file mode 100644 index 00000000..006189b7 --- /dev/null +++ b/src/main/resources/input/IHW/cfg/metamodels/IHWLM.xml @@ -0,0 +1,54 @@ + + + + + + + + + IHW LOGICAL + + + + NBGNL + 0.9.5 + NEN3610 BRO Grouping NL + + + NBGEN + 0.9.5 + NEN3610 BRO Grouping EN + + + + + + + AsIs + + + AsIs + + + + + + false + true + domain + true + + + + + + diff --git a/src/main/resources/input/IHW/cfg/notesrules/IHWLM.xml b/src/main/resources/input/IHW/cfg/notesrules/IHWLM.xml new file mode 100644 index 00000000..7f98babb --- /dev/null +++ b/src/main/resources/input/IHW/cfg/notesrules/IHWLM.xml @@ -0,0 +1,41 @@ + + + + + IHW LOGICAL + + These are the schemes to apply to notes fields in order to determine the tagged values. + + markdown + + +
    +
    +
    +
    +
    + + + +
    +
    +
    +
    +
    + + + \ No newline at end of file diff --git a/src/main/resources/input/IHW/cfg/tvsets/IHWLM.xml b/src/main/resources/input/IHW/cfg/tvsets/IHWLM.xml new file mode 100644 index 00000000..a4ec2ce8 --- /dev/null +++ b/src/main/resources/input/IHW/cfg/tvsets/IHWLM.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + ihw LOGICAL + + Gebaseerd op NEN3610:2022 + Based on NEN3610:2022 + + \ No newline at end of file diff --git a/src/main/resources/input/IHW/cfg/visuals/IHWLM.xml b/src/main/resources/input/IHW/cfg/visuals/IHWLM.xml new file mode 100644 index 00000000..2da226f9 --- /dev/null +++ b/src/main/resources/input/IHW/cfg/visuals/IHWLM.xml @@ -0,0 +1,29 @@ + + + + + + + + IHW logical + + Visuals for IHW logical models + Visuele aspecten van IHW logische modellen + + + + + + + + + + + + + + diff --git a/src/main/resources/input/IHW/props/IHW.xlsx b/src/main/resources/input/IHW/props/IHW.xlsx index 2673bb66fcb70e23d117d1f050176b1b036563b6..4b3dbce349da79a9564ccf608d77bd11e3d83330 100644 GIT binary patch delta 14461 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 z

    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 P9mJU_J%*6}Ka>9jBDef? From 1c91877a27a97f63a9b4a4f65296f077e5dba9ce Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 24 Jun 2024 15:17:40 +0200 Subject: [PATCH 66/75] MIM eigenschap relatiemodelleringstype met s Zie #377 Bugfix. --- .../etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd | 4 ++-- .../v2/1.2/MIMFORMAT_Mim_relatierol.xsd | 4 ++-- .../v2/1.2/MIMFORMAT_Mim_relatiesoort.xsd | 4 ++-- .../MIMformat/v2/1.2/Samples/Fietsenwinkel.xml | 4 ++-- .../resources/input/MIM/cfg/tvsets/MIM12.xml | 16 ++++++++++++++++ .../cfg/metamodels/WaarderingskamerSIM.xml | 1 + .../xsl/EpCompiler/MIM1.2/MIM2EP-core.xsl | 2 +- .../xsl/EpCompiler/MIM1.2/MIM2EP-pre.xsl | 2 +- .../xsl/MIMCompiler/v2/MIM1.2/MIM1.2-model.xml | 6 +++--- .../xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl | 8 ++++---- 10 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd index 05c9e74a..271a581c 100644 --- a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd @@ -41,7 +41,7 @@ - + @@ -802,7 +802,7 @@ - + diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim_relatierol.xsd b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim_relatierol.xsd index 39465da8..5b71245d 100644 --- a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim_relatierol.xsd +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim_relatierol.xsd @@ -20,7 +20,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim_relatiesoort.xsd b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim_relatiesoort.xsd index 850e5f16..cdfd6ede 100644 --- a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim_relatiesoort.xsd +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim_relatiesoort.xsd @@ -20,7 +20,7 @@ - + De typering van het structurele verband tussen een object van een objecttype en een (ander) object van een ander (of hetzelfde) objecttype. @@ -77,7 +77,7 @@ - + diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/Samples/Fietsenwinkel.xml b/src/main/resources/etc/xsd/MIMformat/v2/1.2/Samples/Fietsenwinkel.xml index 72c3817d..9bccd265 100644 --- a/src/main/resources/etc/xsd/MIMformat/v2/1.2/Samples/Fietsenwinkel.xml +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/Samples/Fietsenwinkel.xml @@ -39,8 +39,8 @@ commentaar toegevoegd. Dat is alleen bij de éérste opkomst van een contructie Conceptueel detailhandel - - Relatierol leidend + + Relatierol leidend 1.1.1 diff --git a/src/main/resources/input/MIM/cfg/tvsets/MIM12.xml b/src/main/resources/input/MIM/cfg/tvsets/MIM12.xml index bb0658c6..2bf61cf5 100644 --- a/src/main/resources/input/MIM/cfg/tvsets/MIM12.xml +++ b/src/main/resources/input/MIM/cfg/tvsets/MIM12.xml @@ -248,6 +248,22 @@ + + + + Relatiemodelleringstype + MIM 1.2: Aanduiding van een in MIM gedefinieerd alternatief voor een modelleringswijze, en welke keuze hierbij is gemaakt. + MIM 1.2: Indication of an alternative to a modeling method defined in MIM, and which choice has been made. + MIM-1.2 + https://docs.geostandaarden.nl/mim/mim/#metagegeven-relatiemodelleringstype + + + Pseudo relatiemodelleringstype + MIM-1.2 + https://docs.geostandaarden.nl/mim/mim/#metagegeven-relatiemodelleringstype + + + \ No newline at end of file diff --git a/src/main/resources/input/Waarderingskamer/cfg/metamodels/WaarderingskamerSIM.xml b/src/main/resources/input/Waarderingskamer/cfg/metamodels/WaarderingskamerSIM.xml index 2903a6e2..c086c6d4 100644 --- a/src/main/resources/input/Waarderingskamer/cfg/metamodels/WaarderingskamerSIM.xml +++ b/src/main/resources/input/Waarderingskamer/cfg/metamodels/WaarderingskamerSIM.xml @@ -47,6 +47,7 @@ If this is reversed (as is discussied in Task #487339), set this parameter to "part", otherwise set to "whole" (default). --> part + no diff --git a/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-core.xsl b/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-core.xsl index 5325d358..f1654d30 100644 --- a/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-core.xsl +++ b/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-core.xsl @@ -40,7 +40,7 @@ - + diff --git a/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-pre.xsl b/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-pre.xsl index 272c725e..ad2203fb 100644 --- a/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-pre.xsl +++ b/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-pre.xsl @@ -32,7 +32,7 @@ - + diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIM1.2-model.xml b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIM1.2-model.xml index 1c622a96..f3e60798 100644 --- a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIM1.2-model.xml +++ b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIM1.2-model.xml @@ -160,7 +160,7 @@ Patroon Populatie Relatie eigenaar - Relatiemodelleringtype + Relatiemodelleringstype Specificatie formeel Specificatie tekst Subtype @@ -269,7 +269,7 @@ Datum opname Informatiemodel type Informatiedomein - Relatiemodelleringtype + Relatiemodelleringstype MIM versie MIM extensie MIM extensie versie @@ -985,7 +985,7 @@ Relatiesoort - Relatiesoort leidend - Relatiemodelleringtype + Relatiemodelleringstype Informatiemodel diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl index 2532ec72..3187510d 100644 --- a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl +++ b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl @@ -85,7 +85,7 @@ - + @@ -219,7 +219,7 @@ @@ -952,9 +952,9 @@ - + - {$relatiemodelleringtype} + {$relatiemodelleringstype} From 3b092ebb8cb61e015f0ae2b9e1908e60c48c79e4 Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 24 Jun 2024 15:34:18 +0200 Subject: [PATCH 67/75] Supertypen kunnen nu ook concreet zijn. Zie #504 Bugfix. De bestaande regel situatie was te restrictief. --- src/main/resources/input/Kadaster/cfg/metamodels/Kadaster.xml | 1 + .../Waarderingskamer/cfg/metamodels/WaarderingskamerSIM.xml | 3 +-- src/main/resources/xsl/Validator/Imvert2validation-KINGUGM.xsl | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/resources/input/Kadaster/cfg/metamodels/Kadaster.xml b/src/main/resources/input/Kadaster/cfg/metamodels/Kadaster.xml index f6983a8f..18adbb7a 100644 --- a/src/main/resources/input/Kadaster/cfg/metamodels/Kadaster.xml +++ b/src/main/resources/input/Kadaster/cfg/metamodels/Kadaster.xml @@ -65,6 +65,7 @@ false false + true true domain true diff --git a/src/main/resources/input/Waarderingskamer/cfg/metamodels/WaarderingskamerSIM.xml b/src/main/resources/input/Waarderingskamer/cfg/metamodels/WaarderingskamerSIM.xml index c086c6d4..5646bc44 100644 --- a/src/main/resources/input/Waarderingskamer/cfg/metamodels/WaarderingskamerSIM.xml +++ b/src/main/resources/input/Waarderingskamer/cfg/metamodels/WaarderingskamerSIM.xml @@ -47,8 +47,7 @@ If this is reversed (as is discussied in Task #487339), set this parameter to "part", otherwise set to "whole" (default). --> part - no - + AsIs diff --git a/src/main/resources/xsl/Validator/Imvert2validation-KINGUGM.xsl b/src/main/resources/xsl/Validator/Imvert2validation-KINGUGM.xsl index 32a43192..75d45646 100644 --- a/src/main/resources/xsl/Validator/Imvert2validation-KINGUGM.xsl +++ b/src/main/resources/xsl/Validator/Imvert2validation-KINGUGM.xsl @@ -125,10 +125,11 @@ + From de73540b4915f7b66dad0ce073819cbaadae2299 Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 24 Jun 2024 15:36:46 +0200 Subject: [PATCH 68/75] VNGR: De regel composition-direction-source vervalt. Eerder is in Task #487339 aangegeven dat deze regel zinvol is. echter, er is geen implememntatie voor (keert niet terug in de code). De metamodel eigenschap komt te vervallen. Minor. --- src/main/resources/input/KING/cfg/metamodels/KINGUGM.xml | 2 -- src/main/resources/input/KING/cfg/metamodels/VNGRSIM.xml | 6 ------ .../Waarderingskamer/cfg/metamodels/WaarderingskamerSIM.xml | 6 ------ .../resources/xsl/ConfigCompiler/Imvert2configuration.xsl | 2 -- 4 files changed, 16 deletions(-) diff --git a/src/main/resources/input/KING/cfg/metamodels/KINGUGM.xml b/src/main/resources/input/KING/cfg/metamodels/KINGUGM.xml index 03128bff..55df1a03 100644 --- a/src/main/resources/input/KING/cfg/metamodels/KINGUGM.xml +++ b/src/main/resources/input/KING/cfg/metamodels/KINGUGM.xml @@ -30,8 +30,6 @@ KINGUGM Metamodel for KING/VNG exchange models: uitwisseling gegevensmodel - - part LOGICAL diff --git a/src/main/resources/input/KING/cfg/metamodels/VNGRSIM.xml b/src/main/resources/input/KING/cfg/metamodels/VNGRSIM.xml index 4aef1b3b..d7ac097d 100644 --- a/src/main/resources/input/KING/cfg/metamodels/VNGRSIM.xml +++ b/src/main/resources/input/KING/cfg/metamodels/VNGRSIM.xml @@ -40,12 +40,6 @@ - - part - AsIs diff --git a/src/main/resources/input/Waarderingskamer/cfg/metamodels/WaarderingskamerSIM.xml b/src/main/resources/input/Waarderingskamer/cfg/metamodels/WaarderingskamerSIM.xml index 5646bc44..8aa3ea8f 100644 --- a/src/main/resources/input/Waarderingskamer/cfg/metamodels/WaarderingskamerSIM.xml +++ b/src/main/resources/input/Waarderingskamer/cfg/metamodels/WaarderingskamerSIM.xml @@ -42,12 +42,6 @@ - - part - AsIs diff --git a/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl b/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl index 10d13c35..025f8f41 100644 --- a/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl +++ b/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl @@ -266,8 +266,6 @@ - - From 33e1c2a98277b611cf3fe91351f538d2f4ce1f99 Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 24 Jun 2024 15:47:27 +0200 Subject: [PATCH 69/75] VNG: GM_SENTINEL niet meenemen in naam validatie. De validatieregel (op naamgevingsconventies) is voorzien van een uitzondering: sla GM_SENTINEL over. zie #488 Bugfix. --- src/main/resources/xsl/Validator/Imvert2validation-KINGUGM.xsl | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/xsl/Validator/Imvert2validation-KINGUGM.xsl b/src/main/resources/xsl/Validator/Imvert2validation-KINGUGM.xsl index 75d45646..d6bbc1f0 100644 --- a/src/main/resources/xsl/Validator/Imvert2validation-KINGUGM.xsl +++ b/src/main/resources/xsl/Validator/Imvert2validation-KINGUGM.xsl @@ -104,6 +104,7 @@ From a9721e4fd083d242db89f95c5006b03c3fbf1a13 Mon Sep 17 00:00:00 2001 From: arjan Date: Mon, 24 Jun 2024 16:39:54 +0200 Subject: [PATCH 70/75] Namen moeten uniek zijn, binnen model of domein. Dit is vastgelegd in model feature _unique-normalized-class-names_ Zie #493 Bugfix. --- src/main/resources/xsl/Validator/Imvert2validation.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/xsl/Validator/Imvert2validation.xsl b/src/main/resources/xsl/Validator/Imvert2validation.xsl index d04c1fda..c6ce8835 100644 --- a/src/main/resources/xsl/Validator/Imvert2validation.xsl +++ b/src/main/resources/xsl/Validator/Imvert2validation.xsl @@ -243,7 +243,7 @@ - + + Kardinaliteit + Multiplicity + \ No newline at end of file From 38788f04f178068e557a26ad1cd71e634a37ebe2 Mon Sep 17 00:00:00 2001 From: arjan Date: Fri, 28 Jun 2024 13:00:02 +0200 Subject: [PATCH 72/75] Opschonen dlogger statements. Refactor. --- src/main/resources/xsl/EpCompiler/MIM1.1/MIM2EP-post.xsl | 1 - src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-post.xsl | 1 - .../RegressionExtractor-extract-canon.xsl | 7 ------- .../RegressionExtractor/RegressionExtractor-extract.xsl | 2 -- .../xsl/ReleaseComparer/Imvert2compare-listing.xsl | 1 - .../xsl/ReleaseComparer/ReleaseComparer-report.xsl | 1 - .../resources/xsl/RunAnalyzer/RunAnalyzer-report.xsl | 2 -- src/main/resources/xsl/SkosCompiler/Imvert2Skos-BRO.xsl | 4 ---- src/main/resources/xsl/common/Imvert-common.xsl | 9 --------- 9 files changed, 28 deletions(-) diff --git a/src/main/resources/xsl/EpCompiler/MIM1.1/MIM2EP-post.xsl b/src/main/resources/xsl/EpCompiler/MIM1.1/MIM2EP-post.xsl index 5d6d394b..d9d25e2e 100644 --- a/src/main/resources/xsl/EpCompiler/MIM1.1/MIM2EP-post.xsl +++ b/src/main/resources/xsl/EpCompiler/MIM1.1/MIM2EP-post.xsl @@ -148,7 +148,6 @@ Check https://github.com/Geonovum/shapeChangeTest/issues/52 --> - diff --git a/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-post.xsl b/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-post.xsl index 9d20c89c..bb14c18e 100644 --- a/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-post.xsl +++ b/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-post.xsl @@ -145,7 +145,6 @@ Check https://github.com/Geonovum/shapeChangeTest/issues/52 --> - diff --git a/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract-canon.xsl b/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract-canon.xsl index 2148480f..cc312140 100644 --- a/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract-canon.xsl +++ b/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract-canon.xsl @@ -66,38 +66,31 @@ - - - - - - - diff --git a/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract.xsl b/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract.xsl index acaa470b..cdd9b77a 100644 --- a/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract.xsl +++ b/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract.xsl @@ -88,7 +88,6 @@ process the XSD's --> - @@ -97,7 +96,6 @@ - diff --git a/src/main/resources/xsl/ReleaseComparer/Imvert2compare-listing.xsl b/src/main/resources/xsl/ReleaseComparer/Imvert2compare-listing.xsl index b7ebe427..a15ed82f 100644 --- a/src/main/resources/xsl/ReleaseComparer/Imvert2compare-listing.xsl +++ b/src/main/resources/xsl/ReleaseComparer/Imvert2compare-listing.xsl @@ -37,7 +37,6 @@ - Release comparison diff --git a/src/main/resources/xsl/ReleaseComparer/ReleaseComparer-report.xsl b/src/main/resources/xsl/ReleaseComparer/ReleaseComparer-report.xsl index 1dddd253..78fcf3ea 100644 --- a/src/main/resources/xsl/ReleaseComparer/ReleaseComparer-report.xsl +++ b/src/main/resources/xsl/ReleaseComparer/ReleaseComparer-report.xsl @@ -40,7 +40,6 @@ - diff --git a/src/main/resources/xsl/RunAnalyzer/RunAnalyzer-report.xsl b/src/main/resources/xsl/RunAnalyzer/RunAnalyzer-report.xsl index 60470773..365ddc74 100644 --- a/src/main/resources/xsl/RunAnalyzer/RunAnalyzer-report.xsl +++ b/src/main/resources/xsl/RunAnalyzer/RunAnalyzer-report.xsl @@ -53,8 +53,6 @@ - - diff --git a/src/main/resources/xsl/SkosCompiler/Imvert2Skos-BRO.xsl b/src/main/resources/xsl/SkosCompiler/Imvert2Skos-BRO.xsl index 6de1e6b3..536d29d4 100644 --- a/src/main/resources/xsl/SkosCompiler/Imvert2Skos-BRO.xsl +++ b/src/main/resources/xsl/SkosCompiler/Imvert2Skos-BRO.xsl @@ -65,8 +65,6 @@ - - @@ -348,8 +346,6 @@ - - diff --git a/src/main/resources/xsl/common/Imvert-common.xsl b/src/main/resources/xsl/common/Imvert-common.xsl index 3b6fcef4..03b27ff7 100644 --- a/src/main/resources/xsl/common/Imvert-common.xsl +++ b/src/main/resources/xsl/common/Imvert-common.xsl @@ -150,15 +150,6 @@ - - debug?> - From 976e209359c05886905c81303383695282e9346e Mon Sep 17 00:00:00 2001 From: arjan Date: Thu, 4 Jul 2024 14:05:04 +0200 Subject: [PATCH 73/75] Constraints zijn nu onderdeel van de respec documentatie Zie #505 Let wel, weergave is nog beperkt tot objecttype constraints (in overzicht en -details). Minor. --- .../Imvertor/cfg/i3n/translation-common.xml | 21 ++++++ .../xsl/OfficeCompiler/Imvert2modeldoc.xsl | 64 ++++++++++++++++++- .../common/Imvert2modeldoc-html-respec.xsl | 4 ++ 3 files changed, 87 insertions(+), 2 deletions(-) diff --git a/src/main/resources/input/Imvertor/cfg/i3n/translation-common.xml b/src/main/resources/input/Imvertor/cfg/i3n/translation-common.xml index 9d5b9ba3..fd4f0b47 100644 --- a/src/main/resources/input/Imvertor/cfg/i3n/translation-common.xml +++ b/src/main/resources/input/Imvertor/cfg/i3n/translation-common.xml @@ -414,6 +414,11 @@ Attribuutsoort details AttributeType details + + DETAIL-CONSTRAINT + Constraint details + Constraint details + DETAIL-ASSOCIATION Relatiesoort details @@ -486,6 +491,7 @@ Attribuutsoort AttributeType + ASSOCIATION RELATIESOORT @@ -508,6 +514,11 @@ Overzicht relaties Overview of associations + + SHORT-CONSTRAINTS + Overzicht constraints + Constraints overview + SHORT-TYPERELATIONS Overzicht relaties @@ -591,6 +602,16 @@ Mult + + CONSTRAINT-NAME + Naam + Name + + + CONSTRAINT-NATURAL + Uitleg + Explanation + ASSOCIATION-NAME Relatienaam met kardinaliteiten diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl index 0ca9801e..54e19253 100644 --- a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl +++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl @@ -219,6 +219,8 @@ + +

    @@ -234,6 +236,8 @@ + +
    @@ -249,7 +253,11 @@ + + + + @@ -262,6 +270,8 @@ + + @@ -322,6 +332,8 @@ + + @@ -429,6 +441,18 @@ + +
    + + + + + + + +
    +     + @@ -624,6 +648,14 @@ + + + + + + + + @@ -978,6 +1010,16 @@ + + + + + @@ -1431,6 +1473,12 @@ + + + + + + @@ -1455,6 +1503,18 @@ + + + + + + + + + + + + @@ -1661,7 +1721,7 @@ - + diff --git a/src/main/resources/xsl/OfficeCompiler/common/Imvert2modeldoc-html-respec.xsl b/src/main/resources/xsl/OfficeCompiler/common/Imvert2modeldoc-html-respec.xsl index 2c3f8812..40ffd68c 100644 --- a/src/main/resources/xsl/OfficeCompiler/common/Imvert2modeldoc-html-respec.xsl +++ b/src/main/resources/xsl/OfficeCompiler/common/Imvert2modeldoc-html-respec.xsl @@ -123,6 +123,10 @@ + + + + From 28a4a4a05827885ff3cbcb7a207b413d6941295d Mon Sep 17 00:00:00 2001 From: arjan Date: Fri, 5 Jul 2024 15:29:29 +0200 Subject: [PATCH 74/75] (Verwijdering dlogger statement) --- src/main/resources/xsl/ConfigCompiler/ConfigCompiler-report.xsl | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/xsl/ConfigCompiler/ConfigCompiler-report.xsl b/src/main/resources/xsl/ConfigCompiler/ConfigCompiler-report.xsl index 307fddb2..dd2dc75c 100644 --- a/src/main/resources/xsl/ConfigCompiler/ConfigCompiler-report.xsl +++ b/src/main/resources/xsl/ConfigCompiler/ConfigCompiler-report.xsl @@ -393,7 +393,6 @@ -

    Translations of included constructs

    From d28b3ed774e542ed5301245120f83b2697f3adcf Mon Sep 17 00:00:00 2001 From: arjan Date: Sun, 7 Jul 2024 11:56:25 +0200 Subject: [PATCH 75/75] Correctie uitlezen Excel als meer dan 26 kolommen. Bugfix. --- .../xsl/Configurator/processingmode.xsl | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/main/resources/static/xsl/Configurator/processingmode.xsl b/src/main/resources/static/xsl/Configurator/processingmode.xsl index 7ac35806..559e0bc1 100644 --- a/src/main/resources/static/xsl/Configurator/processingmode.xsl +++ b/src/main/resources/static/xsl/Configurator/processingmode.xsl @@ -2,7 +2,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:imf="http://www.imvertor.org/xsl/functions" - version="2.0"> + version="3.0"> @@ -14,12 +14,12 @@ - - - - + + + + - + @@ -28,11 +28,10 @@ - - - - - + + + + @@ -48,6 +47,9 @@ + + + @@ -57,4 +59,8 @@ + + + + \ No newline at end of file