From e6f0f3671feffa4c9e431f8ec7693fbec9eba050 Mon Sep 17 00:00:00 2001
From: latlon team <info@lat-lon.de>
Date: Tue, 28 Nov 2023 07:30:01 +0000
Subject: [PATCH] Code drop
- XPLANBOX-2549 - added xplan-inspireplu and xplan-root (58007e67f)
- XPLANBOX-2302 - set activateValidityPeriodDialog to deprecated (4ac037e36)
- XPLANBOX-2553 - Fix typo (3954419bd)
- XPLANBOX-2302 - enhanced documentation: deprecated Gueltigkeitszeitraum (479eb3648)
- XPLANBOX-2521 - enhanced documentation: deprecated defaultCrs and chooseCrs (e1a832d44)
- XPLANBOX-2521 - set isCrsSet to deprecated (d8ec76475)
- XPLANBOX-2521 - set defaultCrs and chooseCrs to deprecated (fa5954cd3)
- XPLANBOX-2302 - set gueltigkeitszeitraum to deprecated (c1be350f6)
- XPLANBOX-2549 - fixed xplan-dokumente-api, added xplan-cli-docker (69eb84114)
Co-authored-by: Dirk Stenger <stenger@lat-lon.de>
Co-authored-by: Lyn Elisa Goltz <goltz@lat-lon.de>
Dropped from commit: 026db019cff0920ca0a83b314b1067f3aabb4221
---
.gitlab-ci.yml | 5 ++--
ci/all-kaniko-builds.gitlab-ci.yml | 28 +++++++++++++++++--
.../handler/EditGueltigkeitHandler.java | 1 +
.../api/manager/v1/PlanGueltigkeitApi.java | 12 ++++----
.../api/manager/v1/model/Zeitraum.java | 1 +
.../managerWebConfiguration.properties | 4 +--
.../feature/FeatureCollectionManipulator.java | 9 ++++++
.../web/shared/edit/ValidityPeriod.java | 1 +
.../manager/web/shared/edit/XPlanToEdit.java | 2 ++
.../xplan/core/manager/db/model/Plan.java | 18 ++++++++++++
.../de/latlon/xplan/manager/XPlanManager.java | 1 +
.../manager/edit/XPlanToEditFactory.java | 3 ++
.../src/main/asciidoc/XPlanManager_Web.adoc | 2 ++
.../src/main/asciidoc/XPlanWMS.adoc | 2 ++
.../src/main/asciidoc/bekannteProbleme.adoc | 2 +-
.../manager/gueltigkeitszeitraum.adoc | 4 ++-
.../manager/koordinatensystem.adoc | 2 ++
.../web/client/gui/dialog/CrsDialog.java | 7 ++---
.../gui/dialog/ValidityPeriodDialog.java | 7 ++---
.../validityPeriod/ValidityPeriodPanel.java | 10 +++----
.../web/client/service/ManagerService.java | 1 +
.../service/rest/ManagerController.java | 1 +
.../web/shared/ManagerWebConfiguration.java | 3 ++
.../managerWebConfiguration.properties | 4 +--
.../ArchiveValidityPeriodInspector.java | 1 +
.../DefaultValidityPeriodInspector.java | 1 +
.../PreValidityPeriodInspector.java | 1 +
.../visibility/ValidityPeriodInspector.java | 1 +
.../src/main/workspace/services/wmspre.xml | 1 +
29 files changed, 106 insertions(+), 29 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f31b7d813..1f7a8ed19a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,16 +72,17 @@ maven-prepare-docker-contexts-cli:
maven-prepare-docker-contexts-web-apps:
extends: .maven-prepare-docker-contexts
variables:
- mvnProjects: ':xplan-manager-web,:xplan-validator-web'
+ mvnProjects: ':xplan-manager-web,:xplan-validator-web,:xplan-root'
artifacts:
paths:
- './xplan-webapps/xplan-manager-web/**/target/docker/**/tmp/docker-build.tar.gz'
- './xplan-webapps/xplan-validator-web/**/target/docker/**/tmp/docker-build.tar.gz'
+ - './xplan-webapps/xplan-root/**/target/docker/**/tmp/docker-build.tar.gz'
maven-prepare-docker-contexts-others:
extends: .maven-prepare-docker-contexts
variables:
- mvnProjects: ':xplan-services-docker,:xplan-tests-soapui,:xplan-docker-tomcat,:xplan-docker-tomcat-gdal,:xplan-database-scripts,:xplan-docker-mapserver,:xplan-validator-wms'
+ mvnProjects: ':xplan-services-docker,:xplan-tests-soapui,:xplan-docker-tomcat,:xplan-docker-tomcat-gdal,:xplan-database-scripts,:xplan-docker-mapserver,:xplan-validator-wms,:xplan-inspireplu'
artifacts:
paths:
- './xplan-docker/**/target/docker/**/tmp/docker-build.tar.gz'
diff --git a/ci/all-kaniko-builds.gitlab-ci.yml b/ci/all-kaniko-builds.gitlab-ci.yml
index 74b3fd84dc..3f4b5499e0 100644
--- a/ci/all-kaniko-builds.gitlab-ci.yml
+++ b/ci/all-kaniko-builds.gitlab-ci.yml
@@ -58,7 +58,7 @@ kaniko:xplan-docker-volume-init:
kaniko:xplan-dokumente-api:
extends: .kaniko:build
variables:
- dockerImageName: xplan-validator-api
+ dockerImageName: xplan-dokumente-api
tarGzFile: xplan-api/xplan-api-dokumente/target/docker/xplanbox/xplan-dokumente-api/tmp/docker-build.tar.gz
needs:
- maven-prepare-docker-contexts-apis
@@ -133,4 +133,28 @@ kaniko:xplan-validator-wms:
tarGzFile: xplan-webservices/xplan-validator-wms/target/docker/xplanbox/xplan-validator-wms/tmp/docker-build.tar.gz
needs:
- maven-prepare-docker-contexts-others
- - kaniko:xplan-docker-tomcat
\ No newline at end of file
+ - kaniko:xplan-docker-tomcat
+
+kaniko:xplan-cli-docker:
+ extends: .kaniko:build
+ variables:
+ dockerImageName: xplan-cli-docker
+ tarGzFile: xplan-cli/xplan-cli-docker/target/docker/xplanbox/xplan-cli/tmp/docker-build.tar
+ needs:
+ - maven-prepare-docker-contexts-cli
+
+kaniko:xplan-inspireplu:
+ extends: .kaniko:build
+ variables:
+ dockerImageName: xplan-inspireplu
+ tarGzFile: xplan-webservices/xplan-inspireplu/target/docker/xplanbox/xplan-inspireplu/tmp/docker-build.tar
+ needs:
+ - maven-prepare-docker-contexts-others
+
+kaniko:xplan-root:
+ extends: .kaniko:build
+ variables:
+ dockerImageName: xplan-root
+ tarGzFile: xplan-webapps/xplan-root/target/docker/xplanbox/xplan-root/tmp/docker-build.tar
+ needs:
+ - maven-prepare-docker-contexts-web-apps
\ No newline at end of file
diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditGueltigkeitHandler.java b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditGueltigkeitHandler.java
index 81c81a37fe..a7e7da416d 100644
--- a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditGueltigkeitHandler.java
+++ b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditGueltigkeitHandler.java
@@ -32,6 +32,7 @@ import java.util.Collections;
/**
* Handles editing of Zeitraum.
*
+ * @deprecated will be removed in a future version.
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
*/
@Component
diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanGueltigkeitApi.java b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanGueltigkeitApi.java
index 94dba392fc..5ee3a56b99 100644
--- a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanGueltigkeitApi.java
+++ b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanGueltigkeitApi.java
@@ -41,6 +41,7 @@ import javax.ws.rs.Produces;
/**
* Controller class for handling access to the gueltigkeit resource of a plan.
*
+ * @deprecated will be removed in a future version.
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
* @since 4.4
*/
@@ -59,11 +60,9 @@ public class PlanGueltigkeitApi {
@ApiResponse(responseCode = "400",
description = "Unsupported plan version or planID is not a valid int value"),
@ApiResponse(responseCode = "404", description = "Invalid planID, plan not found"),
- @ApiResponse(responseCode = "406", description = "Requested format is not available"), })
- public Zeitraum getGueltigkeit(
- @PathParam("planId") @Parameter(description = "ID of the plan gueltigkeit to be returned",
- example = "123") String planId)
- throws Exception {
+ @ApiResponse(responseCode = "406", description = "Requested format is not available"), },
+ description = "deprecated: Gueltigkeitszeitraum will be removed in a future version.", deprecated = true)
+ public Zeitraum getGueltigkeit(@PathParam("planId") @Parameter(example = "123") String planId) throws Exception {
return editGueltigkeitHandler.retrieveGueltigkeit(planId);
}
@@ -80,7 +79,8 @@ public class PlanGueltigkeitApi {
@ApiResponse(responseCode = "406", description = "Requested format is not available"),
@ApiResponse(responseCode = "422", description = "Request body contains invalid content") },
requestBody = @RequestBody(content = {
- @Content(mediaType = "application/json", schema = @Schema(implementation = Zeitraum.class)) }))
+ @Content(mediaType = "application/json", schema = @Schema(implementation = Zeitraum.class)) }),
+ description = "deprecated: Gueltigkeitszeitraum will be removed in a future version.", deprecated = true)
public Zeitraum replaceGueltigkeit(@PathParam("planId") @Parameter(description = "ID of the plan to be returned",
example = "123") String planId, @Valid Zeitraum zeitraum) throws Exception {
return editGueltigkeitHandler.replaceGueltigkeit(planId, zeitraum);
diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Zeitraum.java b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Zeitraum.java
index 592c0e1338..9fccdde49e 100644
--- a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Zeitraum.java
+++ b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Zeitraum.java
@@ -33,6 +33,7 @@ import java.util.Objects;
/**
* Datatype for Zeitraum.
*
+ * @deprecated will be removed in a future version.
* @since 4.4
*/
@XmlRootElement
diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/managerWebConfiguration.properties b/xplan-configuration/xplan-manager-config/src/main/resources/managerWebConfiguration.properties
index 57120b994e..33681202a9 100644
--- a/xplan-configuration/xplan-manager-config/src/main/resources/managerWebConfiguration.properties
+++ b/xplan-configuration/xplan-manager-config/src/main/resources/managerWebConfiguration.properties
@@ -23,13 +23,13 @@
activateInternalIdDialog=${isInternalIdDialogActivated}
# enables the legislative status dialog
activateLegislationStatusDialog=${isLegislationStatusDialogActivated}
-# enables the validity period dialog
+# enables the validity period dialog (deprecated)
activateValidityPeriodDialog=${isValidityPeriodDialogActivated}
# activates the editor function
activateEditor=${isEditorActivated}
# enables the function to transform a plan to INSPIRE PLU
activatePublishingInspirePlu=${isPublishingInspirePluActivated}
-# crs dialog
+# crs dialog (deprecated)
defaultCrs=${defaultCrs}
chooseCrs=${chooseCrs}
# filter (deprecated)
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulator.java b/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulator.java
index 668710fd30..2241b20e0c 100644
--- a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulator.java
+++ b/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulator.java
@@ -52,8 +52,14 @@ public class FeatureCollectionManipulator {
private static final String XPLAN_MGR_PLAN_ID_PROP_NAME = "xplanMgrPlanId";
+ /**
+ * @deprecated will be removed in a future version.
+ */
private static final String START_DATE_TIME_PROP_NAME = "gueltigkeitBeginn";
+ /**
+ * @deprecated will be removed in a future version.
+ */
private static final String END_DATE_TIME_PROP_NAME = "gueltigkeitEnde";
/**
@@ -142,6 +148,9 @@ public class FeatureCollectionManipulator {
addDateProperty(feature, featureType, WMS_SORT_DATE_PROP_NAME, releaseDate);
}
+ /**
+ * @deprecated will be removed in a future version.
+ */
private void addStartAndEndDateTimeProperty(Date beginValidity, Date endValidity, Feature feature,
FeatureType featureType) {
if (beginValidity != null)
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ValidityPeriod.java b/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ValidityPeriod.java
index 58fb2d236b..06a5411db4 100644
--- a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ValidityPeriod.java
+++ b/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ValidityPeriod.java
@@ -26,6 +26,7 @@ import java.util.Date;
/**
* Encapsulates the validity period of a plan.
*
+ * @deprecated will be removed in a future version.
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz</a>
* @version $Revision: $, $Date: $
*/
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/XPlanToEdit.java b/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/XPlanToEdit.java
index 0ea1e10202..0a2e0749ea 100644
--- a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/XPlanToEdit.java
+++ b/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/XPlanToEdit.java
@@ -72,6 +72,7 @@ public class XPlanToEdit {
}
/**
+ * @deprecated will be removed in a future version.
* @return the validityPeriod, never <code>null</code>
*/
public ValidityPeriod getValidityPeriod() {
@@ -81,6 +82,7 @@ public class XPlanToEdit {
}
/**
+ * @deprecated will be removed in a future version.
* @param validityPeriod the validityPeriod to set, may be <code>null</code>
*/
public void setValidityPeriod(ValidityPeriod validityPeriod) {
diff --git a/xplan-core/xplan-core-manager-db/src/main/java/de/latlon/xplan/core/manager/db/model/Plan.java b/xplan-core/xplan-core-manager-db/src/main/java/de/latlon/xplan/core/manager/db/model/Plan.java
index e10866ea57..3c186f1474 100644
--- a/xplan-core/xplan-core-manager-db/src/main/java/de/latlon/xplan/core/manager/db/model/Plan.java
+++ b/xplan-core/xplan-core-manager-db/src/main/java/de/latlon/xplan/core/manager/db/model/Plan.java
@@ -310,27 +310,45 @@ public class Plan {
return this;
}
+ /**
+ * @deprecated will be removed in a future version.
+ */
public Date getGueltigkeitbeginn() {
return gueltigkeitbeginn;
}
+ /**
+ * @deprecated will be removed in a future version.
+ */
public void setGueltigkeitbeginn(Date gueltigkeitbeginn) {
this.gueltigkeitbeginn = gueltigkeitbeginn;
}
+ /**
+ * @deprecated will be removed in a future version.
+ */
public Plan gueltigkeitbeginn(Date gueltigkeitbeginn) {
this.gueltigkeitbeginn = gueltigkeitbeginn;
return this;
}
+ /**
+ * @deprecated will be removed in a future version.
+ */
public Date getGueltigkeitende() {
return gueltigkeitende;
}
+ /**
+ * @deprecated will be removed in a future version.
+ */
public void setGueltigkeitende(Date gueltigkeitende) {
this.gueltigkeitende = gueltigkeitende;
}
+ /**
+ * @deprecated will be removed in a future version.
+ */
public Plan gueltigkeitende(Date gueltigkeitende) {
this.gueltigkeitende = gueltigkeitende;
return this;
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/XPlanManager.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/XPlanManager.java
index ac1e6f9608..e975d6fc5e 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/XPlanManager.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/XPlanManager.java
@@ -219,6 +219,7 @@ public class XPlanManager {
/**
* Check if the crs is set in target file.
+ * @deprecated will be removed in a future version
* @param archiveFileName path to the file
* @return true if crs is set, false if crs is not set
* @throws IOException
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java
index 718274b2c2..08481ddfe5 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java
@@ -122,6 +122,9 @@ public class XPlanToEditFactory {
return xPlanToEdit;
}
+ /**
+ * @deprecated will be removed in a future version.
+ */
private void setValidityPeriod(AdditionalPlanData additionalPlanData, XPlanToEdit xPlanToEdit) {
if (additionalPlanData != null) {
additionalPlanData.getStartDateTime();
diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanManager_Web.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanManager_Web.adoc
index 7dd7ecf823..ef83357a5e 100644
--- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanManager_Web.adoc
+++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanManager_Web.adoc
@@ -120,6 +120,8 @@ unbeabsichtigt zu einer Zustandsänderung des Plans kommen kann!
Entsprechung im XPlanGML. Die Angabe des Zeitraums, wie sie beim Import
erfolgt ist, wird beim Ändern des Zeitraums überschrieben.
+IMPORTANT: Die Möglichkeit einen Gültigkeitszeitraum anzugeben ist veraltet, das Editieren des Gültigkeitszeitraum wird in zukünftigen Versionen der xPlanBox entfernt.
+
*Änderungen*
bis XPlanGML 5.4:
diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanWMS.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanWMS.adoc
index 4ea954305b..c25831c2e3 100644
--- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanWMS.adoc
+++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanWMS.adoc
@@ -226,6 +226,8 @@ Wird der XPlanWMSInAufstellung innerhalb des gewählten Zeitraums angefragt, so
NOTE: Ausnahme: Die Sichtbarkeit der Layer, die den Geltungsbereich darstellen, werden nicht über den Gültigkeitszeitraum verändert und werden immer angezeigt.
+IMPORTANT: Die Möglichkeit einen Gültigkeitszeitraum anzugeben ist veraltet und wird in zukünftigen Versionen der xPlanBox entfernt.
+
[[xplanwms-getfeatureinfo]]
==== GetFeatureInfo
diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/bekannteProbleme.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/bekannteProbleme.adoc
index 96a3a6aaba..ea210fe1a8 100644
--- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/bekannteProbleme.adoc
+++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/bekannteProbleme.adoc
@@ -34,7 +34,7 @@ ein FPlan mit Rasterdaten.
=== XPlanWMS - Darstellung von Plänen mit Gültigkeitszeitraum
-Wenn beim Import eines Plans über den XPlanManager ein Gültigkeitszeitraum angegeben wird, werden derzeit keine Vektordaten bei GetMap-Anfragen an den XPlanWMS angezeigt. Dies gilt für alle XPlanWMS unabhängig vom Planststatus.
+Wenn beim Import eines Plans über den XPlanManager ein Gültigkeitszeitraum angegeben wird, werden derzeit keine Vektordaten bei GetMap-Anfragen an den XPlanWMS angezeigt. Dies gilt für alle XPlanWMS unabhängig vom Planstatus.
=== XPlanManagerWeb - Anzeige der Pläne auf der letzten Seite
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/gueltigkeitszeitraum.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/gueltigkeitszeitraum.adoc
index b8c040e8ee..bba2de632c 100644
--- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/gueltigkeitszeitraum.adoc
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/gueltigkeitszeitraum.adoc
@@ -28,4 +28,6 @@ Dazu ist folgender Abschnitt in der Datei _<DEEGREE_WORKSPACE_ROOT>/xplansyn-wms
<wms:CategoryLayerIdentifier>SO_Planraster</wms:CategoryLayerIdentifier>
<wms:CategoryLayerIdentifier>soplanraster_sortiert</wms:CategoryLayerIdentifier>
</wms:VisibilityInspector>
-----
\ No newline at end of file
+----
+
+IMPORTANT: Die Möglichkeit einen Gültigkeitszeitraum für einen Plan anzugeben ist veraltet, die dazugehörigen Konfigurationsmöglichkeiten werden in zukünftigen Versionen der xPlanBox entfernt.
\ No newline at end of file
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/koordinatensystem.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/koordinatensystem.adoc
index dc513ef6ab..429bfdb7b7 100644
--- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/koordinatensystem.adoc
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/koordinatensystem.adoc
@@ -24,6 +24,8 @@ _chooseCrs_ konfiguriert werden:
chooseCrs=EPSG:4326,EPSG:25833,EPSG:31466,EPSG:31467,EPSG:31468,EPSG:31469
----
+IMPORTANT: Die Konfiguration des Koordinatenreferenzsystems der Vektordaten ist veraltet und wird in zukünftigen Versionen der xPlanBox entfernt. Das Koordinatenreferenzsystem der Vektordaten muss gemäß der Konformitätsregel 2.1.3 Koordinaten-Referenzsysteme (CRS) im XPlanGML gesetzt sein.
+
[[crs-rasterdaten]]
==== Rasterdaten
diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/CrsDialog.java b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/CrsDialog.java
index 033305b983..bd31087818 100644
--- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/CrsDialog.java
+++ b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/CrsDialog.java
@@ -20,8 +20,6 @@
*/
package de.latlon.xplan.manager.web.client.gui.dialog;
-import static com.google.gwt.user.client.ui.HasHorizontalAlignment.ALIGN_LEFT;
-
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ChangeEvent;
import com.google.gwt.event.dom.client.ChangeHandler;
@@ -32,17 +30,18 @@ import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.RadioButton;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-
import de.latlon.xplan.manager.web.client.i18n.XPlanWebMessages;
import de.latlon.xplan.manager.web.shared.ManagerWebConfiguration;
+import static com.google.gwt.user.client.ui.HasHorizontalAlignment.ALIGN_LEFT;
+
/**
* Wizard to select a crs.
*
+ * @deprecated will be removed in a future version.
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz</a>
* @author <a href="mailto:wanhoff@lat-lon.de">Jeronimo Wanhoff</a>
* @author <a href="mailto:stenger@lat-lon.de">Dirk Stenger</a>
- * @version $Revision: $, $Date: $
*/
public class CrsDialog extends WizardDialogBox {
diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/ValidityPeriodDialog.java b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/ValidityPeriodDialog.java
index 59cd3e24f6..d18f7d6ff8 100644
--- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/ValidityPeriodDialog.java
+++ b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/ValidityPeriodDialog.java
@@ -20,22 +20,21 @@
*/
package de.latlon.xplan.manager.web.client.gui.dialog;
-import java.util.Date;
-
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.VerticalPanel;
-
import de.latlon.xplan.manager.web.client.gui.widget.Validable;
import de.latlon.xplan.manager.web.client.gui.widget.ValidityPeriodInput;
import de.latlon.xplan.manager.web.client.i18n.XPlanWebMessages;
+import java.util.Date;
+
/**
* Dialog to set the validity period of a plan.
*
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz</a>
- * @version $Revision: $, $Date: $
+ * @deprecated class will be removed in a future version.
*/
public class ValidityPeriodDialog extends WizardDialogBox implements Validable {
diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/validityPeriod/ValidityPeriodPanel.java b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/validityPeriod/ValidityPeriodPanel.java
index 65cc020a31..a2e66078fc 100644
--- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/validityPeriod/ValidityPeriodPanel.java
+++ b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/validityPeriod/ValidityPeriodPanel.java
@@ -20,23 +20,23 @@
*/
package de.latlon.xplan.manager.web.client.gui.editor.validityPeriod;
-import static com.google.gwt.user.client.ui.HasHorizontalAlignment.ALIGN_CENTER;
-
-import java.util.Date;
-
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.CaptionPanel;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-
import de.latlon.xplan.manager.web.client.gui.widget.Validable;
import de.latlon.xplan.manager.web.client.gui.widget.ValidityPeriodInput;
import de.latlon.xplan.manager.web.client.i18n.XPlanWebMessages;
import de.latlon.xplan.manager.web.shared.edit.ValidityPeriod;
+import java.util.Date;
+
+import static com.google.gwt.user.client.ui.HasHorizontalAlignment.ALIGN_CENTER;
+
/**
* CaptionPanel with editor for the validity period section.
*
+ * @deprecated will be removed in a future version.
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz</a>
*/
public class ValidityPeriodPanel extends CaptionPanel implements Validable {
diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/ManagerService.java b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/ManagerService.java
index 8709e6a365..0ea44e4d4c 100644
--- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/ManagerService.java
+++ b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/ManagerService.java
@@ -120,6 +120,7 @@ public interface ManagerService extends RestService {
@GET
@Produces(APPLICATION_JSON)
@Path("/crs/{id}")
+ @Deprecated
void isCrsSet(@PathParam("id") String id, MethodCallback<Boolean> callback);
@GET
diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/rest/ManagerController.java b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/rest/ManagerController.java
index 6d2ae06bc1..c86595cf5d 100644
--- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/rest/ManagerController.java
+++ b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/rest/ManagerController.java
@@ -396,6 +396,7 @@ public class ManagerController {
@RequestMapping(value = "/crs/{id}", method = GET)
@ResponseBody
+ @Deprecated
// @formatter:off
public boolean isCrsSet( @PathVariable String id,@Context HttpServletRequest request, @Context HttpServletResponse response )
throws Exception {
diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/ManagerWebConfiguration.java b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/ManagerWebConfiguration.java
index a3b8c05196..6333ea0325 100644
--- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/ManagerWebConfiguration.java
+++ b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/ManagerWebConfiguration.java
@@ -109,6 +109,7 @@ public class ManagerWebConfiguration implements Serializable {
/**
* @return <code>true</code> if the dialog to select the validity period of a plan
* should be activated, <code>false</code> otherwise
+ * @deprecated method will be removed in a future version.
*/
public boolean isValidityPeriodActivated() {
return validityPeriodActivated;
@@ -132,6 +133,7 @@ public class ManagerWebConfiguration implements Serializable {
/**
* @return default crs of the crs dialog, never <code>null</code>
+ * @deprecated method will be removed in a future version.
*/
public String getCrsDialogDefaultCrs() {
return crsDialogDefaultCrs;
@@ -139,6 +141,7 @@ public class ManagerWebConfiguration implements Serializable {
/**
* @return list of possible crs for the crs dialog, never <code>null</code>
+ * @deprecated method will be removed in a future version.
*/
public String[] getCrsDialogChooseCrs() {
if (crsDialogChooseCrs == null)
diff --git a/xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/server/configuration/managerWebConfiguration.properties b/xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/server/configuration/managerWebConfiguration.properties
index 37d8d784bb..b91f3afcdb 100644
--- a/xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/server/configuration/managerWebConfiguration.properties
+++ b/xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/server/configuration/managerWebConfiguration.properties
@@ -23,13 +23,13 @@
activateInternalIdDialog=false
# enables the legislative status dialog
activateLegislationStatusDialog=true
-# enables the validity period dialog
+# enables the validity period dialog (deprecated)
activateValidityPeriodDialog=true
# activates the editor function
activateEditor=true
# enables the function to transform a plan to INSPIRE PLU
activatePublishingInspirePlu=false
-# crs dialog
+# crs dialog (deprecated)
defaultCrs=EPSG:25832
chooseCrs=EPSG:4326,EPSG:25833,EPSG:31466,EPSG:31467,EPSG:31468,EPSG:31469
# filter (deprecated)
diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/ArchiveValidityPeriodInspector.java b/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/ArchiveValidityPeriodInspector.java
index e364545078..8e21aee798 100644
--- a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/ArchiveValidityPeriodInspector.java
+++ b/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/ArchiveValidityPeriodInspector.java
@@ -23,6 +23,7 @@ package de.latlon.xplan.wms.visibility;
/**
* A {@link ValidityPeriodInspector} for schema 'xplansynarchive'
*
+ * @deprecated The VisibilityInspector will be removed in a future version.
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
*/
public class ArchiveValidityPeriodInspector extends ValidityPeriodInspector {
diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/DefaultValidityPeriodInspector.java b/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/DefaultValidityPeriodInspector.java
index 02fedafe64..8fc645b0d0 100644
--- a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/DefaultValidityPeriodInspector.java
+++ b/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/DefaultValidityPeriodInspector.java
@@ -23,6 +23,7 @@ package de.latlon.xplan.wms.visibility;
/**
* A {@link ValidityPeriodInspector} for schema 'xplansyn'
*
+ * @deprecated The VisibilityInspector will be removed in a future version.
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
*/
public class DefaultValidityPeriodInspector extends ValidityPeriodInspector {
diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/PreValidityPeriodInspector.java b/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/PreValidityPeriodInspector.java
index e5f3526546..46835eb96c 100644
--- a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/PreValidityPeriodInspector.java
+++ b/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/PreValidityPeriodInspector.java
@@ -23,6 +23,7 @@ package de.latlon.xplan.wms.visibility;
/**
* A {@link ValidityPeriodInspector} for schema 'xplansynpre'
*
+ * @deprecated The VisibilityInspector will be removed in a future version.
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
*/
public class PreValidityPeriodInspector extends ValidityPeriodInspector {
diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/ValidityPeriodInspector.java b/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/ValidityPeriodInspector.java
index e5308fe541..5616e06088 100644
--- a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/ValidityPeriodInspector.java
+++ b/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/ValidityPeriodInspector.java
@@ -41,6 +41,7 @@ import java.sql.Timestamp;
* if currently valid according the validity period. Subclasses have to specify the
* database schema.
*
+ * @deprecated The VisibilityInspector will be removed in a future version.
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
*/
public abstract class ValidityPeriodInspector implements LayerVisibilityInspector {
diff --git a/xplan-workspaces/src/main/workspace/services/wmspre.xml b/xplan-workspaces/src/main/workspace/services/wmspre.xml
index cabc0a7db9..154d011c0e 100644
--- a/xplan-workspaces/src/main/workspace/services/wmspre.xml
+++ b/xplan-workspaces/src/main/workspace/services/wmspre.xml
@@ -36,6 +36,7 @@
<wms:ThemeId>lplanpreraster</wms:ThemeId>
<wms:ThemeId>rplanpreraster</wms:ThemeId>
<wms:ThemeId>soplanpreraster</wms:ThemeId>
+ <!--Deprecated: The VisibilityInspector will be removed in a future version. -->
<wms:VisibilityInspector>
<wms:JavaClass>de.latlon.xplan.wms.visibility.PreValidityPeriodInspector</wms:JavaClass>
<wms:CategoryLayerIdentifier>BP_Planraster</wms:CategoryLayerIdentifier>
--
GitLab