diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf5d9a1d391f3595f50b95a5d34f4aae9f56d0cf..510b3194e10f3b096e42071adcd493115a9a2514 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,20 @@
Alle nennenswerten Änderungen an diesem Projekt werden in dieser Datei dokumentiert.
+## Version 7.1.2 (2024-02-29)
+
+### Fehlerbehebungen
+- Fehler beim Start des XPlanInspirePluWFS aufgrund einer nicht abwärtskompatible Änderungen im Schema behoben
+- Fehler in den Liniensignaturen für BP_StrassenbegrenzungsLinie, BP_EinfahrtsbereichLinie und BP_BereichOhneEinAusfahrtLinie behoben
+- Fehler beim Löschen von Planwerken unter dem Betriebssystem Windows behoben
+- Fehlende Konfiguration _xplan-validator-workspace_ im Distributionspaket ergänzt
+
## Version 7.1.1 (2024-02-09)
### Fehlerbehebungen
- Fehler bei der Installation der XPlanManagerAPI, XPlanValidatorAPI und XPlanDokumenteAPI im Tomcat behoben
- Fehler beim Editieren eines Plans, bei dem sonstPlanArt gesetzt ist und keine Ganzzahl beinhaltet behoben
-- Fehler bei der Flächenschlussprüfung, wenn der Geltungsbereich von Bereich und PlanFeature nicht übereinstimmen behoben
+- Fehler bei der Flächenschlussprüfung behoben, wenn der Geltungsbereich von BP_Bereich und BP_Plan aus mehreren Geometrien bestehen und diese nicht übereinstimmen
## Version 7.1 (2023-12-13)
diff --git a/pom.xml b/pom.xml
index 75382e24873da4b23496c7365c33dc1d6b6e4768..9f0004136d771e43ace8f264c0f81256e1ed62e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
<packaging>pom</packaging>
- <version>7.1.1</version>
+ <version>7.1.2</version>
<name>xPlanBox</name>
<description>Software zur Verwaltung von XPlanGML Daten</description>
<inceptionYear>2008</inceptionYear>
@@ -18,7 +18,7 @@
<java.version>11</java.version>
<maven.version>3.8.1</maven.version>
<!-- version properties -->
- <deegree3.version>3.5.3.1</deegree3.version>
+ <deegree3.version>3.5.5.1</deegree3.version>
<xplanung.regeln.version>1.1.6</xplanung.regeln.version>
<xplanung.regeln.berlin.version>0.4</xplanung.regeln.berlin.version>
<gwt.version>2.10.0</gwt.version>
@@ -1566,7 +1566,7 @@
<connection>scm:git:git@bitbucket.org:latlon/xplanbox.git</connection>
<developerConnection>scm:git:git@bitbucket.org:latlon/xplanbox.git</developerConnection>
<url>https://bitbucket.org/latlon/xplanbox</url>
- <tag>xplanbox-7.1.1</tag>
+ <tag>xplanbox-7.1.2</tag>
</scm>
<repositories>
diff --git a/xplan-api/pom.xml b/xplan-api/pom.xml
index 35756cacb86ede879af2bc9d317ea2781af140b7..82d887edfba0d05b7139c592f12c7d8c7b8db978 100644
--- a/xplan-api/pom.xml
+++ b/xplan-api/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<modules>
diff --git a/xplan-api/xplan-api-commons/pom.xml b/xplan-api/xplan-api-commons/pom.xml
index cceaaad3a69f5dac5fa76278b689415e1518bf58..ecb6087fb2394ce37e3f07fc00cfe04e48a62220 100644
--- a/xplan-api/xplan-api-commons/pom.xml
+++ b/xplan-api/xplan-api-commons/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-api</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<dependencies>
diff --git a/xplan-api/xplan-api-dokumente/pom.xml b/xplan-api/xplan-api-dokumente/pom.xml
index 8399c38f91ecbdc2c6d9db1dea40c0ff93c929f2..22c1029088792f73e5563a6ad638c80d7dc98974 100755
--- a/xplan-api/xplan-api-dokumente/pom.xml
+++ b/xplan-api/xplan-api-dokumente/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-api</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<dependencyManagement>
diff --git a/xplan-api/xplan-api-manager/pom.xml b/xplan-api/xplan-api-manager/pom.xml
index 8fbdac52210192ee6eb5a8335b0918112f23d032..4e52ee3065b8051b9f3973788f9d490c5ff75eaf 100644
--- a/xplan-api/xplan-api-manager/pom.xml
+++ b/xplan-api/xplan-api-manager/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-api</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<dependencyManagement>
diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContext.java b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContext.java
index 8f6cf17a75892d73e84782d601b24117e6d998a5..e233da67ef9ec30e00045799e80e8ef0923fed50 100644
--- a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContext.java
+++ b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContext.java
@@ -43,6 +43,7 @@ import de.latlon.xplan.manager.metadata.DataServiceCouplingException;
import de.latlon.xplan.manager.metadata.MetadataCouplingHandler;
import de.latlon.xplan.manager.storage.StorageCleanUpManager;
import de.latlon.xplan.manager.storage.config.StorageCleanUpContext;
+import de.latlon.xplan.manager.storage.filesystem.DeegreeRasterCacheCleaner;
import de.latlon.xplan.manager.synthesizer.XPlanSynthesizer;
import de.latlon.xplan.manager.synthesizer.rules.SynRulesAccessor;
import de.latlon.xplan.manager.transaction.AttachmentUrlHandler;
@@ -339,6 +340,11 @@ public class ApplicationContext {
return new WorkspaceReloader(managerConfiguration.getWorkspaceReloaderConfiguration());
}
+ @Bean
+ public DeegreeRasterCacheCleaner deegreeRasterCacheCleaner(ManagerConfiguration managerConfiguration) {
+ return new DeegreeRasterCacheCleaner(managerConfiguration.getWorkspaceReloaderConfiguration());
+ }
+
@Bean
public ValidatorConfiguration validatorConfiguration(PropertiesLoader validatorPropertiesLoader)
throws IOException, ConfigurationException {
diff --git a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/config/TestContext.java b/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/config/TestContext.java
index 1a3d8293e52cbee2974866a016b69abd474765b6..ce758bfb339549331e97456d899562095ed3b5db 100644
--- a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/config/TestContext.java
+++ b/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/config/TestContext.java
@@ -24,7 +24,6 @@ import de.latlon.xplan.commons.XPlanSchemas;
import de.latlon.xplan.commons.archive.XPlanArchiveCreator;
import de.latlon.xplan.commons.configuration.SortConfiguration;
import de.latlon.xplan.commons.feature.SortPropertyReader;
-import de.latlon.xplan.manager.CategoryMapper;
import de.latlon.xplan.manager.XPlanManager;
import de.latlon.xplan.manager.configuration.InternalIdRetrieverConfiguration;
import de.latlon.xplan.manager.configuration.ManagerConfiguration;
@@ -32,6 +31,7 @@ import de.latlon.xplan.manager.database.ManagerWorkspaceWrapper;
import de.latlon.xplan.manager.database.PlanNotFoundException;
import de.latlon.xplan.manager.database.XPlanDao;
import de.latlon.xplan.manager.export.XPlanExporter;
+import de.latlon.xplan.manager.storage.filesystem.DeegreeRasterCacheCleaner;
import de.latlon.xplan.manager.synthesizer.XPlanSynthesizer;
import de.latlon.xplan.manager.transaction.XPlanDeleteManager;
import de.latlon.xplan.manager.transaction.XPlanEditManager;
@@ -57,8 +57,6 @@ import de.latlon.xplanbox.api.manager.v1.DefaultApi;
import de.latlon.xplanbox.api.manager.v1.InfoApi;
import de.latlon.xplanbox.api.manager.v1.PlanApi;
import de.latlon.xplanbox.api.manager.v1.PlansApi;
-import liquibase.integration.spring.SpringLiquibase;
-
import org.deegree.commons.config.DeegreeWorkspace;
import org.deegree.cs.coordinatesystems.ICRS;
import org.deegree.feature.persistence.FeatureStore;
@@ -241,9 +239,10 @@ public class TestContext {
}
@Bean
- public RasterStorage rasterStorage(WmsWorkspaceWrapper wmsWorkspaceWrapper, RasterEvaluation rasterEvaluation) {
+ public RasterStorage rasterStorage(WmsWorkspaceWrapper wmsWorkspaceWrapper, RasterEvaluation rasterEvaluation,
+ DeegreeRasterCacheCleaner deegreeRasterCacheCleaner) {
Path dataDirectory = wmsWorkspaceWrapper.getDataDirectory();
- return new FileSystemStorage(dataDirectory, rasterEvaluation);
+ return new FileSystemStorage(dataDirectory, rasterEvaluation, deegreeRasterCacheCleaner);
}
@Bean
@@ -359,6 +358,14 @@ public class TestContext {
return workspaceReloader;
}
+ @Bean
+ @Primary
+ public DeegreeRasterCacheCleaner deegreeRasterCacheCleaner() {
+ DeegreeRasterCacheCleaner deegreeRasterCacheCleaner = mock(DeegreeRasterCacheCleaner.class);
+ when(deegreeRasterCacheCleaner.clearCache("1_raster")).thenReturn(true);
+ return deegreeRasterCacheCleaner;
+ }
+
@PostConstruct
void initLoggingAdapter() {
SLF4JBridgeHandler.removeHandlersForRootLogger();
diff --git a/xplan-api/xplan-api-validator/pom.xml b/xplan-api/xplan-api-validator/pom.xml
index 644154aabb38e964c80596ea246f81be73738b70..97040ce61daa7cda8053b3bf1edbe938fab4967e 100755
--- a/xplan-api/xplan-api-validator/pom.xml
+++ b/xplan-api/xplan-api-validator/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-api</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<dependencyManagement>
diff --git a/xplan-cli/pom.xml b/xplan-cli/pom.xml
index 38047f12e14cd2e0a4f17627dd07aae92a6b02bb..fea5e622c86a0a1346995d8ae7eb70e0fd056aac 100644
--- a/xplan-cli/pom.xml
+++ b/xplan-cli/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<modules>
diff --git a/xplan-cli/xplan-cli-docker/pom.xml b/xplan-cli/xplan-cli-docker/pom.xml
index f686cb64b393bc0f13a24ce7f244270dea0d1b6c..a5ff653ab64e8145b53e36fa5c289116905b2442 100644
--- a/xplan-cli/xplan-cli-docker/pom.xml
+++ b/xplan-cli/xplan-cli-docker/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml b/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml
index 8f8d40c093b988c7d98453abded704dd3d4b31af..ad58b6b0e3e31fce9b55a95a003d4bfe897c6d2f 100644
--- a/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml
+++ b/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-manager-cli/pom.xml b/xplan-cli/xplan-manager-cli/pom.xml
index 21ebf8fd756ef1f0e2c4ade616d8c156ba35d53a..54d9ce2a64ccdae376d88c899d88a991f25d0188 100644
--- a/xplan-cli/xplan-manager-cli/pom.xml
+++ b/xplan-cli/xplan-manager-cli/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-manager-cli/src/main/java/de/latlon/xplan/manager/cli/config/ApplicationContext.java b/xplan-cli/xplan-manager-cli/src/main/java/de/latlon/xplan/manager/cli/config/ApplicationContext.java
index f6baf646de1b7b6652a250024b73c227305f2e1f..23f9edf946a38afd336d06cd48402b2862f81efa 100644
--- a/xplan-cli/xplan-manager-cli/src/main/java/de/latlon/xplan/manager/cli/config/ApplicationContext.java
+++ b/xplan-cli/xplan-manager-cli/src/main/java/de/latlon/xplan/manager/cli/config/ApplicationContext.java
@@ -46,6 +46,7 @@ import de.latlon.xplan.manager.metadata.DataServiceCouplingException;
import de.latlon.xplan.manager.metadata.MetadataCouplingHandler;
import de.latlon.xplan.manager.storage.StorageCleanUpManager;
import de.latlon.xplan.manager.storage.config.StorageCleanUpContext;
+import de.latlon.xplan.manager.storage.filesystem.DeegreeRasterCacheCleaner;
import de.latlon.xplan.manager.synthesizer.XPlanSynthesizer;
import de.latlon.xplan.manager.synthesizer.rules.SynRulesAccessor;
import de.latlon.xplan.manager.transaction.AttachmentUrlHandler;
@@ -349,6 +350,11 @@ public class ApplicationContext {
return new WorkspaceReloader(managerConfiguration.getWorkspaceReloaderConfiguration());
}
+ @Bean
+ public DeegreeRasterCacheCleaner deegreeRasterCacheCleaner(ManagerConfiguration managerConfiguration) {
+ return new DeegreeRasterCacheCleaner(managerConfiguration.getWorkspaceReloaderConfiguration());
+ }
+
@Bean
public ValidatorConfiguration validatorConfiguration(PropertiesLoader validatorPropertiesLoader)
throws IOException, ConfigurationException {
diff --git a/xplan-cli/xplan-transform-cli/pom.xml b/xplan-cli/xplan-transform-cli/pom.xml
index 45e79dccd7acfb71692fa4b44ecf55695696c7e3..8a5dc2f15c52c82884d1ee217d68114159037010 100644
--- a/xplan-cli/xplan-transform-cli/pom.xml
+++ b/xplan-cli/xplan-transform-cli/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-update-data-cli/pom.xml b/xplan-cli/xplan-update-data-cli/pom.xml
index 38b5f73c8e9969014afdbe33b1251632bf1ce676..f41be6545ccdc14e0b9cc694ad90f689dc4b52aa 100644
--- a/xplan-cli/xplan-update-data-cli/pom.xml
+++ b/xplan-cli/xplan-update-data-cli/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<dependencyManagement>
diff --git a/xplan-cli/xplan-validatedb-cli/pom.xml b/xplan-cli/xplan-validatedb-cli/pom.xml
index 760223ad18e1aaf06a71f438b1f92d3761358f48..ae27f23850d8ce9ed26d88e2263192b6f8aba4b3 100644
--- a/xplan-cli/xplan-validatedb-cli/pom.xml
+++ b/xplan-cli/xplan-validatedb-cli/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-validator-cli/pom.xml b/xplan-cli/xplan-validator-cli/pom.xml
index 00b608495f14b0f5508af1f22ab43330cbcca91d..7f8ebcec450d5a2686f5e415ed400dd1db2630b0 100644
--- a/xplan-cli/xplan-validator-cli/pom.xml
+++ b/xplan-cli/xplan-validator-cli/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<properties>
diff --git a/xplan-configuration/pom.xml b/xplan-configuration/pom.xml
index 865068173ec1a51ee149c36b08d224cdb9a3947d..bb05d95befe0003c5837c83e125bcd1967ca0263 100644
--- a/xplan-configuration/pom.xml
+++ b/xplan-configuration/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<modules>
diff --git a/xplan-configuration/xplan-dokumenten-config/pom.xml b/xplan-configuration/xplan-dokumenten-config/pom.xml
index 22339ed162087537b383ab7a8f9c5b0c90397688..d03c0231bc92504a27a2a77fce1472cf3d497da9 100644
--- a/xplan-configuration/xplan-dokumenten-config/pom.xml
+++ b/xplan-configuration/xplan-dokumenten-config/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-configuration</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-configuration/xplan-manager-config/pom.xml b/xplan-configuration/xplan-manager-config/pom.xml
index daa2a8d19b252954780a0465c5d43864e73de072..43f9c8c072f6c5b8e3c282fc6cd9b6bdd1d25903 100644
--- a/xplan-configuration/xplan-manager-config/pom.xml
+++ b/xplan-configuration/xplan-manager-config/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-configuration</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-configuration/xplan-mapproxy-config/pom.xml b/xplan-configuration/xplan-mapproxy-config/pom.xml
index 5da06bd336d0d05941f0a3f42942698fea90d944..717d548224bdd5bf09e8fa561875213a5eac6fb5 100644
--- a/xplan-configuration/xplan-mapproxy-config/pom.xml
+++ b/xplan-configuration/xplan-mapproxy-config/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-configuration</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-configuration/xplan-mapserver-config/pom.xml b/xplan-configuration/xplan-mapserver-config/pom.xml
index a92b95308b2c3b08838a675ca9a9e93f6fb98366..5e517c402ebfb26eec1883d1f6695ac8da15b0ee 100644
--- a/xplan-configuration/xplan-mapserver-config/pom.xml
+++ b/xplan-configuration/xplan-mapserver-config/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-configuration</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-configuration/xplan-validator-config/pom.xml b/xplan-configuration/xplan-validator-config/pom.xml
index e555993f4d24a2bee9ee6998c6b8fc39c53ecf35..aa3ebd96ec74b011b6596a16e7380562385534ec 100644
--- a/xplan-configuration/xplan-validator-config/pom.xml
+++ b/xplan-configuration/xplan-validator-config/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-configuration</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-core/pom.xml b/xplan-core/pom.xml
index 1ac4feb8558f40a72f23193e23fdd667b6200425..7d827a5667e44508a5f5f554ba3561d7f0d4c9c8 100644
--- a/xplan-core/pom.xml
+++ b/xplan-core/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<modules>
diff --git a/xplan-core/xplan-commons-cli/pom.xml b/xplan-core/xplan-commons-cli/pom.xml
index 580c1903bb94c63f0b65b01261f73fbbdef6581a..adbb9709a1a4d3d943a815aafa5d2a807a8afeaa 100644
--- a/xplan-core/xplan-commons-cli/pom.xml
+++ b/xplan-core/xplan-commons-cli/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<dependencies>
diff --git a/xplan-core/xplan-commons/pom.xml b/xplan-core/xplan-commons/pom.xml
index fb14321ee0a8139db5706fc86f394633f928f5ab..44f9adb829849df35dca1101ef4095e5052627b3 100644
--- a/xplan-core/xplan-commons/pom.xml
+++ b/xplan-core/xplan-commons/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-core/xplan-core-job/pom.xml b/xplan-core/xplan-core-job/pom.xml
index 141f76998260060e599786c497642af8315cd866..c5038fd7008c9d8fb4221df381c84d841675cab3 100644
--- a/xplan-core/xplan-core-job/pom.xml
+++ b/xplan-core/xplan-core-job/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<artifactId>xplan-core-job</artifactId>
diff --git a/xplan-core/xplan-core-manager-db/pom.xml b/xplan-core/xplan-core-manager-db/pom.xml
index f2aa2326ed98f94765ecd33cbef50057eee2a317..f34b04288af5a85a0af738a62e105d0f91fe478a 100644
--- a/xplan-core/xplan-core-manager-db/pom.xml
+++ b/xplan-core/xplan-core-manager-db/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<dependencies>
diff --git a/xplan-core/xplan-core-manager-deegree/pom.xml b/xplan-core/xplan-core-manager-deegree/pom.xml
index 043bb2972af0e0b672cb810e062b7ef009ecebad..c13676e7144958853cc170e552301cdbd211036c 100644
--- a/xplan-core/xplan-core-manager-deegree/pom.xml
+++ b/xplan-core/xplan-core-manager-deegree/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-core/xplan-inspireplu-transformation/pom.xml b/xplan-core/xplan-inspireplu-transformation/pom.xml
index 4cbc54d896882ebdeda12c580f04a5d688531630..f1d05b66f127eba85ea1057e53f656b295607dc6 100644
--- a/xplan-core/xplan-inspireplu-transformation/pom.xml
+++ b/xplan-core/xplan-inspireplu-transformation/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<dependencies>
diff --git a/xplan-core/xplan-manager-core/pom.xml b/xplan-core/xplan-manager-core/pom.xml
index d99779bcd1417d52b55db7f19e63e2756e731139..61bc0ccd177e1d71e1e64bd5317430d0193486d1 100644
--- a/xplan-core/xplan-manager-core/pom.xml
+++ b/xplan-core/xplan-manager-core/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<dependencies>
@@ -181,7 +181,7 @@
<dependency>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core-manager-deegree</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/config/StorageCleanUpContext.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/config/StorageCleanUpContext.java
index cc184b3ab6fbcdad9fc281d536359ec049a3cd49..49c509198b87515fa7ba8ffeb62f9345d3f55cd3 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/config/StorageCleanUpContext.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/config/StorageCleanUpContext.java
@@ -21,6 +21,7 @@
package de.latlon.xplan.manager.storage.config;
import de.latlon.xplan.manager.storage.StorageCleanUpManager;
+import de.latlon.xplan.manager.storage.filesystem.DeegreeRasterCacheCleaner;
import de.latlon.xplan.manager.storage.filesystem.FilesystemStorageCleanUpManager;
import de.latlon.xplan.manager.wmsconfig.WmsWorkspaceWrapper;
import org.springframework.context.annotation.Bean;
@@ -36,8 +37,9 @@ import org.springframework.context.annotation.Profile;
public class StorageCleanUpContext {
@Bean
- public StorageCleanUpManager storageCleanUpManager(WmsWorkspaceWrapper wmsWorkspaceWrapper) {
- return new FilesystemStorageCleanUpManager(wmsWorkspaceWrapper.getDataDirectory());
+ public StorageCleanUpManager storageCleanUpManager(WmsWorkspaceWrapper wmsWorkspaceWrapper,
+ DeegreeRasterCacheCleaner deegreeRasterCacheCleaner) {
+ return new FilesystemStorageCleanUpManager(wmsWorkspaceWrapper.getDataDirectory(), deegreeRasterCacheCleaner);
}
}
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/filesystem/DeegreeRasterCacheCleaner.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/filesystem/DeegreeRasterCacheCleaner.java
new file mode 100644
index 0000000000000000000000000000000000000000..13961ed6d8e340fe709f89b86d47641b0d5d842b
--- /dev/null
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/filesystem/DeegreeRasterCacheCleaner.java
@@ -0,0 +1,140 @@
+package de.latlon.xplan.manager.storage.filesystem;
+
+import de.latlon.xplan.manager.workspace.WorkspaceReloader;
+import de.latlon.xplan.manager.workspace.WorkspaceReloaderConfiguration;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Required to remove file locks on windows to ensure raster files can be removed. Invokes
+ * http://HOST:PORT/xplan-wms/removecache/TILESTOREID
+ *
+ * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
+ * @since 7.1.2
+ */
+public class DeegreeRasterCacheCleaner {
+
+ private final Logger LOG = LoggerFactory.getLogger(DeegreeRasterCacheCleaner.class);
+
+ private WorkspaceReloaderConfiguration configuration;
+
+ /**
+ * @param configuration configuration for {@link WorkspaceReloader}, if
+ * {@link WorkspaceReloaderConfiguration} is invalid, reload is skipped, never
+ * <code>null</code>
+ */
+ public DeegreeRasterCacheCleaner(WorkspaceReloaderConfiguration configuration) {
+ this.configuration = configuration;
+ }
+
+ /**
+ * Clears the internal cache of the XPlanWMS
+ * @param tileStoreId the tileStoreId, never <code>null</code>
+ * @return true if clearing the cache was successful, false otherwise.
+ */
+ public boolean clearCache(String tileStoreId) {
+ boolean isValid = checkIfConfigurationIsValid();
+ if (isValid) {
+ LOG.info("Workspace reloader configuration is valid and used to clear cache.");
+ return executeClearCache(tileStoreId);
+ }
+ else {
+ LOG.info("Workspace reloader configuration is invalid. Reload of workspace is skipped!");
+ LOG.info("Workspace reloader configuration is invalid. Cache cannot be cleared.");
+ return false;
+ }
+ }
+
+ private boolean executeClearCache(String tileStoreId) {
+ List<String> urls = configuration.getUrls();
+ boolean isSuccessfulForAll = true;
+ for (String url : urls) {
+ boolean clearCacheResult = clearCache(url, tileStoreId);
+ isSuccessfulForAll = isSuccessfulForAll && clearCacheResult;
+ }
+ return isSuccessfulForAll;
+ }
+
+ private boolean clearCache(String url, String tileStoreId) {
+ try {
+ String clearCacheUrl = retrieveDeletePlanwerkWmsUrl(url, tileStoreId);
+ LOG.info("Attempting to clear internal raster cache with URL {}", clearCacheUrl);
+ HttpGet httpGet = new HttpGet(clearCacheUrl);
+ addAuthentication(httpGet);
+
+ CloseableHttpClient client = HttpClientBuilder.create().build();
+ HttpResponse response = client.execute(httpGet);
+ if (isResponseCodeOk(response)) {
+ LOG.info("Clearing raster cache was successful.");
+ return true;
+ }
+ else {
+ LOG.info(
+ "Error while clearing the internal raster cache. Statuscode: {}, Reason: {}. Check your configuration if workspace reload is configured correctly.",
+ response.getStatusLine().getStatusCode(),
+ response.getStatusLine().getReasonPhrase() != null
+ && !response.getStatusLine().getReasonPhrase().isEmpty()
+ ? response.getStatusLine().getReasonPhrase() : "-");
+ return false;
+ }
+ }
+ catch (IOException e) {
+ LOG.error("Clearing raster cache failed!", e);
+ LOG.trace(e.getMessage(), e);
+ return false;
+ }
+ }
+
+ private String retrieveDeletePlanwerkWmsUrl(String url, String tileStoreId) {
+ if (!url.endsWith("/"))
+ url = url.concat("/");
+ return url.concat("removecache/").concat(tileStoreId);
+ }
+
+ private void addAuthentication(HttpRequestBase httpRequest) {
+ if (configuration.isApiKeyConfigured()) {
+ LOG.debug("apiKey is used for authentication");
+ String apiKey = configuration.getApiKey();
+ httpRequest.addHeader("X-API-Key", apiKey);
+ }
+ else {
+ LOG.debug("user/password is used for authentication");
+ String user = configuration.getUser();
+ String password = configuration.getPassword();
+ byte[] basicAuth = (user + ":" + password).getBytes();
+ String basicAuthEncoded = new String(Base64.encodeBase64(basicAuth));
+ httpRequest.addHeader("Authorization", "Basic " + basicAuthEncoded);
+ }
+ }
+
+ private boolean isResponseCodeOk(HttpResponse response) {
+ return response.getStatusLine().getStatusCode() == 200;
+ }
+
+ private boolean checkIfConfigurationIsValid() {
+ List<String> url = configuration.getUrls();
+ String apiKey = configuration.getApiKey();
+ String user = configuration.getUser();
+ String password = configuration.getPassword();
+ return isNotNullOrEmpty(url)
+ && (isNotNullOrEmpty(apiKey) || (isNotNullOrEmpty(user) && isNotNullOrEmpty(password)));
+ }
+
+ private boolean isNotNullOrEmpty(String configValue) {
+ return configValue != null && !configValue.isEmpty();
+ }
+
+ private boolean isNotNullOrEmpty(List<String> configValue) {
+ return configValue != null && !configValue.isEmpty();
+ }
+
+}
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/filesystem/FilesystemStorageCleanUpManager.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/filesystem/FilesystemStorageCleanUpManager.java
index 3fca40aec76a5fb83ac9af9d2125bb6437617810..2e23d5ad8356d8ec17cb287f68e99debc8aa9695 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/filesystem/FilesystemStorageCleanUpManager.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/filesystem/FilesystemStorageCleanUpManager.java
@@ -45,15 +45,17 @@ public class FilesystemStorageCleanUpManager implements StorageCleanUpManager {
private final Path dataDirectory;
- public FilesystemStorageCleanUpManager(Path dataDirectory) {
+ private final DeegreeRasterCacheCleaner deegreeRasterCacheCleaner;
+
+ public FilesystemStorageCleanUpManager(Path dataDirectory, DeegreeRasterCacheCleaner deegreeRasterCacheCleaner) {
this.dataDirectory = dataDirectory;
+ this.deegreeRasterCacheCleaner = deegreeRasterCacheCleaner;
}
@Override
public void deleteAll(String id, StorageEvent storageEvent) throws StorageException {
String prefix = id + "_";
- deleteFilesWithPrefix((path, basicFileAttributes) -> path.getFileName().toString().startsWith(prefix),
- storageEvent);
+ deleteFilesWithPrefix((path, basicFileAttributes) -> extractTileStoreId(path).startsWith(prefix), storageEvent);
}
private void deleteFilesWithPrefix(BiPredicate<Path, BasicFileAttributes> filenameFilter, StorageEvent storageEvent)
@@ -65,6 +67,8 @@ public class FilesystemStorageCleanUpManager implements StorageCleanUpManager {
for (Path file : filesToDelete) {
LOG.info("- Entferne Raster-Datei '" + file + "'...");
try {
+ String tileStoreId = extractTileStoreId(file);
+ deegreeRasterCacheCleaner.clearCache(tileStoreId);
byte[] bytes = Files.readAllBytes(file);
Files.delete(file);
storageEvent.addDeletedPath(file, bytes);
@@ -77,6 +81,13 @@ public class FilesystemStorageCleanUpManager implements StorageCleanUpManager {
}
}
+ private static String extractTileStoreId(Path file) {
+ String fileName = file.getFileName().toString();
+ if (fileName.contains("."))
+ return fileName.substring(0, fileName.lastIndexOf("."));
+ return fileName;
+ }
+
private List<Path> findFilesToDelete(BiPredicate<Path, BasicFileAttributes> filenameFilter)
throws StorageException {
try {
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/config/RasterStorageContext.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/config/RasterStorageContext.java
index ef0643b19948f48dac3be5139bfde12f6670f523..5254701e1414e2978cfb0045cb298b3bc188c2ea 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/config/RasterStorageContext.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/config/RasterStorageContext.java
@@ -21,6 +21,7 @@
package de.latlon.xplan.manager.wmsconfig.config;
import de.latlon.xplan.manager.configuration.ManagerConfiguration;
+import de.latlon.xplan.manager.storage.filesystem.DeegreeRasterCacheCleaner;
import de.latlon.xplan.manager.wmsconfig.WmsWorkspaceWrapper;
import de.latlon.xplan.manager.wmsconfig.raster.access.GdalRasterAdapter;
import de.latlon.xplan.manager.wmsconfig.raster.config.DeegreeRasterConfigManager;
@@ -57,14 +58,16 @@ public class RasterStorageContext {
@Bean
public RasterStorage rasterStorage(ManagerConfiguration managerConfiguration,
- WmsWorkspaceWrapper wmsWorkspaceWrapper, RasterEvaluation rasterEvaluation) {
+ WmsWorkspaceWrapper wmsWorkspaceWrapper, RasterEvaluation rasterEvaluation,
+ DeegreeRasterCacheCleaner deegreeRasterCacheCleaner) {
final Path dataDirectory = wmsWorkspaceWrapper.getDataDirectory();
switch (managerConfiguration.getRasterConfigurationType()) {
case gdal:
case mapserver:
- return new GdalRasterStorage(dataDirectory, rasterEvaluation, new GdalRasterAdapter());
+ return new GdalRasterStorage(dataDirectory, rasterEvaluation, new GdalRasterAdapter(),
+ deegreeRasterCacheCleaner);
default:
- return new FileSystemStorage(dataDirectory, rasterEvaluation);
+ return new FileSystemStorage(dataDirectory, rasterEvaluation, deegreeRasterCacheCleaner);
}
}
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/FileSystemStorage.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/FileSystemStorage.java
index e34bd841bfcb3b9f4675d2b1de93c005cdbceabb..95f34dcf6ee7ef754f44dc1457d632b262097a6c 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/FileSystemStorage.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/FileSystemStorage.java
@@ -22,6 +22,7 @@ package de.latlon.xplan.manager.wmsconfig.raster.storage;
import de.latlon.xplan.commons.archive.XPlanArchiveContentAccess;
import de.latlon.xplan.manager.storage.StorageEvent;
+import de.latlon.xplan.manager.storage.filesystem.DeegreeRasterCacheCleaner;
import de.latlon.xplan.manager.wmsconfig.raster.evaluation.RasterEvaluation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,9 +42,13 @@ public class FileSystemStorage implements RasterStorage {
private final RasterEvaluation rasterEvaluation;
- public FileSystemStorage(Path dataDirectory, RasterEvaluation rasterEvaluation) {
+ private final DeegreeRasterCacheCleaner deegreeRasterCacheCleaner;
+
+ public FileSystemStorage(Path dataDirectory, RasterEvaluation rasterEvaluation,
+ DeegreeRasterCacheCleaner deegreeRasterCacheCleaner) {
this.dataDirectory = dataDirectory;
this.rasterEvaluation = rasterEvaluation;
+ this.deegreeRasterCacheCleaner = deegreeRasterCacheCleaner;
}
@Override
@@ -62,6 +67,7 @@ public class FileSystemStorage implements RasterStorage {
@Override
public void deleteRasterFile(int planId, String fileName, StorageEvent storageEvent) {
final String rasterLayerFileName = planId + "_" + fileName;
+ deegreeRasterCacheCleaner.clearCache(rasterLayerFileName);
Path file = dataDirectory.resolve(rasterLayerFileName);
LOG.info("- Entferne Raster-Datei '" + file + "'...");
try {
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/GdalRasterStorage.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/GdalRasterStorage.java
index 1d43750b3c48cde186392281d65bf502b215d89b..48f993db25f372f5f21c2873953f1a02b3e3b101 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/GdalRasterStorage.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/GdalRasterStorage.java
@@ -22,6 +22,7 @@ package de.latlon.xplan.manager.wmsconfig.raster.storage;
import de.latlon.xplan.commons.archive.XPlanArchiveContentAccess;
import de.latlon.xplan.manager.storage.StorageEvent;
+import de.latlon.xplan.manager.storage.filesystem.DeegreeRasterCacheCleaner;
import de.latlon.xplan.manager.wmsconfig.raster.access.GdalRasterAdapter;
import de.latlon.xplan.manager.wmsconfig.raster.evaluation.RasterEvaluation;
@@ -38,8 +39,9 @@ public class GdalRasterStorage extends FileSystemStorage {
private GdalRasterAdapter rasterAdapter;
- public GdalRasterStorage(Path dataDirectory, RasterEvaluation rasterEvaluation, GdalRasterAdapter rasterAdapter) {
- super(dataDirectory, rasterEvaluation);
+ public GdalRasterStorage(Path dataDirectory, RasterEvaluation rasterEvaluation, GdalRasterAdapter rasterAdapter,
+ DeegreeRasterCacheCleaner deegreeRasterCacheCleaner) {
+ super(dataDirectory, rasterEvaluation, deegreeRasterCacheCleaner);
this.rasterAdapter = rasterAdapter;
}
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/XPlanManagerTest.java b/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/XPlanManagerTest.java
index 4bfdcb1055f1adf1592432eee8d8961ed6cba537..2f0ce80f5ad99de384ff6c91ae2ddd06982b0323 100644
--- a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/XPlanManagerTest.java
+++ b/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/XPlanManagerTest.java
@@ -24,8 +24,8 @@ import de.latlon.xplan.ResourceAccessor;
import de.latlon.xplan.commons.archive.XPlanArchiveCreator;
import de.latlon.xplan.commons.configuration.SortConfiguration;
import de.latlon.xplan.manager.configuration.ManagerConfiguration;
-import de.latlon.xplan.manager.database.ManagerWorkspaceWrapper;
import de.latlon.xplan.manager.database.XPlanDao;
+import de.latlon.xplan.manager.storage.filesystem.DeegreeRasterCacheCleaner;
import de.latlon.xplan.manager.web.shared.PlanStatus;
import de.latlon.xplan.manager.web.shared.RasterEvaluationResult;
import de.latlon.xplan.manager.web.shared.Rechtsstand;
@@ -126,7 +126,10 @@ public class XPlanManagerTest {
when(wmsWorkspaceWrapper.getLocation()).thenReturn(wmsWorkspaceDirectory.getAbsoluteFile());
RasterEvaluation rasterEvaluation = createRasterEvaluation(managerConfiguration);
XPlanRasterEvaluator xPlanRasterEvaluator = new XPlanRasterEvaluator(rasterEvaluation);
- RasterStorage rasterStorage = createRasterStorage(managerConfiguration, wmsWorkspaceWrapper, rasterEvaluation);
+ DeegreeRasterCacheCleaner deegreeRasterCacheCleaner = new DeegreeRasterCacheCleaner(
+ managerConfiguration.getWorkspaceReloaderConfiguration());
+ RasterStorage rasterStorage = createRasterStorage(managerConfiguration, wmsWorkspaceWrapper, rasterEvaluation,
+ deegreeRasterCacheCleaner);
RasterConfigManager rasterConfigManager = createRasterConfigManager(wmsWorkspaceWrapper, managerConfiguration);
ApplicationEventPublisher applicationEventPublisher = createApplicationEventPublisher();
XPlanRasterManager xPlanRasterManager = new XPlanRasterManager(rasterStorage, rasterConfigManager,
@@ -146,9 +149,11 @@ public class XPlanManagerTest {
}
private RasterStorage createRasterStorage(ManagerConfiguration managerConfiguration,
- WmsWorkspaceWrapper wmsWorkspaceWrapper, RasterEvaluation rasterEvaluation) {
+ WmsWorkspaceWrapper wmsWorkspaceWrapper, RasterEvaluation rasterEvaluation,
+ DeegreeRasterCacheCleaner deegreeRasterCacheCleaner) {
// TODO turn into autowired field
- return new RasterStorageContext().rasterStorage(managerConfiguration, wmsWorkspaceWrapper, rasterEvaluation);
+ return new RasterStorageContext().rasterStorage(managerConfiguration, wmsWorkspaceWrapper, rasterEvaluation,
+ deegreeRasterCacheCleaner);
}
private RasterEvaluation createRasterEvaluation(ManagerConfiguration managerConfiguration) {
diff --git a/xplan-core/xplan-synthesizer/pom.xml b/xplan-core/xplan-synthesizer/pom.xml
index 2b7b3e7f0409c6d70c5001a138254fd7570d7e40..a375d46742d344b39257260b9e00b90c75aac0dd 100644
--- a/xplan-core/xplan-synthesizer/pom.xml
+++ b/xplan-core/xplan-synthesizer/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<dependencies>
diff --git a/xplan-core/xplan-validator-core/pom.xml b/xplan-core/xplan-validator-core/pom.xml
index b8cf1f82e698c5d7ace42736d66139f753f7369b..4e36df4c4d7a0d4cfb0aa081a5188f7c3b3b526a 100644
--- a/xplan-core/xplan-validator-core/pom.xml
+++ b/xplan-core/xplan-validator-core/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-distribution/pom.xml b/xplan-distribution/pom.xml
index ca3d759fef798999a8661d15fdd330497d0c5a30..d38a7b1adbef7eda288e9e6a1b53c2ceb40a6cc9 100644
--- a/xplan-distribution/pom.xml
+++ b/xplan-distribution/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
@@ -241,6 +241,13 @@
<classifier>xplan-inspireplu-workspace</classifier>
<type>zip</type>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>xplan-workspaces</artifactId>
+ <version>${project.version}</version>
+ <classifier>xplan-validator-workspace</classifier>
+ <type>zip</type>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>xplan-workspaces</artifactId>
diff --git a/xplan-docker/pom.xml b/xplan-docker/pom.xml
index bb74a32bcbdaa1f48742a24429aa362d73a96e50..1454ab0b2cad921ada865cee3424229f089e64bb 100644
--- a/xplan-docker/pom.xml
+++ b/xplan-docker/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<modules>
diff --git a/xplan-docker/xplan-docker-mapproxy/pom.xml b/xplan-docker/xplan-docker-mapproxy/pom.xml
index 4561bac36d9feb6fa0690456db31b76ddcfac925..4e7045b8a96e98639f580efa644a3e0f6a986d9f 100644
--- a/xplan-docker/xplan-docker-mapproxy/pom.xml
+++ b/xplan-docker/xplan-docker-mapproxy/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-docker</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<properties>
diff --git a/xplan-docker/xplan-docker-mapserver/pom.xml b/xplan-docker/xplan-docker-mapserver/pom.xml
index abd250b9528274f6d920c34bed6023aba870fc41..8030e687d3d5a0641feb0b30b84036cf949f9acd 100644
--- a/xplan-docker/xplan-docker-mapserver/pom.xml
+++ b/xplan-docker/xplan-docker-mapserver/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-docker</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<properties>
diff --git a/xplan-docker/xplan-docker-tomcat-gdal/pom.xml b/xplan-docker/xplan-docker-tomcat-gdal/pom.xml
index 3682496ada725ceb7309c3e1a9c80e0c35eddfe3..93d0a353c89f328326352345cc3ce646f7c950cc 100644
--- a/xplan-docker/xplan-docker-tomcat-gdal/pom.xml
+++ b/xplan-docker/xplan-docker-tomcat-gdal/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-docker</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<properties>
diff --git a/xplan-docker/xplan-docker-tomcat/pom.xml b/xplan-docker/xplan-docker-tomcat/pom.xml
index 3521344a26f41bd9d35cab1a96a431af931c73d5..e19d0ed2b10c3737f1f92cf12d6f2a2ff6340049 100644
--- a/xplan-docker/xplan-docker-tomcat/pom.xml
+++ b/xplan-docker/xplan-docker-tomcat/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-docker</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<properties>
diff --git a/xplan-docker/xplan-docker-volume-init/pom.xml b/xplan-docker/xplan-docker-volume-init/pom.xml
index 4f409d7c38955a7e0702d8e65a01d4dc8720f8b2..677f167aee3a293d461073e802b49406b876cf7c 100644
--- a/xplan-docker/xplan-docker-volume-init/pom.xml
+++ b/xplan-docker/xplan-docker-volume-init/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-docker</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<properties>
diff --git a/xplan-documentation/pom.xml b/xplan-documentation/pom.xml
index ef482051d3c05851ebbdd4a7093aa8d362b99c82..51f30b66ca2a933b22bc55247e656632ba49085e 100644
--- a/xplan-documentation/pom.xml
+++ b/xplan-documentation/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<properties>
diff --git a/xplan-documentation/xplan-benutzerhandbuch/pom.xml b/xplan-documentation/xplan-benutzerhandbuch/pom.xml
index eebcca047342f65a47209890e6e697d816db2999..cefd1eaa8bc287a9f75d41f907ffd0a1bd0ca403 100644
--- a/xplan-documentation/xplan-benutzerhandbuch/pom.xml
+++ b/xplan-documentation/xplan-benutzerhandbuch/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-documentation</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/aenderungsHistorie.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/aenderungsHistorie.adoc
index 1ecb68e617ae866ac560a89e523c132277de4232..98d57768912dc8f3eecb90f311e4bce57798cd49 100644
--- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/aenderungsHistorie.adoc
+++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/aenderungsHistorie.adoc
@@ -2,13 +2,22 @@
[[Aenderungshistorie]]
== Änderungshistorie der xPlanBox
+[[Aenderungshistorie-7.1.2]]
+=== Version 7.1.2
+
+==== Fehlerbehebungen
+- Fehler beim Start des XPlanInspirePluWFS aufgrund einer nicht abwärtskompatible Änderungen im Schema behoben
+- Fehler in den Liniensignaturen für BP_StrassenbegrenzungsLinie, BP_EinfahrtsbereichLinie und BP_BereichOhneEinAusfahrtLinie behoben
+- Fehler beim Löschen von Planwerken unter dem Betriebssystem Windows behoben
+- Fehlende Konfiguration _xplan-validator-workspace_ im Distributionspaket ergänzt
+
[[Aenderungshistorie-7.1.1]]
=== Version 7.1.1
==== Fehlerbehebungen
- Fehler bei der Installation der XPlanManagerAPI, XPlanValidatorAPI und XPlanDokumenteAPI im Tomcat behoben
- Fehler beim Editieren eines Plans, bei dem sonstPlanArt gesetzt ist und keine Ganzzahl beinhaltet behoben
-- Fehler bei der Flächenschlussprüfung, wenn der Geltungsbereich von Bereich und PlanFeature nicht übereinstimmen behoben
+- Fehler bei der Flächenschlussprüfung behoben, wenn der Geltungsbereich von BP_Bereich und BP_Plan aus mehreren Geometrien bestehen und diese nicht übereinstimmen
[[Aenderungshistorie-7.1]]
=== Version 7.1
diff --git a/xplan-documentation/xplan-betriebshandbuch/pom.xml b/xplan-documentation/xplan-betriebshandbuch/pom.xml
index e59c3248598fa0257dd3824f4f25c145613c3d2e..345b5ad15ec89a1e5e954f525ece0ab958feab07 100644
--- a/xplan-documentation/xplan-betriebshandbuch/pom.xml
+++ b/xplan-documentation/xplan-betriebshandbuch/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-documentation</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/aktualisierung.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/aktualisierung.adoc
index 7a7707977602888d8a4e1c6a53a3e3ad4ff13eaa..d834bb2c1a756cd3d66501b61d92732b7a725ded 100644
--- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/aktualisierung.adoc
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/aktualisierung.adoc
@@ -81,6 +81,7 @@ Die Aktualisierungswerkzeuge und -skripte werden nur für die genannten Versione
| 7.0.2 | ja (<<aktualisierung-version-7.0.2, Details>>) | nein
| 7.1 | ja (<<aktualisierung-version-7.1, Details>>) | ja (<<aktualisierung-version-7.1, Details>>)
| 7.1.1 | nein | nein
+| 7.1.2 | ja (<<aktualisierung-version-7.1.2, Details>>) | nein
|Durchzuführende Aktualisierungen | <<aktualisierung-der-betroffenen-konfigurationsdateien-in-den-workspaces>> | <<aktualisierung-der-schemas>> und <<aktualisierung-der-daten>>
|===
@@ -283,15 +284,6 @@ Für die Aktualisierung auf die Version 7.1 sind folgende Schritte auszuführen:
* Aktualisierung der Datenbank:
** Ausführen des Skripts _migrate.sql_ im Verzeichnis _sql/update/from_7.0_to_7.1_ im Modul _xplan-manager-workspace_
-=== Troubleshooting
-
-Bei unerwartetem Verhalten der xPlanBox nach einer Aktualisierung können folgende Aktionen helfen:
-
-* Ausführen des Kommandozeilenwerkzeugs __reSynthesizer__ aus XPlanUpdateDataCLI zur Aktualisierung der in der XPlanSyn-Datenhaltung gespeicherten Daten.
-* Löschen des Verzeichnisses _<CATALINA_HOME>/work/_ des Tomcat-Servers. Der Tomcat-Server muss zuvor gestoppt und anschließend neu gestartet werden.
-* Reload der Workspaces der XPlanDienste.
-* Löschen des Browser-Caches.
-
[[aktualisierung-version-7.1.1]]
=== Aktualisierung auf die Version 7.1.1
@@ -304,4 +296,30 @@ Für eine Installation der Bugfix-Version müssen folgende Schritte ausgeführt
** _xplan-manager-web.war_
** _xplan-api-dokumente.war_
-TIP: Alle anderen Komponenten sind unverändert und müssen nicht aktualisiert werden.
\ No newline at end of file
+TIP: Alle anderen Komponenten sind unverändert und müssen nicht aktualisiert werden.
+
+[[aktualisierung-version-7.1.2]]
+=== Aktualisierung auf die Version 7.1.2
+
+Für eine Installation der Bugfix-Version müssen folgende Schritte ausgeführt werden:
+
+* Austausch der Webapps:
+** _xplan-wms.war_
+** _xplan-api-manager.war_
+** _xplan-manager-web.war_
+* Aktualisierung der Workspaces und Konfigurationen (s. <<teilweise-aktualisierung>>)
+** _xplansyn-wms-workspace.zip_
+** _xplan-inspireplu-workspace.zip_
+
+TIP: Alle anderen Komponenten sind unverändert und müssen nicht aktualisiert werden.
+
+NOTE: Um das Löschen von Rasterdaten unter dem Betriebssystem Windows sicher zu stellen, muss der Workspace-Reload, wie im Kapitel <<automatischer-workspace-reload>> beschrieben, konfiguriert sein.
+
+=== Troubleshooting
+
+Bei unerwartetem Verhalten der xPlanBox nach einer Aktualisierung können folgende Aktionen helfen:
+
+* Ausführen des Kommandozeilenwerkzeugs __reSynthesizer__ aus XPlanUpdateDataCLI zur Aktualisierung der in der XPlanSyn-Datenhaltung gespeicherten Daten.
+* Löschen des Verzeichnisses _<CATALINA_HOME>/work/_ des Tomcat-Servers. Der Tomcat-Server muss zuvor gestoppt und anschließend neu gestartet werden.
+* Reload der Workspaces der XPlanDienste.
+* Löschen des Browser-Caches.
\ No newline at end of file
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/gdal.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/gdal.adoc
index ceab6cf0b2c07d7374bea3955115fa60555a0ada..4d8327202f334f678b1aca0c2579ee31ce07c7b4 100644
--- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/gdal.adoc
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/gdal.adoc
@@ -31,10 +31,7 @@ http://windows.microsoft.com/de-de/windows/32-bit-and-64-bit-windows[Windows]
entsprechen. Als Download-Format sollten die kompilierten Binaries in
einem einzelnen ZIP-Archiv gewählt werden.
-NOTE: Die MSVC-Version mit der GDAL kompiliert wurde, setzt die jeweilige
-Version des Microsoft C/C++ Runtime Library (CRT) voraus. Ab der Version
-MSVC 11.0 (1700) werden Windows XP and Windows Server 2003 nicht mehr
-unterstützt. Die Version des Microsoft C/C++ Runtime Library (CRT) kann über die Windows Systemsteuerung angezeigt werden.
+NOTE: Die MSVC-Version mit der GDAL kompiliert wurde, setzt die jeweilige Version des Microsoft C/C++ Runtime Library (CRT) voraus. Welche Version des Microsoft C/C++ Runtime Library (CRT) installiert ist, kann über die Windows Systemsteuerung angezeigt werden.
Das ZIP-Archiv kann an einem beliebigen Ort entpackt werden.
@@ -43,6 +40,7 @@ _Systemsteuerung->System und Sicherheit->System->Erweiterte Systemeinstellungen-
müssen folgende Einstellungen vorgenommen werden:
* Setzen der Umgebungsvariable `JAVA_HOME` mit der Pfadangabe zum Installationsverzeichnis des JDK, z. B.: `C:\Program Files\Java\jdk-11.0.11`
-* Setzen der Umgebungsvariable `GDAL_DATA` mit der Pfadangabe zum Verzeichnis in dem die Datei _gcs.csv_ enthalten ist, z. B.: `C:\Program Files (x86)\gdal\bin\gdal-data`
+* Setzen der Umgebungsvariable `GDAL_DATA` mit der Pfadangabe zum Verzeichnis _gdal-data_, z. B.: `C:\Program Files (x86)\gdal\bin\gdal-data`
+* Setzen der Umgebungsvariable `PROJ_LIB` mit der Pfadangabe zum Verzeichnis mit der Datei _proj.db_, z. B.: `C:\Program Files (x86)\gdal\bin\proj9\share`
* Zur Umgebungsvariable _PATH_ müssen zwei Pfade hinzugefügt werden (Annahme: Entpacktes ZIP-Archiv von GISInternals wurde genutzt):
`<GDAL-INSTALLATIONSORDNER>\bin;<GDAL-INSTALLATIONSORDNER>\bin\gdal\java`
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/installation.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/installation.adoc
index 8e3620e80f66d5742b741f886b9c3cfe9c224eec..c683e79e2320d07cb97b18ecc21a8af4e6614da8 100644
--- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/installation.adoc
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/installation.adoc
@@ -11,6 +11,7 @@ Die ZIP-Archive mit den deegree Workspaces (s. <<installationskomponenten>>) mü
* _xplan-wfs-workspace_
* _xplansyn-wfs-workspace_
* _xplansyn-wms-workspace_
+* _xplan-validator-workspace.zip_ (nur erforderlich in Kombination mit dem _xplan-webservices-validator-wms-sql-workspace.zip_)
* _xplan-validator-wms-memory-workspace_ *oder* _xplan-validator-wms-sql-workspace_ (siehe <<konfiguration-xplanvalidatorwms>>)
* _xplan-manager-workspace_
* _xplan-inspireplu-workspace_ (optional)
@@ -52,6 +53,7 @@ Die WAR-Archive der REST-API werden über eine weitere Tomcat-Instanz _API-Tomca
TIP: Da die Komponente XPlanRessourcen eine Einstiegsseite bereitstellt, bietet es sich an, diese als ROOT-Webapp der Instanz _Anwendungs-Tomcat_ zu installieren. Das WAR-Archiv _xplan-root.war_ muss dafür im Verzeichnis _ROOT_ entpackt werden.
+[[installation-webapp-properties]]
==== Verknüpfung von Webapp und Workspace
Für die Tomcat-Instanz _Dienste-Tomcat_ muss eine _webapp.properties_ Datei angelegt werden.
@@ -63,11 +65,10 @@ Diese enthält die Verknüpfung zwischen der Webapp und dem Workspace.
/xplan-wms=xplansyn-wms-workspace
/xplansyn-wfs=xplansyn-wfs-workspace
/xplan-wfs=xplan-wfs-workspace
-/xplan-validator-wms=xplan-validator-wms-sql-workspace
+/xplan-validator-wms=xplan-validator-wms-memory-workspace <1>
/xplan-inspireplu=xplan-inspireplu-workspace
----
-
-Weitere Informationen zur Konfiguration des XPlanValidatorWMS sind im Kapitel <<konfiguration-xplanvalidatorwms>> zu finden.
+<1> dieser Workspace wird als Vorgabewert konfiguriert, alternativ kann der _xplan-webservices-validator-wms-sql-workspace_ verwendet werden (weitere Informationen zur Konfiguration des XPlanValidatorWMS sind im Kapitel <<konfiguration-xplanvalidatorwms>> zu finden).
[[kommandozeilen-anwendungen]]
==== Kommandozeilen-Anwendungen
@@ -105,12 +106,12 @@ Das Datenbankschema für die Auswertung muss durch Ausführen der SQL-Skripte au
. _02_create_tables.sql_
. _03_create_trigger-function.sql_
. _04_create_trigger.sql_
-. _05_grant_user.sql_ (zuvor ist die Variable $DB_USER im Skript durch den Namen des Datenbanknutzers auszutauschen, mit dem der XPlanManager und die XPlanDienste auf die XPlaNDB zugreifen, s. Abschnitt "Konfiguration der Datenbank" im Betriebshandbuch)
+. _05_grant_user.sql_ (zuvor muss die Variable `$DB_USER` im Skript durch den Namen des Datenbanknutzers ausgetauscht werden, mit dem der XPlanManager und die XPlanDienste auf die XPlanDB zugreifen (s. Abschnitt <<konfiguration-der-datenbank>>).
Die Skripte erstellen eine Kopie der drei XPlanSyn-Schemas in den Schemas _xplanevaluationxplansynpre_, _xplanevaluationxplansyn_ und _xplanevaluationxplansynarchive_ sowie eine Log-Tabelle _xplanevaluation.planTableLog_.
-Die Log-Tabelle wird beim Importieren, Editieren und Löschen von Plänen über den XPlanManager mit einer Historie der ausgeführten Operationen auf die einzelnen Pläne gefüllt und dient als Basis für die regelmäßige Synchronisierung des XPlanSyn-Schema und des Auswerteschemas.
+Die Log-Tabelle wird beim Importieren, Editieren und Löschen von Plänen über den XPlanManager mit einer Historie der ausgeführten Operationen auf die einzelnen Pläne gefüllt und dient als Basis für die regelmäßige Synchronisierung des Auswerteschemas mit dem XPlanSyn-Schema.
Damit das Tool ausgeführt werden kann, muss GDAL installiert werden, wie in Kapitel <<installation-gdal>> beschrieben.
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/ueberblick.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/ueberblick.adoc
index 878fe52f716f9eb2bcb0a8e3ae2f4499a32fd0dd..f9546ad863a87041a3121831308ec5768eb09c71 100644
--- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/ueberblick.adoc
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/ueberblick.adoc
@@ -16,9 +16,9 @@ Die xPlanBox umfasst die folgenden Komponenten, die zusammengenommen die Liefere
|===
|*Web-Anwendung/Dienst* |*Konfigurationen*
|xplan-root-<VERSION>.war |-
-|xplan-validator-web-<VERSION>.war |xplan-validator-config-<VERSION>.zip
+|xplan-validator-web-<VERSION>.war |xplan-validator-config-<VERSION>.zip, xplan-workspaces-<VERSION>-xplan-validator-workspace.zip
|xplan-manager-web-<VERSION>.war |xplan-manager-config-<VERSION>.zip und xplan-workspaces-<VERSION>-xplan-manager-workspace.zip
-|xplan-api-validator-<VERSION>.war |xplan-validator-config-<VERSION>.zip
+|xplan-api-validator-<VERSION>.war |xplan-validator-config-<VERSION>.zip, xplan-workspaces-<VERSION>-xplan-validator-workspace.zip
|xplan-api-manager-<VERSION>.war |xplan-manager-config-<VERSION>.zip und xplan-workspaces-<VERSION>-xplan-manager-workspace.zip
|xplansyn-wfs-<VERSION>.war |xplan-workspaces-<VERSION>-xplansyn-wfs-workspace.zip
|xplan-wfs-<VERSION>.war |xplan-workspaces-<VERSION>-xplan-wfs-workspace.zip
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/workspacereload.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/workspacereload.adoc
index ae603133852f12c6f43fb6f6676a2ae0a82ae5e1..2c264908eb0461b48efe69bc0e1d13755b6a90d6 100644
--- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/workspacereload.adoc
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/workspacereload.adoc
@@ -3,22 +3,23 @@
Der XPlanManager kann nach jedem Import, jeder Änderung oder jedem
Löschvorgang eines Planwerks automatisch einen Workspace-Reload des XPlanWMS/XPlanWerkWMS
-auslösen. Dadurch werden Änderungen an Rasterplänen sofort im WMS sichtbar.
+auslösen. Dadurch werden Änderungen an Rasterplänen sofort im XPlanWMS sichtbar.
-In der Datei _<XPLANBOX_CONFIG>/managerConfiguration.properties_ müssen folgende Felder gefüllt
-werden:
+In der Datei _<XPLANBOX_CONFIG>/managerConfiguration.properties_ müssen folgende Elemente gesetzt werden:
-.Konfigurationselemente in der managerConfiguration.properties Datei:
+.Konfigurationselemente in der _managerConfiguration.properties_ Datei:
[source,properties]
----
workspaceReloadUrls=<XPLANWMS-URLS> <1>
workspaceReloadApiKey=<API-KEY> <2>
workspaceReloadAction=[ALL,RELOAD,PLANWERKWMS] <3>
----
-<1> ein oder mehrere URLs (kommasepariert), wenn mehrere Instanzen des XPlanWMS/XPlanWerkWMS hinter einem Load-Balancer betrieben werden
+<1> Angabe ein oder mehrerer URLs (kommasepariert), z. B. wenn mehrere Instanzen des XPlanWMS/XPlanWerkWMS hinter einem Load-Balancer betrieben werden
<2> API-Key für die Authentifizierung
<3> definiert wie die Dienste aktualisiert werden, mit `ALL` (Vorgabewert) werden die Workspace-Konfigurationen aller Dienste neu geladen (`RELOAD`) und der XPlanWerkWMS aktualisiert (`PLANWERKWMS`), so dass einzelne XPlanWerkWMS Endpunkte entfernt werden können. Mit `RELOAD` und `PLANWERKWMS` können diese Aktualisierungen auch getrennt aufgerufen werden.
+CAUTION: Wenn der XPlanWMS mit deegree unter dem *Betriebssystem Windows* verwendet wird, ist die Konfiguration für den Workspace-Reload erforderlich, da ansonsten Rasterdaten nicht aus dem Workspace gelöscht werden können.
+
.Beispiel für mehrere URLs für das Element `workspaceReloadUrls`:
[source,properties]
----
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/validator/kartenvorschau.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/validator/kartenvorschau.adoc
index e0e37f73e2e691f0cfa187fa519be3645a56b75f..a5cae7abe52b317f705640e4f47354f26d33b857 100644
--- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/validator/kartenvorschau.adoc
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/validator/kartenvorschau.adoc
@@ -32,11 +32,13 @@ NOTE: Die Zeilen mit den Angaben für `${SERVICESCONFIG}`, `id` und `name` dürf
[[konfiguration-xplanvalidatorwms]]
==== Konfiguration des XPlanValidatorWMS
-Im XPlanValidatorWMS werden die im XPlanValidator hochgeladenen XPlanGML-Dateien visualisiert und über die Kartenvorschau im XPlanValidatorWeb angezeigt. Der XPlanValidatorWMS kann für die temporäre Datenhaltung so konfiguriert werden, dass die Daten ausschliesslich im Arbeitsspeicher vorgehalten oder in einer Datenbank gespeichert werden.
+Im XPlanValidatorWMS werden die im XPlanValidator hochgeladenen XPlanGML-Dateien visualisiert und können u.a. über die Kartenvorschau im XPlanValidatorWeb angezeigt werden. Der XPlanValidatorWMS unterstützt für die temporäre Datenhaltung zwei Konfigurationen.
-Über den _xplan-validator-wms-memory-workspace_ (dies ist der Vorgabewert) steht eine Konfiguration für den XPlanValidatorWMS bereit, die die Daten ausschliesslich im Arbeitsspeicher vorhält. Mit dem _xplan-validator-wms-sql-workspace_ kann stattdessen die XPlanDB als Datenhaltung ausgewählt werden. Dabei muss ein separates Schema für den XPlanValidatorWMS in der XPlanDB angelegt werden (weitere Informationen zur Einrichtung der XPlanDB im Kapitel <<konfiguration-der-datenbank>>).
+Mit der Workspace-Konfiguration _xplan-validator-wms-memory-workspace_ wird der XPlanValidatorWMS so konfiguriert, dass die Daten ausschliesslich im Arbeitsspeicher vorgehalten werden.
-Die Aktivierung des jeweiligen Workspace erfolgt über die Datei _<DEEGREE_WORKSPACE_ROOT>/webapps.properties_.
+Mit dem _xplan-webservices-validator-wms-sql-workspace_ kann stattdessen die XPlanDB als Datenhaltung für den XPlanValidatorWMS konfiguriert werden. Dabei muss ein separates Schema für den XPlanValidatorWMS in der XPlanDB angelegt werden (weitere Informationen zur Einrichtung der XPlanDB im Kapitel <<konfiguration-der-datenbank>>). Wenn diese Workspace-Konfiguration gewählt wird, muss zusätzlich auch der der _xplan-validator-workspace.zip_ im Verzeichnis _<DEEGREE_WORKSPACE_ROOT>_ abgelegt werden.
+
+Die Aktivierung der gewünschten Workspace-Konfiguration erfolgt über die Datei _<DEEGREE_WORKSPACE_ROOT>/webapps.properties_ (siehe <<installation-webapp-properties>>).
.Beispiel für den Eintrag in der _webapps.properties_ mit der Auswahl der XPlanDB als Datenhaltung für den XPlanValidatorWMS:
[source,properties]
diff --git a/xplan-resources/pom.xml b/xplan-resources/pom.xml
index 789ead135e443d3d1529df1c007e26b8f1b2b351..4897b1e0d40f5bcb48afea49001ea83b46ede8f2 100644
--- a/xplan-resources/pom.xml
+++ b/xplan-resources/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<modules>
diff --git a/xplan-resources/xplan-database-scripts/pom.xml b/xplan-resources/xplan-database-scripts/pom.xml
index 86d296273ecda4451d5111f064217def684a2328..f9fd5c52dfd4be2896133279241dace49a7a20f0 100644
--- a/xplan-resources/xplan-database-scripts/pom.xml
+++ b/xplan-resources/xplan-database-scripts/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-resources</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-resources/xplan-schemas/pom.xml b/xplan-resources/xplan-schemas/pom.xml
index 42803815437087af80ea5be3cdad54668b51f27c..2d543879ded2fc671ed1c454cea4704ae4100523 100644
--- a/xplan-resources/xplan-schemas/pom.xml
+++ b/xplan-resources/xplan-schemas/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-resources</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-resources/xplan-sql-scripts/pom.xml b/xplan-resources/xplan-sql-scripts/pom.xml
index db9dcbdc65bfc942629a05b9be12c45eb3b7a6a9..6f5856faa2b7a03a1c6993ee9de505d1494daae7 100644
--- a/xplan-resources/xplan-sql-scripts/pom.xml
+++ b/xplan-resources/xplan-sql-scripts/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-resources</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-security/pom.xml b/xplan-security/pom.xml
index 7f3cef45537576ee395d3ebeaa9da98cde4e7c95..d340f779d95f511982f88d21f41a63a03e603451 100644
--- a/xplan-security/pom.xml
+++ b/xplan-security/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<dependencies>
diff --git a/xplan-tests/pom.xml b/xplan-tests/pom.xml
index 9668c3290429bb197406ac967109e8d89db0e353..950421c56d7572ebb0bee5d747b114664546bf22 100644
--- a/xplan-tests/pom.xml
+++ b/xplan-tests/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<properties>
diff --git a/xplan-tests/xplan-tests-manual/pom.xml b/xplan-tests/xplan-tests-manual/pom.xml
index d8558edc044098d0e8d8c8dc3751a0cc6c7ead7d..37a5bc6750bca493bb003ab8cbd70a6560bfbf47 100644
--- a/xplan-tests/xplan-tests-manual/pom.xml
+++ b/xplan-tests/xplan-tests-manual/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-tests</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
</project>
diff --git a/xplan-tests/xplan-tests-resources/pom.xml b/xplan-tests/xplan-tests-resources/pom.xml
index 70b51a54f9a1153d1898d5fd770b0ff8803f884d..45292d3c0d697f0abb8feffd548f85b644aa4e49 100644
--- a/xplan-tests/xplan-tests-resources/pom.xml
+++ b/xplan-tests/xplan-tests-resources/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-tests</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
</project>
\ No newline at end of file
diff --git a/xplan-tests/xplan-tests-soapui/pom.xml b/xplan-tests/xplan-tests-soapui/pom.xml
index 76d0cf450b6365c5e831041ed0af9cf2b9953b06..3b8e8f4ce91f1ed788c4648824b0aeb4bca4ac34 100644
--- a/xplan-tests/xplan-tests-soapui/pom.xml
+++ b/xplan-tests/xplan-tests-soapui/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-tests</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-webapps/pom.xml b/xplan-webapps/pom.xml
index b821b999d3d45e832eb505abd55210a2694d26ee..19b65ecf64af68ed6f74047eeb54333239dd9766 100644
--- a/xplan-webapps/pom.xml
+++ b/xplan-webapps/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<modules>
diff --git a/xplan-webapps/xplan-commons-web/pom.xml b/xplan-webapps/xplan-commons-web/pom.xml
index 9486f285d8bb506df6f03c84b739ac299c9aef9e..42eb263ad2bf78ebeb48f9919d8a69cb126519fb 100644
--- a/xplan-webapps/xplan-commons-web/pom.xml
+++ b/xplan-webapps/xplan-commons-web/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webapps</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-webapps/xplan-manager-web/pom.xml b/xplan-webapps/xplan-manager-web/pom.xml
index 167351a8cf7ebfd7b6dd6b1953d02e6cc9fe4a66..be6a8a28e24ba60e13677bffae563c021a1e16fb 100644
--- a/xplan-webapps/xplan-manager-web/pom.xml
+++ b/xplan-webapps/xplan-manager-web/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webapps</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<properties>
diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/BasicSpringConfig.java b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/BasicSpringConfig.java
index 12dfba48cf9448990a0ce322b5453f275dbc2fea..8ce0a40e6abc1a7211f2bb74e81aa2752ac5a0a0 100644
--- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/BasicSpringConfig.java
+++ b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/BasicSpringConfig.java
@@ -43,6 +43,7 @@ import de.latlon.xplan.manager.internalid.InternalIdRetriever;
import de.latlon.xplan.manager.metadata.DataServiceCouplingException;
import de.latlon.xplan.manager.metadata.MetadataCouplingHandler;
import de.latlon.xplan.manager.storage.StorageCleanUpManager;
+import de.latlon.xplan.manager.storage.filesystem.DeegreeRasterCacheCleaner;
import de.latlon.xplan.manager.synthesizer.XPlanSynthesizer;
import de.latlon.xplan.manager.synthesizer.rules.SynRulesAccessor;
import de.latlon.xplan.manager.transaction.AttachmentUrlHandler;
@@ -332,6 +333,11 @@ public class BasicSpringConfig {
return new WorkspaceReloader(managerConfiguration.getWorkspaceReloaderConfiguration());
}
+ @Bean
+ public DeegreeRasterCacheCleaner deegreeRasterCacheCleaner(ManagerConfiguration managerConfiguration) {
+ return new DeegreeRasterCacheCleaner(managerConfiguration.getWorkspaceReloaderConfiguration());
+ }
+
@Bean
public ReportProvider reportProvider() {
return new ManagerReportProvider();
diff --git a/xplan-webapps/xplan-root/pom.xml b/xplan-webapps/xplan-root/pom.xml
index 6171ee9d11e95fd3df1b1376ca3b9eb0d04aff94..a12a9b0762ded4bdc3dc2a6c94ae081dba72b076 100644
--- a/xplan-webapps/xplan-root/pom.xml
+++ b/xplan-webapps/xplan-root/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webapps</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-webapps/xplan-validator-web-commons/pom.xml b/xplan-webapps/xplan-validator-web-commons/pom.xml
index 8bbed430f2455f5171fa8d5e9e07e0dd8ca30934..e371a1b84fad27c944151545197f32ddc8291e52 100644
--- a/xplan-webapps/xplan-validator-web-commons/pom.xml
+++ b/xplan-webapps/xplan-validator-web-commons/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webapps</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-webapps/xplan-validator-web/pom.xml b/xplan-webapps/xplan-validator-web/pom.xml
index fd8e737e7f169f5d0520bf633610715560328846..5d62605f7b788e9d328b8895b7e2cd37ddb1c909 100644
--- a/xplan-webapps/xplan-validator-web/pom.xml
+++ b/xplan-webapps/xplan-validator-web/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webapps</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<properties>
diff --git a/xplan-webservices/pom.xml b/xplan-webservices/pom.xml
index d34c29492b59545cb7f5b1be78b592125c14a9cf..148baacdbf379b006e093b1ca97d5a811e9d2f8a 100644
--- a/xplan-webservices/pom.xml
+++ b/xplan-webservices/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<modules>
diff --git a/xplan-webservices/xplan-commons-webservices/pom.xml b/xplan-webservices/xplan-commons-webservices/pom.xml
index a9e1edd297bfa50e132240e387e6b6965d458f6e..366d5c3f483e0d728117cd883c42eb810c3caace 100644
--- a/xplan-webservices/xplan-commons-webservices/pom.xml
+++ b/xplan-webservices/xplan-commons-webservices/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-webservices/xplan-inspireplu/pom.xml b/xplan-webservices/xplan-inspireplu/pom.xml
index 96b98019a92450b88b8965662a1f75abf2d61dbc..63d19fae4b748a3a574082ab887c02d1cdbe525b 100644
--- a/xplan-webservices/xplan-inspireplu/pom.xml
+++ b/xplan-webservices/xplan-inspireplu/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<dependencies>
diff --git a/xplan-webservices/xplan-services-docker/pom.xml b/xplan-webservices/xplan-services-docker/pom.xml
index b2ecab584f922551c55c6584d921cd5c723c71c9..25e5d8e5698f9fa572047b0e498c7380ca5911b2 100644
--- a/xplan-webservices/xplan-services-docker/pom.xml
+++ b/xplan-webservices/xplan-services-docker/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<properties>
diff --git a/xplan-webservices/xplan-validator-wms/pom.xml b/xplan-webservices/xplan-validator-wms/pom.xml
index f2eef7a3ae29d77e3c598e3a3e8dc4059ff1363c..3fe6315d400327f54ad32dc55531633200b8e67e 100644
--- a/xplan-webservices/xplan-validator-wms/pom.xml
+++ b/xplan-webservices/xplan-validator-wms/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<dependencies>
diff --git a/xplan-webservices/xplan-wfs/pom.xml b/xplan-webservices/xplan-wfs/pom.xml
index 94c7d49e90599b90bd14ded79725ce1fa2f04b31..f57d3ccfc2214c2458c72af898df33d836c6e7aa 100644
--- a/xplan-webservices/xplan-wfs/pom.xml
+++ b/xplan-webservices/xplan-wfs/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<dependencies>
diff --git a/xplan-webservices/xplan-wms/pom.xml b/xplan-webservices/xplan-wms/pom.xml
index de2e0baed644c6c9390eae76877509adb9678d9e..1d5a64509fced32b8d9ab38560527f5a1a011ff7 100644
--- a/xplan-webservices/xplan-wms/pom.xml
+++ b/xplan-webservices/xplan-wms/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
@@ -44,6 +44,14 @@
<groupId>de.latlon</groupId>
<artifactId>deegree-services-config</artifactId>
</dependency>
+ <dependency>
+ <groupId>de.latlon</groupId>
+ <artifactId>deegree-tilestore-geotiff</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>de.latlon</groupId>
+ <artifactId>deegree-tilestore-gdal</artifactId>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>xplan-commons-webservices</artifactId>
diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/raster/RemoveFromRasterCacheServlet.java b/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/raster/RemoveFromRasterCacheServlet.java
new file mode 100644
index 0000000000000000000000000000000000000000..104bb124b26170e17f73911a3881b9733b8c9b19
--- /dev/null
+++ b/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/raster/RemoveFromRasterCacheServlet.java
@@ -0,0 +1,75 @@
+package de.latlon.xplan.raster;
+
+import org.apache.commons.io.IOUtils;
+import org.deegree.commons.config.DeegreeWorkspace;
+import org.deegree.services.config.ApiKey;
+import org.deegree.services.controller.OGCFrontController;
+import org.deegree.tile.TileDataLevel;
+import org.deegree.tile.TileDataSet;
+import org.deegree.tile.persistence.GenericTileStore;
+import org.deegree.tile.persistence.TileStoreProvider;
+import org.deegree.tile.persistence.gdal.GdalTileDataLevel;
+import org.deegree.tile.persistence.geotiff.GeoTIFFTileDataLevel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Clear raster cache to ensure raster files can be removed on windows.
+ *
+ * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
+ * @since 7.1.2
+ */
+public class RemoveFromRasterCacheServlet extends HttpServlet {
+
+ private static final Logger LOG = LoggerFactory.getLogger(RemoveFromRasterCacheServlet.class);
+
+ private static ApiKey apiKey = new ApiKey();
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ try {
+ apiKey.validate(req);
+ }
+ catch (SecurityException e) {
+ resp.setStatus(403);
+ IOUtils.write("There were security concerns: " + e.getLocalizedMessage() + "\n", resp.getOutputStream());
+ }
+ String pathInfo = req.getPathInfo();
+ if (pathInfo != null) {
+ String tileStoreId = pathInfo.substring(1);
+ LOG.info("Cleanup pool of tile store and data set {}", tileStoreId);
+ DeegreeWorkspace workspace = OGCFrontController.getServiceWorkspace();
+ GenericTileStore tileStore = (GenericTileStore) workspace.getNewWorkspace()
+ .getResource(TileStoreProvider.class, tileStoreId);
+ if (tileStore == null) {
+ LOG.warn("Could not find tile store with id {}", tileStoreId);
+ resp.setStatus(404);
+ IOUtils.write("Could not find tile store with id " + tileStoreId, resp.getOutputStream());
+ return;
+ }
+ TileDataSet tileDataSet = tileStore.getTileDataSet(tileStoreId);
+ List<TileDataLevel> tileDataLevels = tileDataSet.getTileDataLevels();
+ tileDataLevels.forEach(tileDataLevel -> {
+ try {
+ if (tileDataLevel instanceof GeoTIFFTileDataLevel) {
+ ((GeoTIFFTileDataLevel) tileDataLevel).clearPool();
+ }
+ else if (tileDataLevel instanceof GdalTileDataLevel) {
+ ((GdalTileDataLevel) tileDataLevel).clearPool();
+ }
+ }
+ catch (IOException e) {
+ LOG.error("Pool could not be cleared!", e);
+ }
+ });
+ }
+ }
+
+}
diff --git a/xplan-webservices/xplan-wms/src/main/webapp/WEB-INF/web.xml b/xplan-webservices/xplan-wms/src/main/webapp/WEB-INF/web.xml
index 7ae3b9655b41f64b432e6cc8eb812ad0c7918dfe..6e63c0127c0f549522704f3f2b7d4ca18f7dccba 100644
--- a/xplan-webservices/xplan-wms/src/main/webapp/WEB-INF/web.xml
+++ b/xplan-webservices/xplan-wms/src/main/webapp/WEB-INF/web.xml
@@ -158,6 +158,12 @@
<load-on-startup>1</load-on-startup>
</servlet>
+ <servlet>
+ <servlet-name>removefromcache</servlet-name>
+ <servlet-class>de.latlon.xplan.raster.RemoveFromRasterCacheServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
<servlet-mapping>
<servlet-name>getAttachment</servlet-name>
<url-pattern>/getAttachment</url-pattern>
@@ -182,11 +188,17 @@
<servlet-name>config</servlet-name>
<url-pattern>/config/*</url-pattern>
</servlet-mapping>
+
<servlet-mapping>
<servlet-name>planwerkwmsapi</servlet-name>
<url-pattern>/planwerkwmsapi/*</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>removefromcache</servlet-name>
+ <url-pattern>/removecache/*</url-pattern>
+ </servlet-mapping>
+
<welcome-file-list>
<welcome-file>index.xhtml</welcome-file>
<welcome-file>index.jsf</welcome-file>
diff --git a/xplan-webservices/xplansyn-wfs/pom.xml b/xplan-webservices/xplansyn-wfs/pom.xml
index 4bc6c8dee6352c2973c1fc971bcca401b378b647..1b26ba72b168fed64b0e6b2e146f15f6a69aabb7 100644
--- a/xplan-webservices/xplansyn-wfs/pom.xml
+++ b/xplan-webservices/xplansyn-wfs/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<dependencies>
diff --git a/xplan-workspaces/pom.xml b/xplan-workspaces/pom.xml
index 4427e2c4aa937d745975157b65f352a6aa5aa8e7..77e1f9c5b56e3762deb6f90159b7cf64bb8ae567 100644
--- a/xplan-workspaces/pom.xml
+++ b/xplan-workspaces/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1.1</version>
+ <version>7.1.2</version>
</parent>
<build>
diff --git a/xplan-workspaces/src/main/assembly/xplan-inspireplu-workspace.xml b/xplan-workspaces/src/main/assembly/xplan-inspireplu-workspace.xml
index 1a0286547e806a1ce7e2d290c33bd430f16728d6..90cecaeb05558178f465c03eb42192f0b6b098e4 100644
--- a/xplan-workspaces/src/main/assembly/xplan-inspireplu-workspace.xml
+++ b/xplan-workspaces/src/main/assembly/xplan-inspireplu-workspace.xml
@@ -31,7 +31,7 @@
<outputDirectory>.</outputDirectory>
<filtered>false</filtered>
<includes>
- <include>appschemas/inspireplu/PlannedLandUse.xsd</include>
+ <include>appschemas/inspireplu/**</include>
<include>datasources/feature/inspireplu.xml</include>
<include>datasources/feature/inspireplu_view.xml</include>
<include>jdbc/inspireplu.xml</include>
diff --git a/xplan-workspaces/src/main/workspace/appschemas/inspireplu/PlannedLandUse.xsd b/xplan-workspaces/src/main/workspace/appschemas/inspireplu/PlannedLandUse.xsd
index 6938089cfe9bc79f1ff60ca20baa107431dcecda..d1aa4b481966e7e9547b7bc70631a1c49a069fb7 100644
--- a/xplan-workspaces/src/main/workspace/appschemas/inspireplu/PlannedLandUse.xsd
+++ b/xplan-workspaces/src/main/workspace/appschemas/inspireplu/PlannedLandUse.xsd
@@ -1,27 +1,897 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- #%L
- xplan-workspaces - Modul zur Gruppierung aller Workspaces
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- #L%
- -->
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:lunom="http://inspire.ec.europa.eu/schemas/lunom/4.0" xmlns:plu="http://inspire.ec.europa.eu/schemas/plu/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/plu/4.0" version="4.0">
+ <annotation>
+ <documentation>-- Name --
+planned land use</documentation>
+ </annotation>
+ <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="./base/3.3/BaseTypes.xsd"/>
+ <import namespace="http://inspire.ec.europa.eu/schemas/base2/2.0" schemaLocation="./base2/2.0/BaseTypes2.xsd"/>
+ <import namespace="http://inspire.ec.europa.eu/schemas/lunom/4.0" schemaLocation="./lunom/4.0/LandUseNomenclature.xsd"/>
+ <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
+ <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
+ <!--XML Schema document created by ShapeChange-->
+ <element name="BackgroundMapValue" substitutionGroup="gml:AbstractObject" type="plu:BackgroundMapValueType">
+ <annotation>
+ <documentation>-- Definition --
+Information regarding the map that has been used as a background in the definition of a spatial plan, a zoning element or a supplementary regulation.</documentation>
+ </annotation>
+ </element>
+ <complexType name="BackgroundMapValueType">
+ <sequence>
+ <element name="backgroundMapDate" type="dateTime">
+ <annotation>
+ <documentation>-- Name --
+background map date
+-- Definition --
+Date of the background map used.</documentation>
+ </annotation>
+ </element>
+ <element name="backgroundMapReference" type="string">
+ <annotation>
+ <documentation>-- Definition --
+Reference to the background map that has been used.</documentation>
+ </annotation>
+ </element>
+ <element name="backgroudMapURI" nillable="true">
+ <annotation>
+ <documentation>-- Name --
+background map URI
+-- Definition --
+URI referring to service that provides background map.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="anyURI">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="BackgroundMapValuePropertyType">
+ <sequence>
+ <element ref="plu:BackgroundMapValue"/>
+ </sequence>
+ </complexType>
+ <element name="DimensioningIndicationCharacterValue" substitutionGroup="plu:DimensioningIndicationValue" type="plu:DimensioningIndicationCharacterValueType">
+ <annotation>
+ <documentation>-- Name --
+dimension indication character value
+-- Definition --
+Dimensioning indication whose value is of type CharacterString.</documentation>
+ </annotation>
+ </element>
+ <complexType name="DimensioningIndicationCharacterValueType">
+ <complexContent>
+ <extension base="plu:DimensioningIndicationValueType">
+ <sequence>
+ <element name="value" type="string">
+ <annotation>
+ <documentation>-- Definition --
+value of the dimension indications.</documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="DimensioningIndicationCharacterValuePropertyType">
+ <sequence>
+ <element ref="plu:DimensioningIndicationCharacterValue"/>
+ </sequence>
+ </complexType>
+ <element name="DimensioningIndicationIntegerValue" substitutionGroup="plu:DimensioningIndicationValue" type="plu:DimensioningIndicationIntegerValueType">
+ <annotation>
+ <documentation>-- Name --
+dimension indication integer value
+-- Definition --
+Dimensioning indication whose value is of type integer.</documentation>
+ </annotation>
+ </element>
+ <complexType name="DimensioningIndicationIntegerValueType">
+ <complexContent>
+ <extension base="plu:DimensioningIndicationValueType">
+ <sequence>
+ <element name="value" type="integer"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="DimensioningIndicationIntegerValuePropertyType">
+ <sequence>
+ <element ref="plu:DimensioningIndicationIntegerValue"/>
+ </sequence>
+ </complexType>
+ <element name="DimensioningIndicationMeasureValue" substitutionGroup="plu:DimensioningIndicationValue" type="plu:DimensioningIndicationMeasureValueType">
+ <annotation>
+ <documentation>-- Name --
+dimension indication measure value
+-- Definition --
+Dimensioning indication whose value is a measure.</documentation>
+ </annotation>
+ </element>
+ <complexType name="DimensioningIndicationMeasureValueType">
+ <complexContent>
+ <extension base="plu:DimensioningIndicationValueType">
+ <sequence>
+ <element name="value" type="gml:MeasureType"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="DimensioningIndicationMeasureValuePropertyType">
+ <sequence>
+ <element ref="plu:DimensioningIndicationMeasureValue"/>
+ </sequence>
+ </complexType>
+ <element name="DimensioningIndicationRealValue" substitutionGroup="plu:DimensioningIndicationValue" type="plu:DimensioningIndicationRealValueType">
+ <annotation>
+ <documentation>-- Name --
+dimension indication real value
+-- Definition --
+Dimensioning indication whose value is a floating point number.</documentation>
+ </annotation>
+ </element>
+ <complexType name="DimensioningIndicationRealValueType">
+ <complexContent>
+ <extension base="plu:DimensioningIndicationValueType">
+ <sequence>
+ <element name="value" type="double"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="DimensioningIndicationRealValuePropertyType">
+ <sequence>
+ <element ref="plu:DimensioningIndicationRealValue"/>
+ </sequence>
+ </complexType>
+ <element name="DimensioningIndicationValue" substitutionGroup="gml:AbstractObject" type="plu:DimensioningIndicationValueType">
+ <annotation>
+ <documentation>-- Name --
+Dimension Indication
+-- Definition --
+Specifications about the dimensioning of the urban developments.</documentation>
+ </annotation>
+ </element>
+ <complexType name="DimensioningIndicationValueType">
+ <sequence>
+ <element name="indicationReference" type="string">
+ <annotation>
+ <documentation>-- Definition --
+Description of the dimension indication.</documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="DimensioningIndicationValuePropertyType">
+ <sequence>
+ <element ref="plu:DimensioningIndicationValue"/>
+ </sequence>
+ </complexType>
+ <element name="OfficialDocumentation" substitutionGroup="gml:AbstractFeature" type="plu:OfficialDocumentationType">
+ <annotation>
+ <documentation>-- Name --
+official documentation
-<schema xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
- targetNamespace="http://inspire.ec.europa.eu/schemas/plu/4.0"
- version="4.0">
- <include schemaLocation="https://inspire.ec.europa.eu/schemas/plu/4.0/PlannedLandUse.xsd" />
+-- Definition --
+The official documentation that composes the spatial plan; it may be composed of, the applicable legislation, the regulations, cartographic elements, descriptive elements that may be associated with the complete spatial plan, a zoning element or a supplementary regulation . In some Member States the actual textual regulation will be part of the data set (and can be put in the regulationText attribute), in other Member States the text will not be part of the data set and will be referenced via a reference to a document or a legal act.
+
+At least one of the three voidable values shall be provided.
+
+-- Description --
+NOTE: The LegislationCitation is the value type of the attribute regulation reference. An example of a regulation reference would be: http://www2.vlaanderen.be /ruimtelijk/grup/00350/00362_00001/data/ 212_00362_00001_d_0BVR.pdf.</documentation>
+ </annotation>
+ </element>
+ <complexType name="OfficialDocumentationType">
+ <complexContent>
+ <extension base="gml:AbstractFeatureType">
+ <sequence>
+ <element name="inspireId" type="base:IdentifierPropertyType">
+ <annotation>
+ <documentation>-- Definition --
+External object identifier of this spatial textual regulation.
+-- Description --
+NOTE An external object identifier is a unique object identifier published by the responsible body, which may be used by external applications to reference the spatial object. The identifier is an identifier of the spatial object, not an identifier of the real-world phenomenon.</documentation>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="legislationCitation" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Reference to the document that contains the text of the regulation.</documentation>
+ </annotation>
+ <complexType>
+ <complexContent>
+ <extension base="gml:AbstractMemberType">
+ <sequence minOccurs="0">
+ <element ref="base2:LegislationCitation"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ </extension>
+ </complexContent>
+ </complexType>
+ </element>
+ <element minOccurs="0" name="regulationText" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Text of the regulation.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="string">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element minOccurs="0" name="planDocument" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Citation of scanned plans and structural drawings which may sometimes be geo-referenced or not,. E.g. raster images, vector drawings or scanned text.</documentation>
+ </annotation>
+ <complexType>
+ <complexContent>
+ <extension base="gml:AbstractMemberType">
+ <sequence minOccurs="0">
+ <element ref="base2:DocumentCitation"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ </extension>
+ </complexContent>
+ </complexType>
+ </element>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="OfficialDocumentationPropertyType">
+ <sequence minOccurs="0">
+ <element ref="plu:OfficialDocumentation"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+ </complexType>
+ <element name="OrdinanceValue" substitutionGroup="gml:AbstractObject" type="plu:OrdinanceValueType">
+ <annotation>
+ <documentation>-- Definition --
+Reference to administrative ordinance. Ordinance is a regulation/rule that is adopted by an authority that is legally mandated to take such ordinance.</documentation>
+ </annotation>
+ </element>
+ <complexType name="OrdinanceValueType">
+ <sequence>
+ <element name="ordinanceDate" type="dateTime">
+ <annotation>
+ <documentation>-- Definition --
+Date of the relevant administrative ordinance.
+-- Description --
+NOTE This attribute is multiple because, independently from the current legal status of the plan, there can be references to the dates of more than one ordinance, in relation to the different steps that the planning process has already undergone (e.g. ordinance for the preparation of a new plan, ordinance of adoption, ordinance of approval, etc.).</documentation>
+ </annotation>
+ </element>
+ <element name="ordinanceReference" type="string">
+ <annotation>
+ <documentation>-- Definition --
+Reference to relevant administrative ordinance.
+-- Description --
+NOTE This attribute is multiple because, independently from the current legal status of the plan, there can be references to more than one ordinance, in relation to the different steps that the planning process has already undergone (e.g. ordinance for the preparation of a new plan, ordinance of adoption, ordinance of approval, etc.).</documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="OrdinanceValuePropertyType">
+ <sequence>
+ <element ref="plu:OrdinanceValue"/>
+ </sequence>
+ </complexType>
+ <element name="SpatialPlan" substitutionGroup="gml:AbstractFeature" type="plu:SpatialPlanType">
+ <annotation>
+ <documentation>-- Name --
+spatial plan
+-- Definition --
+A set of documents that indicates a strategic direction for the development of a given geographic area, states the policies, priorities, programmes and land allocations that will implement the strategic direction and influences the distribution of people and activities in spaces of various scales. Spatial plans may be developed for urban planning, regional planning, environmental planning, landscape planning, national spatial plans, or spatial planning at the Union level.</documentation>
+ </annotation>
+ </element>
+ <complexType name="SpatialPlanType">
+ <complexContent>
+ <extension base="gml:AbstractFeatureType">
+ <sequence>
+ <element name="inspireId" type="base:IdentifierPropertyType">
+ <annotation>
+ <documentation>-- Definition --
+External object identifier of the spatial plan.
+-- Description --
+NOTE An external object identifier is a unique object identifier published by the responsible body, which may be used by external applications to reference the spatial object. The identifier is an identifier of the spatial object, not an identifier of the real-world phenomenon.</documentation>
+ </annotation>
+ </element>
+ <element name="extent" type="gml:MultiSurfacePropertyType">
+ <annotation>
+ <documentation>-- Definition --
+Geometrical union of all the instances of the spatial objects ZoningElement and SupplementaryRegulation. When a SpatialPlan is only composed of a document, the attribute extent is the border of the cartographic image that contains the land use information (i.e. the land use map extent).</documentation>
+ </annotation>
+ </element>
+ <element name="beginLifespanVersion" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Date and time at which this version of the spatial object was inserted or changed in the spatial data set.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="dateTime">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="officialTitle" type="string">
+ <annotation>
+ <documentation>-- Definition --
+Official title of the spatial plan.</documentation>
+ </annotation>
+ </element>
+ <element name="levelOfSpatialPlan" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Name --
+level of spatial plan
+-- Definition --
+Level of the administrative units covered by the plan.
+-- Description --
+Member states should make a mapping to this enumeration.</documentation>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="endLifespanVersion" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Date and time at which this version of the spatial object was superseded or retired in the spatial data set.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="dateTime">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element minOccurs="0" name="validFrom" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+First date at which this spatial plan is valid in reality.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="date">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element minOccurs="0" name="validTo" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+The time from which the spatial plan no longer exists in the real world.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="date">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="alternativeTitle" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Alternative (unofficial) title of the spatial plan.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="string">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="planTypeName" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+Name of the type of plan that the Member State has given to the plan.
+-- Description --
+NOTE The admissible values for this attribute are managed at the member state level via a code list
+
+EXAMPLE:
+FR: DTA, SCOT, PLU, etc.
+DE: Bebauungsplan, Flächennutzungsplan, Regionalplan, Landesentwicklungsplan
+NL: bestemmingsplan, structuurvisie.</documentation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="obligation">implementingRule</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
+ <element name="processStepGeneral" nillable="true" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+General indication of the step of the planning process that the plan is undergoing.
+-- Description --
+NOTE This enumeration contains values that are common to most planning systems.</documentation>
+ </annotation>
+ </element>
+ <element name="backgroundMap" nillable="true">
+ <annotation>
+ <documentation>-- Name --
+background map
+-- Definition --
+Identification of the background map that has been used for constructing this Plan.</documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="plu:BackgroundMapValue"/>
+ </sequence>
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </complexType>
+ </element>
+ <element maxOccurs="unbounded" name="ordinance" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Reference to relevant administrative ordinance.
+-- Description --
+NOTE This attribute is multiple because, independently from the current legal status of the plan, there can be references to more than one ordinance, in relation to the different steps that the planning process has already undergone (e.g. ordinance for the preparation of a new plan, ordinance of adoption, ordinance of approval, etc.).</documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="plu:OrdinanceValue"/>
+ </sequence>
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </complexType>
+ </element>
+ <element maxOccurs="unbounded" name="officialDocument" nillable="true" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+Link to the official documents that relate to the spatial plan.</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">plu:OfficialDocumentation</targetElement>
+ </appinfo>
+ </annotation>
+ </element>
+ <element maxOccurs="unbounded" minOccurs="0" name="member" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+Reference to the ZoningElements which belong to this SpatialPlan.</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">plu:ZoningElement</targetElement>
+ <reversePropertyName xmlns="http://www.opengis.net/gml/3.2">plu:plan</reversePropertyName>
+ </appinfo>
+ </annotation>
+ </element>
+ <element maxOccurs="unbounded" minOccurs="0" name="restriction" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+Links to supplementary regulations providing information and/or limitations on the use of land/water that supplements the zoning as part of this spatial plan.</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">plu:SupplementaryRegulation</targetElement>
+ <reversePropertyName xmlns="http://www.opengis.net/gml/3.2">plu:plan</reversePropertyName>
+ </appinfo>
+ </annotation>
+ </element>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="SpatialPlanPropertyType">
+ <sequence minOccurs="0">
+ <element ref="plu:SpatialPlan"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+ </complexType>
+ <element name="SupplementaryRegulation" substitutionGroup="gml:AbstractFeature" type="plu:SupplementaryRegulationType">
+ <annotation>
+ <documentation>-- Name --
+supplementary regulation
+-- Definition --
+A spatial object (point, line or polygon) of a spatial plan that provides supplementary information and/or limitation of the use of land/water necessary for spatial planning reasons or to formalise external rules defined in legal text.
+-- Description --
+NOTE the supplementary regulations affects all land use that overlap with the geometry
+EXAMPLE an air field generates restriction in its surroundings regarding aircraft landing, radar and telecommunication devices. It is the buffer around these artefacts that generates the supplementary regulation on the Land Use.</documentation>
+ </annotation>
+ </element>
+ <complexType name="SupplementaryRegulationType">
+ <complexContent>
+ <extension base="gml:AbstractFeatureType">
+ <sequence>
+ <element minOccurs="0" name="validFrom" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+First date at which this version of this supplementary regulation is valid in reality.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="date">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element minOccurs="0" name="validTo" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+The time from which the supplementary regulation is no longer valid.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="date">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element maxOccurs="unbounded" name="specificSupplementaryRegulation" nillable="true" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+Reference to a category of supplementary regulation provided in a specific nomenclature of supplementary regulations provided by the data provider.</documentation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="obligation">implementingRule</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
+ <element name="processStepGeneral" nillable="true" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+General indication of the step of the planning process that the supplementary regulation is undergoing.
+-- Description --
+NOTE This enumeration contains values that are common to most planning systems.</documentation>
+ </annotation>
+ </element>
+ <element name="backgroundMap" nillable="true">
+ <annotation>
+ <documentation>-- Name --
+background map
+-- Definition --
+Identification of the background map that has been used for constructing the supplementary regulation.</documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="plu:BackgroundMapValue"/>
+ </sequence>
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </complexType>
+ </element>
+ <element name="beginLifespanVersion" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Date and time at which this version of the spatial object was inserted or changed in the spatial data set.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="dateTime">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element maxOccurs="unbounded" minOccurs="0" name="dimensioningIndication" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Specifications about the dimensioning that are added to the dimensioning of the zoning elements that overlap the geometry of the supplementary regulation.</documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="plu:DimensioningIndicationValue"/>
+ </sequence>
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </complexType>
+ </element>
+ <element name="inspireId" type="base:IdentifierPropertyType">
+ <annotation>
+ <documentation>-- Definition --
+External object identifier of the spatial object.
+-- Description --
+NOTE An external object identifier is a unique object identifier published by the responsible body, which may be used by external applications to reference the spatial object. The identifier is an identifier of the spatial object, not an identifier of the real-world phenomenon.</documentation>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="endLifespanVersion" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Date and time at which this version of the spatial object was superseded or retired in the spatial data set.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="dateTime">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="geometry" type="gml:GeometryPropertyType">
+ <annotation>
+ <documentation>-- Definition --
+Geometry of the piece of land on which the supplementary regulation applies.</documentation>
+ </annotation>
+ </element>
+ <element name="inheritedFromOtherPlans" nillable="true">
+ <annotation>
+ <documentation>-- Name --
+inherited from other plans
+-- Definition --
+Indication whether the supplementary regulation is inherited from another spatial plan.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="boolean">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="specificRegulationNature" nillable="true">
+ <annotation>
+ <documentation>-- Name --
+specific regulation nature
+-- Definition --
+Legal nature of the land use regulation from a national perspective.
+-- Description --
+On member state level the legal classification for plan regulations may be complex. A supplementary regulation may be principally "bindingOnlyForAuthorities" but according to national law this regulation have to be more specified to explain the specific degree of binding. (e.g. on state or regional planning level in Germany: principles of spatial planning, other spatial planning requirements or goals of spatial planning).
+
+NOTE This attribute complements the information provided by the attribute regulationNature.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="string">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element maxOccurs="unbounded" minOccurs="0" name="name" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Official name of the supplementary regulation</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="string">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="regulationNature" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+Legal nature of the land use regulation.
+-- Description --
+NOTE Indicates whether the land use regulation is legally binding or not.</documentation>
+ </annotation>
+ </element>
+ <element maxOccurs="unbounded" name="supplementaryRegulation" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+Code of the supplementary regulation from the hierarchical supplementary regulation code list agreed at the European level.</documentation>
+ </annotation>
+ </element>
+ <element maxOccurs="unbounded" name="officialDocument" nillable="true" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+Link to the Textual regulations that correspond to this supplementary regulation.</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">plu:OfficialDocumentation</targetElement>
+ </appinfo>
+ </annotation>
+ </element>
+ <element name="plan" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+Link to the plan this supplementary regulation is part of.</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">plu:SpatialPlan</targetElement>
+ <reversePropertyName xmlns="http://www.opengis.net/gml/3.2">plu:restriction</reversePropertyName>
+ </appinfo>
+ </annotation>
+ </element>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="SupplementaryRegulationPropertyType">
+ <sequence minOccurs="0">
+ <element ref="plu:SupplementaryRegulation"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+ </complexType>
+ <element name="ZoningElement" substitutionGroup="gml:AbstractFeature" type="plu:ZoningElementType">
+ <annotation>
+ <documentation>-- Name --
+zoning element
+-- Definition --
+A spatial object which is homogeneous regarding the permitted uses of land based on zoning which separate one set of land uses from another.
+-- Description --
+Zoning elements refer to the regulation of the kinds of activities which will be acceptable on particular lots (such as open space, residential, agricultural, commercial or industrial). The intensity of use at which those activities can be performed (from low-density housing such as single family homes to high-density such as high-rise apartment buildings), the height of buildings, the amount of space that structures may occupy, the proportions of the types of space on a lot, such as how much landscaped space, impervious surface, traffic lanes, and parking may be provided.</documentation>
+ </annotation>
+ </element>
+ <complexType name="ZoningElementType">
+ <complexContent>
+ <extension base="gml:AbstractFeatureType">
+ <sequence>
+ <element name="inspireId" type="base:IdentifierPropertyType">
+ <annotation>
+ <documentation>-- Definition --
+External object identifier of the spatial object.
+-- Description --
+An external object identifier is a unique object identifier published by the responsible body, which may be used by external applications to reference the spatial object. The identifier is an identifier of the spatial object, not an identifier of the real-world phenomenon.</documentation>
+ </annotation>
+ </element>
+ <element name="geometry" type="gml:MultiSurfacePropertyType">
+ <annotation>
+ <documentation>-- Definition --
+Geometry of this zoning element</documentation>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="validFrom" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+The date when the phenomenon started to exist in the real world.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="date">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element minOccurs="0" name="validTo" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+The time from which the phenomenon no longer exists in the real world.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="date">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element maxOccurs="unbounded" name="hilucsLandUse" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+Land use HILUCS class that is dominant in this land use object.</documentation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="obligation">implementingRule</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
+ <element name="beginLifespanVersion" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Date and time at which this version of the spatial object was inserted or changed in the spatial data set.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="dateTime">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="hilucsPresence" nillable="true">
+ <annotation>
+ <documentation>-- Name --
+land use presence
+
+-- Definition --
+Actual presence of a land use HILUCS category wihtin the object.</documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="lunom:HILUCSPresence"/>
+ </sequence>
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </complexType>
+ </element>
+ <element maxOccurs="unbounded" name="specificLandUse" nillable="true" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+Land Use Category according to the nomenclature specific to this data set.
+-- Description --
+Reference to an entry in the classfication that is part of the SpecificLandUseClassification.</documentation>
+ </annotation>
+ </element>
+ <element name="specificPresence" nillable="true">
+ <annotation>
+ <documentation>-- Name --
+land use presence
+-- Definition --
+Actual presence of a land use category wihtin the object.</documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="lunom:SpecificPresence"/>
+ </sequence>
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </complexType>
+ </element>
+ <element name="regulationNature" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+Legal nature of the land use indication.
+-- Description --
+NOTE Indicates whether the land use indication is legally binding or not.</documentation>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="endLifespanVersion" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Date and time at which this version of the spatial object was superseded or retired in the spatial data set.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="dateTime">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="processStepGeneral" nillable="true" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+General indication of the step of the planning process that the zoning element is undergoing.
+-- Description --
+NOTE This enumeration contains values that are common to most planning systems.</documentation>
+ </annotation>
+ </element>
+ <element name="backgroundMap" nillable="true">
+ <annotation>
+ <documentation>-- Name --
+background map
+-- Definition --
+Identification of the background map that has been used for constructing this zoning element.</documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="plu:BackgroundMapValue"/>
+ </sequence>
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </complexType>
+ </element>
+ <element maxOccurs="unbounded" minOccurs="0" name="dimensioningIndication" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Specifications about the dimensioning of the urban developments.</documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="plu:DimensioningIndicationValue"/>
+ </sequence>
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </complexType>
+ </element>
+ <element maxOccurs="unbounded" name="officialDocument" nillable="true" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+Textual Regulation that is part of this zoning element.</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">plu:OfficialDocumentation</targetElement>
+ </appinfo>
+ </annotation>
+ </element>
+ <element name="plan" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+SpatialPlan which this ZoningElement belongs to.</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">plu:SpatialPlan</targetElement>
+ <reversePropertyName xmlns="http://www.opengis.net/gml/3.2">plu:member</reversePropertyName>
+ </appinfo>
+ </annotation>
+ </element>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="ZoningElementPropertyType">
+ <sequence minOccurs="0">
+ <element ref="plu:ZoningElement"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+ </complexType>
</schema>
diff --git a/xplan-workspaces/src/main/workspace/appschemas/inspireplu/ad/4.0/Addresses.xsd b/xplan-workspaces/src/main/workspace/appschemas/inspireplu/ad/4.0/Addresses.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..b221c9cf3d08197811f973ab1fcf2474652a2068
--- /dev/null
+++ b/xplan-workspaces/src/main/workspace/appschemas/inspireplu/ad/4.0/Addresses.xsd
@@ -0,0 +1,1012 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ad="http://inspire.ec.europa.eu/schemas/ad/4.0" xmlns:au="http://inspire.ec.europa.eu/schemas/au/4.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:bu-base="http://inspire.ec.europa.eu/schemas/bu-base/4.0" xmlns:cp="http://inspire.ec.europa.eu/schemas/cp/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:tn="http://inspire.ec.europa.eu/schemas/tn/4.0" targetNamespace="http://inspire.ec.europa.eu/schemas/ad/4.0" elementFormDefault="qualified" version="4.0">
+ <annotation>
+ <documentation>Application schema for Addresses</documentation>
+ </annotation>
+ <import namespace="http://inspire.ec.europa.eu/schemas/au/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/au/4.0/AdministrativeUnits.xsd"/>
+ <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
+ <import namespace="http://inspire.ec.europa.eu/schemas/bu-base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/bu-base/4.0/BuildingsBase.xsd"/>
+ <import namespace="http://inspire.ec.europa.eu/schemas/cp/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/cp/4.0/CadastralParcels.xsd"/>
+ <import namespace="http://inspire.ec.europa.eu/schemas/gn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/gn/4.0/GeographicalNames.xsd"/>
+ <import namespace="http://inspire.ec.europa.eu/schemas/tn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/tn/4.0/CommonTransportElements.xsd"/>
+ <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
+ <!--XML Schema document created by ShapeChange-->
+ <element name="Address" type="ad:AddressType" substitutionGroup="gml:AbstractFeature">
+ <annotation>
+ <documentation>-- Definition --
+An identification of the fixed location of property by means of a structured composition of geographic names and identifiers.
+
+-- Description --
+NOTE 1 The spatial object, referenced by the address, is defined as the "addressable object". The addressable object is not within the application schema, but it is possible to represent the address' reference to a cadastral parcel or a building through associations. It should, however, be noted that in different countries and regions, different traditions and/or regulations determine which object types should be regarded as addressable objects.
+
+NOTE 2 In most situations the addressable objects are current, real world objects. However, addresses may also reference objects which are planned, under construction or even historical.
+
+NOTE 3 Apart from the identification of the addressable objects (like e.g. buildings), addresses are very often used by a large number of other applications to identify object types e.g. statistics of the citizens living in the building, for taxation of the business entities that occupy the building, and the utility installations.
+
+NOTE 4 For different purposes, the identification of an address can be represented in different ways (see example 3).
+
+EXAMPLE 1 A property can e.g., be a plot of land, building, part of building, way of access or other construction,
+
+EXAMPLE 2 In the Netherlands the primary addressable objects are buildings and dwellings which may include parts of buildings, mooring places or places for the permanent placement of trailers (mobile homes), in the UK it is the lowest level of unit for the delivery of services, in the Czech Republic it is buildings and entrance doors.
+
+EXAMPLE 3 Addresses can be represented differently. In a human readable form an address in Spain and an address in Denmark could be represented like this: "Calle Mayor, 13, Cortijo del Marqués, 41037 Écija, Sevilla, España" or "Wildersgade 60A, st. th, 1408 Copenhagen K., Denmark".</documentation>
+ </annotation>
+ </element>
+ <complexType name="AddressType">
+ <complexContent>
+ <extension base="gml:AbstractFeatureType">
+ <sequence>
+ <element name="inspireId" type="base:IdentifierPropertyType">
+ <annotation>
+ <documentation>-- Definition --
+External object identifier of the address.
+
+-- Description --
+NOTE 1 An external object identifier is a unique object identifier published by the responsible body, which may be used by external applications to reference the spatial object. The identifier is an identifier of the spatial object, not an identifier of the addressable object.
+
+NOTE 2 The primary purpose of this identifier is to enable links between various sources and the address components.
+
+EXAMPLE An address spatial object from Denmark could carry this identifier:
+Namespace: DK_ADR
+Local identifier: 0A3F507B2AB032B8E0440003BA298018
+Version identifier: 12-02-2008T10:05:01+01:00</documentation>
+ </annotation>
+ </element>
+ <element name="alternativeIdentifier" nillable="true" minOccurs="0">
+ <annotation>
+ <documentation>-- Definition --
+External, thematic identifier of the address spatial object, which enables interoperability with existing legacy systems or applications.
+
+-- Description --
+NOTE 1 Compared with the proper identifier of the address, the alternative identifier is not necessarily persistent in the lifetime of the address spatial object. Likewise it is usually not globally unique and in general does not include information on the version of the address spatial object.
+
+NOTE 2 Often alternative address identifiers are composed by a set of codes that, e.g., identify the region and the municipality, the thoroughfare name and the address number. These alternative identifiers will not remain persistent e.g. in the case of the merging of two municipalities.
+
+EXAMPLE In Denmark many legacy systems (e.g. in the Statistics Denmark or the Central Business Register) uses as address identification the three digit municipality code plus the four character street name code plus the address number.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="string">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="position" type="ad:GeographicPositionPropertyType" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+Position of a characteristic point which represents the location of the address according to a certain specification, including information on the origin of the position.</documentation>
+ </annotation>
+ </element>
+ <element name="status" type="gml:ReferenceType" nillable="true" minOccurs="0">
+ <annotation>
+ <documentation>-- Definition --
+Validity of the address within the life-cycle (version) of the address spatial object.
+
+-- Description --
+NOTE This status relates to the address and is not a property of the object to which the address is assigned (the addressable object).</documentation>
+ </annotation>
+ </element>
+ <element name="locator" type="ad:AddressLocatorPropertyType" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+Human readable designator or name.</documentation>
+ </annotation>
+ </element>
+ <element name="validFrom" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Date and time of which this version of the address was or will be valid in the real world.
+
+-- Description --
+NOTE This date and time can be set in the future for situations where an address or a version of an address has been decided by the appropriate authority to take effect for a future date.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="dateTime">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="validTo" nillable="true" minOccurs="0">
+ <annotation>
+ <documentation>-- Definition --
+Date and time at which this version of the address ceased or will cease to exist in the real world.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="dateTime">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="beginLifespanVersion" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Date and time at which this version of the spatial object was inserted or changed in the spatial data set.
+
+-- Description --
+NOTE This date is recorded to enable the generation of change only update files.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="dateTime">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="endLifespanVersion" nillable="true" minOccurs="0">
+ <annotation>
+ <documentation>-- Definition --
+Date and time at which this version of the spatial object was superseded or retired in the spatial data set.
+
+-- Description --
+NOTE This date is recorded primarily for those systems which "close" an entry in the spatial data set in the event of an attribute change.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="dateTime">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="parcel" type="gml:ReferenceType" nillable="true" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+Cadastral parcel that this address is assigned to or associated with.
+
+-- Description --
+NOTE An address could potentially have an association to zero, one or several cadastral parcels. Also it is possible (but this is not expressed in this application schema) that several addresses are associated to a single cadastral parcel.
+
+EXAMPLE In the street "Wildersgade" in Copenhagen, Denmark, the address designated as "Wildersgade 66, 1408 København K" is associated to the cadastral parcel identifier "81" in the district of "Christianshavn".</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">cp:CadastralParcel</targetElement>
+ </appinfo>
+ </annotation>
+ </element>
+ <element name="parentAddress" type="gml:ReferenceType" nillable="true" minOccurs="0">
+ <annotation>
+ <documentation>-- Definition --
+The main (parent) address with which this (sub) address is tightly connected.
+
+-- Description --
+NOTE 1 The relationship between a set of subaddresses and the main address most often means that the sub addresses use the same locator and address components (for example , thoroughfare name, address area, post code) as the parent address. For each sub address additional address locators are then included for identification, like e.g. flat number, floor identifier, door number.
+
+NOTE 2 In some countries several levels of parent-, sub- and sub-sub-addresses exist. In other countries the concept of parent addresses does not exist; all addresses are thus of the same level.
+
+EXAMPLE 1 In a Spanish city the address "Calle Gran VÃa 8" is a parent address where the locator "8" represents the building. In the building, the sub address "Calle Gran Via 8, door 3" represents a sub-address, while the more detailed sub-sub address "Calle Gran Via 8, door 3, staircase A, floor 5, dwelling 1" represents the address of a specific dwelling.
+
+EXAMPLE 2 In Denmark the legislation on addresses define two types of addresses: the parent "access level" and the sub "unit level". In the city of Copenhagen "Wildersgade 60A" is a parent access address that represents a specific entrance to a building. Inside the entrance, subaddresses using floor and door designators identifies the individual dwellings like e.g. "Wildersgade 60A, 1st floor, left door".
+
+EXAMPLE 3 In The Netherlands only one level of addresses exists.</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">ad:Address</targetElement>
+ </appinfo>
+ </annotation>
+ </element>
+ <element name="building" type="gml:ReferenceType" nillable="true" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Name --
+building
+
+-- Definition --
+Building that the address is assigned to or associated with.
+
+-- Description --
+NOTE An address could potentially have an association to zero, one or several buildings. Also it is possible (but this is not expressed in this application schema) that several addresses are associated to a single building.
+
+EXAMPLE In Praha, The Czech Republic, the address designated "NaPankráci 1690/125" is associated to a specific building in the street, in this case the building with number 1690 in the district (cz: cast obce) "Nusle".</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">bu-base:AbstractConstruction</targetElement>
+ </appinfo>
+ </annotation>
+ </element>
+ <element name="component" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+Represents that the address component is engaged as a part of the address.
+
+-- Description --
+EXAMPLE For the address designated "Calle Mayor 13, Cortijo del Marqués, 41037, Écija, Sevilla, España" the six address components "Calle Mayor", "Cortijo del Marqués", "41037", "Écija", "Sevilla" and "España" are engaged as address components.</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">ad:AddressComponent</targetElement>
+ </appinfo>
+ </annotation>
+ <complexType>
+ <complexContent>
+ <extension base="gml:AbstractMemberType">
+ <sequence/>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ </extension>
+ </complexContent>
+ </complexType>
+ </element>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="AddressPropertyType">
+ <sequence minOccurs="0">
+ <element ref="ad:Address"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+ </complexType>
+ <element name="AddressAreaName" type="ad:AddressAreaNameType" substitutionGroup="ad:AddressComponent">
+ <annotation>
+ <documentation>-- Definition --
+An address component which represents the name of a geographic area or locality that groups a number of addressable objects for addressing purposes, without being an administrative unit.
+
+-- Description --
+NOTE 1 In some countries and regions an address area is a true subdivision of an administrative unit (most often a municipality), so that every address area is fully inside the municipality and so that every part of the municipality is within an address area. In other countries, the concept of address area names is less strict and based on local tradition or specific needs.
+
+NOTE 2 In some situations an address area name is not required to obtain unambiguousness; instead the purpose is to make the complete address more informative and descriptive, adding a well known place name (e.g. of a village or community) to the address. This is particularly useful if the municipality or post code covers a large area.
+
+EXAMPLE 1 In Sweden a "Kommundel" (en: Municipal sub division) is a type of address area names that ensures that street names are unique within the sub division.
+
+EXAMPLE 2 In Spain an "Entidad de población" (en: population entity) has the same function. It is the general address area which depending on its characteristics can be classified as "Entidad Singular" (en: singular entity) or "Entidad Colectiva" (en: collective entity). Moreover, according to the population distribution, these areas can contain one or several "Núcleo de población" (en: population core) and/or "Población diseminada" (en: scattered population).
+
+EXAMPLE 3 In Denmark "Supplerende bynavn" (en: Supplementary town name) is sometimes compulsory to ensure uniqueness of street names within the post code, sometimes it is just useful extra information, that makes the address more informative.</documentation>
+ </annotation>
+ </element>
+ <complexType name="AddressAreaNameType">
+ <complexContent>
+ <extension base="ad:AddressComponentType">
+ <sequence>
+ <element name="name" type="gn:GeographicalNamePropertyType" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+Proper noun applied to the address area.
+
+-- Description --
+NOTE The data type allows names in different languages and scripts as well as inclusion of alternative name, alternative spellings, historical name and exonyms.</documentation>
+ </annotation>
+ </element>
+ <element name="namedPlace" type="gml:ReferenceType" nillable="true" minOccurs="0">
+ <annotation>
+ <documentation>-- Definition --
+The named place that this address area name represents.
+
+-- Description --
+NOTE In order to populate this association, it is important that the area covered by the identified Named Place is exactly the same as the area covered by the address area name in question; if this is not the case the association would result in an inconsistency.
+
+EXAMPLE The geographical name "Huskvarna", which represents a part of the municipality of Jönköping in Sweden, is the source of the address area name, "Huskvarna".</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">gn:NamedPlace</targetElement>
+ </appinfo>
+ </annotation>
+ </element>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="AddressAreaNamePropertyType">
+ <sequence minOccurs="0">
+ <element ref="ad:AddressAreaName"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+ </complexType>
+ <element name="AddressComponent" type="ad:AddressComponentType" abstract="true" substitutionGroup="gml:AbstractFeature">
+ <annotation>
+ <documentation>-- Definition --
+Identifier or geographic name of a specific geographic area, location, or other spatial object which defines the scope of an address.
+
+-- Description --
+NOTE 1 Four different subclasses of address components are defined:
+o Administrative unit name, which may include name of country, name of municipality, name of district
+o Address area name like e.g. name of village or settlement
+o Thoroughfare name, most often road name
+o Postal descriptor
+In order to construct an address, these subclasses are often structured hierarchically.
+
+NOTE 2 It is the combination of the address locator and the address components, which makes a specific address spatial object readable and unambiguous for the human user.
+
+EXAMPLE The combination of the locator "13" and the address components "Calle Mayor" (thoroughfare name), "Cortijo del Marqués" (address area name), "41037" (postal descriptor), "Écija", "Sevilla" and "España" (administrative unit names) makes this specific address spatial object readable and unambiguous.</documentation>
+ </annotation>
+ </element>
+ <complexType name="AddressComponentType" abstract="true">
+ <complexContent>
+ <extension base="gml:AbstractFeatureType">
+ <sequence>
+ <element name="inspireId" type="base:IdentifierPropertyType" minOccurs="0">
+ <annotation>
+ <documentation>-- Definition --
+External object identifier of the address component.
+
+-- Description --
+NOTE 1 An external object identifier is a unique object identifier published by the responsible body, which may be used by external applications to reference the spatial object. The identifier is an identifier of the spatial object, not an identifier of the real-world phenomenon.
+
+NOTE 2 The primary purpose of this identifier is to enable links between various sources and the address components.
+
+EXAMPLE An address component spatial object from Denmark could carry this identifier:
+Namespace: DK_ADR
+Local identifier: 0A3F507B2AB032B8E0440003BA298018
+Version identifier: 12-02-2008T10:05:01+01:00</documentation>
+ </annotation>
+ </element>
+ <element name="alternativeIdentifier" nillable="true" minOccurs="0">
+ <annotation>
+ <documentation>-- Definition --
+External, thematic identifier of the address component spatial object, which enables interoperability with existing legacy systems or applications.
+
+-- Description --
+NOTE Compared with a proper identifier of the address component, the alternative identifier is not necessarily persistent in the lifetime of the component spatial object. Likewise it is usually not globally unique and in general does include information on the version of the spatial object.
+
+EXAMPLE 1 National or regional sector-specific identifiers (like e.g. a number- or letter code) for administrative units, address areas (localities, villages, sub-divisions) or thoroughfare names, which are used by a number of existing legacy systems.
+
+EXAMPLE 2 In Denmark the four character municipal "road name code" (0001-9899) is only unique within the present municipality, thus if two municipalities merge, it is necessary to assign new road name codes.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="string">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="beginLifespanVersion" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Date and time at which this version of the spatial object was inserted or changed in the spatial data set.
+
+-- Description --
+NOTE This date is recorded to enable the generation of change only update files.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="dateTime">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="endLifespanVersion" nillable="true" minOccurs="0">
+ <annotation>
+ <documentation>-- Definition --
+Date and time at which this version of the spatial object was superseded or retired in the spatial data set.
+
+-- Description --
+NOTE This date is recorded primarily for those systems which "close" an entry in the spatial data set in the event of an attribute change.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="dateTime">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="status" type="gml:ReferenceType" nillable="true" minOccurs="0">
+ <annotation>
+ <documentation>-- Definition --
+Validity of the address component within the life-cycle (version) of the address component spatial object.
+
+-- Description --
+NOTE This status relates to the address component and is not a property of the object to which the address is assigned (the addressable object).</documentation>
+ </annotation>
+ </element>
+ <element name="validFrom" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Date and time of which this version of the address component was or will be valid in the real world.
+
+-- Description --
+NOTE This date and time can be set in the future for situations where an address component or a version of an address component has been decided by the appropriate authority to take effect for a future date.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="dateTime">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="validTo" nillable="true" minOccurs="0">
+ <annotation>
+ <documentation>-- Definition --
+Date and time at which the address component ceased or will cease to exist in the real world.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="dateTime">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="situatedWithin" type="gml:ReferenceType" nillable="true" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+Another address component within which the geographic feature represented by this address component is situated.
+
+-- Description --
+NOTE 1 The association enables the application schema to express that the subtypes of address components in the dataset form a hierarchy e.g. like: thoroughfare name within municipality within region within country
+
+NOTE 2 The representation of the hierarchy facilitates queries e.g. for a specific thoroughfare name within a given municipality or postcode. It is also necessary where the application schema is used to create or update, for example , a gazetteer which is based on the hierarchical structure of the address components.
+
+NOTE 3 The multiplicity of the association allows it to express that a thoroughfare name is situated in a certain municipality and in a certain postcode. It is also possible to express, for example, that some thoroughfare names cross borders between municipalities and thus is situated within more than one municipality.
+
+EXAMPLE 1 In Spain many spatial objects of the thoroughfare name "Calle Santiago" exist. The association can express that one of the spatial objects is situated within in the municipality of Albacete. From the same example the municipality name "Albacete" is situated within the administrative name (region) of "Castilla La Mancha".
+
+EXAMPLE 2 In Denmark, several address area names entitled "Strandby" exists. In order to identify a specific spatial object it is necessary to know that the relevant spatial object is situated e.g. in the municipality of "Frederikshavn".</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">ad:AddressComponent</targetElement>
+ </appinfo>
+ </annotation>
+ </element>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="AddressComponentPropertyType">
+ <sequence minOccurs="0">
+ <element ref="ad:AddressComponent"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+ </complexType>
+ <element name="AddressLocator" type="ad:AddressLocatorType" substitutionGroup="gml:AbstractObject">
+ <annotation>
+ <documentation>-- Definition --
+Human readable designator or name that allows a user or application to reference and distinguish the address from neighbour addresses, within the scope of a thoroughfare name, address area name, administrative unit name or postal designator, in which the address is situated.
+
+-- Description --
+NOTE 1 The most common locators are designators like an address number, building number or flat identifier as well as the name of the property, complex or building.
+
+NOTE 2 The locator identifier(s) are most often only unambiguous and meaningful within the scope of the adjacent thoroughfare name, address area name or post code.
+
+NOTE 3 The locator could be composed of one or more designators e.g., address number, address number suffix, building number or name, floor number, flat or room identifier. In addition to these common locator types, also narrative or descriptive locators are possible.
+
+NOTE 4 The locators of an address could be composed as a hierarchy, where one level of locators identifies the real property or building while another level of locators identifies the flats or dwellings inside the property.
+
+EXAMPLE 1 In a Spanish city a "site-level" locator could identify a building on the thoroughfare name "Calle Gran VÃa using the address number "8". If the building has four entrance doors, the door number "3" could be the "access-level" locator. The 3rd door could, via two staircases "A" and "B", give access to a number of floors, identified by a number "1" to "5" on which a number of dwellings are situated, also identified by numbers "1" to "3"; The "unit level" locator will thus composed of staircase-, floor- and dwelling identification e.g. "staircase A, floor 5, dwelling 1". In total, the three parent-child levels of locators uniquely identify the dwelling.
+
+EXAMPLE 2 In Copenhagen an "access level" locator could identify a specific entrance door in a building on the thoroughfare name "Wildersgade" using the address number "60A" (In Denmark the optional suffix is a part of the address number). The entrance door gives access to a number of floors, e.g, "st", "1", "2", "3", on which two dwellings are situated "tv" and "th". The "unit level" locator will thus be composed by a floor- and a door identifier: "2. th." (2nd floor, door to the right). In total, the two parent-child levels of locators uniquely identify the dwelling.
+
+EXAMPLE 3 In The Netherlands only one level of locators exists. The individual apartment within a large complex, a dwelling, a part of other kinds of buildings (for example an office), a mooring place or a place for the permanent placing of trailers are addressable objects which must have an address. This address is the only level of the locator. This locator could be composed by three attributes the house number, plus optionally an additional house letter, plus optionally an additional housenumber suffix.
+
+EXAMPLE 4 Sometimes the building name is an alternative identifier to the address number e.g. the house located in "Calle Santiago, 15, Elizondo-Baztán, Navarra, Spain" is also identified by the building name "Urtekoetxea"</documentation>
+ </annotation>
+ </element>
+ <complexType name="AddressLocatorType">
+ <sequence>
+ <element name="designator" type="ad:LocatorDesignatorPropertyType" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+A number or a sequence of characters that uniquely identifies the locator within the relevant scope(s).</documentation>
+ </annotation>
+ </element>
+ <element name="name" type="ad:LocatorNamePropertyType" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+A geographic name or descriptive text associated to a property identified by the locator.
+
+-- Description --
+NOTE 1 The locator name could be the name of the property or complex (e.g. an estate, hospital or a shopping mall), of the building or part of the building (e.g. a wing), or it could be the name of a room inside the building.
+
+NOTE 2 As locator name it is also possible to use a description that allows a user to identify the property in question.
+
+NOTE 3 The locator name could be an alternative addition to the locator designator (e.g. the address number) or it could be an independent identifier.
+
+EXAMPLE In the address "Calle Santiago, 15, Elizondo-Baztán, Navarra, Spain" the building name "Urtekoetxea" is an alternative to the building identifier "3".</documentation>
+ </annotation>
+ </element>
+ <element name="level" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+The level to which the locator refers.</documentation>
+ </annotation>
+ </element>
+ <element name="withinScopeOf" type="gml:ReferenceType" nillable="true" minOccurs="0">
+ <annotation>
+ <documentation>-- Definition --
+The address component that defines the scope within which the address locator is assigned according to rules ensuring unambiguousness.
+
+-- Description --
+NOTE 1 For the assignment of unambiguous locators (e.g. address numbers) different rules exists in different countries and regions. According to the most common rule, an address number should be unique within the scope of the thoroughfare name. In other areas the address number is unique inside an address area name (e.g. the name of the village) or postal designator (e.g. the post code). In some areas even a combination of rules are applied: e.g. addresses with two locators, each of them referencing to a separate address component.
+
+NOTE 2 Locators that has the level of unit (like e.g. floor identifier and door or unit identifiers) are most often assigned so that they are unambiguous within the more narrow scope of the property or building; for these locators the association should therefore not be populated.
+
+EXAMPLE 1 In a typical European address dataset, parts of the addresses have locators which are unambiguous within the scope of the road name (thoroughfare name) while others are unambiguous within the name ogf the village or district (address area name).
+
+EXAMPLE 2 In Lithuania and Estonia a concept of "corner addresses" exists. Corner addresses have two address numbers (designators) each of them referring to a thoroughfare name (primary and secondary street name). E.g. in Vilnius the address designated "A. Stulginskio gatve 4 / A. Smetonos gatve 7" is situated on the corner of the two streets.
+
+EXAMPLE 3 In the Czech Republic in some cities an address has two locator designators: A building number which referres to the address area (district, cz: "cast obce") and a address number that referres to the thoroughfare name. As an example in Praha for address designated "Na Pankráci 1690/125, Nusle" the designator "1690" is a building number unique within the address area (cz cast obce) "Nusle", while the "125" is an address number that has the thoroughfare name as its scope.</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">ad:AddressComponent</targetElement>
+ </appinfo>
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="AddressLocatorPropertyType">
+ <sequence>
+ <element ref="ad:AddressLocator"/>
+ </sequence>
+ </complexType>
+ <element name="AddressRepresentation" type="ad:AddressRepresentationType" substitutionGroup="gml:AbstractObject">
+ <annotation>
+ <documentation>-- Definition --
+Representation of an address spatial object for use in external application schemas that need to include the basic, address information in a readable way.
+
+-- Description --
+NOTE 1 The data type includes the all necessary readable address components as well as the address locator(s), which allows the identification of the address spatial objects, e.g., country, region, municipality, address area, post code, street name and address number. It also includes an optional reference to the full address spatial object.
+
+NOTE 2 The datatype could be used in application schemas that wish to include address information e.g. in a dataset that registers buildings or properties.</documentation>
+ </annotation>
+ </element>
+ <complexType name="AddressRepresentationType">
+ <sequence>
+ <element name="adminUnit" type="gn:GeographicalNamePropertyType" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+The name or names of a unit of administration where a Member State has and/or exercises jurisdictional rights, for local, regional and national governance.</documentation>
+ </annotation>
+ </element>
+ <element name="locatorDesignator" type="string" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+A number or a sequence of characters which allows a user or an application to interpret, parse and format the locator within the relevant scope. A locator may include more locator designators.</documentation>
+ </annotation>
+ </element>
+ <element name="locatorName" type="gn:GeographicalNamePropertyType" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+Proper noun(s) applied to the real world entity identified by the locator.</documentation>
+ </annotation>
+ </element>
+ <element name="addressArea" nillable="true" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+The name or names of a geographic area or locality that groups a number of addressable objects for addressing purposes, without being an administrative unit.</documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="gn:GeographicalName"/>
+ </sequence>
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </complexType>
+ </element>
+ <element name="postName" nillable="true" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+One or more names created and maintained for postal purposes to identify a subdivision of addresses and postal delivery points.</documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="gn:GeographicalName"/>
+ </sequence>
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </complexType>
+ </element>
+ <element name="postCode" nillable="true" minOccurs="0">
+ <annotation>
+ <documentation>-- Definition --
+A code created and maintained for postal purposes to identify a subdivision of addresses and postal delivery points.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="string">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="thoroughfare" nillable="true" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+The name or names of a passage or way through from one location to another like a road or a waterway.</documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="gn:GeographicalName"/>
+ </sequence>
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </complexType>
+ </element>
+ <element name="addressFeature" type="gml:ReferenceType" nillable="true" minOccurs="0">
+ <annotation>
+ <documentation>-- Definition --
+Reference to the address spatial object.</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">ad:Address</targetElement>
+ </appinfo>
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="AddressRepresentationPropertyType">
+ <sequence>
+ <element ref="ad:AddressRepresentation"/>
+ </sequence>
+ </complexType>
+ <element name="AdminUnitName" type="ad:AdminUnitNameType" substitutionGroup="ad:AddressComponent">
+ <annotation>
+ <documentation>-- Definition --
+An address component which represents the name of a unit of administration where a Member State has and/or exercises jurisdictional rights, for local, regional and national governance.</documentation>
+ </annotation>
+ </element>
+ <complexType name="AdminUnitNameType">
+ <complexContent>
+ <extension base="ad:AddressComponentType">
+ <sequence>
+ <element name="name" type="gn:GeographicalNamePropertyType" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+Official, geographical name of the administrative unit, given in different languages where required.
+
+-- Description --
+NOTE The data type allows names in different languages and scripts as well as inclusion of alternative name, alternative spellings, historical name and exonyms.</documentation>
+ </annotation>
+ </element>
+ <element name="level" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+The level of administration in the national administrative hierarchy.</documentation>
+ </annotation>
+ </element>
+ <element name="adminUnit" type="gml:ReferenceType" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+The administrative unit that is the source of the content of the administrative unit name.
+
+-- Description --
+EXAMPLE The administrative unit (municipality) "Gävle" in Sweden is the source of the address component administrative unit name, "Gävle".</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">au:AdministrativeUnit</targetElement>
+ </appinfo>
+ </annotation>
+ </element>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="AdminUnitNamePropertyType">
+ <sequence minOccurs="0">
+ <element ref="ad:AdminUnitName"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+ </complexType>
+ <element name="GeographicPosition" type="ad:GeographicPositionType" substitutionGroup="gml:AbstractObject">
+ <annotation>
+ <documentation>-- Definition --
+The position of a characteristic point which represents the location of the address according to a certain specification, including information on the origin of the position.</documentation>
+ </annotation>
+ </element>
+ <complexType name="GeographicPositionType">
+ <sequence>
+ <element name="geometry" type="gml:PointPropertyType">
+ <annotation>
+ <documentation>-- Definition --
+The position of the point expressed in coordinates in the chosen spatial reference system.</documentation>
+ </annotation>
+ </element>
+ <element name="specification" type="gml:ReferenceType" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Information defining the specification used to create or derive this geographic position of the address.</documentation>
+ </annotation>
+ </element>
+ <element name="method" type="gml:ReferenceType" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Description of how and by whom the geographic position of the address was created or derived.
+
+-- Description --
+NOTE The geographic position could be created manually by the address authority itself, by an independent party (e.g. by field surveying or digitizing of paper maps) or it could be derived automatically from the addressable object or from other Inspire features.</documentation>
+ </annotation>
+ </element>
+ <element name="default" type="boolean">
+ <annotation>
+ <documentation>-- Definition --
+Specifies whether or not this position should be considered as the default.
+
+-- Description --
+NOTE As a member state may provide several positions of an address, there is a need to identify the commonly used (main) position. Preferrably, the default position should be the one with best accuracy.</documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="GeographicPositionPropertyType">
+ <sequence>
+ <element ref="ad:GeographicPosition"/>
+ </sequence>
+ </complexType>
+ <element name="LocatorDesignator" type="ad:LocatorDesignatorType" substitutionGroup="gml:AbstractObject">
+ <annotation>
+ <documentation>-- Definition --
+A number or a sequence of characters that uniquely identifies the locator within the relevant scope(s). The full identification of the locator could include one or more locator designators.
+
+-- Description --
+NOTE 1 Locator designators are often assigned according to a set of commonly known rules which enables a user or application to "parse" the information: Address numbers are most often assigned in ascending order with odd and even numbers on each side of the thoroughfare. In a building, the floor identifier represents the level according to the traditions within the area, e.g., 1, 2, 3.
+
+NOTE 2 Several types of locator designators exist, such as: Address number, address number suffix, building identifier, building name. A locator could be composed by an ordered set of these.
+
+EXAMPLE In Paris, France a locator could be composed by two locator designators: address number "18" and address number suffix: "BIS".</documentation>
+ </annotation>
+ </element>
+ <complexType name="LocatorDesignatorType">
+ <sequence>
+ <element name="designator" type="string">
+ <annotation>
+ <documentation>-- Definition --
+The identifying part of the locator designator composed by one or more digits or other characters.
+
+-- Description --
+NOTE The value is often a descriptive code assigned according to certain well known rules e.g. like ascending odd and even address numbers along the thoroughfare, or like floor identifiers: 0, 1, 2, 3.
+
+EXAMPLE Address number "2065", Address number suffix "B", Floor identifier "7" door identifier "B707" are all locator attribute values.</documentation>
+ </annotation>
+ </element>
+ <element name="type" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+The type of locator value, which enables an application to interpret, parse or format it according to certain rules.
+
+-- Description --
+NOTE The type enables a user or an application to understand if the value "A" is e.g. an identifier of a specific building, door, staircase or dwelling.</documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="LocatorDesignatorPropertyType">
+ <sequence>
+ <element ref="ad:LocatorDesignator"/>
+ </sequence>
+ </complexType>
+ <element name="LocatorName" type="ad:LocatorNameType" substitutionGroup="gml:AbstractObject">
+ <annotation>
+ <documentation>-- Definition --
+Proper noun applied to the real world entity identified by the locator.
+
+-- Description --
+NOTE The locator name could be the name of the property or complex, of the building or part of the building, or it could be the name of a room inside a building.</documentation>
+ </annotation>
+ </element>
+ <complexType name="LocatorNameType">
+ <sequence>
+ <element name="name" type="gn:GeographicalNamePropertyType" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+The identifying part of the locator name.
+
+-- Description --
+NOTE 1 The data type allows names in different languages and scripts as well as inclusion of alternative name, alternative spellings, historical name and exonyms.
+
+NOTE 2 The locator name could be the name of the property or complex, of the building or part of the building (e.g. a wing), or it could be the name of a room or similar inside the building.
+
+NOTE 3 The locator name sometimes refer to the name of the family or business entity which at present or in the past has owned or occupied the property or building; although this is the case the locator name must not be confused with the name of the addressee(s).
+
+NOTE 4 As locator name it is also possible to use a descriptive text that allows a user to identify the property in question.
+
+EXAMPLE 1 The "Radford Mill Farm" in Timsbury, Bath, UK; The allotment house area "Brumleby" in Copenhagen, Denmark, the university campus "Cité Universitaire", in Paris, France.
+
+EXAMPLE 2 "Millers House" in Stromness, Orkney Isles, UK; "Ulla's Pension" in Niederfell, Rheinland-Pfalz, Germany.
+
+EXAMPLE 3 "Multi-storey car park at Southampton Magistrates Courts" in Southampton, UK.</documentation>
+ </annotation>
+ </element>
+ <element name="type" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+The type of locator value, which enables an application to interpret, parse or format it according to certain rules.
+
+-- Description --
+NOTE The type enables a user or an application to understand if the name "Radford Mill Farm" is for example a name of a specific site or of a building.</documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="LocatorNamePropertyType">
+ <sequence>
+ <element ref="ad:LocatorName"/>
+ </sequence>
+ </complexType>
+ <element name="PartOfName" type="ad:PartOfNameType" substitutionGroup="gml:AbstractObject">
+ <annotation>
+ <documentation>-- Definition --
+A part of the full name resulting from the subdivision of the thoroughfare name into separate, semantic parts, using the same language and script as the full thoroughfare name.
+
+-- Description --
+NOTE Each part of the name must be qualified by using the type attribute.</documentation>
+ </annotation>
+ </element>
+ <complexType name="PartOfNameType">
+ <sequence>
+ <element name="part" type="string">
+ <annotation>
+ <documentation>-- Definition --
+The character string that expresses the separate part of the name using the same language and script as the full thoroughfare name.</documentation>
+ </annotation>
+ </element>
+ <element name="type" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+A classification of the part of name according to its semantics (meaning) in the complete thoroughfare name.</documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="PartOfNamePropertyType">
+ <sequence>
+ <element ref="ad:PartOfName"/>
+ </sequence>
+ </complexType>
+ <element name="PostalDescriptor" type="ad:PostalDescriptorType" substitutionGroup="ad:AddressComponent">
+ <annotation>
+ <documentation>-- Definition --
+An address component which represents the identification of a subdivision of addresses and postal delivery points in a country, region or city for postal purposes.
+
+-- Description --
+NOTE 1 The postal descriptor is specified by means of a post code and/or names of the associated post office, town or area.
+
+NOTE 2 In some countries post codes are seen as a proper geographic subdivision of the country, in other countries the post code is regarded only as an attribute that characterizes a (usually small) number of adjacent postal delivery points and addresses.
+
+NOTE 3 The postal descriptors are created and developed on the basis of postal requirements (e.g. efficient sorting, logistics, transport and distribution). Consequently, there is not often a tight relationship between the postal areas and administrative units in the same area.
+
+NOTE 4 The structure schema and formats of national postal descriptor systems are different. Sometimes (for example in the UK) the post code itself is the only information required for a valid address; in other situations both the post code and the associated name of post office or town is required. Sometimes there is a simple relationship between the code and the name; in other situations a set of postcodes are associated with a single post office or town.
+
+NOTE 5 In some countries like e.g. The Republic of Ireland, no post code system currently exists, therefore the postal descriptor is only represented by the name of the post town.
+
+EXAMPLE 1 In the UK the post code "EC4M 7DR" is sufficient, as a postal descriptor, while the related town name "London" is informative, but not necessary in the postal address.
+
+EXAMPLE 2 In Sweden all postcodes starting with "80" is related to the postal name "Gävle". Therefore in the postal descriptor "802 74 Gävle", the postcode "802 74" bears all postal necessary information, while the town name "Gävle" is extra information.
+
+EXAMPLE 3 In Denmark, outside the centre of Copenhagen, each postcode has a 1:1 relationship to one post name only: Postcode "6372" relates to the village "Bylderup-Bov".
+
+EXAMPLE 4 In Germany the lowest level of the Postal descriptor (the 5 digit Postleitzahl) often does not fall within an administrative unit (e.g. municipality). The Postleitzahl is handled completely independent from the hierarchal systematic of the addresses. In addition, some "Postleitzahlen" represent not a delivery area, but institutions with a big amount of post.</documentation>
+ </annotation>
+ </element>
+ <complexType name="PostalDescriptorType">
+ <complexContent>
+ <extension base="ad:AddressComponentType">
+ <sequence>
+ <element name="postName" type="gn:GeographicalNamePropertyType" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+One or more names created and maintained for postal purposes to identify a subdivision of addresses and postal delivery points.
+
+-- Description --
+NOTE 1 Often the post name (or names) is a supplementary identification of the post office to which the associated post code belongs. For example it may be the name of the town in which the office is situated. In other situations the post name could be an independent descriptor without any post code or it could be a postal subdivision connected to a parent postal descriptor (post code and post name).
+
+NOTE 2 In some countries like e.g. Spain and The Netherlands, no post names exit therefore the postal descriptor is only represented by the post code.
+
+NOTE 3 Even though the post name is the same as the name of an administrative unit or an address area, the area covered are not necessarilythe same.</documentation>
+ </annotation>
+ </element>
+ <element name="postCode" type="string" minOccurs="0">
+ <annotation>
+ <documentation>-- Definition --
+A code created and maintained for postal purposes to identify a subdivision of addresses and postal delivery points.
+
+-- Description --
+NOTE 1 The structure, schema and formats of post codes are different in different countries. Often the components of the post code are hierarchical, e.g. when the first character(s) identifies the region covered by the post code and the next characters define the subdivision.
+
+NOTE 2 In some countries, e.g., The Republic of Ireland, no post codes exists therefore the postal descriptor is only represented by the post name (e.g. town name).
+
+EXAMPLE In the UK postcodes starting with W covers the Western (W1) and Paddington (W2-14) districts of the London postal district. In Sweden all postcodes starting with "80" is related to the postal name "Gävle".</documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="PostalDescriptorPropertyType">
+ <sequence minOccurs="0">
+ <element ref="ad:PostalDescriptor"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+ </complexType>
+ <element name="ThoroughfareName" type="ad:ThoroughfareNameType" substitutionGroup="ad:AddressComponent">
+ <annotation>
+ <documentation>-- Definition --
+An address component which represents the name of a passage or way through from one location to another.
+
+-- Description --
+NOTE 1 A thoroughfare can, e.g., be a road or a waterway
+
+NOTE 2 Thoroughfare names includes names of squares and of cul de sacs, and they can also represent the network of smaller roads or paths e.g. in a small village or settlement.</documentation>
+ </annotation>
+ </element>
+ <complexType name="ThoroughfareNameType">
+ <complexContent>
+ <extension base="ad:AddressComponentType">
+ <sequence>
+ <element name="name" type="ad:ThoroughfareNameValuePropertyType" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+Name of the thoroughfare.
+
+-- Description --
+NOTE 1 The name can optionally include an often used alternative name, alternative spelling of the name, a historic name or spelling, which is still in use. It may also optionally include a subdivision of the name into parts.
+
+NOTE 2 Most often thoroughfares are roads, in this situation the thoroughfare name is the road name.
+
+NOTE 3 The data type also allows a representation of the thoroughfare name in separate parts e.g. "rue" + "de la" + "Paix"</documentation>
+ </annotation>
+ </element>
+ <element name="transportLink" type="gml:ReferenceType" nillable="true" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+One or several transport network links to which the spatial object of the thoroughfare name has been designated.
+
+-- Description --
+EXAMPLE The thoroughfare name "Na Pankráci" in Praha, The Czech Republic, has been designated as a road name for a number of road links (street segments) in the city.</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">tn:TransportLink</targetElement>
+ </appinfo>
+ </annotation>
+ </element>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="ThoroughfareNamePropertyType">
+ <sequence minOccurs="0">
+ <element ref="ad:ThoroughfareName"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+ </complexType>
+ <element name="ThoroughfareNameValue" type="ad:ThoroughfareNameValueType" substitutionGroup="gml:AbstractObject">
+ <annotation>
+ <documentation>-- Definition --
+Proper noun applied to thoroughfare optionally including a subdivision of the name into parts.
+
+-- Description --
+NOTE 1 The data type allows names in different languages and scripts as well as inclusion of alternative name, alternative spellings, historical name and exonyms.
+
+NOTE 2 The data type allows optionally a representation of the thoroughfare name subdivided into separate, semantic parts e.g. "Avenue" + "de la" + "Poste".</documentation>
+ </annotation>
+ </element>
+ <complexType name="ThoroughfareNameValueType">
+ <sequence>
+ <element name="name" type="gn:GeographicalNamePropertyType">
+ <annotation>
+ <documentation>-- Definition --
+Proper noun applied to the thoroughfare.
+
+-- Description --
+NOTE 1 The complete name of the thoroughfare must be applied in this attribute, including type, prefix or qualifier, like for example "Avenue de la Poste", "Calle del Christo Canneregio" or "Untere Quai". The name part attribute enables a representation of the name subdivided into separate semantic parts.
+
+NOTE 2 The data type allows names in different languages as well as inclusion of exonyms.</documentation>
+ </annotation>
+ </element>
+ <element name="nameParts" nillable="true" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>-- Definition --
+One or several parts into which the thoroughfare name can be subdivided.
+
+-- Description --
+NOTE 1 This is a definition which is consistent with that adopted by the UPU
+
+NOTE 2 A subdivision of a thoroughfare name into semantic parts could improve parsing (e.g. of abbreviated or misspelled names) and for sorting of address data for example for postal delivery purposes. It could also improve the creation of alphabetically sorted street gazetteers.
+
+NOTE 3 The data type requires that each part of the subdivided thoroughfare name is qualified with information on the semantics e.g. if it is a thoroughfare type (e.g., Rua, Place, Calle, Street), a prefix (e.g., da, de la, del), a qualifier (e.g., Unterer, Little) or if it is the core of the name, which would normally be used for sorting or indexing.
+
+NOTE 4 In some countries or regions and for some thoroughfare names it is not feasible or it does not add value to subdivide the thoroughfare name into parts.
+
+EXAMPLE In France the thoroughfare name "Avenue de la Poste" could be subdivided into these parts: "Avenue" + "de la" + "Poste".</documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="ad:PartOfName"/>
+ </sequence>
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="ThoroughfareNameValuePropertyType">
+ <sequence>
+ <element ref="ad:ThoroughfareNameValue"/>
+ </sequence>
+ </complexType>
+</schema>
diff --git a/xplan-workspaces/src/main/workspace/appschemas/inspireplu/base/3.3/BaseTypes.xsd b/xplan-workspaces/src/main/workspace/appschemas/inspireplu/base/3.3/BaseTypes.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..9e97fa373f7a5ed6637770e53b296e8a6d46e627
--- /dev/null
+++ b/xplan-workspaces/src/main/workspace/appschemas/inspireplu/base/3.3/BaseTypes.xsd
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://inspire.ec.europa.eu/schemas/base/3.3" elementFormDefault="qualified" version="3.3.1">
+ <!-- Bugfix version 3.3.1
+ - The <SpatialDataSet>, <SpatialDataSetType> and <SpatialDataSetPropertyType> elements are deprecated (in accordance with D2.7 v3.3 Recommendation 11 stating that wfs:FeatureCollection should be used instead)
+ - The (optional) <member> element, which was accidentally removed in v3.3(.0), is re-included inside the (deprecated) <SpatialDataSet> element. -->
+ <annotation>
+ <documentation>-- Definition --
+schema for basic types used by multiple themes</documentation>
+ </annotation>
+ <import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
+ <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
+ <!--XML Schema document created by ShapeChange-->
+ <simpleType name="VerticalPositionValueType">
+ <annotation>
+ <documentation>-- Definition --
+The relative vertical position of a spatial object.</documentation>
+ </annotation>
+ <restriction base="string">
+ <enumeration value="onGroundSurface">
+ <annotation>
+ <documentation>-- Definition --
+The spatial object is on ground level.</documentation>
+ </annotation>
+ </enumeration>
+ <enumeration value="suspendedOrElevated">
+ <annotation>
+ <documentation>-- Definition --
+The spatial object is suspended or elevated.</documentation>
+ </annotation>
+ </enumeration>
+ <enumeration value="underground">
+ <annotation>
+ <documentation>-- Definition --
+The spatial object is underground.</documentation>
+ </annotation>
+ </enumeration>
+ </restriction>
+ </simpleType>
+ <!-- WARNING This element has been deprecated in v3.3.1 of this schema (in accordance with D2.7 v3.3 Recommendation 11 stating that wfs:FeatureCollection should be used instead of base:SpatialDataSet). -->
+ <element name="SpatialDataSet" type="base:SpatialDataSetType" substitutionGroup="gml:AbstractFeature">
+ <annotation>
+ <documentation>-- Definition --
+Identifiable collection of spatial data.
+
+-- Description --
+WARNING This element has been deprecated in v3.3.1 of this schema (in accordance with D2.7 v3.3 Recommendation 11 stating that wfs:FeatureCollection should be used instead of base:SpatialDataSet).
+
+NOTE The type SpatialDataSet is offered as a pre-defined type for spatial data sets. The scope of this type is packaging pre-defined data sets for the non-direct access download service. It may be reused in thematic application schemas, but if it does not fit an application-schema-specific data set object should be modelled. This type may have the same name and definition like this type, but may have a different set of properties.
+
+This type specifies three properties: an external object identifier, a container for metadata (may be void), and an association to zero or more spatial objects.</documentation>
+ </annotation>
+ </element>
+ <!-- WARNING This type has been deprecated in v3.3.1 of this schema (in accordance with D2.7 v3.3 Recommendation 11 stating that wfs:FeatureCollection should be used instead of base:SpatialDataSet). -->
+ <complexType name="SpatialDataSetType">
+ <complexContent>
+ <extension base="gml:AbstractFeatureType">
+ <sequence>
+ <element name="identifier" type="base:IdentifierPropertyType">
+ <annotation>
+ <documentation>-- Definition --
+Identifier of the spatial data set.</documentation>
+ </annotation>
+ </element>
+ <element name="metadata" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Metadata of the spatial data set.</documentation>
+ </annotation>
+ <complexType>
+ <complexContent>
+ <extension base="gml:AbstractMetadataPropertyType">
+ <sequence minOccurs="0">
+ <element ref="gmd:MD_Metadata"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ </extension>
+ </complexContent>
+ </complexType>
+ </element>
+ <element name="member" type="gml:FeaturePropertyType" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>The spatial objects that are members of the spatial data set</documentation>
+ <appinfo>
+ <targetElement xmlns="http://www.opengis.net/gml/3.2">gml:AbstractFeature</targetElement>
+ </appinfo>
+ </annotation>
+ </element>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <!-- WARNING This type has been deprecated in v3.3.1 of this schema (in accordance with D2.7 v3.3 Recommendation 11 stating that wfs:FeatureCollection should be used instead of base:SpatialDataSet). -->
+ <complexType name="SpatialDataSetPropertyType">
+ <sequence minOccurs="0">
+ <element ref="base:SpatialDataSet"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+ </complexType>
+ <element name="Identifier" type="base:IdentifierType" substitutionGroup="gml:AbstractObject">
+ <annotation>
+ <documentation>-- Definition --
+External unique object identifier published by the responsible body, which may be used by external applications to reference the spatial object.
+
+-- Description --
+NOTE1 External object identifiers are distinct from thematic object identifiers.
+
+NOTE 2 The voidable version identifier attribute is not part of the unique identifier of a spatial object and may be used to distinguish two versions of the same spatial object.
+
+NOTE 3 The unique identifier will not change during the life-time of a spatial object.</documentation>
+ </annotation>
+ </element>
+ <complexType name="IdentifierType">
+ <sequence>
+ <element name="localId" type="string">
+ <annotation>
+ <documentation>-- Definition --
+A local identifier, assigned by the data provider. The local identifier is unique within the namespace, that is no other spatial object carries the same unique identifier.
+
+-- Description --
+NOTE It is the responsibility of the data provider to guarantee uniqueness of the local identifier within the namespace.</documentation>
+ </annotation>
+ </element>
+ <element name="namespace" type="string">
+ <annotation>
+ <documentation>-- Definition --
+Namespace uniquely identifying the data source of the spatial object.
+
+-- Description --
+NOTE The namespace value will be owned by the data provider of the spatial object and will be registered in the INSPIRE External Object Identifier Namespaces Register.</documentation>
+ </annotation>
+ </element>
+ <element name="versionId" nillable="true" minOccurs="0">
+ <annotation>
+ <documentation>-- Definition --
+The identifier of the particular version of the spatial object, with a maximum length of 25 characters. If the specification of a spatial object type with an external object identifier includes life-cycle information, the version identifier is used to distinguish between the different versions of a spatial object. Within the set of all versions of a spatial object, the version identifier is unique.
+
+-- Description --
+NOTE The maximum length has been selected to allow for time stamps based on ISO 8601, for example, "2007-02-12T12:12:12+05:30" as the version identifier.
+
+NOTE 2 The property is void, if the spatial data set does not distinguish between different versions of the spatial object. It is missing, if the spatial object type does not support any life-cycle information.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="string">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="IdentifierPropertyType">
+ <sequence>
+ <element ref="base:Identifier"/>
+ </sequence>
+ </complexType>
+</schema>
diff --git a/xplan-workspaces/src/main/workspace/appschemas/inspireplu/base2/2.0/BaseTypes2.xsd b/xplan-workspaces/src/main/workspace/appschemas/inspireplu/base2/2.0/BaseTypes2.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..33245abbcecf927d83272aeccdaa351862c94a63
--- /dev/null
+++ b/xplan-workspaces/src/main/workspace/appschemas/inspireplu/base2/2.0/BaseTypes2.xsd
@@ -0,0 +1,515 @@
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ad="http://inspire.ec.europa.eu/schemas/ad/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/base2/2.0" version="2.0">
+ <annotation>
+ <documentation>-- Definition --
+schema for additional basic types used by multiple themes
+
+-- Description --
+NOTE The additional types specified with Annex II/III data specifications are placed in a separate schema to maintain backwards compatibility.</documentation>
+ </annotation>
+ <import namespace="http://inspire.ec.europa.eu/schemas/ad/4.0" schemaLocation="../../ad/4.0/Addresses.xsd"/>
+ <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
+ <import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
+ <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
+ <!--XML Schema document created by ShapeChange-->
+ <element name="Contact" substitutionGroup="gml:AbstractObject" type="base2:ContactType">
+ <annotation>
+ <documentation>-- Name --
+contact
+
+-- Definition --
+Communication channels by which it is possible to gain access to someone or something.
+
+-- Description --</documentation>
+ </annotation>
+ </element>
+ <complexType name="ContactType">
+ <sequence>
+ <element minOccurs="0" name="address" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+An address provided as free text.</documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="ad:AddressRepresentation"/>
+ </sequence>
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </complexType>
+ </element>
+ <element minOccurs="0" name="contactInstructions" nillable="true" type="gmd:PT_FreeText_PropertyType">
+ <annotation>
+ <documentation>-- Definition --
+Supplementary instructions on how or when to contact an individual or organisation.
+
+
+-- Description --</documentation>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="electronicMailAddress" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+An address of the organisation's or individual's electronic mailbox.
+
+-- Description --</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="string">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element minOccurs="0" name="hoursOfService" nillable="true" type="gmd:PT_FreeText_PropertyType">
+ <annotation>
+ <documentation>-- Definition --
+Periods of time when the organisation or individual can be contacted.
+
+-- Description --</documentation>
+ </annotation>
+ </element>
+ <element maxOccurs="unbounded" minOccurs="0" name="telephoneFacsimile" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Number of a facsimile machine of the organisation or individual.
+
+-- Description --</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="string">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element maxOccurs="unbounded" minOccurs="0" name="telephoneVoice" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Telephone number of the organisation or individual.
+
+-- Description --</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="string">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element minOccurs="0" name="website" nillable="true">
+ <annotation>
+ <documentation>-- Definition --
+Pages provided on the World Wide Web by the organisation or individual.
+
+-- Description --</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="anyURI">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="ContactPropertyType">
+ <sequence>
+ <element ref="base2:Contact"/>
+ </sequence>
+ </complexType>
+ <element name="DocumentCitation" substitutionGroup="gml:AbstractGML" type="base2:DocumentCitationType">
+ <annotation>
+ <documentation>-- Name --
+document citation
+
+-- Definition --
+Citation for the purposes of unambiguously referencing a document.</documentation>
+ </annotation>
+ </element>
+ <complexType name="DocumentCitationType">
+ <complexContent>
+ <extension base="gml:AbstractGMLType">
+ <sequence>
+ <element name="name" type="string">
+ <annotation>
+ <documentation>-- Name --
+name
+
+-- Definition --
+Name of the document.
+
+-- Description --
+NOTE For legal documents, this should be the official name assigned to the legislative instrument.
+
+EXAMPLE The official legal name for the INSPIRE Directive is "Directive 2007/2/EC of the European Parliament and of the Council of 14 March 2007 establishing an Infrastructure for Spatial Information in the European Community (INSPIRE)"</documentation>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="shortName" nillable="true">
+ <annotation>
+ <documentation>-- Name --
+short name
+
+-- Definition --
+Short name or alternative title of the document.
+
+-- Description --
+NOTE For legal documents, this should be a short name or alternative title commonly used to identify the legislation.
+
+EXAMPLE 1: INSPIRE Directive is the short name for "Directive 2007/2/EC of the European Parliament and of the Council of 14 March 2007 establishing an Infrastructure for Spatial Information in the European Community (INSPIRE)"
+
+EXAMPLE 2: CAFE Directive is the short name for the Directive 2008/50/EC of the European Parliament and of the Council of 21 May 2008 on ambient air quality and cleaner air for Europe"
+
+EXAMPLE 3: Water Framework Directive the short name for "Directive 2000/60/EC of the European Parliament and of the Council establishing a framework for the Community action in the field of water policy"</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="string">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="date" nillable="true">
+ <annotation>
+ <documentation>-- Name --
+date
+
+-- Definition --
+Date of creation, publication or revision of the document.</documentation>
+ </annotation>
+ <complexType>
+ <complexContent>
+ <extension base="gml:AbstractMetadataPropertyType">
+ <sequence>
+ <element ref="gmd:CI_Date"/>
+ </sequence>
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </complexContent>
+ </complexType>
+ </element>
+ <element maxOccurs="unbounded" name="link" nillable="true">
+ <annotation>
+ <documentation>-- Name --
+link to online version
+
+-- Definition --
+Link to an online version of the document</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="anyURI">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element maxOccurs="unbounded" minOccurs="0" name="specificReference" nillable="true">
+ <annotation>
+ <documentation>-- Name --
+specific reference
+
+-- Definition --
+Reference to a specific part of the document.
+
+-- Description --
+EXAMPLE For legal documents, this attribute can contain a reference to article(s) that specify a specific requirement or obligation.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="string">
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="DocumentCitationPropertyType">
+ <sequence minOccurs="0">
+ <element ref="base2:DocumentCitation"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+ </complexType>
+ <element name="LegislationCitation" substitutionGroup="base2:DocumentCitation" type="base2:LegislationCitationType">
+ <annotation>
+ <documentation>-- Name --
+legislation citation
+
+-- Definition --
+Citation for the purposes of unambiguously referencing a legal act or a specific part of a legal act.</documentation>
+ </annotation>
+ </element>
+ <complexType name="LegislationCitationType">
+ <complexContent>
+ <extension base="base2:DocumentCitationType">
+ <sequence>
+ <element minOccurs="0" name="identificationNumber" type="string">
+ <annotation>
+ <documentation>-- Name --
+identification number
+
+-- Definition --
+Code used to identify the legislative instrument
+
+-- Description --
+
+EXAMPLE 1: 2007/2/EC is the identification number for the INSPIRE Directive
+
+EXAMPLE 2: 2008/50/EC is the identification number for the CAFE Directive
+
+EXAMPLE 3: 2000/60/EC is the identification number for the Water Framework Directive</documentation>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="officialDocumentNumber" type="string">
+ <annotation>
+ <documentation>-- Name --
+official document number
+
+-- Definition --
+Official document number used to uniquely identify the legislative instrument.
+
+-- Description --
+NOTE: An official document number may be assigned to uniquely identify the legislative instrument.
+
+EXAMPLE: CELEX Number used to uniquely identify European Union Legislation</documentation>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="dateEnteredIntoForce" type="gml:TimePositionType">
+ <annotation>
+ <documentation>-- Name --
+date entered into force
+
+-- Definition --
+Date the legislative instrument entered into force.</documentation>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="dateRepealed" type="gml:TimePositionType">
+ <annotation>
+ <documentation>-- Name --
+date repealed
+
+-- Definition --
+Date the legislative instrument was repealed.</documentation>
+ </annotation>
+ </element>
+ <element name="level" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Name --
+name
+
+-- Definition --
+The level at which the legislative instrument is adopted.</documentation>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="journalCitation" type="base2:OfficialJournalInformationPropertyType">
+ <annotation>
+ <documentation>-- Name --
+journal citation
+
+-- Definition --
+Citation of the official journal in which the legislation is published.</documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="LegislationCitationPropertyType">
+ <sequence minOccurs="0">
+ <element ref="base2:LegislationCitation"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+ </complexType>
+ <element name="OfficialJournalInformation" substitutionGroup="gml:AbstractObject" type="base2:OfficialJournalInformationType">
+ <annotation>
+ <documentation>-- Name --
+official journal information
+
+-- Definition --
+Full citation of the location of the legislative instrument within the official journal.</documentation>
+ </annotation>
+ </element>
+ <complexType name="OfficialJournalInformationType">
+ <sequence>
+ <element name="officialJournalIdentification" type="string">
+ <annotation>
+ <documentation>-- Name --
+official journal identification
+
+-- Definition --
+Reference to the location within the official journal within which the legislative instrument was published. This reference shall be comprised of three parts:
+<ul>
+ <li>the title of the official journal</li>
+ <li>the volume and/or series number</li>
+ <li>Page number(s)</li>
+</ul>
+
+-- Description --
+EXAMPLE: Official Journal of European Union (OJEU), L108, Volume 50, 1-14</documentation>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="ISSN" type="string">
+ <annotation>
+ <documentation>-- Name --
+ISSN
+
+-- Definition --
+The International Standard Serial Number (ISSN) is an eight-digit number that identifies the periodical publication in which the legislative instrument was published.
+
+-- Description --
+NOTE: Periodical publilcations are issued in successive parts, usually having numerical or chronological designations and required that each serial publication can be uniquely identified.
+
+EXAMPLE: OJ Series in which INSPIRE Directive is published has been assigned the ISSN: 1725-2555</documentation>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="ISBN" type="string">
+ <annotation>
+ <documentation>-- Name --
+ISBN
+
+-- Definition --
+International Standard Book Number (ISBN) is an nine-digit number that uniquely identifies the book in which the legislative instrument was published.</documentation>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="linkToJournal" type="anyURI">
+ <annotation>
+ <documentation>-- Name --
+link to online version
+
+-- Definition --
+Link to an online version of the official journal</documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="OfficialJournalInformationPropertyType">
+ <sequence>
+ <element ref="base2:OfficialJournalInformation"/>
+ </sequence>
+ </complexType>
+ <element name="RelatedParty" substitutionGroup="gml:AbstractObject" type="base2:RelatedPartyType">
+ <annotation>
+ <documentation>-- Name --
+related party
+
+-- Definition --
+An organisation or a person with a role related to a resource.
+
+-- Description --
+NOTE 1 A party, typically an individual person, acting as a general point of contact for a resource can be specified without providing any particular role.</documentation>
+ </annotation>
+ </element>
+ <complexType name="RelatedPartyType">
+ <sequence>
+ <element minOccurs="0" name="individualName" nillable="true" type="gmd:PT_FreeText_PropertyType">
+ <annotation>
+ <documentation>-- Name --
+individual name
+
+-- Definition --
+Name of the related person.</documentation>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="organisationName" nillable="true" type="gmd:PT_FreeText_PropertyType">
+ <annotation>
+ <documentation>-- Name --
+organisation name
+
+-- Definition --
+Name of the related organisation.</documentation>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="positionName" nillable="true" type="gmd:PT_FreeText_PropertyType">
+ <annotation>
+ <documentation>-- Name --
+position name
+
+-- Definition --
+Position of the party in relation to a resource, such as head of department.</documentation>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="contact" nillable="true">
+ <annotation>
+ <documentation>-- Name --
+contact
+
+-- Definition --
+Contact information for the related party.</documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="base2:Contact"/>
+ </sequence>
+ <attribute name="nilReason" type="gml:NilReasonType"/>
+ </complexType>
+ </element>
+ <element maxOccurs="unbounded" minOccurs="0" name="role" nillable="true" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+Role(s) of the party in relation to a resource, such as owner.</documentation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="obligation">TG</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="RelatedPartyPropertyType">
+ <sequence>
+ <element ref="base2:RelatedParty"/>
+ </sequence>
+ </complexType>
+ <element name="ThematicIdentifier" substitutionGroup="gml:AbstractObject" type="base2:ThematicIdentifierType">
+ <annotation>
+ <documentation>-- Name --
+thematic identifier
+
+-- Definition --
+Thematic identifier to uniquely identify the spatial object.
+
+-- Description --
+Some spatial objects may be assigned multiple unique identifiers.
+These may have been established to meet data exchange requirements of different reporting obligations at International, European or national levels and/or internal data maintenance requirements.</documentation>
+ </annotation>
+ </element>
+ <complexType name="ThematicIdentifierType">
+ <sequence>
+ <element name="identifier" type="string">
+ <annotation>
+ <documentation>-- Name --
+identifier
+
+-- Definition --
+Unique identifier used to identify the spatial object within the specified identification scheme.</documentation>
+ </annotation>
+ </element>
+ <element name="identifierScheme" type="string">
+ <annotation>
+ <documentation>-- Name --
+identifier scheme
+
+-- Definition --
+Identifier defining the scheme used to assign the identifier.
+
+-- Description --
+NOTE 1: Reporting requirements for different environmental legislation mandate that each spatial object is assigned an identifier conforming to specific lexical rules.
+
+NOTE 2: These rules are often inconsistent so a spatial object may be assigned multiple identifiers which are used for object referencing to link information to the spatial object.</documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="ThematicIdentifierPropertyType">
+ <sequence>
+ <element ref="base2:ThematicIdentifier"/>
+ </sequence>
+ </complexType>
+</schema>
diff --git a/xplan-workspaces/src/main/workspace/appschemas/inspireplu/lunom/4.0/LandUseNomenclature.xsd b/xplan-workspaces/src/main/workspace/appschemas/inspireplu/lunom/4.0/LandUseNomenclature.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..28ca720d4e475cfa77f6aa73481a6797252747c1
--- /dev/null
+++ b/xplan-workspaces/src/main/workspace/appschemas/inspireplu/lunom/4.0/LandUseNomenclature.xsd
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:lunom="http://inspire.ec.europa.eu/schemas/lunom/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/lunom/4.0" version="4.0">
+ <annotation>
+ <documentation>-- Name --
+land use nomenclature</documentation>
+ </annotation>
+ <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="../../base/3.3/BaseTypes.xsd"/>
+ <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
+ <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
+ <import namespace="http://www.opengis.net/gmlcov/1.0" schemaLocation="http://schemas.opengis.net/gmlcov/1.0/coverage.xsd"/>
+ <!--XML Schema document created by ShapeChange-->
+ <element name="HILUCSPercentage" substitutionGroup="gml:AbstractObject" type="lunom:HILUCSPercentageType">
+ <annotation>
+ <documentation>-- Name --
+HILUCS percentage
+-- Definition --
+Percentage of land use object that is covered by this HILUCS presence.
+-- Description --
+NOTE1:The percentage is according to the socio-economic or functional importance of the use.
+
+NOTE2:examples are provided in the narrative description part of the data specification.</documentation>
+ </annotation>
+ </element>
+ <complexType name="HILUCSPercentageType">
+ <sequence>
+ <element name="hilucsValue" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+HILUCS category for this HILUCS percentage.</documentation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="obligation">implementingRule</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
+ <element name="percentage" type="integer">
+ <annotation>
+ <documentation>-- Definition --
+Percentage of land use object that is covered by this specific presence.
+-- Description --
+NOTE The percentage is according to the socio-economic importance of the use. In section 5.2.1.1.2. examples of the use of percentages are given.</documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="HILUCSPercentagePropertyType">
+ <sequence>
+ <element ref="lunom:HILUCSPercentage"/>
+ </sequence>
+ </complexType>
+ <element name="HILUCSPresence" substitutionGroup="gml:AbstractObject" type="lunom:HILUCSPresenceType">
+ <annotation>
+ <documentation>-- Name --
+HILUCS presence
+
+-- Definition --
+Presence of one or several HILUCS values in an area, indicated either as the percentage covered for each value or as the values listed in their order of importance.
+
+-- Description --
+The HILUCS presence data type enables the provision of information on land uses inside one land use object in order to collect more than one land use existence perfectly identifiable by importance order or percentages.
+NOTE 1: The order of land use value presence without percentages enable providing an order of dominance/importance of each land use present in the land use object
+NOTE 2: The sum of the percentages can be below 100%, or above. The order is provided according to the respective importance when the percentages are not known.</documentation>
+ </annotation>
+ </element>
+ <complexType name="HILUCSPresenceType">
+ <choice>
+ <element maxOccurs="unbounded" name="orderedList" type="gml:ReferenceType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="obligation">implementingRule</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
+ <element maxOccurs="unbounded" name="percentageList" type="lunom:HILUCSPercentagePropertyType"/>
+ </choice>
+ </complexType>
+ <complexType name="HILUCSPresencePropertyType">
+ <sequence>
+ <element ref="lunom:HILUCSPresence"/>
+ </sequence>
+ </complexType>
+ <element name="SpecificPercentage" substitutionGroup="gml:AbstractObject" type="lunom:SpecificPercentageType">
+ <annotation>
+ <documentation>-- Name --
+specific percentage
+-- Definition --
+Percentage of land use object that is covered by this specific presence.</documentation>
+ </annotation>
+ </element>
+ <complexType name="SpecificPercentageType">
+ <sequence>
+ <element name="specificValue" type="gml:ReferenceType">
+ <annotation>
+ <documentation>-- Definition --
+specific value category for this specific percentage.</documentation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="obligation">implementingRule</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
+ <element name="percentage" type="integer">
+ <annotation>
+ <documentation>-- Definition --
+Percentage of land use object that is covered by a specific presence.
+-- Description --
+NOTE The percentage is according to the socio-economic importance of the use. In section 5.2.1.1.2. examples of the use of percentages are given.</documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="SpecificPercentagePropertyType">
+ <sequence>
+ <element ref="lunom:SpecificPercentage"/>
+ </sequence>
+ </complexType>
+ <element name="SpecificPresence" substitutionGroup="gml:AbstractObject" type="lunom:SpecificPresenceType">
+ <annotation>
+ <documentation>-- Name --
+specific presence
+
+-- Definition --
+Presence of one or several land use classification values in an area according to the code list
+provided by the data provider, indicated either as the percentage covered for each value or as
+the values listed in their order of importance.
+
+-- Description --
+NOTE 1: The order of land use value presence without percentages enable providing an order of dominance/importance of each land use present in the land use object
+NOTE 2: The sum of the percentages can be below 100%, or above. The order is provided according to the respective importance when the percentages are not known.</documentation>
+ </annotation>
+ </element>
+ <complexType name="SpecificPresenceType">
+ <choice>
+ <element maxOccurs="unbounded" name="orderedList" type="gml:ReferenceType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="obligation">implementingRule</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
+ <element maxOccurs="unbounded" name="percentageList" type="lunom:SpecificPercentagePropertyType"/>
+ </choice>
+ </complexType>
+ <complexType name="SpecificPresencePropertyType">
+ <sequence>
+ <element ref="lunom:SpecificPresence"/>
+ </sequence>
+ </complexType>
+</schema>
diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_berohneeinausflin.xml b/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_berohneeinausflin.xml
index 0d086a4c5f86a742db3c408a4ff5e1feb2144658..df57f0653369285a1853d74009dbfb4a832c25b6 100644
--- a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_berohneeinausflin.xml
+++ b/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_berohneeinausflin.xml
@@ -44,21 +44,22 @@
<OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple"
xlink:href="../../symbols/berohneeinausflin_sym.svg"/>
<Format>svg</Format>
+ <Fill>
+ <SvgParameter name="fill">#000000</SvgParameter>
+ </Fill>
<Stroke>
<SvgParameter name="stroke">#000000</SvgParameter>
<SvgParameter name="stroke-opacity">1.0</SvgParameter>
<SvgParameter name="stroke-width">0.2</SvgParameter>
</Stroke>
- <Fill>
- <SvgParameter name="fill">#000000</SvgParameter>
- </Fill>
</Mark>
<Size>2.7</Size>
+ <Rotation>180</Rotation>
</Graphic>
<Gap>5</Gap>
</GraphicStroke>
</Stroke>
- <sed:PerpendicularOffset type="Standard">0</sed:PerpendicularOffset>
+ <sed:PerpendicularOffset type="Edged">-0.7</sed:PerpendicularOffset>
</LineSymbolizer>
</Rule>
</FeatureTypeStyle>
diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_einfberlin.xml b/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_einfberlin.xml
index e22e2f24c69555a5d3cbaad872afdacfb60c8f84..1dbe5e1243423e9f372d019294e63b51376b888c 100644
--- a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_einfberlin.xml
+++ b/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_einfberlin.xml
@@ -22,6 +22,7 @@
<FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:ogc="http://www.opengis.net/ogc"
xmlns:xplan="http://www.deegree.org/xplanung/1/0"
+ xmlns:sed="http://www.deegree.org/se"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se https://schemas.deegree.org/se/1.1.0/Symbolizer-deegree.xsd">
<Name>vollflaechig</Name>
@@ -54,7 +55,7 @@
<Graphic>
<Mark>
<OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple"
- xlink:href="../../symbols/einfberlin_as.svg"/>
+ xlink:href="../../symbols/einfberlin_es.svg"/>
<Format>svg</Format>
<Fill>
<SvgParameter name="fill">#000000</SvgParameter>
@@ -66,11 +67,12 @@
</Stroke>
</Mark>
<Size>2</Size>
+ <Rotation>180</Rotation>
</Graphic>
</GraphicStroke>
<SvgParameter name="deegree-graphicstroke-position-percentage">0</SvgParameter>
</Stroke>
- <PerpendicularOffset type="Standard">0.9</PerpendicularOffset>
+ <sed:PerpendicularOffset type="Standard">-0.9</sed:PerpendicularOffset>
</LineSymbolizer>
<LineSymbolizer uom="meter">
<Geometry>
@@ -81,7 +83,7 @@
<Graphic>
<Mark>
<OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple"
- xlink:href="../../symbols/einfberlin_es.svg"/>
+ xlink:href="../../symbols/einfberlin_as.svg"/>
<Format>svg</Format>
<Fill>
<SvgParameter name="fill">#000000</SvgParameter>
@@ -93,11 +95,12 @@
</Stroke>
</Mark>
<Size>2</Size>
+ <Rotation>180</Rotation>
</Graphic>
</GraphicStroke>
<SvgParameter name="deegree-graphicstroke-position-percentage">99.9</SvgParameter>
</Stroke>
- <PerpendicularOffset type="Standard">0.9</PerpendicularOffset>
+ <sed:PerpendicularOffset type="Standard">-0.9</sed:PerpendicularOffset>
</LineSymbolizer>
</Rule>
</FeatureTypeStyle>
diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_strbegrlin.xml b/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_strbegrlin.xml
index 6dcc683a04ff96e939f0ea77c552fe5e807d3472..e0bbe6c68d297177db5241dbbfdfe61750c9ebfd 100644
--- a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_strbegrlin.xml
+++ b/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_strbegrlin.xml
@@ -44,7 +44,7 @@
<SvgParameter name="stroke-linecap">butt</SvgParameter>
<SvgParameter name="stroke-linejoin">mitre</SvgParameter>
</Stroke>
- <sed:PerpendicularOffset type="Edged">0.5</sed:PerpendicularOffset>
+ <sed:PerpendicularOffset type="Edged">-0.5</sed:PerpendicularOffset>
</LineSymbolizer>
<LineSymbolizer uom="meter">
<Geometry>