From 8d664f6ba17478d066645cda42540dbe9be295e6 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Wed, 7 Sep 2022 15:16:23 +0200 Subject: [PATCH] First import --- CHANGELOG.md | 5 + pom.xml | 150 ++++++++++-------- .../client/GeoportalDataViewer.java | 1 + .../client/StartParameters.java | 23 ++- .../client/events/OpenCollectionsEvent.java | 2 +- .../client/ui/GeonaDataViewMainPanel.java | 31 ++-- .../GeoportalDataViewerServiceImpl.java | 14 +- .../shared/GCubeCollection.java | 6 +- src/main/webapp/WEB-INF/web.xml | 12 +- 9 files changed, 151 insertions(+), 93 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4a8125..d28db71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ 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.0-SNAPSHOT] - 2022-08-09 + +- Support for Use Case Descriptors + ## [v2.3.0] - 2022-07-26 #### Bug fixed diff --git a/pom.xml b/pom.xml index 5599184..dd48178 100644 --- a/pom.xml +++ b/pom.xml @@ -14,13 +14,13 @@ org.gcube.portlets.user geoportal-data-viewer-app war - 2.3.0 + 3.0.0-SNAPSHOT GeoPortal Data Viewer App The GeoPortal Data Viewer App is an application to access, discovery and navigate the GeoNa products by a Web-Map Interface - 2.9.0 + 2.8.2 PRETTY ${project.build.directory}/${project.build.finalName} @@ -63,11 +63,86 @@ + + + + org.gcube.common + metadata-profile-discovery + [1.0.0-SNAPSHOT, 1.1.0-SNAPSHOT) + + + org.gcube.application + geoportal-data-common + [1.0.0-SNAPSHOT, 1.5.0-SNAPSHOT) + compile + + + org.gcube.application + geoportal-client + [1.0.0, 1.1.0-SNAPSHOT) + compile + + + org.gcube.resources.discovery + ic-client + + + org.ow2.asm + asm + + + + + + + + com.github.gwtbootstrap + gwt-bootstrap + 2.3.2.0 + compile + + + + com.github.tdesjardins + gwt-ol3 + + 8.2.0-gwt2_8 + + + + org.gcube.spatial.data + geo-utility + [1.0.0,2.0.0-SNAPSHOT) + + + + org.gcube.portlets.user + gcube-url-shortener + [1.0.0,2.0.0-SNAPSHOT) + compile + + + + org.gcube.common + keycloak-client + [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + + + + + + + + + + javax.servlet javax.servlet-api 3.1.0 provided + + @@ -105,22 +180,7 @@ oidc-library provided - - com.github.tdesjardins - gwt-ol3 - 8.1.0-gwt2_9 - - - com.github.gwtbootstrap - gwt-bootstrap - 2.3.2.0 - compile - - - org.gcube.spatial.data - geo-utility - [1.0.0,2.0.0-SNAPSHOT) - + org.gcube.resources.discovery ic-client @@ -141,73 +201,33 @@ usermanagement-core provided - - org.gcube.portlets.user - gcube-url-shortener - [1.0.0,2.0.0-SNAPSHOT) - compile - - - - - - org.gcube.common - metadata-profile-discovery - [1.0.0-SNAPSHOT, 1.1.0-SNAPSHOT) - - - org.gcube.application - geoportal-data-common - [1.0.0-SNAPSHOT, 1.5.0-SNAPSHOT) - compile - - - org.gcube.application - geoportal-client - [1.0.0, 1.1.0-SNAPSHOT) - compile - - - org.gcube.resources.discovery - ic-client - - - org.ow2.asm - asm - - - - - - - org.gcube.common - keycloak-client - [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) - + + com.liferay.portal portal-service - provided javax.portlet portlet-api - provided org.slf4j slf4j-log4j12 - provided org.slf4j slf4j-api - provided + + + + + junit junit diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java index 6c2b90d..1a79ec6 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java @@ -116,6 +116,7 @@ public class GeoportalDataViewer implements EntryPoint { @Override public void onFailure(Throwable caught) { RootPanel.get(APP_DIV).remove(loaderApp); + GWT.log("Failure on loading base layers", caught); Window.alert("Sorry, an error occurred on instancing the GeoPortale Viewer. Please, contact the support"); } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/StartParameters.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/StartParameters.java index 26139f0..f3c1f59 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/StartParameters.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/StartParameters.java @@ -2,14 +2,13 @@ package org.gcube.portlets.user.geoportaldataviewer.client; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Window; -import lombok.Getter; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -@Getter + class StartParameters { public StartParameters(Map> parameters) { if (parameters == null || parameters.isEmpty()) @@ -18,8 +17,6 @@ class StartParameters { paramWmsRequest = getFirst(parameters, GeoportalDataViewerConstants.GET_WMS_PARAMETER); paramLayerTitle = Window.Location.getParameter(GeoportalDataViewerConstants.GET_LAYER_TITLE); - - paramGeonaItemType = Window.Location.getParameter(GeoportalDataViewerConstants.GET_GEONA_ITEM_TYPE); paramGeonaItemID = Window.Location.getParameter(GeoportalDataViewerConstants.GET_GEONA_ITEM_ID); } @@ -66,4 +63,22 @@ class StartParameters { private String paramGeonaItemID; + public String getParamWmsRequest() { + return paramWmsRequest; + } + + public String getParamGeonaItemType() { + return paramGeonaItemType; + } + + public String getParamLayerTitle() { + return paramLayerTitle; + } + + public String getParamGeonaItemID() { + return paramGeonaItemID; + } + + + } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/OpenCollectionsEvent.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/OpenCollectionsEvent.java index ea7cfe9..8ce9c20 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/OpenCollectionsEvent.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/OpenCollectionsEvent.java @@ -13,6 +13,6 @@ public class OpenCollectionsEvent extends GwtEvent @Override protected void dispatch(OpenCollectionsEventHandler h) { - h. + } } 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 59c4313..cc7d5b3 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 @@ -155,19 +155,24 @@ public class GeonaDataViewMainPanel extends Composite { linkPresetLocation.setCustomIconStyle(GNAIcons.CustomIconType.PRESET_LOCATION.get()); linkLayers.setCustomIconStyle(GNAIcons.CustomIconType.LAYERS.get()); - searchFacility = new SearchFacilityUI(applicationBus, sortByFields, searchForFields, initialSortFilter); - searchFacility.setSearchButton(searchFacilityButton); - searchFacilityButton.setIcon(IconType.SEARCH); - searchFacilityPanel.add(searchFacility); - Scheduler.get().scheduleDeferred(new ScheduledCommand() { - - @Override - public void execute() { - searchFacilityPanel.getElement().getParentElement().getStyle().setOpacity(0.9); - - } - - }); + + // TODO + GWT.log("!!! NB TODO : Search facility is skipped "); + + +// searchFacility = new SearchFacilityUI(applicationBus, sortByFields, searchForFields, initialSortFilter); +// searchFacility.setSearchButton(searchFacilityButton); +// searchFacilityButton.setIcon(IconType.SEARCH); +// searchFacilityPanel.add(searchFacility); +// Scheduler.get().scheduleDeferred(new ScheduledCommand() { +// +// @Override +// public void execute() { +// searchFacilityPanel.getElement().getParentElement().getStyle().setOpacity(0.9); +// +// } +// +// }); // layersDDB.setToggle(true); bindEvents(); 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 345e0e2..a01ad7b 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 @@ -77,7 +77,8 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme * @throws Exception the exception */ private GNADataViewerConfigProfile getGNADataVieweConfigProfile() throws Exception { - + LOG.info("METHOD getDataResult called"); + GNADataViewerConfigProfile profile = SessionUtil.getGNADataViewerConfigProfile(getThreadLocalRequest()); if (profile == null) { LOG.info(GNADataViewerConfigProfile.class.getSimpleName() + " is null, loading configurations from IS"); @@ -114,6 +115,7 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme */ public GeoInformationForWMSRequest loadGeoInfoForWmsRequest(String wmsLink, String layerName) throws Exception { try { + LOG.info("METHOD load GEO infor for WMS Req called"); WMSUrlValidator validator = new WMSUrlValidator(wmsLink, layerName); String wmsServiceHost = validator.getWmsServiceHost(); String validWMSRequest = validator.parseWMSRequest(true, true); @@ -164,7 +166,7 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme @Override public List getDataResult(List layerObjects, String mapSrsName, BoundsMap selectBBOX, int maxWFSFeature, double zoomLevel) { - LOG.info("getDataResult called"); + LOG.info("METHOD getDataResult called"); List listDAO = new ArrayList(layerObjects.size()); @@ -426,7 +428,9 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme */ public Map getParametersFromURL(String theURL, List parameters) { - + LOG.info("METHOD getPAramsFromURL"); + + if (theURL == null) return null; @@ -450,6 +454,7 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme */ @Override public String getMyLogin() { + LOG.info("METHOD getMYLogin "); try { GCubeUser user = SessionUtil.getCurrentUser(this.getThreadLocalRequest()); if (user == null) @@ -551,6 +556,7 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme * @throws Exception the exception */ public boolean isSessionExpired() throws Exception { + LOG.info("METHOD isSessionExpired "); return SessionUtil.isSessionExpired(this.getThreadLocalRequest()); } @@ -700,7 +706,7 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme public List getListBaseLayers() { LOG.info("getListBaseLayers called"); List listBL = new ArrayList(); - // Setting scope in the cuurent thread + // Setting scope in the current thread SessionUtil.getCurrentContext(this.getThreadLocalRequest(), true); listBL = SessionUtil.getGNABaseMaps(this.getThreadLocalRequest()); LOG.info("getListBaseLayers returning " + listBL.size() + " base maps"); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/GCubeCollection.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/GCubeCollection.java index a143791..38c3841 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/GCubeCollection.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/GCubeCollection.java @@ -1,12 +1,14 @@ package org.gcube.portlets.user.geoportaldataviewer.shared; -import lombok.Data; import java.io.Serializable; -//@Data + public class GCubeCollection implements Serializable { // private Document ucd; // private List indexes; + + + } diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index c66589b..b978c28 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,12 @@ - + + + + + + + +