diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4495d0..15107ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for org.gcube.application.geoportal-logic
+## [v1.0.12] - 2020-12-11
+Fixed missing centroid
+
+## [v1.0.11] - 2020-12-11
+Fixed wms url
+Fixed duplicate posizionamento
+
## [v1.0.10] - 2020-12-11
Fixed filenames
diff --git a/pom.xml b/pom.xml
index d02be84..3c8e90a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
org.gcube.application
geoportal-logic
- 1.0.10
+ 1.0.12
Geoportal Logic
@@ -124,13 +124,13 @@
org.gcube.spatial.data
gis-interface
- [2.4.6,3.0.0)
+ [2.4.6-SNAPSHOT,3.0.0)
org.gcube.spatial.data
geonetwork
- [3.4.5,4.0.0)
+ [3.4.5-SNAPSHOT,4.0.0)
diff --git a/src/main/java/org/gcube/application/geoportal/managers/ConcessioneManager.java b/src/main/java/org/gcube/application/geoportal/managers/ConcessioneManager.java
index 18ceda0..02cf10e 100644
--- a/src/main/java/org/gcube/application/geoportal/managers/ConcessioneManager.java
+++ b/src/main/java/org/gcube/application/geoportal/managers/ConcessioneManager.java
@@ -65,7 +65,7 @@ public class ConcessioneManager extends AbstractRecordManager {
}
if(getRecord().getPosizionamentoScavo()!=null) {
LayerConcessione l=getRecord().getPosizionamentoScavo();
- entityManager.createNativeQuery("Update layerconcessione set record_id="+getRecord().getId()+" where id = "+l.getId()).executeUpdate();
+// entityManager.createNativeQuery("Update layerconcessione set record_id="+getRecord().getId()+" where id = "+l.getId()).executeUpdate();
if(l.getWmsLink()!=null) {
entityManager.createNativeQuery("Update layerconcessione set wmslink='"+l.getWmsLink()+"' where id = "+l.getId()).executeUpdate();
// entityManager.createNativeQuery("Update sdilayerdescriptor set wmslink='"+l.getWMSLink()+"' where id = "+l.getId()).executeUpdate();
@@ -84,7 +84,14 @@ public class ConcessioneManager extends AbstractRecordManager {
}
}
-
+ if(getRecord().getCentroidLat()!=null) {
+ entityManager.createNativeQuery(
+ String.format("Update concessione set centroidlat=%1$f where id=%2$d", getRecord().getCentroidLat(),getRecord().getId())).executeUpdate();
+ }
+ if(getRecord().getCentroidLong()!=null) {
+ entityManager.createNativeQuery(
+ String.format("Update concessione set centroidlong=%1$f where id=%2$d", getRecord().getCentroidLong(),getRecord().getId())).executeUpdate();
+ }
transaction.commit();
}
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 f24b04b..99724d6 100644
--- a/src/main/java/org/gcube/application/geoportal/storage/SDIManager.java
+++ b/src/main/java/org/gcube/application/geoportal/storage/SDIManager.java
@@ -182,7 +182,7 @@ public class SDIManager {
currentElement.setWmsLink(
- String.format("http://%1$s/geoserver/%2$s/wms?"
+ String.format("https://%1$s/geoserver/%2$s/wms?"
+"service=WMS&version=1.1.0&request=GetMap&layers=%2$s:%3$s&"
+ "styles=&bbox=%4$f,%5$f,%6$f,%7$f&srs=%8$s&format=application/openlayers&width=%9$d&height=%10$d",
geoserverHostName,