diff --git a/src/main/java/nl/imvertor/MIMCompiler/MIMCompiler.java b/src/main/java/nl/imvertor/MIMCompiler/MIMCompiler.java index a12b7772..929e15e8 100644 --- a/src/main/java/nl/imvertor/MIMCompiler/MIMCompiler.java +++ b/src/main/java/nl/imvertor/MIMCompiler/MIMCompiler.java @@ -119,9 +119,10 @@ public boolean generateDefault() throws Exception { } if (isRDFType) { - transformer.setXslParm("generate-readable-ids", "false"); + transformer.setXslParm("generate-readable-ids", "true"); transformer.setXslParm("generate-all-ids", "true"); - } + transformer.setXslParm("add-generated-id", "true"); + } 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. diff --git a/src/main/resources/cfg/OfficeCompiler/parms.xml b/src/main/resources/cfg/OfficeCompiler/parms.xml index fc6a30fa..e6b7cb2e 100644 --- a/src/main/resources/cfg/OfficeCompiler/parms.xml +++ b/src/main/resources/cfg/OfficeCompiler/parms.xml @@ -210,7 +210,11 @@ Imvert2modeldoc-IHW-MIM-11-CONCEPTUAL.xsl Imvert2modeldoc-IHW-MIM-11-CONCEPTUAL-POSTPROC.xsl Imvert2modeldoc-IHW-MIM-11-CONCEPTUAL-html-respec.xsl - + + Imvert2modeldoc-IHW-MIM-11-CONCEPTUAL.xsl + Imvert2modeldoc-IHW-MIM-11-CONCEPTUAL-POSTPROC.xsl + Imvert2modeldoc-IHW-MIM-11-CONCEPTUAL-html-respec.xsl + Imvert2modeldoc-Waarderingskamer-MIM-11-SIM.xsl Imvert2modeldoc-Waarderingskamer-MIM-11-SIM-html-respec.xsl diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd index 271a581c..606c7580 100644 --- a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd @@ -327,7 +327,8 @@ - + + diff --git a/src/main/resources/input/IHW/cfg/docrules/IHW-MIM-11-CONCEPTUAL.xml b/src/main/resources/input/IHW/cfg/docrules/IHW-MIM-11-CONCEPTUAL.xml index 373e5323..c57080db 100644 --- a/src/main/resources/input/IHW/cfg/docrules/IHW-MIM-11-CONCEPTUAL.xml +++ b/src/main/resources/input/IHW/cfg/docrules/IHW-MIM-11-CONCEPTUAL.xml @@ -8,164 +8,8 @@ - IHW-MIM-1-CONCEPTUAL + IHW-MIM-11-CONCEPTUAL IHW specific requirements on documentation. - - - 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-PRIMITIVEDATATYPE - DISPLAY-GLOBAL-STRUCTUREDDATATYPE - 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 - - - - Definitie - Definition - - DISPLAY-GLOBAL-OBJECTTYPE - DISPLAY-GLOBAL-ASSOCIATIONCLASS - DISPLAY-GLOBAL-REFERENCELIST - 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-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 - - - - Herkomst definitie - Origin of definition - - DISPLAY-GLOBAL-OBJECTTYPE - - DISPLAY-GLOBAL-REFERENCELIST - 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-UNIONELEMENT - DISPLAY-DETAIL-DATAELEMENT - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - DISPLAY-DETAIL-ENUMERATION - - - - Herkomst - Origin - - DISPLAY-GLOBAL-OBJECTTYPE - - DISPLAY-GLOBAL-REFERENCELIST - 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-DATAELEMENT - DISPLAY-DETAIL-ASSOCIATION - DISPLAY-DETAIL-COMPOSITE-ASSOCIATION - - \ No newline at end of file diff --git a/src/main/resources/input/IHW/cfg/docrules/IHW-MIM-12-CONCEPTUAL.xml b/src/main/resources/input/IHW/cfg/docrules/IHW-MIM-12-CONCEPTUAL.xml new file mode 100644 index 00000000..e7d1baf0 --- /dev/null +++ b/src/main/resources/input/IHW/cfg/docrules/IHW-MIM-12-CONCEPTUAL.xml @@ -0,0 +1,15 @@ + + + + + + + + + IHW-MIM-12-CONCEPTUAL + + IHW specific requirements on documentation. + + \ No newline at end of file diff --git a/src/main/resources/input/IHW/cfg/docrules/IHW.xml b/src/main/resources/input/IHW/cfg/docrules/IHW.xml index abb612a2..170e6640 100644 --- a/src/main/resources/input/IHW/cfg/docrules/IHW.xml +++ b/src/main/resources/input/IHW/cfg/docrules/IHW.xml @@ -49,5 +49,5 @@ Wanneer ReSpec wordt samengesteld, welke config kan worden gebruikt? --> respec-nlgov - + \ No newline at end of file diff --git a/src/main/resources/input/IHW/cfg/metamodels/IHW-MIM-1-CONCEPTUAL.xml b/src/main/resources/input/IHW/cfg/metamodels/IHW-MIM-1-CONCEPTUAL.xml index 69bebd8c..6491d108 100644 --- a/src/main/resources/input/IHW/cfg/metamodels/IHW-MIM-1-CONCEPTUAL.xml +++ b/src/main/resources/input/IHW/cfg/metamodels/IHW-MIM-1-CONCEPTUAL.xml @@ -4,9 +4,9 @@ --> - + - + IHW-MIM-1-CONCEPTUAL diff --git a/src/main/resources/input/IHW/cfg/notesrules/IHW-MIM-11-CONCEPTUAL.xml b/src/main/resources/input/IHW/cfg/notesrules/IHW-MIM-11-CONCEPTUAL.xml index 9e1869a1..575e179f 100644 --- a/src/main/resources/input/IHW/cfg/notesrules/IHW-MIM-11-CONCEPTUAL.xml +++ b/src/main/resources/input/IHW/cfg/notesrules/IHW-MIM-11-CONCEPTUAL.xml @@ -6,6 +6,6 @@ - IHW-MIM-1-CONCEPTUAL + IHW-MIM-11-CONCEPTUAL \ No newline at end of file diff --git a/src/main/resources/input/IHW/cfg/notesrules/IHW-MIM-12-CONCEPTUAL.xml b/src/main/resources/input/IHW/cfg/notesrules/IHW-MIM-12-CONCEPTUAL.xml new file mode 100644 index 00000000..516eaf85 --- /dev/null +++ b/src/main/resources/input/IHW/cfg/notesrules/IHW-MIM-12-CONCEPTUAL.xml @@ -0,0 +1,11 @@ + + + + + + + IHW-MIM-12-CONCEPTUAL + + \ No newline at end of file diff --git a/src/main/resources/input/IHW/cfg/tvsets/IHW-MIM-1-CONCEPTUAL.xml b/src/main/resources/input/IHW/cfg/tvsets/IHW-MIM-1-CONCEPTUAL.xml index 232e5274..e29eabe0 100644 --- a/src/main/resources/input/IHW/cfg/tvsets/IHW-MIM-1-CONCEPTUAL.xml +++ b/src/main/resources/input/IHW/cfg/tvsets/IHW-MIM-1-CONCEPTUAL.xml @@ -20,11 +20,11 @@ - + - + - + IHW-MIM-1-CONCEPTUAL diff --git a/src/main/resources/input/IHW/cfg/visuals/IHW-MIM-12-CONCEPTUAL.xml b/src/main/resources/input/IHW/cfg/visuals/IHW-MIM-12-CONCEPTUAL.xml new file mode 100644 index 00000000..0bc28021 --- /dev/null +++ b/src/main/resources/input/IHW/cfg/visuals/IHW-MIM-12-CONCEPTUAL.xml @@ -0,0 +1,29 @@ + + + + + + + + IHW MIM 1.2 + + Visuals for IHW MIM 1.2 models + Visuele aspecten van IHW MIM 1.2 modellen + + + + + + + + + + + + + + diff --git a/src/main/resources/input/IHW/props/IHW.xlsx b/src/main/resources/input/IHW/props/IHW.xlsx index 2dbddf93..3d6137dd 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/xsl/ConfigCompiler/Imvert2configuration.xsl b/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl index c6642510..6dfbd844 100644 --- a/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl +++ b/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl @@ -145,7 +145,7 @@ - + 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 index 24cb5512..34bb3b37 100644 --- a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler-RDF.xsl +++ b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler-RDF.xsl @@ -70,13 +70,13 @@ Zie: https://docs.geostandaarden.nl/mim/mim/ voor de laatste versie van de stand + mim-in:ReferentieElement|mim-in:Constraint|mim-in:Keuze|mim-in:ExterneKoppeling|mim-in:Interface|mim-in:Relatiesoort|mim-in:Bron|mim-in:Doel|mim-in:Relatieklasse|mim-in:GeneralisatieObjecttypen|mim-in:GeneralisatieDatatypen"> + mim-in:type|mim-in:gegevensgroepType|mim-in:supertype)/*" mode="metagegeven"/> @@ -186,7 +186,7 @@ Zie: https://docs.geostandaarden.nl/mim/mim/ voor de laatste versie van de stand - + diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl index f46bbf59..87c43e4d 100644 --- a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl +++ b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler.xsl @@ -49,8 +49,8 @@ - - + + @@ -1342,9 +1342,8 @@ - - - + + @@ -1355,7 +1354,10 @@ - + @@ -1365,7 +1367,7 @@ - + diff --git a/src/main/resources/xsl/Validator/Imvert2validation.xsl b/src/main/resources/xsl/Validator/Imvert2validation.xsl index 72dea259..3a01a094 100644 --- a/src/main/resources/xsl/Validator/Imvert2validation.xsl +++ b/src/main/resources/xsl/Validator/Imvert2validation.xsl @@ -884,7 +884,7 @@ - + @@ -899,6 +899,13 @@ imvert:stereotype/@id = 'stereotype-name-attributegroup' and not($defining-class/imvert:designation = 'class'), '[1] type must be an UML class', imf:string-group(imf:get-config-stereotypes('stereotype-name-attributegroup'),' or '))"/> + + @@ -909,7 +916,7 @@ - +