diff --git a/.classpath b/.classpath
index 61bb68c..1e9c243 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 3f0dc49..2377aa7 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.4.0-SNAPSHOT
+lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-3.5.0-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 9957ee3..f13f375 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
-
+
@@ -79,8 +79,12 @@
-
-
+
+
+
+
+
+
@@ -161,7 +165,9 @@
-
+
+
+
@@ -242,7 +248,9 @@
-
+
+
+
@@ -323,7 +331,9 @@
-
+
+
+
@@ -404,7 +414,9 @@
-
+
+
+
@@ -488,7 +500,9 @@
uses
-
+
+
+
@@ -569,7 +583,9 @@
-
+
+
+
@@ -650,7 +666,9 @@
-
+
+
+
@@ -731,7 +749,9 @@
-
+
+
+
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 cffe69c..98547e5 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
@@ -59,6 +59,7 @@ import org.gcube.portlets.user.geoportaldataviewer.client.gis.OpenLayerMap;
import org.gcube.portlets.user.geoportaldataviewer.client.resources.GNAImages;
import org.gcube.portlets.user.geoportaldataviewer.client.ui.GeonaDataViewMainPanel;
import org.gcube.portlets.user.geoportaldataviewer.client.ui.cms.project.relation.TimelineManagerStatus;
+import org.gcube.portlets.user.geoportaldataviewer.client.ui.util.OLGeoJSONUtil;
import org.gcube.portlets.user.geoportaldataviewer.client.util.ControlledCallBack;
import org.gcube.portlets.user.geoportaldataviewer.client.util.LoaderIcon;
import org.gcube.portlets.user.geoportaldataviewer.client.util.URLUtil;
@@ -91,12 +92,6 @@ import com.google.gwt.user.client.ui.Widget;
import ol.Coordinate;
import ol.Feature;
-import ol.OLFactory;
-import ol.format.GeoJson;
-import ol.format.GeoJsonFeatureOptions;
-import ol.format.GeoJsonOptions;
-import ol.proj.Projection;
-import ol.proj.ProjectionOptions;
/**
* Entry point classes define onModuleLoad()
.
@@ -295,7 +290,7 @@ public class GeoportalDataViewer implements EntryPoint {
// if (result.getListCustomLayers() != null && result.getListCustomLayers().size() > 0) {
// mainPanel.setCustomLayers(result.getListCustomLayers());
// }
-
+
loadConfigureduGroupedLayersForUCD();
GWT.log("DONE INIT LOAD");
@@ -318,7 +313,6 @@ public class GeoportalDataViewer implements EntryPoint {
RootPanel.get(APP_DIV).add(attributionDiv);
}
-
/**
* Load Overlay Layers and Cross-Filtering layers for UCD
*
@@ -332,13 +326,14 @@ public class GeoportalDataViewer implements EntryPoint {
@Override
public void onFailure(Throwable caught) {
- Window.alert("error: "+caught.getMessage());
+ GWT.log("loadConfigureduGroupedLayersForUCD error for "
+ + GEOPORTAL_DATA_HANDLER.geoportal_grouped_overlay_layers + ": " + caught.getMessage());
}
@Override
public void onSuccess(Map>> result) {
- GWT.log("GEOPORTAL_DATA_HANDLER.geoportal_grouped_overlay_layers returned: ");
+ GWT.log(GEOPORTAL_DATA_HANDLER.geoportal_grouped_overlay_layers +" returned: "+result);
if (result != null && result.size() > 0) {
Map collections = viewerConfiguration.getAvailableCollections();
@@ -355,6 +350,38 @@ public class GeoportalDataViewer implements EntryPoint {
}
}
});
+
+ GeoportalDataViewerServiceAsync.Util.getInstance().getAvaiableCustomGroupedLayersForUCD(
+ GEOPORTAL_DATA_HANDLER.geoportal_grouped_cross_filtering,
+ new AsyncCallback