From ba9c8aee7808cf17063839817c59efff77d49456 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Thu, 31 Aug 2023 17:21:15 +0200 Subject: [PATCH] Using the latest libraries version: gwt-ol.v8.4.1 (with openlayers.v6.6.1) and gwt.v2.10 --- CHANGELOG.md | 1 + pom.xml | 3 ++- .../client/gis/ExtentWrapped.java | 18 +++++++++--------- src/main/webapp/GeoportalDataViewer.html | 4 ++-- .../jsp/GeoPortalDataViewerAppPortlet_view.jsp | 4 ++-- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6f6feb..efcf3a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v3.6.0-SNAPSHOT] - GUI optimization [#25461] +- Using the latest libraries version: gwt-ol.v8.4.1 (with openlayers.v6.6.1) and gwt.v2.10 ## [v3.5.0] diff --git a/pom.xml b/pom.xml index 3c5268f..0fea206 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,7 @@ 2.10.0 PRETTY 2.6.2 + 8.4.1 ${project.build.directory}/${project.build.finalName} 1.8 @@ -102,7 +103,7 @@ com.github.tdesjardins gwt-ol3 - 8.1.0-gwt2_9 + ${gwt.ol.version} com.github.gwtbootstrap diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/ExtentWrapped.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/ExtentWrapped.java index fbf694e..e20b6df 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/ExtentWrapped.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/ExtentWrapped.java @@ -32,15 +32,15 @@ public class ExtentWrapped extends ol.Extent { super(minX, minY, maxX, maxY); } - /** - * @param coordinate coordinate to check. - * @return true if the passed coordinate is contained or on the edge of the - * extent. - */ - @JsOverlay - public final Coordinate getCenter() { - return getCenter((ol.Extent) this); - } +// /** +// * @param coordinate coordinate to check. +// * @return true if the passed coordinate is contained or on the edge of the +// * extent. +// */ +// @JsOverlay +// public final Coordinate getCenter() { +// return getCenter((ol.Extent) this); +// } @JsMethod(name = "getCenter", namespace = PACKAGE_EXTENT) private static native Coordinate getCenter(Extent extent); diff --git a/src/main/webapp/GeoportalDataViewer.html b/src/main/webapp/GeoportalDataViewer.html index 19326ac..5520d6f 100644 --- a/src/main/webapp/GeoportalDataViewer.html +++ b/src/main/webapp/GeoportalDataViewer.html @@ -10,10 +10,10 @@