From 3d003a742904a2d0348e79bdd8423007214eb987 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 8 Sep 2021 16:15:36 +0200 Subject: [PATCH] increasing max zoom level and min resolution --- .../user/geoportaldataviewer/client/OLMapManager.java | 2 +- .../geoportaldataviewer/client/gis/LightOpenLayerOSM.java | 2 ++ .../user/geoportaldataviewer/client/gis/OpenLayerOSM.java | 4 +++- .../server/GeoportalDataViewerServiceImpl.java | 2 -- 4 files changed, 6 insertions(+), 4 deletions(-) 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 d5f00de..33540d6 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 @@ -37,7 +37,7 @@ public class OLMapManager { private Double zoomEnd = null; private ol.Extent dragEndExtent = null; public static final int QUERY_MIN_ZOOM_LEVEL = 13; - public static final Double LAYER_DETAIL_MIN_RESOLUTION = 0.10; + public static final Double LAYER_DETAIL_MIN_RESOLUTION = 0.01; public static final Double LAYER_DETAIL_MAX_RESOLUTION = 13.0; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/LightOpenLayerOSM.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/LightOpenLayerOSM.java index 4c662dd..73615d7 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/LightOpenLayerOSM.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/LightOpenLayerOSM.java @@ -59,6 +59,8 @@ import ol.style.TextOptions; * Nov 11, 2020 */ public class LightOpenLayerOSM { + + public static final int MAX_ZOOM = 20; /** The map. */ private Map map; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OpenLayerOSM.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OpenLayerOSM.java index ccd6759..0232c01 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OpenLayerOSM.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OpenLayerOSM.java @@ -68,6 +68,8 @@ import ol.source.XyzOptions; */ public abstract class OpenLayerOSM { + public static final int MAX_ZOOM = 21; + /** * Click listener. * @@ -163,7 +165,7 @@ public abstract class OpenLayerOSM { Projection projection = new Projection(projectionOptions); viewOptions.setProjection(projection); - viewOptions.setMaxZoom(19); + viewOptions.setMaxZoom(MAX_ZOOM); // create a view view = new View(viewOptions); 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 7403483..d14ebbb 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 @@ -26,8 +26,6 @@ import org.gcube.application.geoportalcommon.shared.products.model.RelazioneScav import org.gcube.application.geoportalcommon.shared.products.model.UploadedImageDV; import org.gcube.application.geoportalcommon.util.URLParserUtil; import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerService; -import org.gcube.portlets.user.geoportaldataviewer.client.ui.gallery.ImagesGallery; -import org.gcube.portlets.user.geoportaldataviewer.client.ui.products.concessioni.RelazioneScavoView; import org.gcube.portlets.user.geoportaldataviewer.server.gis.FeatureParser; import org.gcube.portlets.user.geoportaldataviewer.server.gis.WMSUrlValidator; import org.gcube.portlets.user.geoportaldataviewer.server.util.CheckAccessUtil;