Merge branch 'develop' of https://github.com/wemove/dcat-ap-plu into …

…develop
wemove · Apr 4, 2024 · b802797 · b802797
2 parents 9b9ea20 + 75fb534
commit b802797
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,14 +2,16 @@
 
 ## xxxx-xx-xx - dev
 
-...
+* [Codelist] Extend `plu:docType` to describe values from https://www.xrepository.de/details/urn:xoev-de:xplanverfahren:codeliste:verfahrensunterlagentyp
+* [Website] Fix links to DCAT-AP.PLU documentation
+* [Deployment] Set draft version for development
+* [Spec] Replace `plu:procedureStartDate` (type `xsd:dateTime`) with `plu:procedurePeriod` (type `dct:PeriodOfTime`)
 
 ## 2024-02-28 - 0.1.4
 
 * [Website] Add latest DCAT-AP.PLU online documentation
 * [API] Add possible values for `source` parameter
 * [Deployment] Update docker base image
-* [Spec] Disable section-linting
 
 ## 2024-02-07 - 0.1.3
 

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,12 +1,12 @@
 FROM alpine:3.18.6
 
 ENV LIGHTTPD_VERSION=1.4.73-r0
-ENV DCATAPPLU_VERSION=0.1.4
+ENV DCATAPPLU_VERSION=../drafts/0.0.1-draft-0.1
 
 RUN addgroup -S --gid 1000 lighttpd \
     && adduser -S -G lighttpd --uid 1000 lighttpd
 
