From 09d4ff60dcf56e010c6943a3184caa4d827e24b3 Mon Sep 17 00:00:00 2001 From: Joachim Nielandt Date: Tue, 29 Oct 2024 14:28:29 +0100 Subject: [PATCH 01/13] added translations --- src/main/plugin/dcat-ap/loc/dut/labels.xml | 47 +++++++++++++++++++ ...matron-rules-dcat-ap-hvd-cardinalities.xml | 4 ++ .../dut/schematron-rules-dcat-ap-hvd-rec.xml | 4 ++ .../loc/dut/schematron-rules-dcat-ap-hvd.xml | 4 ++ src/main/plugin/dcat-ap/loc/dut/strings.xml | 16 +++++++ src/main/plugin/dcat-ap/loc/eng/labels.xml | 40 ++++++++-------- ...matron-rules-dcat-ap-hvd-cardinalities.xml | 4 ++ .../eng/schematron-rules-dcat-ap-hvd-rec.xml | 4 ++ .../loc/eng/schematron-rules-dcat-ap-hvd.xml | 4 ++ src/main/plugin/dcat-ap/loc/eng/strings.xml | 16 +++++-- src/main/plugin/dcat-ap/loc/fre/labels.xml | 47 +++++++++++++++++++ ...matron-rules-dcat-ap-hvd-cardinalities.xml | 4 ++ .../fre/schematron-rules-dcat-ap-hvd-rec.xml | 4 ++ .../loc/fre/schematron-rules-dcat-ap-hvd.xml | 4 ++ src/main/plugin/dcat-ap/loc/fre/strings.xml | 16 +++++++ src/main/plugin/dcat-ap/loc/ger/labels.xml | 47 +++++++++++++++++++ ...matron-rules-dcat-ap-hvd-cardinalities.xml | 4 ++ .../ger/schematron-rules-dcat-ap-hvd-rec.xml | 4 ++ .../loc/ger/schematron-rules-dcat-ap-hvd.xml | 4 ++ src/main/plugin/dcat-ap/loc/ger/strings.xml | 16 +++++++ 20 files changed, 269 insertions(+), 24 deletions(-) create mode 100644 src/main/plugin/dcat-ap/loc/dut/schematron-rules-dcat-ap-hvd-cardinalities.xml create mode 100644 src/main/plugin/dcat-ap/loc/dut/schematron-rules-dcat-ap-hvd-rec.xml create mode 100644 src/main/plugin/dcat-ap/loc/dut/schematron-rules-dcat-ap-hvd.xml create mode 100644 src/main/plugin/dcat-ap/loc/eng/schematron-rules-dcat-ap-hvd-cardinalities.xml create mode 100644 src/main/plugin/dcat-ap/loc/eng/schematron-rules-dcat-ap-hvd-rec.xml create mode 100644 src/main/plugin/dcat-ap/loc/eng/schematron-rules-dcat-ap-hvd.xml create mode 100644 src/main/plugin/dcat-ap/loc/fre/schematron-rules-dcat-ap-hvd-cardinalities.xml create mode 100644 src/main/plugin/dcat-ap/loc/fre/schematron-rules-dcat-ap-hvd-rec.xml create mode 100644 src/main/plugin/dcat-ap/loc/fre/schematron-rules-dcat-ap-hvd.xml create mode 100644 src/main/plugin/dcat-ap/loc/ger/schematron-rules-dcat-ap-hvd-cardinalities.xml create mode 100644 src/main/plugin/dcat-ap/loc/ger/schematron-rules-dcat-ap-hvd-rec.xml create mode 100644 src/main/plugin/dcat-ap/loc/ger/schematron-rules-dcat-ap-hvd.xml diff --git a/src/main/plugin/dcat-ap/loc/dut/labels.xml b/src/main/plugin/dcat-ap/loc/dut/labels.xml index 721f5f2..053371c 100644 --- a/src/main/plugin/dcat-ap/loc/dut/labels.xml +++ b/src/main/plugin/dcat-ap/loc/dut/labels.xml @@ -631,4 +631,51 @@ Tooltip: Resource URI Resource URI + + + + This property refers to the mobility-related theme (i.e., a specific subject, category, or type) of the delivered content. + A dataset may be associated with multiple themes. A theme is important for data seekers who are interested in a particular type of data content. + + + + This property describes the transport mode that is covered by the delivered content. Data can be valid for more than one mode, so a multiple choice should be applied. + + + + This property describes the part of the transport network that is covered by the delivered content. For road traffic, the property SHOULD refer to the network classification for which the data is provided. As a minimum, an international or higher-level classification, e.g., via functional road classes, is recommended to allow data search across different countries. In addition, national classifications are allowed. + For other transport modes, the property is meant to refer to the physical infrastructure which is used by the services covered by the data. + For all modes, the property SHOULD also indicate if the data content relates to the EU’s trans-European transport network [EU-TEN-T]. + + + + This property SHOULD be used to specify the georeferencing method used in the dataset. + + + + This property MAY describe predefined information services, which the data content is intended to support. + Such services MAY be, e.g., information services for multimodal mobility, as specified by EC Delegated Regulation 2017/1926 [EC-MMTIS-DR]. + Examples of such services include “location search”, which is based on a datasets with address identifiers, or “trip plan computation”, which is based on datasets about a road network. + + + + + The HVD category to which this Dataset belongs. + HVD Category + + + + The HVD category to which this Data Service belongs. + HVD Category + + + + The legislation that mandates the creation or management of the Dataset. + applicable legislation + + + + The legislation that mandates the creation or management of the Data Service. + applicable legislation + diff --git a/src/main/plugin/dcat-ap/loc/dut/schematron-rules-dcat-ap-hvd-cardinalities.xml b/src/main/plugin/dcat-ap/loc/dut/schematron-rules-dcat-ap-hvd-cardinalities.xml new file mode 100644 index 0000000..42bf541 --- /dev/null +++ b/src/main/plugin/dcat-ap/loc/dut/schematron-rules-dcat-ap-hvd-cardinalities.xml @@ -0,0 +1,4 @@ + + + High Value Datasets - Kardinaliteiten + diff --git a/src/main/plugin/dcat-ap/loc/dut/schematron-rules-dcat-ap-hvd-rec.xml b/src/main/plugin/dcat-ap/loc/dut/schematron-rules-dcat-ap-hvd-rec.xml new file mode 100644 index 0000000..c0355d4 --- /dev/null +++ b/src/main/plugin/dcat-ap/loc/dut/schematron-rules-dcat-ap-hvd-rec.xml @@ -0,0 +1,4 @@ + + + High Value Datasets - Aanbevolen + diff --git a/src/main/plugin/dcat-ap/loc/dut/schematron-rules-dcat-ap-hvd.xml b/src/main/plugin/dcat-ap/loc/dut/schematron-rules-dcat-ap-hvd.xml new file mode 100644 index 0000000..feb72bf --- /dev/null +++ b/src/main/plugin/dcat-ap/loc/dut/schematron-rules-dcat-ap-hvd.xml @@ -0,0 +1,4 @@ + + + High Value Datasets - Verplicht + diff --git a/src/main/plugin/dcat-ap/loc/dut/strings.xml b/src/main/plugin/dcat-ap/loc/dut/strings.xml index e4929db..7e9f4c9 100644 --- a/src/main/plugin/dcat-ap/loc/dut/strings.xml +++ b/src/main/plugin/dcat-ap/loc/dut/strings.xml @@ -86,4 +86,20 @@ LINK-1.0-http--link LINK-1.0-http--related Vul uw eigen protocol in... + + High Value Dataset (HVD) + Data Service + High Value Dataset (HVD) + Dataset + High Value Dataset + + Mobility + Mobility + Mobility + + Data Service + Metadata DCAT + Dataset + Metadata DCAT + Metadata DCAT diff --git a/src/main/plugin/dcat-ap/loc/eng/labels.xml b/src/main/plugin/dcat-ap/loc/eng/labels.xml index 0be2953..4fecf71 100644 --- a/src/main/plugin/dcat-ap/loc/eng/labels.xml +++ b/src/main/plugin/dcat-ap/loc/eng/labels.xml @@ -926,26 +926,6 @@ Language - - - - - The HVD category to which this Dataset belongs. - The HVD IR defines six thematic data categories: geospatial, earth observation and environment, meteorological, statistics, companies and company ownership, and mobility. - A new property HVD category is introduced to indicate the HVD category to which an resource, i.e. a dataset, belongs. - The controlled vocabulary with all possible values is maintained by the Publications Office. - A resource may belong to more than one data category. - - - - The legislation that mandates the creation or management of the Data Service. For HVD the value MUST include the ELI http://data.europa.eu/eli/reg_impl/2023/138/oj. - As multiple legislations may apply to the resource the maximum cardinality is not limited. - - - - - - This property refers to the mobility-related theme (i.e., a specific subject, category, or type) of the delivered content. @@ -972,4 +952,24 @@ Examples of such services include “location search”, which is based on a datasets with address identifiers, or “trip plan computation”, which is based on datasets about a road network. + + + The HVD category to which this Dataset belongs. + HVD Category + + + + The HVD category to which this Data Service belongs. + HVD Category + + + + The legislation that mandates the creation or management of the Dataset. + applicable legislation + + + + The legislation that mandates the creation or management of the Data Service. + applicable legislation + diff --git a/src/main/plugin/dcat-ap/loc/eng/schematron-rules-dcat-ap-hvd-cardinalities.xml b/src/main/plugin/dcat-ap/loc/eng/schematron-rules-dcat-ap-hvd-cardinalities.xml new file mode 100644 index 0000000..cf19a09 --- /dev/null +++ b/src/main/plugin/dcat-ap/loc/eng/schematron-rules-dcat-ap-hvd-cardinalities.xml @@ -0,0 +1,4 @@ + + + High Value Datasets - Cardinalities + diff --git a/src/main/plugin/dcat-ap/loc/eng/schematron-rules-dcat-ap-hvd-rec.xml b/src/main/plugin/dcat-ap/loc/eng/schematron-rules-dcat-ap-hvd-rec.xml new file mode 100644 index 0000000..11a7659 --- /dev/null +++ b/src/main/plugin/dcat-ap/loc/eng/schematron-rules-dcat-ap-hvd-rec.xml @@ -0,0 +1,4 @@ + + + High Value Datasets - Recommended + diff --git a/src/main/plugin/dcat-ap/loc/eng/schematron-rules-dcat-ap-hvd.xml b/src/main/plugin/dcat-ap/loc/eng/schematron-rules-dcat-ap-hvd.xml new file mode 100644 index 0000000..6b8ba3d --- /dev/null +++ b/src/main/plugin/dcat-ap/loc/eng/schematron-rules-dcat-ap-hvd.xml @@ -0,0 +1,4 @@ + + + High Value Datasets - Mandatory + diff --git a/src/main/plugin/dcat-ap/loc/eng/strings.xml b/src/main/plugin/dcat-ap/loc/eng/strings.xml index 3b7cfc5..e465d45 100644 --- a/src/main/plugin/dcat-ap/loc/eng/strings.xml +++ b/src/main/plugin/dcat-ap/loc/eng/strings.xml @@ -87,11 +87,19 @@ LINK-1.0-http--related Enter your own protocol... + High Value Dataset (HVD) + Data Service + High Value Dataset (HVD) + Dataset High Value Dataset - High Value Dataset - High Value Dataset (HVD) - Mobility - Mobility Mobility + Mobility + Mobility + + Data Service + Metadata DCAT + Dataset + Metadata DCAT + Metadata DCAT diff --git a/src/main/plugin/dcat-ap/loc/fre/labels.xml b/src/main/plugin/dcat-ap/loc/fre/labels.xml index 16e02e7..76b44ae 100644 --- a/src/main/plugin/dcat-ap/loc/fre/labels.xml +++ b/src/main/plugin/dcat-ap/loc/fre/labels.xml @@ -2196,4 +2196,51 @@ Tooltip: in scheme in scheme + + + + This property refers to the mobility-related theme (i.e., a specific subject, category, or type) of the delivered content. + A dataset may be associated with multiple themes. A theme is important for data seekers who are interested in a particular type of data content. + + + + This property describes the transport mode that is covered by the delivered content. Data can be valid for more than one mode, so a multiple choice should be applied. + + + + This property describes the part of the transport network that is covered by the delivered content. For road traffic, the property SHOULD refer to the network classification for which the data is provided. As a minimum, an international or higher-level classification, e.g., via functional road classes, is recommended to allow data search across different countries. In addition, national classifications are allowed. + For other transport modes, the property is meant to refer to the physical infrastructure which is used by the services covered by the data. + For all modes, the property SHOULD also indicate if the data content relates to the EU’s trans-European transport network [EU-TEN-T]. + + + + This property SHOULD be used to specify the georeferencing method used in the dataset. + + + + This property MAY describe predefined information services, which the data content is intended to support. + Such services MAY be, e.g., information services for multimodal mobility, as specified by EC Delegated Regulation 2017/1926 [EC-MMTIS-DR]. + Examples of such services include “location search”, which is based on a datasets with address identifiers, or “trip plan computation”, which is based on datasets about a road network. + + + + + The HVD category to which this Dataset belongs. + HVD Category + + + + The HVD category to which this Data Service belongs. + HVD Category + + + + The legislation that mandates the creation or management of the Dataset. + applicable legislation + + + + The legislation that mandates the creation or management of the Data Service. + applicable legislation + diff --git a/src/main/plugin/dcat-ap/loc/fre/schematron-rules-dcat-ap-hvd-cardinalities.xml b/src/main/plugin/dcat-ap/loc/fre/schematron-rules-dcat-ap-hvd-cardinalities.xml new file mode 100644 index 0000000..57acd12 --- /dev/null +++ b/src/main/plugin/dcat-ap/loc/fre/schematron-rules-dcat-ap-hvd-cardinalities.xml @@ -0,0 +1,4 @@ + + + High Value Datasets - Cardinalités + diff --git a/src/main/plugin/dcat-ap/loc/fre/schematron-rules-dcat-ap-hvd-rec.xml b/src/main/plugin/dcat-ap/loc/fre/schematron-rules-dcat-ap-hvd-rec.xml new file mode 100644 index 0000000..81f979d --- /dev/null +++ b/src/main/plugin/dcat-ap/loc/fre/schematron-rules-dcat-ap-hvd-rec.xml @@ -0,0 +1,4 @@ + + + High Value Datasets - Recommendé + diff --git a/src/main/plugin/dcat-ap/loc/fre/schematron-rules-dcat-ap-hvd.xml b/src/main/plugin/dcat-ap/loc/fre/schematron-rules-dcat-ap-hvd.xml new file mode 100644 index 0000000..647716d --- /dev/null +++ b/src/main/plugin/dcat-ap/loc/fre/schematron-rules-dcat-ap-hvd.xml @@ -0,0 +1,4 @@ + + + High Value Datasets - Obligatoire + diff --git a/src/main/plugin/dcat-ap/loc/fre/strings.xml b/src/main/plugin/dcat-ap/loc/fre/strings.xml index 6503722..c7871f3 100644 --- a/src/main/plugin/dcat-ap/loc/fre/strings.xml +++ b/src/main/plugin/dcat-ap/loc/fre/strings.xml @@ -100,4 +100,20 @@ LINK-1.0-http--link LINK-1.0-http--related Vul uw eigen protocol in... + + High Value Dataset (HVD) + Data Service + High Value Dataset (HVD) + Dataset + High Value Dataset + + Mobility + Mobility + Mobility + + Data Service + Metadata DCAT + Dataset + Metadata DCAT + Metadata DCAT diff --git a/src/main/plugin/dcat-ap/loc/ger/labels.xml b/src/main/plugin/dcat-ap/loc/ger/labels.xml index 16e02e7..76b44ae 100644 --- a/src/main/plugin/dcat-ap/loc/ger/labels.xml +++ b/src/main/plugin/dcat-ap/loc/ger/labels.xml @@ -2196,4 +2196,51 @@ Tooltip: in scheme in scheme + + + + This property refers to the mobility-related theme (i.e., a specific subject, category, or type) of the delivered content. + A dataset may be associated with multiple themes. A theme is important for data seekers who are interested in a particular type of data content. + + + + This property describes the transport mode that is covered by the delivered content. Data can be valid for more than one mode, so a multiple choice should be applied. + + + + This property describes the part of the transport network that is covered by the delivered content. For road traffic, the property SHOULD refer to the network classification for which the data is provided. As a minimum, an international or higher-level classification, e.g., via functional road classes, is recommended to allow data search across different countries. In addition, national classifications are allowed. + For other transport modes, the property is meant to refer to the physical infrastructure which is used by the services covered by the data. + For all modes, the property SHOULD also indicate if the data content relates to the EU’s trans-European transport network [EU-TEN-T]. + + + + This property SHOULD be used to specify the georeferencing method used in the dataset. + + + + This property MAY describe predefined information services, which the data content is intended to support. + Such services MAY be, e.g., information services for multimodal mobility, as specified by EC Delegated Regulation 2017/1926 [EC-MMTIS-DR]. + Examples of such services include “location search”, which is based on a datasets with address identifiers, or “trip plan computation”, which is based on datasets about a road network. + + + + + The HVD category to which this Dataset belongs. + HVD Category + + + + The HVD category to which this Data Service belongs. + HVD Category + + + + The legislation that mandates the creation or management of the Dataset. + applicable legislation + + + + The legislation that mandates the creation or management of the Data Service. + applicable legislation + diff --git a/src/main/plugin/dcat-ap/loc/ger/schematron-rules-dcat-ap-hvd-cardinalities.xml b/src/main/plugin/dcat-ap/loc/ger/schematron-rules-dcat-ap-hvd-cardinalities.xml new file mode 100644 index 0000000..d9112e4 --- /dev/null +++ b/src/main/plugin/dcat-ap/loc/ger/schematron-rules-dcat-ap-hvd-cardinalities.xml @@ -0,0 +1,4 @@ + + + High Value Datasets - Kardinalitäten + diff --git a/src/main/plugin/dcat-ap/loc/ger/schematron-rules-dcat-ap-hvd-rec.xml b/src/main/plugin/dcat-ap/loc/ger/schematron-rules-dcat-ap-hvd-rec.xml new file mode 100644 index 0000000..0e2d8a4 --- /dev/null +++ b/src/main/plugin/dcat-ap/loc/ger/schematron-rules-dcat-ap-hvd-rec.xml @@ -0,0 +1,4 @@ + + + High Value Datasets - Empfohlen + diff --git a/src/main/plugin/dcat-ap/loc/ger/schematron-rules-dcat-ap-hvd.xml b/src/main/plugin/dcat-ap/loc/ger/schematron-rules-dcat-ap-hvd.xml new file mode 100644 index 0000000..6e08f72 --- /dev/null +++ b/src/main/plugin/dcat-ap/loc/ger/schematron-rules-dcat-ap-hvd.xml @@ -0,0 +1,4 @@ + + + High Value Datasets - Obligatorisch + diff --git a/src/main/plugin/dcat-ap/loc/ger/strings.xml b/src/main/plugin/dcat-ap/loc/ger/strings.xml index 345aa8f..49106ea 100644 --- a/src/main/plugin/dcat-ap/loc/ger/strings.xml +++ b/src/main/plugin/dcat-ap/loc/ger/strings.xml @@ -100,4 +100,20 @@ LINK-1.0-http--link LINK-1.0-http--related Vul uw eigen protocol in... + + High Value Dataset (HVD) + Data Service + High Value Dataset (HVD) + Dataset + High Value Dataset + + Mobility + Mobility + Mobility + + Data Service + Metadata DCAT + Dataset + Metadata DCAT + Metadata DCAT From 37054f54b761d2454d481748aa78d3b03d72ba48 Mon Sep 17 00:00:00 2001 From: Joachim Nielandt Date: Tue, 29 Oct 2024 14:28:43 +0100 Subject: [PATCH 02/13] added hvd schematrons --- ...matron-rules-dcat-ap-hvd-cardinalities.sch | 63 +++++++++++++++++++ .../schematron-rules-dcat-ap-hvd-rec.sch | 28 +++++++++ .../schematron-rules-dcat-ap-hvd.sch | 39 ++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 src/main/plugin/dcat-ap/schematron/schematron-rules-dcat-ap-hvd-cardinalities.sch create mode 100644 src/main/plugin/dcat-ap/schematron/schematron-rules-dcat-ap-hvd-rec.sch create mode 100644 src/main/plugin/dcat-ap/schematron/schematron-rules-dcat-ap-hvd.sch diff --git a/src/main/plugin/dcat-ap/schematron/schematron-rules-dcat-ap-hvd-cardinalities.sch b/src/main/plugin/dcat-ap/schematron/schematron-rules-dcat-ap-hvd-cardinalities.sch new file mode 100644 index 0000000..c7976b3 --- /dev/null +++ b/src/main/plugin/dcat-ap/schematron/schematron-rules-dcat-ap-hvd-cardinalities.sch @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + {$loc/strings/schematron.title} + + + Cardinality of $element in $context + + + / should be of cardinality .. but found nodes. + + / is of cardinality ... Found nodes. + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/plugin/dcat-ap/schematron/schematron-rules-dcat-ap-hvd-rec.sch b/src/main/plugin/dcat-ap/schematron/schematron-rules-dcat-ap-hvd-rec.sch new file mode 100644 index 0000000..2e401f2 --- /dev/null +++ b/src/main/plugin/dcat-ap/schematron/schematron-rules-dcat-ap-hvd-rec.sch @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + {$loc/strings/schematron.title} + + diff --git a/src/main/plugin/dcat-ap/schematron/schematron-rules-dcat-ap-hvd.sch b/src/main/plugin/dcat-ap/schematron/schematron-rules-dcat-ap-hvd.sch new file mode 100644 index 0000000..be581ad --- /dev/null +++ b/src/main/plugin/dcat-ap/schematron/schematron-rules-dcat-ap-hvd.sch @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + {$loc/strings/schematron.title} + + + Required applicable legislation value. + + + For HVD the value must include the ELI http://data.europa.eu/eli/reg_impl/2023/138/oj. + + + For HVD the value must include the ELI http://data.europa.eu/eli/reg_impl/2023/138/oj. + + + + From ad80473a936abbe8a8daf68c41b316a29b607dfb Mon Sep 17 00:00:00 2001 From: Joachim Nielandt Date: Tue, 29 Oct 2024 14:28:59 +0100 Subject: [PATCH 03/13] added hvd elements to dataservice --- src/main/plugin/dcat-ap/schema/dcat.xsd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/plugin/dcat-ap/schema/dcat.xsd b/src/main/plugin/dcat-ap/schema/dcat.xsd index e1897e7..346d85a 100644 --- a/src/main/plugin/dcat-ap/schema/dcat.xsd +++ b/src/main/plugin/dcat-ap/schema/dcat.xsd @@ -319,6 +319,10 @@ + + + + From 68b53a12aae76469e40117e0e68d8ac7459cc165 Mon Sep 17 00:00:00 2001 From: Joachim Nielandt Date: Tue, 29 Oct 2024 14:29:20 +0100 Subject: [PATCH 04/13] editor tweaks: mdcat and hvd --- .../plugin/dcat-ap/layout/config-editor.xml | 173 +++++++++++++++++- 1 file changed, 168 insertions(+), 5 deletions(-) diff --git a/src/main/plugin/dcat-ap/layout/config-editor.xml b/src/main/plugin/dcat-ap/layout/config-editor.xml index 125c2f9..2e18afa 100644 --- a/src/main/plugin/dcat-ap/layout/config-editor.xml +++ b/src/main/plugin/dcat-ap/layout/config-editor.xml @@ -135,6 +135,27 @@ useReference="true"/> + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + - -
+ +
+ or="hvdCategory" + in="/rdf:RDF/dcat:Catalog/dcat:dataset/dcat:Dataset" + if="count(rdf:RDF/dcat:Catalog/dcat:dataset/dcat:Dataset/dcatap:hvdCategory) = 0"> + + + + + + + + + + + @@ -442,8 +501,198 @@ - - + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
- - + - - + + + + + + + + - + + + + @@ -954,7 +999,22 @@ + + + + +
+
From c0c88c1b07b34a588d06bd6390eb188e2133ff68 Mon Sep 17 00:00:00 2001 From: Joachim Nielandt Date: Mon, 2 Dec 2024 16:11:15 +0100 Subject: [PATCH 09/13] added geographical extent to VL view --- .../plugin/dcat-ap/layout/config-editor.xml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/main/plugin/dcat-ap/layout/config-editor.xml b/src/main/plugin/dcat-ap/layout/config-editor.xml index 44dc4a7..81b9f6a 100644 --- a/src/main/plugin/dcat-ap/layout/config-editor.xml +++ b/src/main/plugin/dcat-ap/layout/config-editor.xml @@ -572,6 +572,27 @@
+ +
+
+ + + +
@@ -1048,6 +1069,7 @@
+
Date: Tue, 3 Dec 2024 11:02:09 +0100 Subject: [PATCH 10/13] added vl distributions with specific license --- .../plugin/dcat-ap/layout/config-editor.xml | 145 ++++++++++++++++++ 1 file changed, 145 insertions(+) diff --git a/src/main/plugin/dcat-ap/layout/config-editor.xml b/src/main/plugin/dcat-ap/layout/config-editor.xml index 81b9f6a..1327b7a 100644 --- a/src/main/plugin/dcat-ap/layout/config-editor.xml +++ b/src/main/plugin/dcat-ap/layout/config-editor.xml @@ -714,6 +714,59 @@ in="/rdf:RDF/dcat:Catalog/dcat:service/dcat:DataService"/>
+ + +
+
+ + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + + + + + + Verplichte bronvermelding + Attribution + Attribution + Attribution + + + + Modellicentie voor gratis hergebruik + Onder deze licentie doet de instantie geen afstand van haar intellectuele rechten, maar mag de data voor eender welk doel hergebruikt worden, gratis en onder minimale restricties. + https://data.vlaanderen.be/id/licentie/modellicentie-gratis-hergebruik/v1.0 + + + + + + + + + Werk in het publiek domein + Public domain + Public domain + Public domain + + + + Creative Commons Zero verklaring + De instantie doet afstand van haar intellectuele eigendomsrechten voor zover dit wettelijk mogelijk is. Hierdoor kan de gebruiker de data hergebruiken voor eender welk doel, zonder een verplichting op naamsvermelding. Deze is de welbekende CC0 licentie. + https://data.vlaanderen.be/id/licentie/creative-commons-zero-verklaring/v1.0 + + + + + + + + + Verplichte bronvermelding + Attribution + Attribution + Attribution + + + + Modellicentie voor hergebruik tegen vergoeding + Onder deze licentie stelt de instantie nog steeds haar data ter beschikking voor eender welk hergebruik, maar wil zij hiervoor een vergoeding ontvangen. In regel is deze vergoeding beperkt tot de marginale kosten voor vermenigvuldiging, verstrekking en verspreiding. + https://data.vlaanderen.be/id/licentie/modellicentie-hergebruik-tegen-vergoeding/v1.0 + + + + + + + + + Werk in het publiek domein + Public domain + Public domain + Public domain + + + + Onvoorwaardelijk hergebruik + Onvoorwaardelijk hergebruik + https://data.vlaanderen.be/id/licentie/onvoorwaardelijk-hergebruik/v1.0 + + + + + + + + + + + + + + + + + + + + + + From 06cc0480d0e212343d9ad780b21e4eef4cff8de6 Mon Sep 17 00:00:00 2001 From: Joachim Nielandt Date: Tue, 3 Dec 2024 11:02:22 +0100 Subject: [PATCH 11/13] missing translations --- src/main/plugin/dcat-ap/loc/dut/strings.xml | 1 + src/main/plugin/dcat-ap/loc/eng/strings.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/plugin/dcat-ap/loc/dut/strings.xml b/src/main/plugin/dcat-ap/loc/dut/strings.xml index 639428b..2ac45cd 100644 --- a/src/main/plugin/dcat-ap/loc/dut/strings.xml +++ b/src/main/plugin/dcat-ap/loc/dut/strings.xml @@ -98,6 +98,7 @@ Vlaanderen Service Dataset + Distributies Metadata DCAT DCAT-AP Vlaanderen diff --git a/src/main/plugin/dcat-ap/loc/eng/strings.xml b/src/main/plugin/dcat-ap/loc/eng/strings.xml index 885a18f..79947d8 100644 --- a/src/main/plugin/dcat-ap/loc/eng/strings.xml +++ b/src/main/plugin/dcat-ap/loc/eng/strings.xml @@ -98,6 +98,7 @@ Flanders Service Dataset + Distributions Metadata DCAT DCAT-AP Vlaanderen From 7b8044b4440edc28c856297ed4db623618bf24ae Mon Sep 17 00:00:00 2001 From: Joachim Nielandt Date: Tue, 3 Dec 2024 11:02:36 +0100 Subject: [PATCH 12/13] removed default VL spatial extent --- src/main/plugin/dcat-ap/layout/config-editor.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/plugin/dcat-ap/layout/config-editor.xml b/src/main/plugin/dcat-ap/layout/config-editor.xml index 1327b7a..a015088 100644 --- a/src/main/plugin/dcat-ap/layout/config-editor.xml +++ b/src/main/plugin/dcat-ap/layout/config-editor.xml @@ -1095,14 +1095,13 @@ + + + +
@@ -770,7 +783,7 @@ @@ -809,7 +822,7 @@ @@ -912,7 +925,7 @@ @@ -1032,6 +1045,7 @@
+
@@ -1220,13 +1234,19 @@ - - - - - + + + + @@ -1255,11 +1275,75 @@ + + + + + +
+ +
+
+ + + + + + + + + + + + + + + + + +
-
+ +
+ + + + +
@@ -1280,6 +1381,7 @@ or="language" in="/rdf:RDF/dcat:Catalog/dcat:record/dcat:CatalogRecord"/>
+
@@ -1290,6 +1392,7 @@ xpath="/rdf:RDF/dcat:Catalog/dcat:record/dcat:CatalogRecord/dct:conformsTo/dct:Standard/owl:versionInfo"/>
+ @@ -1330,7 +1433,7 @@ diff --git a/src/main/plugin/dcat-ap/loc/eng/labels.xml b/src/main/plugin/dcat-ap/loc/eng/labels.xml index 76ed103..148553a 100644 --- a/src/main/plugin/dcat-ap/loc/eng/labels.xml +++ b/src/main/plugin/dcat-ap/loc/eng/labels.xml @@ -191,9 +191,9 @@ Frequency - + An established standard to which the described resource conforms. - conforms to standard + Conforms to standard