From 8b7fe2920153f4d754800e08ea55d6922b282deb Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Fri, 4 Dec 2020 12:18:31 +0100
Subject: [PATCH] gis coordinates

---
 CHANGELOG.md                                                | 3 +++
 pom.xml                                                     | 2 +-
 .../geoportal/model/concessioni/LayerConcessione.java       | 2 ++
 .../application/geoportal/model/gis/SDILayerDescriptor.java | 6 ++++--
 .../org/gcube/application/geoportal/storage/SDIManager.java | 6 ++++++
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e25208a..0ee1cd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 # Changelog for org.gcube.application.geoportal-logic
 
+## [v1.0.6-SNAPSHOT] - 2020-12-4
+Fix layer coordinates
+
 ## [v1.0.5] - 2020-12-1
 
 Deletion feature
diff --git a/pom.xml b/pom.xml
index d69dcaa..cbdd395 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.application</groupId>
 	<artifactId>geoportal-logic</artifactId>
-	<version>1.0.5</version>
+	<version>1.0.6-SNAPSHOT</version>
 	<name>Geoportal Logic</name>
 
 
diff --git a/src/main/java/org/gcube/application/geoportal/model/concessioni/LayerConcessione.java b/src/main/java/org/gcube/application/geoportal/model/concessioni/LayerConcessione.java
index 2cd146e..49f3e96 100644
--- a/src/main/java/org/gcube/application/geoportal/model/concessioni/LayerConcessione.java
+++ b/src/main/java/org/gcube/application/geoportal/model/concessioni/LayerConcessione.java
@@ -32,6 +32,8 @@ public class LayerConcessione extends SDILayerDescriptor{
 	
 	//layer
 	private String layerName;
+	private String workspace;
+	
 	@Type(type="text")
 	private String wmsLink;
 	
diff --git a/src/main/java/org/gcube/application/geoportal/model/gis/SDILayerDescriptor.java b/src/main/java/org/gcube/application/geoportal/model/gis/SDILayerDescriptor.java
index 99b0223..6eff299 100644
--- a/src/main/java/org/gcube/application/geoportal/model/gis/SDILayerDescriptor.java
+++ b/src/main/java/org/gcube/application/geoportal/model/gis/SDILayerDescriptor.java
@@ -22,7 +22,9 @@ public abstract class SDILayerDescriptor extends AssociatedContent{
 	public abstract void setLayerName(String layerName);
 	public abstract String getWmsLink();
 	public abstract void setWmsLink(String wmsLink);
-	
-	
+	public abstract void setWorkspace(String workspace);
+	public abstract String getWorkspace();
+	public abstract BBOX getBbox();
+	public abstract void setBbox(BBOX toSet);
 }
 	
\ No newline at end of file
diff --git a/src/main/java/org/gcube/application/geoportal/storage/SDIManager.java b/src/main/java/org/gcube/application/geoportal/storage/SDIManager.java
index 10d81bd..1f2a1c9 100644
--- a/src/main/java/org/gcube/application/geoportal/storage/SDIManager.java
+++ b/src/main/java/org/gcube/application/geoportal/storage/SDIManager.java
@@ -8,6 +8,7 @@ import org.gcube.application.geoportal.model.content.GeoServerContent;
 import org.gcube.application.geoportal.model.content.PersistedContent;
 import org.gcube.application.geoportal.model.content.WorkspaceContent;
 import org.gcube.application.geoportal.model.fault.SDIInteractionException;
+import org.gcube.application.geoportal.model.gis.BBOX;
 import org.gcube.application.geoportal.model.gis.SDILayerDescriptor;
 import org.gcube.application.geoportal.utils.Files;
 import org.gcube.common.storagehub.client.dsl.FileContainer;
@@ -186,6 +187,11 @@ public class SDIManager {
 									DEFAULT_CRS,
 									400,
 									400));
+			
+			currentElement.setWorkspace(workspace);
+			currentElement.setBbox(new BBOX(f.getMaxY(), f.getMaxX(), f.getMinY(), f.getMinX()));
+			
+			
 			// TODO Metadata
 			return content;
 //		} catch (InvalidSourceException | SourceNotSetException | FailedTransferException | InitializationException