-RUN apk add --update --no-cache lighttpd=${LIGHTTPD_VERSION} \
+RUN apk add --update --no-cache lighttpd=${LIGHTTPD_VERSION} curl \
     && rm -rf /var/cache/apk/* \
     && chgrp lighttpd /usr/sbin/lighttpd
 

diff --git a/docker/static/resource/index.html b/docker/static/resource/index.html
@@ -46,11 +46,11 @@ <h1>
         <p>
             <span lang="de">
                 Dieses Repository enthält die Codelisten, die in der
-                <a href="https://github.com/wemove/dcat-ap-plu" title="DCAT-AP.PLU Spezifikation">Spezifikation für DCAT-AP.PLU {DCATAPPLU_VERSION}</a> verwendet werden.
+                <a href="../doc-plu-latest.html" title="DCAT-AP.PLU Spezifikation">Spezifikation für DCAT-AP.PLU {DCATAPPLU_VERSION}</a> verwendet werden.
             </span>
             <span lang="en">
                 This repository houses the codelists used in the
-                <a href="https://github.com/wemove/dcat-ap-plu" title="DCAT-AP.PLU specification">specification for DCAT-AP.PLU {DCATAPPLU_VERSION} (German)</a>.
+                <a href="../doc-plu-latest.html" title="DCAT-AP.PLU specification">specification for DCAT-AP.PLU {DCATAPPLU_VERSION} (German)</a>.
             </span>
         </p>
         <p>

diff --git a/drafts/0.0.1-draft-0.1/README.md b/drafts/0.0.1-draft-0.1/README.md
@@ -22,7 +22,7 @@ Finally, update the [changelog](../../CHANGELOG.md).
 
 Run [release.sh](release.sh) and follow the instructions.
 
-Alternatively, you can create a manual release:
+Alternatively, you can manually create a release:
 - Validate all examples using the `SHACL` shapefile
 - Finalize the [changelog](../../CHANGELOG.md)
 - Create a new folder in [releases](../../releases), named after your new version number (semver)
@@ -33,5 +33,6 @@ Alternatively, you can create a manual release:
   - the version in `README.md`
 - Also update the `DCATAPPLU_VERSION` in the [Dockerfile](../../docker/Dockerfile)
 - Merge `develop` into `main`
+- In `develop`, add a new dummy entry to the changelog and revert the changes to the Dockerfile
 
 Finally, announce the new version via mail and ADO.
diff --git a/drafts/0.0.1-draft-0.1/api-plu.yml b/drafts/0.0.1-draft-0.1/api-plu.yml
@@ -1090,14 +1090,15 @@ components:
           xml:
             prefix: dct
             name: relation
-        procedureStartDate:
-          description: Date of the start of the procedure
-          type: string
-          format: date-time
-          example: 2023-01-01T00:00:00.000Z
+        procedurePeriod:
+          description: Period of the procedure
+          type: object
+          properties:
+            periodOfTime:
+              $ref: '#/components/schemas/period'
           xml:
             prefix: plu
-            name: procedureStartDate
+            name: procedurePeriod
         developmentFreezePeriod:
           description: Period of a development freeze
           type: object

diff --git a/drafts/0.0.1-draft-0.1/codelists/docType.xml b/drafts/0.0.1-draft-0.1/codelists/docType.xml
@@ -91,32 +91,31 @@ Zur kodierten Angabe der Art eines Dokuments:
         <skos:prefLabel xml:lang="en">cost assumption contract</skos:prefLabel>
         <skos:exactMatch rdf:resource="https://specs.diplanung.de/resource/docType#costAssumptionContract"/>
     </skos:Concept>
-        <skos:Concept rdf:about="https://specs.diplanung.de/resource/docType#urbanDevelopmentContract">
+    <skos:Concept rdf:about="https://specs.diplanung.de/resource/docType#urbanDevelopmentContract">
         <dc:identifier>urbanDevelopmentContract</dc:identifier>
         <skos:topConceptOf rdf:resource="https://specs.diplanung.de/resource/docType"/>
         <skos:inScheme rdf:resource="https://specs.diplanung.de/resource/docType"/>
         <skos:prefLabel xml:lang="de">Städtebaulicher Vertrag</skos:prefLabel>
         <skos:prefLabel xml:lang="en">urban development contract</skos:prefLabel>
         <skos:exactMatch rdf:resource="https://specs.diplanung.de/resource/docType#urbanDevelopmentContract"/>
     </skos:Concept>
-        <skos:Concept rdf:about="https://specs.diplanung.de/resource/docType#implementationContract">
+    <skos:Concept rdf:about="https://specs.diplanung.de/resource/docType#implementationContract">
         <dc:identifier>implementationContract</dc:identifier>
         <skos:topConceptOf rdf:resource="https://specs.diplanung.de/resource/docType"/>
         <skos:inScheme rdf:resource="https://specs.diplanung.de/resource/docType"/>
         <skos:prefLabel xml:lang="de">Durchführungsvertrag</skos:prefLabel>
         <skos:prefLabel xml:lang="en">implementation contract</skos:prefLabel>
         <skos:exactMatch rdf:resource="https://specs.diplanung.de/resource/docType#implementationContract"/>
     </skos:Concept>
-        <skos:Concept rdf:about="https://specs.diplanung.de/resource/docType#propertyDevelopmentContract">
+    <skos:Concept rdf:about="https://specs.diplanung.de/resource/docType#propertyDevelopmentContract">
         <dc:identifier>propertyDevelopmentContract</dc:identifier>
         <skos:topConceptOf rdf:resource="https://specs.diplanung.de/resource/docType"/>
         <skos:inScheme rdf:resource="https://specs.diplanung.de/resource/docType"/>
         <skos:prefLabel xml:lang="de">Erschließungsvertrag</skos:prefLabel>
         <skos:prefLabel xml:lang="en">property development contract</skos:prefLabel>
         <skos:exactMatch rdf:resource="https://specs.diplanung.de/resource/docType#propertyDevelopmentContract"/>
     </skos:Concept>
-    </skos:Concept>
-        <skos:Concept rdf:about="https://specs.diplanung.de/resource/docType#contract">
+    <skos:Concept rdf:about="https://specs.diplanung.de/resource/docType#contract">
         <dc:identifier>contract</dc:identifier>
         <skos:topConceptOf rdf:resource="https://specs.diplanung.de/resource/docType"/>
         <skos:inScheme rdf:resource="https://specs.diplanung.de/resource/docType"/>
@@ -172,7 +171,7 @@ Zur kodierten Angabe der Art eines Dokuments:
         <skos:prefLabel xml:lang="en">cover letter participation procedure</skos:prefLabel>
         <skos:exactMatch rdf:resource="https://specs.diplanung.de/resource/docType#coverLetterParticipatioProcedure"/>
     </skos:Concept>
-        <skos:Concept rdf:about="https://specs.diplanung.de/resource/docType#transcript">
+    <skos:Concept rdf:about="https://specs.diplanung.de/resource/docType#transcript">
         <dc:identifier>transcript</dc:identifier>
         <skos:topConceptOf rdf:resource="https://specs.diplanung.de/resource/docType"/>
         <skos:inScheme rdf:resource="https://specs.diplanung.de/resource/docType"/>

diff --git a/drafts/0.0.1-draft-0.1/doc-plu.html b/drafts/0.0.1-draft-0.1/doc-plu.html
@@ -473,31 +473,31 @@ <h4 id="property-plan-state">Eigenschaft: Status des Plans</h4>
           </table>
         </section>
 
-        <section id="Property:procedureStartDate">
-          <h4 id="property-procedure-start-date">Eigenschaft: Verfahrensbeginn</h4>
+        <section id="Property:procedurePeriod">
+          <h4 id="property-procedure-period">Eigenschaft: Verfahrenszeitraum</h4>
           <table class="definition">
-          <thead><tr><th>URI:</th><th><a href="http://purl.org/dc/terms/issued">plu:procedureStartDate</a></th></tr></thead>
+          <thead><tr><th>URI:</th><th>plu:procedurePeriod</th></tr></thead>
           <tbody>
-          <tr><td class="prop">Verbindlichkeit:</td><td>Optional</td></tr>
-          <tr><td class="prop">Definition:</td><td>Verfahrensbeginn</td></tr>
-          <tr><td class="prop">Typ/Wertebereich:</td><td><a href="http://www.w3.org/2000/01/rdf-schema#Literal"><code>rdfs:Literal</code> als <code>xsd:date</code> oder <code>xsd:dateTime</code></a></td></tr>
-          <tr><td class="prop">Anwendungshinweis:</td><td>Diese Eigenschaft enthält das Datum des Verfahrensbeginns.</td></tr>
+          <tr><td class="prop">Verbindlichkeit:</td><td>Empfohlen</td></tr>
+          <tr><td class="prop">Definition:</td><td>Verfahrenszeitraum</td></tr>
+          <tr><td class="prop">Typ/Wertebereich:</td><td>dct:PeriodOfTime</td></tr>
+          <tr><td class="prop">Anwendungshinweis:</td><td>Diese Eigenschaft beschreibt den Zeitraum des Verfahrens. dct:startDate enthält das Datum des Verfahrensbeginns. Für festgestellte oder untergegangene Pläne enthält dct:endDate das Datum des Verfahrensendes (d.h. der Planfeststellung oder des Untergangs), für Pläne in Aufstellung entfällt dct:endDate.</td></tr>
           </tbody>
           </table>
-       </section>
+        </section>
 
-       <section id="Property:relation">
-        <h4 id="property-relation">Eigenschaft: Verweis</h4>
-        <table class="definition">
-        <thead><tr><th>URI:</th><th>dct:relation</th></tr></thead>
-        <tbody>
-        <tr><td class="prop">Verbindlichkeit:</td><td>Optional</td></tr>
-        <tr><td class="prop">Definition:</td><td>Verweis auf einen anderen Datensatz.</td></tr>
-        <tr><td class="prop">Typ/Wertebereich:</td><td><a href="http://www.w3.org/2000/01/rdf-schema#Resource"><code>rdfs:Resource</code></a></td></tr>
-        <tr><td class="prop">Anwendungshinweis:</td><td>Über diese Eigenschaft kann eine Verknüpfung mit einem anderen Verfahren dargestellt werden.</td></tr>
-        </tbody>
-        </table>
-       </section>
+        <section id="Property:relation">
+          <h4 id="property-relation">Eigenschaft: Verweis</h4>
+          <table class="definition">
+          <thead><tr><th>URI:</th><th>dct:relation</th></tr></thead>
+          <tbody>
+          <tr><td class="prop">Verbindlichkeit:</td><td>Optional</td></tr>
+          <tr><td class="prop">Definition:</td><td>Verweis auf einen anderen Datensatz.</td></tr>
+          <tr><td class="prop">Typ/Wertebereich:</td><td><a href="http://www.w3.org/2000/01/rdf-schema#Resource"><code>rdfs:Resource</code></a></td></tr>
+          <tr><td class="prop">Anwendungshinweis:</td><td>Über diese Eigenschaft kann eine Verknüpfung mit einem anderen Verfahren dargestellt werden.</td></tr>
+          </tbody>
+          </table>
+        </section>
 
         <section id="Property:location">
           <h4 id="property-location">Eigenschaft: Raumbezug</h4>

diff --git a/drafts/0.0.1-draft-0.1/examples/plu-example-03.xml b/drafts/0.0.1-draft-0.1/examples/plu-example-03.xml
@@ -72,7 +72,12 @@
         <dct:modified>2022-06-01T00:00:00.000Z</dct:modified>
         <plu:planState rdf:resource="https://specs.diplanung.de/resource/planState#fixed"/>
         <plu:procedureState rdf:resource="https://specs.diplanung.de/resource/procedureState#ongoing"/>
-        <plu:procedureStartDate>2022-04-01T00:00:00.000Z</plu:procedureStartDate>
+        <plu:procedurePeriod>
+            <dct:PeriodOfTime>
+                <dcat:startDate>2022-04-01</dcat:startDate>
+                <dcat:endDate>2022-05-11</dcat:endDate>
+            </dct:PeriodOfTime>
+        </plu:procedurePeriod>
         <dct:relation rdf:resource="http://uvp-verbund.de/trefferanzeige?docuuid=D33223C6-F4A3-40B5-9E69-CED36D2A69A2"/>
         <plu:planType rdf:resource="https://specs.diplanung.de/resource/planType#developmentPlan"/>
         <plu:planTypeFine rdf:resource="https://registry.gdi-de.org/codelist/de.xleitstelle.inspire_plu/PlanTypeNameValue/6_Bebauungsplan#6_3_EinfacherBPlan"/>

diff --git a/drafts/0.0.1-draft-0.1/examples/plu-example-full.xml b/drafts/0.0.1-draft-0.1/examples/plu-example-full.xml
@@ -35,7 +35,11 @@
         <plu:planType rdf:resource="https://specs.diplanung.de/resource/planType#developmentPlan"/>
         <plu:planTypeFine rdf:resource="https://registry.gdi-de.org/codelist/de.xleitstelle.inspire_plu/PlanTypeNameValue/6_Bebauungsplan#6_3_EinfacherBPlan"/>
         <plu:planState rdf:resource="https://specs.diplanung.de/resource/planState#inPreparation"/>
-        <plu:procedureStartDate>2023-01-01T00:00:00.000Z</plu:procedureStartDate>
+        <plu:procedurePeriod>
+            <dct:PeriodOfTime>
+                <dcat:startDate>2023-01-01T00:00:00.000Z</dcat:startDate>
+            </dct:PeriodOfTime>
+        </plu:procedurePeriod>
         <plu:notification>Eine Notiz für Planverfahren</plu:notification>
         <dct:relation rdf:resource="https://dev.informationgrid.eu/trefferanzeige?docuuid=206f1cb5-c021-44ae-842b-8ea148172763"/>
         <dct:spatial>

diff --git a/drafts/0.0.1-draft-0.1/release.sh b/drafts/0.0.1-draft-0.1/release.sh
@@ -74,6 +74,8 @@ fi
 
 # build new version number
 git fetch --prune --tags
+DRAFT_VERSION="../drafts/0.0.1-draft-0.1"
+ESC_DRAFT_VERSION="\.\./drafts/0\.0\.1-draft-0\.1"
 LATEST_VERSION=$(git describe --abbrev=0 --tags main)
 VERSION_ARRAY=( ${LATEST_VERSION//./ } )
 ESC_LATEST_VERSION="${VERSION_ARRAY[0]}\.${VERSION_ARRAY[1]}\.${VERSION_ARRAY[2]}"
@@ -135,7 +137,7 @@ sed -i "s@version: x.y.z@version: ${NEXT_VERSION}@g" releases/${NEXT_VERSION}/ap
 # in the new version folder, change the version in `README.md`
 sed -i "s@DCAT-AP\.PLU v\?${ESC_LATEST_VERSION}@DCAT-AP.PLU ${NEXT_VERSION}@g" releases/${NEXT_VERSION}/README.md
 # update the `DCATAPPLU_VERSION` in the Dockerfile
-sed -i "s@ENV DCATAPPLU_VERSION=${ESC_LATEST_VERSION}@ENV DCATAPPLU_VERSION=${NEXT_VERSION}@g" docker/Dockerfile
+sed -i "s@ENV DCATAPPLU_VERSION=${ESC_DRAFT_VERSION}@ENV DCATAPPLU_VERSION=${NEXT_VERSION}@g" docker/Dockerfile
 
 # commit, merge, tag new release
 echo
@@ -147,9 +149,13 @@ git tag -a ${NEXT_VERSION} -m "Release ${NEXT_VERSION}"
 
 # prepare next dev version
 git checkout develop
+echo -e "\nUpdating changelog ..."
 sed -i "s@# Changelog@# Changelog\n\n## xxxx-xx-xx - dev\n\n...@g" CHANGELOG.md
 git add CHANGELOG.md
-git commit -m "Prepare changelog for development"
+echo -e "\nUpdating version in Dockerfile ..."
+sed -i "s@ENV DCATAPPLU_VERSION=${NEXT_VERSION}@ENV DCATAPPLU_VERSION=${DRAFT_VERSION}@g" docker/Dockerfile
+git add docker/Dockerfile
+git commit -m "Set next development version"
 
 echo -e "\nThe new ${VERSION_TYPE} release ${NEXT_VERSION} has been created locally."
 echo "Next steps:"

diff --git a/drafts/0.0.1-draft-0.1/shacl/dcat-ap-plu_shacl-shapes.ttl b/drafts/0.0.1-draft-0.1/shacl/dcat-ap-plu_shacl-shapes.ttl
@@ -12,7 +12,7 @@
 @prefix org: <http://www.w3.org/ns/org#> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 #@prefix odrl: <http://www.w3.org/ns/odrl/2/> .
-@prefix plu: <http://specs.diplanung.de/plu/>
+@prefix plu: <http://specs.diplanung.de/plu/> .
 #@prefix prov: <http://www.w3.org/ns/prov#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix schema: <http://schema.org/> .
@@ -334,6 +334,10 @@
         sh:path plu:planTypeFine ;
         sh:nodeKind sh:BlankNodeOrIRI ;
         sh:maxCount 1 ;
+    ], [
+        sh:path plu:procedurePeriod ;
+        sh:class dct:PeriodOfTime ;
+        sh:maxCount 1 ;
     ], [
         sh:path plu:procedureType ;
         sh:nodeKind sh:BlankNodeOrIRI ;
@@ -369,10 +373,6 @@
         sh:path plu:notification ;
         sh:nodeKind sh:Literal ;
         sh:maxCount 1 ;
-    ], [
-        sh:path plu:procedureStartDate ;
-        sh:nodeKind sh:Literal ;
-        sh:maxCount 1 ;
     ] ;
     sh:closed true ;
     sh:ignoredProperties (rdf:type) ;