From f5785268ef46a4b892f21300b6dd8378ab8c29b2 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Mon, 15 May 2023 15:49:58 +0200 Subject: [PATCH] - Integrated the grouped custom layers configuration [#25110] --- .../materialization/CustomLayerDV.java | 70 +++++++++++++++++ .../GroupedCustomLayersDV.java | 78 +++++++++++++++++++ .../java/org/gcube/application/UCD_Tests.java | 2 +- 3 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/CustomLayerDV.java create mode 100644 src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/GroupedCustomLayersDV.java diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/CustomLayerDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/CustomLayerDV.java new file mode 100644 index 0000000..1607f5f --- /dev/null +++ b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/CustomLayerDV.java @@ -0,0 +1,70 @@ +package org.gcube.application.geoportalcommon.shared.geoportal.materialization; + +import java.io.Serializable; + +/** + * The Class CustomLayerDV. + * + * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it + * + * May 12, 2023 + */ +public class CustomLayerDV implements Serializable { + + String title; + String name; + String wms_url; + boolean display = false; + + public CustomLayerDV() { + + } + + public String getTitle() { + return title; + } + + public String getName() { + return name; + } + + public String getWms_url() { + return wms_url; + } + + public boolean isDisplay() { + return display; + } + + public void setTitle(String title) { + this.title = title; + } + + public void setName(String name) { + this.name = name; + } + + public void setWms_url(String wms_url) { + this.wms_url = wms_url; + } + + public void setDisplay(boolean display) { + this.display = display; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("CustomLayerDV [title="); + builder.append(title); + builder.append(", name="); + builder.append(name); + builder.append(", wms_url="); + builder.append(wms_url); + builder.append(", display="); + builder.append(display); + builder.append("]"); + return builder.toString(); + } + +} diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/GroupedCustomLayersDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/GroupedCustomLayersDV.java new file mode 100644 index 0000000..e43bbd5 --- /dev/null +++ b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/GroupedCustomLayersDV.java @@ -0,0 +1,78 @@ +package org.gcube.application.geoportalcommon.shared.geoportal.materialization; + +import java.io.Serializable; +import java.util.List; + +import org.gcube.application.geoportalcommon.shared.geoportal.config.GeoportalConfigurationID; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * The Class GroupedCustomLayersDV. + * + * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it + * + * May 12, 2023 + */ +public class GroupedCustomLayersDV implements Serializable, GeoportalConfigurationID { + + private String name; + private String description; + + @JsonProperty(value = "layers") + private List listCustomLayers; + + @Override + public String getID() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setID(String configID) { + // TODO Auto-generated method stub + + } + + public GroupedCustomLayersDV() { + + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public List getListCustomLayers() { + return listCustomLayers; + } + + public void setName(String name) { + this.name = name; + } + + public void setDescription(String description) { + this.description = description; + } + + public void setListCustomLayers(List listCustomLayers) { + this.listCustomLayers = listCustomLayers; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("GroupedCustomLayersDV [name="); + builder.append(name); + builder.append(", description="); + builder.append(description); + builder.append(", listCustomLayers="); + builder.append(listCustomLayers); + builder.append("]"); + return builder.toString(); + } + +} diff --git a/src/test/java/org/gcube/application/UCD_Tests.java b/src/test/java/org/gcube/application/UCD_Tests.java index efaf2ce..bc60d9a 100644 --- a/src/test/java/org/gcube/application/UCD_Tests.java +++ b/src/test/java/org/gcube/application/UCD_Tests.java @@ -92,7 +92,7 @@ public class UCD_Tests { * * @return the client */ - //@Before + @Before public void getClient() { readContextSettings(); ScopeProvider.instance.set(CONTEXT);