diff --git a/.classpath b/.classpath
index 5cc23e2..ccff2d0 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -35,5 +35,5 @@
-
+
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index b33f01f..e96e5b4 100644
--- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs
+++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
@@ -1,4 +1,4 @@
eclipse.preferences.version=1
-lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-3.2.1-SNAPSHOT
+lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-3.2.1
warSrcDir=src/main/webapp
warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index eab82a9..36a04c4 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
-
+
@@ -48,8 +48,14 @@
-
-
+
+
+
+
+
+
+
+
@@ -99,7 +105,10 @@
-
+
+
+
+
@@ -149,7 +158,10 @@
-
+
+
+
+
@@ -199,7 +211,10 @@
-
+
+
+
+
@@ -249,7 +264,10 @@
-
+
+
+
+
@@ -302,7 +320,10 @@
uses
-
+
+
+
+
@@ -352,7 +373,10 @@
-
+
+
+
+
@@ -402,7 +426,10 @@
-
+
+
+
+
@@ -452,7 +479,10 @@
-
+
+
+
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0d3643..3885b93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- [#24432] Reverting serialization LinkedHashMap to LinkedHashMap.
- Improved Alert UX in case of broken shared link
+- Moved to gwt 2.9.0
## [v3.2.0] - 2023-01-31
diff --git a/pom.xml b/pom.xml
index 9868adf..c56d707 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
- 2.10.0
+ 2.9.0
PRETTY
2.6.2
${project.build.directory}/${project.build.finalName}
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java
index 528de4d..795b99b 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java
@@ -9,7 +9,6 @@ import java.util.Set;
import org.gcube.application.geoportalcommon.shared.GNADataViewerConfigProfile;
import org.gcube.application.geoportalcommon.shared.GeoportalItemReferences;
-import org.gcube.application.geoportalcommon.shared.geoportal.geojson.GeoJSON;
import org.gcube.application.geoportalcommon.shared.geoportal.materialization.IndexLayerDV;
import org.gcube.application.geoportalcommon.shared.geoportal.project.ProjectDV;
import org.gcube.application.geoportalcommon.shared.geoportal.project.RelationshipDV;
@@ -910,8 +909,9 @@ public class GeoportalDataViewer implements EntryPoint {
Feature[] features = geoJson.readFeatures(geoJSONFeatures);
GWT.log("features: " + features);
- olMapMng.getOLMap().addLayerFeaturesAsHighlight(layerItem, features);
+ olMapMng.getOLMap().addLayerFeaturesAsHighlight(layerItem, features, true);
+ /* Fit to extent calculating the features extent
if (projectDV != null) {
GeoJSON spatialReference = projectDV.getSpatialReference();
@@ -922,6 +922,7 @@ public class GeoportalDataViewer implements EntryPoint {
if (transfCoord != null)
olMapMng.getOLMap().setCenter(transfCoord);
}
+ */
}
}
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OpenLayerMap.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OpenLayerMap.java
index 9d7d153..7ff2f16 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OpenLayerMap.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OpenLayerMap.java
@@ -636,7 +636,7 @@ public abstract class OpenLayerMap {
* @param layerItem the layer item
* @param features the features
*/
- public void addLayerFeaturesAsHighlight(LayerItem layerItem, Feature[] features) {
+ public void addLayerFeaturesAsHighlight(LayerItem layerItem, Feature[] features, boolean fitMapToFeaturesExtent) {
removeLayerFeaturesAsHighlight(layerItem.getName());
@@ -649,17 +649,30 @@ public abstract class OpenLayerMap {
style.setStroke(stroke);
Vector vectorSource = OLFactory.createVectorSource();
+
+ EventListener listenerE = new EventListener() {
+
+ @Override
+ public void onEvent(ol.events.Event event) {
+ ol.Extent theExtent = vectorSource.getExtent();
+ //GWT.log(theExtent.toString());
+ map.getView().fit(theExtent);
+
+ }
+ };
+
+ if (fitMapToFeaturesExtent)
+ vectorSource.addChangeListener(listenerE);
+
vectorSource.addFeatures(features);
- GWT.log("features: " + features);
+ // GWT.log("features: " + features);
VectorLayerOptions vectorLayerOptions = new VectorLayerOptions();
vectorLayerOptions.setSource(vectorSource);
vectorLayerOptions.setStyle(style);
- // vectorLayerOptions.setMap(map);
-
- GWT.log("vectorLayerOptions: " + vectorLayerOptions);
+ // GWT.log("vectorLayerOptions: " + vectorLayerOptions);
ol.layer.Vector vector = OLFactory.createVector(vectorLayerOptions);
// vector.setStyle(style);
@@ -669,6 +682,7 @@ public abstract class OpenLayerMap {
vectorLayersHighlighted.put(layerItem.getName(), vector);
map.addLayer(vector);
+
}
/**