From b53fe20a6f2a390b71fcfc02cb90b2fc534ec962 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Thu, 15 Dec 2022 15:39:08 +0100 Subject: [PATCH] Fix - reduced the bounding boxing when resolving a project by share link --- CHANGELOG.md | 3 ++- .../user/geoportaldataviewer/client/LayerManager.java | 3 +++ .../user/geoportaldataviewer/client/OLMapManager.java | 7 ++++--- .../client/ui/GeonaDataViewMainPanel.java | 3 --- .../server/GeoportalDataViewerServiceImpl.java | 6 +++++- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c26fd2..48f8e45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,10 @@ 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.0.1-SNAPSHOT] - 2022-12-13 +## [v3.0.1-SNAPSHOT] - 2022-12-15 - [#24300] Improved the GUI of the search functionality when multiple collections are available. +- Fixing minor issue on bounding boxing when resolving a project by share link ## [v3.0.0] - 2022-11-28 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 e1d5792..e2177f1 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 @@ -149,6 +149,9 @@ public class LayerManager { mapBBOX.setCrs(MAP_PROJECTION.EPSG_4326.getName()); GWT.log("Bounds is: " + mapBBOX); + GWT.log("Bounds to" + MAP_PROJECTION.EPSG_4326.getName() + " Long/Lat: " + mapBBOX.getLowerLeftY() + + "," + mapBBOX.getLowerLeftX() + "," + mapBBOX.getUpperRightY() + "," + + mapBBOX.getUpperRightX()); GWT.log("MAX_WFS_FEATURES is: " + GeoportalDataViewerConstants.MAX_WFS_FEATURES); // GeoportalDataViewerConstants.print("calling getDataResult"); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/OLMapManager.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/OLMapManager.java index 24fa9b6..02a346d 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/OLMapManager.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/OLMapManager.java @@ -166,15 +166,16 @@ public class OLMapManager { // geoWidth = (bboxWidth / w) * (14 / 2); geoWidth = (bboxWidth / w) * (16 / 2); } else { - // data point selection for coordinate loaded from concessione - geoWidth = (bboxWidth / w) * (2); + // data point selection for coordinate loaded from the centroid + geoWidth = (bboxWidth / w) / 20; + GWT.log("geo width: "+geoWidth); } double x1 = Math.min(lon + geoWidth, lon - geoWidth); double x2 = Math.max(lon + geoWidth, lon - geoWidth); double y1 = Math.min(lat + geoWidth, lat - geoWidth); double y2 = Math.max(lat + geoWidth, lat - geoWidth); - // GWT.log("("+x1+","+y1+")("+x2+","+y2+")"); + //GWT.log("("+x1+","+y1+")("+x2+","+y2+")"); GeoQuery select = new GeoQuery(x1, y1, x2, y2, TYPE.POINT); return select; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.java index 1cecd06..0a4c415 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.java @@ -32,7 +32,6 @@ import com.github.gwtbootstrap.client.ui.CheckBox; import com.github.gwtbootstrap.client.ui.DropdownButton; import com.github.gwtbootstrap.client.ui.ListBox; import com.github.gwtbootstrap.client.ui.NavLink; -import com.github.gwtbootstrap.client.ui.NavList; import com.github.gwtbootstrap.client.ui.Paragraph; import com.github.gwtbootstrap.client.ui.constants.IconType; import com.google.gwt.core.client.GWT; @@ -59,8 +58,6 @@ import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; -import ol.has.Has; - /** * The Class GeonaDataViewMainPanel. * diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java index c81b992..51adaa4 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java @@ -972,7 +972,11 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme @Override public List getDataResult(List layerObjects, String mapSrsName, BoundsMap selectBBOX, int maxWFSFeature, double zoomLevel) throws Exception { - LOG.info("getDataResult called for layerObjects: " + layerObjects); + LOG.info("getDataResult called"); + + for (LayerObject layerObject : layerObjects) { + LOG.info("ProfileID: "+layerObject.getProfileID() + ", ProjectID: " +layerObject.getProjectID() + ", TYPE: "+layerObject.getType()); + } if (LOG.isDebugEnabled()) { LOG.debug("getDataResult parmeters layerObjects: " + layerObjects,