From 23feb1a3c8afc65566e79df0e00c348773cb612f Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 9 Jun 2023 13:54:45 +0200 Subject: [PATCH] Setting initial layer opacity at 0.8 --- .settings/org.eclipse.wst.common.component | 3 --- CHANGELOG.md | 2 +- pom.xml | 4 ++-- .../client/GeoportalDataViewerConstants.java | 3 ++- .../user/geoportaldataviewer/client/LayerManager.java | 2 +- .../geoportaldataviewer/client/gis/OpenLayerMap.java | 5 ++++- .../client/ui/dandd/RangeSlider.java | 11 ++++++----- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 0f58218..753eaa6 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -521,9 +521,6 @@ - - uses - diff --git a/CHANGELOG.md b/CHANGELOG.md index c6df39c..11ba5b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [v3.5.0] +## [v3.5.0-SNAPSHOT] - Supported the cross-filtering [#25074] - Supported the grouped custom layers [#25110] diff --git a/pom.xml b/pom.xml index eda2071..523aedd 100644 --- a/pom.xml +++ b/pom.xml @@ -14,13 +14,13 @@ org.gcube.portlets.user geoportal-data-viewer-app war - 3.5.0 + 3.5.0-SNAPSHOT GeoPortal Data Viewer App The GeoPortal Data Viewer App is an application to access, discovery and navigate the Geoportal projects/documents by a Web-Map Interface - 2.9.0 + 2.10.0 PRETTY 2.6.2 ${project.build.directory}/${project.build.finalName} diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerConstants.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerConstants.java index c1391e4..0a0ddc4 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerConstants.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerConstants.java @@ -25,7 +25,8 @@ public class GeoportalDataViewerConstants { public static final String GET_MAX_ZOOM_LEVEL = OpenLayersMapParameters.OL_MAP_PARAM.maxzoomlevel.name(); public static final String GET_ZOOM = OpenLayersMapParameters.OL_MAP_PARAM.zoom.name(); public static final String GET_CENTER_MAP_TO_LONG_LAT = OpenLayersMapParameters.OL_MAP_PARAM.centermap.name(); - + + public static final Double INITIAL_LAYER_OPACITY = 0.8; public static final int SEARCH_LIMIT_RESULTS_TO_MAXIMUM = 50; public static final DateTimeFormat DATE_TIME_FORMAT = DateTimeFormat.getFormat("dd MMMM yyyy"); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java index ef77a8a..b1fb916 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java @@ -553,7 +553,7 @@ public class LayerManager { theLo = lo; mapOtherLayerObjects.put(layerNameKey, theLo); GWT.log("PROJECT_LAYER mapOtherLayerObjects is: " + mapOtherLayerObjects); - olMap.addWMSDetailLayer(layerItem); + olMap.addWMSDetailLayer(layerItem, GeoportalDataViewerConstants.INITIAL_LAYER_OPACITY); overlayLayerManager.addLayerItem(theLo); } else { GWT.log("Skipping " + lo.getType() + " layer " + theLo.getLayerItem().getName() 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 95fcbae..be37cc3 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 @@ -523,12 +523,14 @@ public abstract class OpenLayerMap { return setCQLFilter; } + /** * Adds the WMS detail layer. * * @param layerItem the layer item + * @param initialOpacity the initial opacity */ - public void addWMSDetailLayer(LayerItem layerItem) { + public void addWMSDetailLayer(LayerItem layerItem, double initialOpacity) { if (wmsDetailsLayerMap == null) wmsDetailsLayerMap = new LinkedHashMap(); @@ -562,6 +564,7 @@ public abstract class OpenLayerMap { Image wmsLayer = new Image(layerOptions); int zIndex = layerOrder.getOffset(LayerOrder.LAYER_TYPE.WMS_DETAIL) + wmsDetailsLayerMap.size() + 1; wmsLayer.setZIndex(zIndex); + wmsLayer.setOpacity(initialOpacity); map.addLayer(wmsLayer); wmsDetailsLayerMap.put(key, wmsLayer); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/RangeSlider.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/RangeSlider.java index f6349de..7a56b12 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/RangeSlider.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/RangeSlider.java @@ -1,5 +1,6 @@ package org.gcube.portlets.user.geoportaldataviewer.client.ui.dandd; +import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerConstants; import org.gcube.portlets.user.geoportaldataviewer.client.events.DoActionOnDetailLayersEvent; import org.gcube.portlets.user.geoportaldataviewer.client.events.DoActionOnDetailLayersEvent.DO_LAYER_ACTION; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.LayerItem; @@ -38,8 +39,8 @@ public class RangeSlider extends Composite { sliderId = "slider-" + Random.nextInt(); theSlider.addClassName("slider"); theSlider.setId(sliderId); - - theSlider.setTitle("Set opacity of "+layer.getName()); + theSlider.setTitle("Set opacity of the layer"); + theSlider.setPropertyObject("value", GeoportalDataViewerConstants.INITIAL_LAYER_OPACITY*100); bindEvents(); } @@ -56,9 +57,9 @@ public class RangeSlider extends Composite { DoActionOnDetailLayersEvent actionChangeOpacity = new DoActionOnDetailLayersEvent( DO_LAYER_ACTION.OPACITY, layer, null); int value = Integer.parseInt((String) theSlider.getPropertyObject("value")); - //GWT.log("opacity int value: "+value); - double opacity = (double) ((double) value/100); - GWT.log("opacity double value: "+opacity); + // GWT.log("opacity int value: "+value); + double opacity = (double) ((double) value / 100); + GWT.log("opacity double value: " + opacity); actionChangeOpacity.setOpacity(opacity); applicationBus.fireEvent(actionChangeOpacity); }