diff --git a/pom.xml b/pom.xml index ab9dcda91..5a973e66f 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 diff --git a/src/main/java/nl/imvertor/ChainTranslateAndReport.java b/src/main/java/nl/imvertor/ChainTranslateAndReport.java index 4d77b33e4..e97f9ced6 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); diff --git a/src/main/java/nl/imvertor/EpCompiler/EpCompiler.java b/src/main/java/nl/imvertor/EpCompiler/EpCompiler.java index 9dca59897..73a7e1d43 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 4a69c7ad9..d056bc4bc 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/java/nl/imvertor/OfficeCompiler/OfficeCompiler.java b/src/main/java/nl/imvertor/OfficeCompiler/OfficeCompiler.java index b3cfd34aa..a6788e8e5 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,"/"),"/"); } /* diff --git a/src/main/java/nl/imvertor/SkosCompiler/SkosCompiler.java b/src/main/java/nl/imvertor/SkosCompiler/SkosCompiler.java index c894bf95d..f03362756 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); 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 000000000..a3709800f --- /dev/null +++ b/src/main/java/nl/imvertor/XmiCompiler/XMIImageExporter.java @@ -0,0 +1,134 @@ +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.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 { + 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(CharEncoding.UTF_8, 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 0793ea5d1..6e3ff56ee 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/java/nl/imvertor/common/file/AnyFolder.java b/src/main/java/nl/imvertor/common/file/AnyFolder.java index 5ce06aaab..2203947f0 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); } /* diff --git a/src/main/java/nl/imvertor/common/file/ShaclFile.java b/src/main/java/nl/imvertor/common/file/ShaclFile.java index 7b063f362..a655e3098 100644 --- a/src/main/java/nl/imvertor/common/file/ShaclFile.java +++ b/src/main/java/nl/imvertor/common/file/ShaclFile.java @@ -21,16 +21,20 @@ package nl.imvertor.common.file; import java.io.File; +import java.io.InputStreamReader; -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.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.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 +48,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); @@ -61,67 +65,62 @@ 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 { - - 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, ""); } - + + /** + * 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 { - 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; - } + ShaclSail shaclSail = new ShaclSail(new MemoryStore()); + + SailRepository sailRepository = new SailRepository(shaclSail); + sailRepository.init(); + + try (RepositoryConnection connection = sailRepository.getConnection()) { + connection.begin(); + + InputStreamReader shaclRulesReader = getReader(); + + connection.add(shaclRulesReader, "", RDFFormat.TURTLE, RDF4J.SHACL_SHAPE_GRAPH); + connection.commit(); + + if (!ttlDataFilePath.equals("")) { + + AnyFile dataFile = new AnyFile(ttlDataFilePath); + + InputStreamReader dataReader = dataFile.getReader(); + + connection.begin(); + connection.add(dataReader, "", 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 schema file \"" + getName() + "\" invalid, cannot validate RDF. " + e.getMessage(),"rdf-parse","some-wiki-ref"); } } diff --git a/src/main/resources/cfg/EpCompiler/parms.xml b/src/main/resources/cfg/EpCompiler/parms.xml index c13af2be8..a861ec836 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 c619ece4d..48679cbbb 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/cfg/OfficeCompiler/parms.xml b/src/main/resources/cfg/OfficeCompiler/parms.xml index 80d58ea08..5ba299b4b 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 @@ -293,6 +296,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/SkosCompiler/parms.xml b/src/main/resources/cfg/SkosCompiler/parms.xml index a35c9a70a..de60f89a6 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/cfg/Validator/parms.xml b/src/main/resources/cfg/Validator/parms.xml index 64dbecef5..01328d200 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 @@ -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 + + + 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 + - 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/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 0f8b3ea22..df93450ac 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 000000000..271a581c4 --- /dev/null +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd @@ -0,0 +1,839 @@ + + + + + + + + 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 000000000..a87f6b00b --- /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 000000000..9349541cd --- /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 000000000..5b71245d4 --- /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 000000000..cdfd6ede4 --- /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 000000000..9bccd2655 --- /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 000000000..0204a5b62 --- /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 000000000..da8be0b57 --- /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 000000000..44cdba459 --- /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/input/BRO/cfg/docrules/BRO.xml b/src/main/resources/input/BRO/cfg/docrules/BRO.xml index 6ff416b66..f476d0ece 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/BRO/cfg/versionrules/BRO.xml b/src/main/resources/input/BRO/cfg/versionrules/BRO.xml index 2cdb0adf5..cf1c8290d 100644 --- a/src/main/resources/input/BRO/cfg/versionrules/BRO.xml +++ b/src/main/resources/input/BRO/cfg/versionrules/BRO.xml @@ -15,6 +15,8 @@ MajorMinorBugfix Versions must be specified as 99.99.99 or 99.99 (major, minor, bugfix). (\d+)\.(\d+)(.(\d+))? + 1.0 + 2.2.1 Major version diff --git a/src/main/resources/input/BRO/xsd/conceptual-schemas.xml b/src/main/resources/input/BRO/xsd/conceptual-schemas.xml index 71154fcab..0b0b53282 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/EIGENAAR/cfg/docrules/EIGENAAR.xml b/src/main/resources/input/EIGENAAR/cfg/docrules/EIGENAAR.xml index 32005461e..7f4e3c7ac 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,421 +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 - - - - 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/EIGENAAR/cfg/metamodels/EIGENAAR-CONCEPTUAL.xml b/src/main/resources/input/EIGENAAR/cfg/metamodels/EIGENAAR-CONCEPTUAL.xml index b42e12dc5..86cfc14d1 100644 --- a/src/main/resources/input/EIGENAAR/cfg/metamodels/EIGENAAR-CONCEPTUAL.xml +++ b/src/main/resources/input/EIGENAAR/cfg/metamodels/EIGENAAR-CONCEPTUAL.xml @@ -4,22 +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/schemarules/JSON-EIGENAAR.xml b/src/main/resources/input/EIGENAAR/cfg/schemarules/JSON-EIGENAAR.xml new file mode 100644 index 000000000..939389b89 --- /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 000000000..1a162a4c8 --- /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 000000000..e9083e73f --- /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 000000000..bf31fdf95 --- /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 + + + + diff --git a/src/main/resources/input/EIGENAAR/cfg/skosrules/EIGENAAR.xml b/src/main/resources/input/EIGENAAR/cfg/skosrules/EIGENAAR.xml index ba4870d5d..e0ba03b59 100644 --- a/src/main/resources/input/EIGENAAR/cfg/skosrules/EIGENAAR.xml +++ b/src/main/resources/input/EIGENAAR/cfg/skosrules/EIGENAAR.xml @@ -19,65 +19,12 @@ --> + + 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/cfg/tvsets/EIGENAAR-CONCEPTUAL.xml b/src/main/resources/input/EIGENAAR/cfg/tvsets/EIGENAAR-CONCEPTUAL.xml index a2ed4c89e..d10d22e9a 100644 --- a/src/main/resources/input/EIGENAAR/cfg/tvsets/EIGENAAR-CONCEPTUAL.xml +++ b/src/main/resources/input/EIGENAAR/cfg/tvsets/EIGENAAR-CONCEPTUAL.xml @@ -4,10 +4,11 @@ --> - + - + + - EIGENAAR CONCEPTUEEL + EIGENAAR CONCEPTUEEL MIM 1.2 \ No newline at end of file diff --git a/src/main/resources/input/EIGENAAR/cfg/versionrules/EIGENAAR.xml b/src/main/resources/input/EIGENAAR/cfg/versionrules/EIGENAAR.xml index c911bd10e..530c61cd7 100644 --- a/src/main/resources/input/EIGENAAR/cfg/versionrules/EIGENAAR.xml +++ b/src/main/resources/input/EIGENAAR/cfg/versionrules/EIGENAAR.xml @@ -15,6 +15,8 @@ MajorMinorBugfix Versions must be specified as 99.99.99 or 99.99 (major, minor, bugfix). (\d+)\.(\d+)(.(\d+))? + 1.0 + 2.2.1 Major version 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 407d0d7bb..3bb80c4ea 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.2 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 08bb78ae5..8a8e59477 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 @@ - + diff --git a/src/main/resources/input/EIGENAAR/props/EIGENAAR.xlsx b/src/main/resources/input/EIGENAAR/props/EIGENAAR.xlsx index ca350be13..24c86c295 100644 Binary files a/src/main/resources/input/EIGENAAR/props/EIGENAAR.xlsx and b/src/main/resources/input/EIGENAAR/props/EIGENAAR.xlsx differ diff --git a/src/main/resources/input/EIGENAAR/xsd/conceptual-schemas.xml b/src/main/resources/input/EIGENAAR/xsd/conceptual-schemas.xml index c913a6b95..a5885c591 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 @@ - + - + diff --git a/src/main/resources/input/Geonovum/cfg/docrules/Geonovum.xml b/src/main/resources/input/Geonovum/cfg/docrules/Geonovum.xml index 5373fe6c2..d1a9191ce 100644 --- a/src/main/resources/input/Geonovum/cfg/docrules/Geonovum.xml +++ b/src/main/resources/input/Geonovum/cfg/docrules/Geonovum.xml @@ -56,5 +56,9 @@ + + Kardinaliteit + Multiplicity + \ No newline at end of file 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 19c5d018a..000000000 --- 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 f8321470b..e67485c29 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/skosrules/Geonovum.xml b/src/main/resources/input/Geonovum/cfg/skosrules/Geonovum.xml index 9caa652b4..93ab085a8 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] - - - - - - - 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 c83f52f90..768ef4fa6 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 diff --git a/src/main/resources/input/Geonovum/cfg/versionrules/Geonovum.xml b/src/main/resources/input/Geonovum/cfg/versionrules/Geonovum.xml index 9603a1eb1..9bde21f3a 100644 --- a/src/main/resources/input/Geonovum/cfg/versionrules/Geonovum.xml +++ b/src/main/resources/input/Geonovum/cfg/versionrules/Geonovum.xml @@ -15,6 +15,8 @@ MajorMinorBugfix Versions must be specified as 99.99.99 or 99.99 (major, minor, bugfix). (\d+)\.(\d+)(.(\d+))? + 1.0 + 2.2.1 Major version 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 000000000..006189b74 --- /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 000000000..7f98babb7 --- /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 000000000..a4ec2ce8c --- /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/versionrules/IHW.xml b/src/main/resources/input/IHW/cfg/versionrules/IHW.xml index c3accd1b0..1bec6a671 100644 --- a/src/main/resources/input/IHW/cfg/versionrules/IHW.xml +++ b/src/main/resources/input/IHW/cfg/versionrules/IHW.xml @@ -37,6 +37,8 @@ Nonempty Versions must be non-empty. .+ + 1.0 + June-2024 Version (not empty) 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 000000000..2da226f91 --- /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 2673bb66f..4b3dbce34 100644 Binary files a/src/main/resources/input/IHW/props/IHW.xlsx and b/src/main/resources/input/IHW/props/IHW.xlsx differ diff --git a/src/main/resources/input/IHW/xsd/conceptual-schemas.xml b/src/main/resources/input/IHW/xsd/conceptual-schemas.xml index 318921fbd..fce881bd2 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 @@ + 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 000000000..b54895240 --- /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 000000000..ca56bc600 --- /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 + + + + + + + + + + + + + + + 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 6f5186639..fd4f0b472 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 @@ -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/input/Imvertor/cfg/metamodels/Grouping-MIM12.xml b/src/main/resources/input/Imvertor/cfg/metamodels/Grouping-MIM12.xml new file mode 100644 index 000000000..220bc70fa --- /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 000000000..3e74928c5 --- /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 diff --git a/src/main/resources/input/Imvertor/cfg/tvsets/Grouping.xml b/src/main/resources/input/Imvertor/cfg/tvsets/Grouping.xml index 0e8a9788b..ffe500ecf 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/KING/cfg/docrules/KINGSIM.xml b/src/main/resources/input/KING/cfg/docrules/KINGSIM.xml index 393646cf2..caa59a082 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/KING/cfg/metamodels/KINGUGM.xml b/src/main/resources/input/KING/cfg/metamodels/KINGUGM.xml index 03128bffc..55df1a031 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 4aef1b3ba..d7ac097d9 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/KING/cfg/versionrules/KING.xml b/src/main/resources/input/KING/cfg/versionrules/KING.xml index 6a49d93f7..4bd1173de 100644 --- a/src/main/resources/input/KING/cfg/versionrules/KING.xml +++ b/src/main/resources/input/KING/cfg/versionrules/KING.xml @@ -36,7 +36,10 @@ 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 Version (not empty) diff --git a/src/main/resources/input/Kadaster/cfg/metamodels/Kadaster.xml b/src/main/resources/input/Kadaster/cfg/metamodels/Kadaster.xml index f6983a8f5..18adbb7a6 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/Kadaster/cfg/schemarules/JSON-OGC-Kadaster.xml b/src/main/resources/input/Kadaster/cfg/schemarules/JSON-OGC-Kadaster.xml index 471e1758d..8563a9ef4 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 + diff --git a/src/main/resources/input/Kadaster/cfg/versionrules/Kadaster.xml b/src/main/resources/input/Kadaster/cfg/versionrules/Kadaster.xml index bf72fdcf9..72a715b17 100644 --- a/src/main/resources/input/Kadaster/cfg/versionrules/Kadaster.xml +++ b/src/main/resources/input/Kadaster/cfg/versionrules/Kadaster.xml @@ -14,8 +14,10 @@ MajorMinorBugfix ANY - Versions must be specified as some informative string, no spaces. - \S+ + Versions must be specified as some informative string. + \S.* + 1.0 + Juli 2024 Version diff --git a/src/main/resources/input/Kadaster/props/Kadaster.xlsx b/src/main/resources/input/Kadaster/props/Kadaster.xlsx index c2828f3bd..6cdf253be 100644 Binary files a/src/main/resources/input/Kadaster/props/Kadaster.xlsx and b/src/main/resources/input/Kadaster/props/Kadaster.xlsx differ diff --git a/src/main/resources/input/Logius/cfg/docrules/Logius.xml b/src/main/resources/input/Logius/cfg/docrules/Logius.xml index 997740436..38e378ad1 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/Logius/cfg/metamodels/Logius-CONCEPTUAL.xml b/src/main/resources/input/Logius/cfg/metamodels/Logius-CONCEPTUAL.xml index df8581324..25875e9b3 100644 --- a/src/main/resources/input/Logius/cfg/metamodels/Logius-CONCEPTUAL.xml +++ b/src/main/resources/input/Logius/cfg/metamodels/Logius-CONCEPTUAL.xml @@ -4,22 +4,23 @@ --> - + + Logius CONCEPTUEEL - 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 diff --git a/src/main/resources/input/Logius/cfg/owners/Logius.xml b/src/main/resources/input/Logius/cfg/owners/Logius.xml index 056ed3324..1ab7f1441 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/tvsets/Logius-CONCEPTUAL.xml b/src/main/resources/input/Logius/cfg/tvsets/Logius-CONCEPTUAL.xml index a0ada0afd..aaac0239c 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/versionrules/Logius.xml b/src/main/resources/input/Logius/cfg/versionrules/Logius.xml index de8b22f56..c88b82c82 100644 --- a/src/main/resources/input/Logius/cfg/versionrules/Logius.xml +++ b/src/main/resources/input/Logius/cfg/versionrules/Logius.xml @@ -15,6 +15,8 @@ MajorMinorBugfix Versions must be specified as 99.99.99 or 99.99 (major, minor, bugfix). (\d+)\.(\d+)(.(\d+))? + 1.0 + 2.2.1 Major version 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 d6d178383..160624a52 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 @@ -23,7 +24,33 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 08bb78ae5..8ec9dfb08 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 @@ - + - + diff --git a/src/main/resources/input/MIM/cfg/docrules/MIM11.xml b/src/main/resources/input/MIM/cfg/docrules/MIM11.xml index 0061144dc..700a1a3c4 100644 --- a/src/main/resources/input/MIM/cfg/docrules/MIM11.xml +++ b/src/main/resources/input/MIM/cfg/docrules/MIM11.xml @@ -126,6 +126,30 @@ DISPLAY-DETAIL-EXTERNEKOPPELING + + 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 000000000..98a03e8b6 --- /dev/null +++ b/src/main/resources/input/MIM/cfg/docrules/MIM12.xml @@ -0,0 +1,125 @@ + + + + + + + MIM12 + + 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/metamodels/MIM11.xml b/src/main/resources/input/MIM/cfg/metamodels/MIM11.xml index 1523e636f..5faa27abd 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 9090bd03f..72bdfb440 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/input/MIM/cfg/tvsets/MIM111.xml b/src/main/resources/input/MIM/cfg/tvsets/MIM111.xml index 5ed4fa7e0..9787a50c0 100644 --- a/src/main/resources/input/MIM/cfg/tvsets/MIM111.xml +++ b/src/main/resources/input/MIM/cfg/tvsets/MIM111.xml @@ -129,8 +129,6 @@ - 1.1 - 1.1.0 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 afab1c8a2..2bf61cf57 100644 --- a/src/main/resources/input/MIM/cfg/tvsets/MIM12.xml +++ b/src/main/resources/input/MIM/cfg/tvsets/MIM12.xml @@ -18,13 +18,26 @@ - - URI - URI + + Tekstopmaak + Text format + De specificatie van de opmaak van een tekstuele beschrijving in het model. + The specification of the layout of a textual description in the model. + MIM-1.2 + https://docs.geostandaarden.nl/mim/vv-st-mim-20240408/#metagegeven-tekstopmaak + no + + stereotype-name-informatiemodel-package + + + + + Identificatie + Identification De identificatie van een modelelement. The identification of a model element. MIM-1.2 - https://docs.geostandaarden.nl/mim/cv-st-mim-20231018/#metagegeven-uri + https://docs.geostandaarden.nl/mim/vv-st-mim-20240408/#metagegeven-identificatie no @@ -74,7 +87,7 @@ De standaard basis-URI voor elk element in dit informatiemodel. The default base URI for each element in this information model. MIM-1.2 - https://docs.geostandaarden.nl/mim/cv-st-mim-20231018/#metagegeven-basis-uri + https://docs.geostandaarden.nl/mim/vv-st-mim-20240408/#metagegeven-basis-uri no stereotype-name-informatiemodel-package @@ -82,17 +95,13 @@ stereotype-name-external-package stereotype-name-view-package - - Ja - Nee - - + Heeft tijdlijn geldigheid Indicatie of voor dit kenmerk een tijdlijn geldigheid bijgehouden wordt en te bevragen is. MIM-1.2 - https://docs.geostandaarden.nl/mim/cv-st-mim-20231018/#metagegeven-heeft-tijdlijn-geldigheid + https://docs.geostandaarden.nl/mim/vv-st-mim-20240408/#metagegeven-heeft-tijdlijn-geldigheid yes stereotype-name-attribute @@ -105,11 +114,11 @@ Nee - + Heeft tijdlijn registratie Indicatie of voor dit kenmerk een tijdlijn registratie bijgehouden wordt en te bevragen is. MIM-1.2 - https://docs.geostandaarden.nl/mim/cv-st-mim-20231018/#metagegeven-heeft-tijdlijn-registratie + https://docs.geostandaarden.nl/mim/vv-st-mim-20240408/#metagegeven-heeft-tijdlijn-registratie yes stereotype-name-attribute @@ -127,21 +136,11 @@ Doelformaat Het formaat waarin een waardelijst is gepubliceerd. MIM-1.2 - https://docs.geostandaarden.nl/mim/cv-st-mim-20231018/#metagegeven-heeft-tijdlijn-registratie - yes - - stereotype-name-codelist - - - - - Datatype - Datatype van de waarden in een waardelijst. - MIM-1.2 - https://docs.geostandaarden.nl/mim/cv-st-mim-20231018/#metagegeven-datatype + https://docs.geostandaarden.nl/mim/vv-st-mim-20240408/#metagegeven-heeft-tijdlijn-registratie yes stereotype-name-codelist + stereotype-name-referentielijst @@ -149,10 +148,10 @@ Waarde-item Het item (of element) van de lijst dat de waarde representeert. MIM-1.2 - https://docs.geostandaarden.nl/mim/cv-st-mim-20231018/#metagegeven-waarde-item + https://docs.geostandaarden.nl/mim/vv-st-mim-20240408/#metagegeven-waarde-item yes - stereotype-name-codelist + stereotype-name-codelist @@ -160,10 +159,10 @@ Profielspecificatie Referentie naar het profiel dat de technische implementatie van de codelijst beschrijft. MIM-1.2 - https://docs.geostandaarden.nl/mim/cv-st-mim-20231018/#metagegeven-profielspecificatie + https://docs.geostandaarden.nl/mim/vv-st-mim-20240408/#metagegeven-profielspecificatie yes - stereotype-name-codelist + stereotype-name-codelist @@ -171,7 +170,7 @@ Eenheid Aanduiding van de eenheid die bij een meting of waarneming hoort. De waarde van Eenheid is een waarde uit de lijst gepubliceerd op https://units-of-measurement.org/. MIM-1.2 - https://docs.geostandaarden.nl/mim/cv-st-mim-20231018/#metagegeven-eenheid + https://docs.geostandaarden.nl/mim/vv-st-mim-20240408/#metagegeven-eenheid yes stereotype-name-attribute @@ -185,7 +184,7 @@ Minimumwaarde inclusief (>=) is de ondergrens van het waardebereik voor een attribuutsoort of data element getypeerd met een primitief datatype, inclusief die waarde zelf. De minimumwaarde moet van hetzelfde primitieve datatype zijn als het datatype van het modelelement waar het voor geldt. Minimum value inclusive (>=) is the lower limit of the value range for an attribute type or data element typed with a primitive data type, including that value itself. The minimum value must be of the same primitive data type as the data type of the model element it applies to. MIM-1.2 - https://docs.geostandaarden.nl/mim/cv-st-mim-20231018/#metagegeven-minimumwaarde-inclusief + https://docs.geostandaarden.nl/mim/vv-st-mim-20240408/#metagegeven-minimumwaarde-inclusief yes stereotype-name-attribute @@ -198,7 +197,7 @@ Minimumwaarde exclusief (>=) is de ondergrens van het waardebereik voor een attribuutsoort of data element getypeerd met een primitief datatype, exclusief die waarde zelf. De minimumwaarde moet van hetzelfde primitieve datatype zijn als het datatype van het modelelement waar het voor geldt. Minimum value exclusive (>=) is the lower limit of the value range for an attribute type or data element typed with a primitive data type, exclusief that value itself. The minimum value must be of the same primitive data type as the data type of the model element it applies to. MIM-1.2 - https://docs.geostandaarden.nl/mim/cv-st-mim-20231018/#metagegeven-minimumwaarde-exclusief + https://docs.geostandaarden.nl/mim/vv-st-mim-20240408/#metagegeven-minimumwaarde-exclusief yes stereotype-name-attribute @@ -211,7 +210,7 @@ Maximumwaarde inclusief (>=) is de bovengrens van het waardebereik voor een attribuutsoort of data element getypeerd met een primitief datatype, inclusief die waarde zelf. De waarde moet van hetzelfde primitieve datatype zijn als het datatype van het modelelement waar het voor geldt. Maximum value inclusive (>=) is the upper limit of the value range for an attribute type or data element typed with a primitive data type, inclusief that value itself. The value must be of the same primitive data type as the data type of the model element it applies to. MIM-1.2 - https://docs.geostandaarden.nl/mim/cv-st-mim-20231018/#metagegeven-maximumwaarde-inclusief + https://docs.geostandaarden.nl/mim/vv-st-mim-20240408/#metagegeven-maximumwaarde-inclusief yes stereotype-name-attribute @@ -224,7 +223,7 @@ Maximumwaarde exclusief (>=) is de bovengrens van het waardebereik voor een attribuutsoort of data element getypeerd met een primitief datatype, exclusief die waarde zelf. De waarde moet van hetzelfde primitieve datatype zijn als het datatype van het modelelement waar het voor geldt. Maximum value exclusive (>=) is the upper limit of the value range for an attribute type or data element typed with a primitive data type, exclusief that value itself. The value must be of the same primitive data type as the data type of the model element it applies to. MIM-1.2 - https://docs.geostandaarden.nl/mim/cv-st-mim-20231018/#metagegeven-maximumwaarde-exclusief + https://docs.geostandaarden.nl/mim/vv-st-mim-20240408/#metagegeven-maximumwaarde-exclusief yes stereotype-name-attribute @@ -238,7 +237,7 @@ Metagegeven om bij een generalisatie aan te geven dat bij een implementatie die geen multiple inheritance ondersteunt de eigenschappen van de superklasse worden overgenomen door de subklasse. De superklasse zelf komt niet in de implementatie voor. Metadata to indicate in a generalization that in an implementation that does not support multiple inheritance, the properties of the superclass are inherited by the subclass. The superclass itself does not appear in the implementation. MIM-1.2 - https://docs.geostandaarden.nl/mim/cv-st-mim-20231018/#metagegeven-mixin + https://docs.geostandaarden.nl/mim/vv-st-mim-20240408/#metagegeven-mixin yes stereotype-name-generalization @@ -249,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/MIM/cfg/visuals/MIM10.xml b/src/main/resources/input/MIM/cfg/visuals/MIM10.xml index df34fda37..218879a48 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 @@ - + + + + + + + + + + + + + + + + @@ -123,6 +138,9 @@ + + + diff --git a/src/main/resources/input/MIM/cfg/visuals/MIM12.xml b/src/main/resources/input/MIM/cfg/visuals/MIM12.xml new file mode 100644 index 000000000..0203617a2 --- /dev/null +++ b/src/main/resources/input/MIM/cfg/visuals/MIM12.xml @@ -0,0 +1,14 @@ + + + + + + + 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 000000000..4df1913c4 --- /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 000000000..faaaf6b13 --- /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 000000000..67687860e --- /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 000000000..50f152afc --- /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 diff --git a/src/main/resources/input/Waarderingskamer/cfg/metamodels/WaarderingskamerSIM.xml b/src/main/resources/input/Waarderingskamer/cfg/metamodels/WaarderingskamerSIM.xml index 2903a6e2f..8aa3ea8f1 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/input/Waarderingskamer/cfg/versionrules/Waarderingskamer.xml b/src/main/resources/input/Waarderingskamer/cfg/versionrules/Waarderingskamer.xml index 77653cd65..f259e35bd 100644 --- a/src/main/resources/input/Waarderingskamer/cfg/versionrules/Waarderingskamer.xml +++ b/src/main/resources/input/Waarderingskamer/cfg/versionrules/Waarderingskamer.xml @@ -37,6 +37,8 @@ Nonempty Versions must be non-empty. .+ + 1.0 + 2.2.1 Version (not empty) diff --git a/src/main/resources/input/Waterschapshuis/cfg/comparerules/Waterschapshuis.xml b/src/main/resources/input/Waterschapshuis/cfg/comparerules/Waterschapshuis.xml new file mode 100644 index 000000000..2844c3945 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/comparerules/Waterschapshuis.xml @@ -0,0 +1,15 @@ + + + + + + + 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 000000000..df85bd060 --- /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 000000000..4c40dc46d --- /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 000000000..599e57cb4 --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/docrules/Waterschapshuis.xml @@ -0,0 +1,510 @@ + + + + + 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 + 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/Waterschapshuis/cfg/i3n/translation.xml b/src/main/resources/input/Waterschapshuis/cfg/i3n/translation.xml new file mode 100644 index 000000000..bc55fc1e2 --- /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 000000000..766252f5d --- /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 000000000..5b444458e --- /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 000000000..c945fccff --- /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 000000000..5e74ff2e2 --- /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 + true + 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 000000000..0fcf4b7ef --- /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 000000000..c1a3f2d67 --- /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 000000000..03588e670 --- /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 000000000..bad3abd85 --- /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 000000000..94e1a6851 --- /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 000000000..5020befad Binary files /dev/null and b/src/main/resources/input/Waterschapshuis/cfg/owners/web/img/logo-big.jpg differ 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 000000000..8e3e20e3d Binary files /dev/null and b/src/main/resources/input/Waterschapshuis/cfg/owners/web/img/logo-small.jpg differ 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 000000000..7c2430802 --- /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 000000000..b8605df1e --- /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;i + + + + + + 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 000000000..b401037c7 --- /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 000000000..d73ad3353 --- /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 000000000..9fd05816f --- /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 000000000..787c2791b --- /dev/null +++ b/src/main/resources/input/Waterschapshuis/cfg/versionrules/Waterschapshuis.xml @@ -0,0 +1,103 @@ + + + + + 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+))? + 1.0 + 2.2.1 + + 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 000000000..fcdbf5ef7 --- /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 000000000..4ea1d38c9 --- /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 000000000..c2e051658 Binary files /dev/null and b/src/main/resources/input/Waterschapshuis/props/Waterschapshuis.xlsx differ 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 000000000..c913a6b95 --- /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 000000000..2b52dc849 --- /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/static/release/release.xml b/src/main/resources/static/release/release.xml index 5dd126642..60b186c06 100644 --- a/src/main/resources/static/release/release.xml +++ b/src/main/resources/static/release/release.xml @@ -1,9 +1,8 @@ Imvertor - 4.0 + 4.1 0 - Copyright (C) 2016-2024 Dienst voor het Kadaster en de openbare registers. This program comes with ABSOLUTELY NO WARRANTY; for details pass -help program. This is free software, and you are welcome to redistribute it diff --git a/src/main/resources/static/xsl/Configurator/processingmode.xsl b/src/main/resources/static/xsl/Configurator/processingmode.xsl index 7ac358063..559e0bc14 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 diff --git a/src/main/resources/xsl/ComplyCompiler/ComplyCompiler-flat.xsl b/src/main/resources/xsl/ComplyCompiler/ComplyCompiler-flat.xsl index fa1196964..7f87b2f2f 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/ConfigCompiler/ConfigCompiler-report.xsl b/src/main/resources/xsl/ConfigCompiler/ConfigCompiler-report.xsl index 307fddb29..dd2dc75cc 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

diff --git a/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl b/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl index 47b2a3468..025f8f41f 100644 --- a/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl +++ b/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl @@ -102,27 +102,22 @@ - + - + - + - - - - - - x?> + + @@ -271,8 +266,6 @@ - - diff --git a/src/main/resources/xsl/ConfigCompiler/Imvert2ea-profile.xsl b/src/main/resources/xsl/ConfigCompiler/Imvert2ea-profile.xsl index afb93e5b2..435cd78f6 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 @@ - + diff --git a/src/main/resources/xsl/EpCompiler/Imvert2EP.xsl b/src/main/resources/xsl/EpCompiler/Imvert2EP.xsl index d9c62589e..0ed06e420 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 d87c7dfde..2a4d141e5 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 98% rename from src/main/resources/xsl/EpCompiler/MIM2EP-post.xsl rename to src/main/resources/xsl/EpCompiler/MIM1.1/MIM2EP-post.xsl index 5c324b196..d9d25e2e1 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" > - + @@ -148,7 +148,6 @@ Check https://github.com/Geonovum/shapeChangeTest/issues/52 --> - 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 8d75484c0..272c725ec 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 000000000..f1654d30d --- /dev/null +++ b/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-core.xsl @@ -0,0 +1,1118 @@ + + + + + + + + + + + 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 000000000..bb14c18e6 --- /dev/null +++ b/src/main/resources/xsl/EpCompiler/MIM1.2/MIM2EP-post.xsl @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 000000000..ad2203fbf --- /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/GenericTransformer/SMAE-transformer-simple.xsl b/src/main/resources/xsl/GenericTransformer/SMAE-transformer-simple.xsl index 219620401..d241ddb63 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 ded824345..23de0a2b3 100644 --- a/src/main/resources/xsl/ImvertCompiler/Imvert2report-valuelists.xsl +++ b/src/main/resources/xsl/ImvertCompiler/Imvert2report-valuelists.xsl @@ -69,7 +69,7 @@ - + diff --git a/src/main/resources/xsl/JsonSchemaCompiler/EP2Json.xsl b/src/main/resources/xsl/JsonSchemaCompiler/EP2Json.xsl index f6b0e52d7..c7630b20a 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 7c52418cf..2b37656bd 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/MIMCompiler/MIMCompiler-report.xsl b/src/main/resources/xsl/MIMCompiler/MIMCompiler-report.xsl index 7af45cf87..aeba9a906 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/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 95% rename from src/main/resources/xsl/MIMCompiler/v2/MIMCompiler-RDF.xsl rename to src/main/resources/xsl/MIMCompiler/v2/MIM1.1/MIMCompiler-RDF.xsl index 598b9b872..955a03eff 100644 --- a/src/main/resources/xsl/MIMCompiler/v2/MIMCompiler-RDF.xsl +++ b/src/main/resources/xsl/MIMCompiler/v2/MIM1.1/MIMCompiler-RDF.xsl @@ -199,16 +199,12 @@ Zie: https://docs.geostandaarden.nl/mim/mim/ voor de laatste versie van de stand - - - - - - - - - - + + + + + + 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 62c817956..79f16dd05 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 @@ - - + + @@ -215,6 +215,11 @@ + + + @@ -571,7 +576,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 new file mode 100644 index 000000000..f3e60798d --- /dev/null +++ b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIM1.2-model.xml @@ -0,0 +1,1059 @@ + + + + + Attribuutsoort + Naam + Begrip + Alias + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Type + Lengte + Patroon + Formeel patroon + Maximumwaarde exclusief + Minimumwaarde exclusief + Maximumwaarde inclusief + Minimumwaarde inclusief + 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 + + + Codelijst + Naam + Begrip + Alias + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Locatie + + literalEncodingType + Doelformaat + Waarde-item + Profielspecificatie + Identificatie + + + Constraint + Naam + Specificatie tekst + Specificatie formeel + + + Data element + Naam + Begrip + Herkomst + Definitie + Herkomst definitie + Toelichting + Datum opname + Type + Lengte + Patroon + Formeel patroon + Maximumwaarde exclusief + Minimumwaarde exclusief + Maximumwaarde inclusief + Minimumwaarde inclusief + Kardinaliteit + + + Identificatie + + + 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 + Relatiemodelleringstype + 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 + Relatiemodelleringstype + 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 + Maximumwaarde exclusief + Minimumwaarde exclusief + Maximumwaarde inclusief + Minimumwaarde inclusief + Kardinaliteit + Identificerend + Eenheid + Identificatie + 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 + + + + Maximumwaarde inclusief + Attribuutsoort + Data element + Referentie element + + + Maximumwaarde exclusief + Attribuutsoort + Data element + Referentie element + + + MIM extensie + Informatiemodel + + + MIM extensie versie + Informatiemodel + + + MIM taal + Informatiemodel + + + MIM versie + Informatiemodel + + + + Minimumwaarde inclusief + Attribuutsoort + Data element + Referentie element + + + Minimumwaarde exclusief + Attribuutsoort + Data element + Referentie element + + + 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 + + + Relatiemodelleringstype + 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/MIM1.2-readme.xml b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIM1.2-readme.xml new file mode 100644 index 000000000..0b6a698ef --- /dev/null +++ b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/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 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 000000000..b27b071d0 --- /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 000000000..3187510d0 --- /dev/null +++ b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl @@ -0,0 +1,1543 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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-DOELFORMAAT')} + + + + + {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')} + + + + + {imf:tagged-values($context, 'CFG-TV-PROFIELSPECIFICATIE')} + + + + + + + + + + {$relatiemodelleringstype} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Generalisatie Objecttypes + + + + + + + + + + + + + + + + + + + + + Generalisatie Datatypes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {imf:mim-boolean(xs:string($context/imvert:source/imvert:navigable = 'false'))} + + + + + + + + + + {imf:tagged-values($context, 'CFG-TV-WAARDEITEM')} + + + + + + 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/OfficeCompiler/Imvert2modeldoc-IHW-SIM-POSTPROC.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-IHW-SIM-POSTPROC.xsl new file mode 100644 index 000000000..933c99035 --- /dev/null +++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-IHW-SIM-POSTPROC.xsl @@ -0,0 +1,22 @@ + + + + + + + + + + Verwijderd: detailinformatie + + + + + + + + + + + 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 b7012ffdd..0cab592ca 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. -

    -
    diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-KINGSIM-html-msword.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-KINGSIM-html-msword.xsl index 26c89e55c..941097b46 100644 --- a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-KINGSIM-html-msword.xsl +++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-KINGSIM-html-msword.xsl @@ -72,12 +72,15 @@

    + Model type - : + : Name - : + : Version + + : Imvertor - : + : At

    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 000000000..44aeae28a --- /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 000000000..793be0769 --- /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 000000000..9b9885cc3 --- /dev/null +++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Waterschapshuis-CONCEPTUAL.xsl @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 4143ceb45..54e192533 100644 --- a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl +++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc.xsl @@ -67,8 +67,8 @@ - - + + @@ -77,7 +77,7 @@ - + @@ -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 @@ + + + + + @@ -1178,6 +1220,9 @@ + + + @@ -1237,6 +1282,12 @@ + + + + + + @@ -1244,14 +1295,21 @@ - + + + + + + + + @@ -1390,6 +1448,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1413,6 +1503,18 @@ + + + + + + + + + + + + @@ -1619,6 +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 2c3f88125..40ffd68cc 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 @@ + + + + diff --git a/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract-canon.xsl b/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract-canon.xsl index 2148480f6..cc312140c 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 acaa470be..cdd9b77a3 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 b7ebe4274..a15ed82fa 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 1dddd2537..78fcf3ead 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 604707739..365ddc742 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 19eba2b24..536d29d41 100644 --- a/src/main/resources/xsl/SkosCompiler/Imvert2Skos-BRO.xsl +++ b/src/main/resources/xsl/SkosCompiler/Imvert2Skos-BRO.xsl @@ -47,6 +47,7 @@ ' ' + @@ -63,7 +64,7 @@ - + @@ -341,18 +342,21 @@ - + + - + + + - + diff --git a/src/main/resources/xsl/Validator/Imvert2validation-KINGUGM.xsl b/src/main/resources/xsl/Validator/Imvert2validation-KINGUGM.xsl index 32a43192c..d6bbc1f07 100644 --- a/src/main/resources/xsl/Validator/Imvert2validation-KINGUGM.xsl +++ b/src/main/resources/xsl/Validator/Imvert2validation-KINGUGM.xsl @@ -104,6 +104,7 @@ @@ -125,10 +126,11 @@ + diff --git a/src/main/resources/xsl/Validator/Imvert2validation-MIM12.xsl b/src/main/resources/xsl/Validator/Imvert2validation-MIM12.xsl index 9f2825768..db3711def 100644 --- a/src/main/resources/xsl/Validator/Imvert2validation-MIM12.xsl +++ b/src/main/resources/xsl/Validator/Imvert2validation-MIM12.xsl @@ -20,6 +20,24 @@ + + + + + + + + + + + + + + + + + + @@ -38,4 +56,17 @@ + + + + + + + + diff --git a/src/main/resources/xsl/Validator/Imvert2validation.xsl b/src/main/resources/xsl/Validator/Imvert2validation.xsl index 0e5e4dcdd..c6ce8835d 100644 --- a/src/main/resources/xsl/Validator/Imvert2validation.xsl +++ b/src/main/resources/xsl/Validator/Imvert2validation.xsl @@ -173,8 +173,6 @@ - - - + @@ -230,8 +228,6 @@ not(normalize-space(imvert:namespace)), 'No root namespace defined for application')"/> - - @@ -247,7 +243,7 @@ - + - + @@ -983,7 +979,7 @@ not($is-collection) and $this/imvert:name and not(imf:test-name-convention($this)), 'Association name does not obey convention')"/> + 'Version [1] must be a sequence of [3] (examples: [2])', ($this/imvert:version, imf:string-group($cfg-version/example), imf:string-group($cfg-version/fragment/name)))"/> @@ -1608,20 +1604,6 @@ 'Release must be specified and takes the form YYYYMMDD')"/> - - - - - - - - - diff --git a/src/main/resources/xsl/XmiCompiler/XmiCompiler-report.xsl b/src/main/resources/xsl/XmiCompiler/XmiCompiler-report.xsl index 936c968a9..366f7dfde 100644 --- a/src/main/resources/xsl/XmiCompiler/XmiCompiler-report.xsl +++ b/src/main/resources/xsl/XmiCompiler/XmiCompiler-report.xsl @@ -51,12 +51,10 @@ - + - - diff --git a/src/main/resources/xsl/XmiTranslator/XMI1Imvert.xsl b/src/main/resources/xsl/XmiTranslator/XMI1Imvert.xsl index aacfa8027..081548852 100644 --- a/src/main/resources/xsl/XmiTranslator/XMI1Imvert.xsl +++ b/src/main/resources/xsl/XmiTranslator/XMI1Imvert.xsl @@ -268,10 +268,9 @@ - - - - + + x?> @@ -288,7 +287,9 @@ - + + + @@ -298,7 +299,7 @@ - + @@ -320,7 +321,6 @@ - @@ -519,6 +519,7 @@ + @@ -526,6 +527,7 @@ + x?> diff --git a/src/main/resources/xsl/XmiTranslator/XmiTranslator-report.xsl b/src/main/resources/xsl/XmiTranslator/XmiTranslator-report.xsl index 47e8cda53..316f25c55 100644 --- a/src/main/resources/xsl/XmiTranslator/XmiTranslator-report.xsl +++ b/src/main/resources/xsl/XmiTranslator/XmiTranslator-report.xsl @@ -45,6 +45,7 @@ + diff --git a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136.xsl b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136.xsl index fe18c4132..1276cd0da 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 @@ - + + + + @@ -983,7 +1017,7 @@ - + @@ -1271,13 +1305,8 @@ - - - + diff --git a/src/main/resources/xsl/XsdCompiler/XsdCompiler-report.xsl b/src/main/resources/xsl/XsdCompiler/XsdCompiler-report.xsl index 516439af8..11690cbaa 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"> @@ -294,40 +285,40 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -1130,7 +1121,7 @@ - +