diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 27ca07b..2fc949e 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,7 @@ - + + + @@ -133,7 +135,9 @@ - + + + @@ -267,7 +271,9 @@ - + + + @@ -401,7 +407,9 @@ - + + + @@ -535,7 +543,9 @@ - + + + @@ -669,7 +679,9 @@ - + + + @@ -689,7 +701,12 @@ - + + uses + + + + @@ -823,7 +840,9 @@ - + + + @@ -957,7 +976,9 @@ - + + + @@ -1091,7 +1112,9 @@ - + + + diff --git a/pom.xml b/pom.xml index 78594a2..6c4cc68 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 2.10.0 PRETTY 2.6.2 - 8.4.1 + 8.5.0 ${project.build.directory}/${project.build.finalName} 1.8 diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java index 2866439..94894ae 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java @@ -24,7 +24,6 @@ import org.gcube.portlets.user.geoportaldataviewer.client.ui.map.ExtentMapUtil.P import org.gcube.portlets.user.geoportaldataviewer.client.ui.map.MapView; import com.github.gwtbootstrap.client.ui.Button; -import com.github.gwtbootstrap.client.ui.Modal; import com.github.gwtbootstrap.client.ui.constants.ButtonType; import com.github.gwtbootstrap.client.ui.constants.IconType; import com.google.gwt.core.client.GWT; @@ -39,7 +38,6 @@ import com.google.gwt.user.client.Random; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.FormPanel; import com.google.gwt.user.client.ui.FormPanel.SubmitCompleteEvent; import com.google.gwt.user.client.ui.FormPanel.SubmitCompleteHandler; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/gis/LayerItem.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/gis/LayerItem.java index befdc6c..89a77cf 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/gis/LayerItem.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/gis/LayerItem.java @@ -2,18 +2,13 @@ package org.gcube.portlets.user.geoportaldataviewer.shared.gis; import java.io.Serializable; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import org.gcube.application.geoportalcommon.shared.gis.BoundsMap; -import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerConstants.LayerType; -import org.gcube.portlets.user.geoportaldataviewer.client.util.URLUtil; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.wms.Property; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.wms.ZAxis; -import com.google.gwt.core.client.GWT; - /** * The Class LayerItem. * @@ -953,90 +948,4 @@ public class LayerItem implements Serializable, Cloneable { return builder.toString(); } - /** - * To layer item. - * - * @param layerType the layer type - * @param layerTitle the layer title - * @param layerName the layer name - * @param layerURL the layer URL - * @param mapServerHost the map server host - * @param isExternal the is external - * @param isBase the is base - * @param displayInLayerSwitcher the display in layer switcher - * @param styles the styles - * @param wmsLink the wms link - * @param onTop the on top - * @param wmsNotStandardParams the wms not standard params - * @param isNcWms the is nc wms - * @param UUID the uuid - * @param zAxis the z axis - * @param minResolution the min resolution - * @param maxResolution the max resolution - * @return the layer item - */ - - // TODO Constructor from IndexLayerDV, GCUBESDILAeryDV or direct info - private LayerItem toLayerItem(LayerType layerType, String layerTitle, String layerName, String layerURL, - String mapServerHost, boolean isExternal, boolean isBase, boolean displayInLayerSwitcher, - ArrayList styles, String wmsLink, boolean onTop, HashMap wmsNotStandardParams, - boolean isNcWms, String UUID, ZAxis zAxis, Double minResolution, Double maxResolution) { - -// GWT.log("Add addLayerByWms 1"); - LayerItem layerItem = new LayerItem(); - layerItem.setBaseLayer(isBase); - layerItem.setTitle(layerTitle); - layerItem.setName(layerName); - layerItem.setUrl(layerURL); - layerItem.setMapServerHost(mapServerHost); - // l.setExternal(isExternal); - layerItem.setOpacity(1d); - layerItem.setBuffer(2); - layerItem.setWmsLink(wmsLink); - layerItem.setWmsNotStandardParams(wmsNotStandardParams); - layerItem.setNcWms(isNcWms); - layerItem.setUUID(UUID); - layerItem.setZAxis(zAxis); - layerItem.setMinResolution(minResolution); - layerItem.setMaxResolution(maxResolution); - - switch (layerType) { - - // TODO IMPLEMENT THIS CASE - case RASTER_BASELAYER: - -// l.setHasLegend(false); - layerItem.setBaseLayer(true); - layerItem.setTrasparent(false); - layerItem.setClickData(false); - break; - - case FEATURE_TYPE: - - // CASE FEATURE TYPE - layerItem.setBaseLayer(false); - layerItem.setClickData(true); - layerItem.setTrasparent(true); - break; - - } - - GWT.log("styles " + styles); - - if (styles != null && styles.size() > 0) { - layerItem.setHasLegend(true); - layerItem.setDefaultStyle(styles.get(0)); - layerItem.setStyle(styles.get(0)); - layerItem.setStyles(styles); - } else { - String style = URLUtil.getValueOfParameter("styles", wmsLink); - if (style != null) { // CASE OF STYLE =""; - // TENTATIVE TO GET LEGEND - layerItem.setHasLegend(true); - } - } - GWT.log("Built layer: " + layerItem); - return layerItem; - } - }