Merge pull request '1.0.12' (#10) from 1.0.12 into master

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
 

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.application</groupId>
 	<artifactId>geoportal-logic</artifactId>
-	<version>1.0.10</version>
+	<version>1.0.12</version>
 	<name>Geoportal Logic</name>
 
 
@@ -124,13 +124,13 @@
 	<dependency>
 			<groupId>org.gcube.spatial.data</groupId>
 			<artifactId>gis-interface</artifactId>
-			<version>[2.4.6,3.0.0)</version>
+			<version>[2.4.6-SNAPSHOT,3.0.0)</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.gcube.spatial.data</groupId>
 			<artifactId>geonetwork</artifactId>
-			<version>[3.4.5,4.0.0)</version>
+			<version>[3.4.5-SNAPSHOT,4.0.0)</version>
 		</dependency>
 
 		<dependency>

src/main/java/org/gcube/application/geoportal/managers/ConcessioneManager.java

@@ -65,7 +65,7 @@ public class ConcessioneManager extends AbstractRecordManager<Concessione> {
 			}
 		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<Concessione> {
 			}
 		}
 		
-		
+		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();
 	}
 	

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,