From 473d93ea7b498254863e6e3c8d7e96d9d8ade77f Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 30 Apr 2024 11:09:39 +0200 Subject: [PATCH] removed unused classes. Refactored class --- .../client/GeoportalDataViewerService.java | 6 +++--- .../client/GeoportalDataViewerServiceAsync.java | 6 +++--- .../geoportaldataviewer/client/LayerManager.java | 14 +++++++------- .../server/GeoportalDataViewerServiceImpl.java | 14 +++++++------- .../server/util/TemporalComparatorUtil.java | 6 +++--- ...ult.java => GeoportalSpatialQueryResult.java} | 12 ++++++------ .../shared/gis/DisplayCategory.java | 16 ---------------- .../shared/gis/OverlayWMSLayer.java | 13 ------------- 8 files changed, 29 insertions(+), 58 deletions(-) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/{GeoNaSpatialQueryResult.java => GeoportalSpatialQueryResult.java} (87%) delete mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/gis/DisplayCategory.java delete mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/gis/OverlayWMSLayer.java diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerService.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerService.java index 2f036cf..a6c1a00 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerService.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerService.java @@ -14,7 +14,7 @@ import org.gcube.application.geoportalcommon.shared.geoportal.materialization.GC import org.gcube.application.geoportalcommon.shared.geoportal.ucd.GEOPORTAL_DATA_HANDLER; import org.gcube.application.geoportalcommon.shared.geoportal.view.ProjectView; import org.gcube.application.geoportalcommon.shared.gis.BoundsMap; -import org.gcube.portlets.user.geoportaldataviewer.shared.GeoNaSpatialQueryResult; +import org.gcube.portlets.user.geoportaldataviewer.shared.GeoportalSpatialQueryResult; import org.gcube.portlets.user.geoportaldataviewer.shared.ItemFieldsResponse; import org.gcube.portlets.user.geoportaldataviewer.shared.ResultSetPaginatedDataIDs; import org.gcube.portlets.user.geoportaldataviewer.shared.ViewerConfiguration; @@ -57,7 +57,7 @@ public interface GeoportalDataViewerService extends RemoteService { * @return the data result * @throws Exception the exception */ - List getDataResult(List layerObjects, String mapSrsName, BoundsMap mapBBOX, + List getDataResult(List layerObjects, String mapSrsName, BoundsMap mapBBOX, int maxWFSFeature, double zoomLevel) throws Exception; /** @@ -104,7 +104,7 @@ public interface GeoportalDataViewerService extends RemoteService { * @param zoomLevel the zoom level * @return the WFS features */ - List getWFSFeatures(List layerObjects, String mapSrsName, + List getWFSFeatures(List layerObjects, String mapSrsName, BoundsMap selectBBOX, int maxWFSFeature, double zoomLevel); /** diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerServiceAsync.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerServiceAsync.java index 0db918c..9de222c 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerServiceAsync.java @@ -14,7 +14,7 @@ import org.gcube.application.geoportalcommon.shared.geoportal.materialization.GC import org.gcube.application.geoportalcommon.shared.geoportal.ucd.GEOPORTAL_DATA_HANDLER; import org.gcube.application.geoportalcommon.shared.geoportal.view.ProjectView; import org.gcube.application.geoportalcommon.shared.gis.BoundsMap; -import org.gcube.portlets.user.geoportaldataviewer.shared.GeoNaSpatialQueryResult; +import org.gcube.portlets.user.geoportaldataviewer.shared.GeoportalSpatialQueryResult; import org.gcube.portlets.user.geoportaldataviewer.shared.ItemFieldsResponse; import org.gcube.portlets.user.geoportaldataviewer.shared.ResultSetPaginatedDataIDs; import org.gcube.portlets.user.geoportaldataviewer.shared.ViewerConfiguration; @@ -48,7 +48,7 @@ public interface GeoportalDataViewerServiceAsync { void parseWmsRequest(String wmsRequest, String layerName, AsyncCallback callback); void getDataResult(List layerObjects, String mapSrsName, BoundsMap mapBBOX, int maxWFSFeature, - double zoomLevel, AsyncCallback> callback); + double zoomLevel, AsyncCallback> callback); void getMyLogin(AsyncCallback callback); @@ -60,7 +60,7 @@ public interface GeoportalDataViewerServiceAsync { AsyncCallback> asyncCallback); void getWFSFeatures(List layerObjects, String mapSrsName, BoundsMap selectBBOX, int maxWFSFeature, - double zoomLevel, AsyncCallback> callback); + double zoomLevel, AsyncCallback> callback); void getListBaseLayers(AsyncCallback> callback); 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 e1b02ac..803200e 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 @@ -40,7 +40,7 @@ import org.gcube.portlets.user.geoportaldataviewer.client.ui.ModalWindow; import org.gcube.portlets.user.geoportaldataviewer.client.ui.cms.project.ProjectUtil; import org.gcube.portlets.user.geoportaldataviewer.client.util.StringUtil; import org.gcube.portlets.user.geoportaldataviewer.client.util.URLUtil; -import org.gcube.portlets.user.geoportaldataviewer.shared.GeoNaSpatialQueryResult; +import org.gcube.portlets.user.geoportaldataviewer.shared.GeoportalSpatialQueryResult; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.GeoQuery; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.LayerItem; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.LayerObject; @@ -190,7 +190,7 @@ public class LayerManager { GeoportalDataViewerServiceAsync.Util.getInstance().getDataResult(listLO, olMap.getProjectionCode(), mapBBOX, GeoportalDataViewerConstants.MAX_WFS_FEATURES, olMap.getCurrentZoomLevel(), - new AsyncCallback>() { + new AsyncCallback>() { @Override public void onFailure(Throwable caught) { @@ -199,7 +199,7 @@ public class LayerManager { } @Override - public void onSuccess(List listGeonaDataObjects) { + public void onSuccess(List listGeonaDataObjects) { if (listGeonaDataObjects == null) return; @@ -221,7 +221,7 @@ public class LayerManager { List theFeatures = null; // TODO SWTCH FOR EARCH ITEM TYPE - for (final GeoNaSpatialQueryResult geoNaDataObject : listGeonaDataObjects) { + for (final GeoportalSpatialQueryResult geoNaDataObject : listGeonaDataObjects) { GWT.log("GeoNaDataObject: " + geoNaDataObject); List features = geoNaDataObject.getFeatures(); LayerItem layerItem = geoNaDataObject.getSourceLayerObject().getLayerItem(); @@ -709,7 +709,7 @@ public class LayerManager { * @param listGeoNaDataObject the list geo na data object * @param queryClick the query click */ - public void showPopupInfoForLayer(List listGeoNaDataObject, ExtentWrapped queryClick) { + public void showPopupInfoForLayer(List listGeoNaDataObject, ExtentWrapped queryClick) { GWT.log("showPopupInfoForLayer called for " + listGeoNaDataObject); ScrollPanel scrollPanel = new ScrollPanel(); @@ -767,7 +767,7 @@ public class LayerManager { // } String prevProjectId = ""; - for (GeoNaSpatialQueryResult geoNaSpatialQueryResult : listGeoNaDataObject) { + for (GeoportalSpatialQueryResult geoNaSpatialQueryResult : listGeoNaDataObject) { try { Set indexLayers = mapIndexLayerObjects.keySet(); @@ -1123,7 +1123,7 @@ public class LayerManager { * @param feature the feature * @param onFailureCenterTo the on failure center to */ - public void showPopupInfoForCentroidLayer(GeoNaSpatialQueryResult geoNaDataObject, FeatureRow feature, + public void showPopupInfoForCentroidLayer(GeoportalSpatialQueryResult geoNaDataObject, FeatureRow feature, Coordinate onFailureCenterTo) { GWT.log("showPopupInfoForCentroidLayer showing feature: " + feature); GWT.log("showPopupInfoForCentroidLayer showing layerObject: " + geoNaDataObject.getSourceLayerObject()); 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 3377c89..fb0b08c 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 @@ -81,7 +81,7 @@ import org.gcube.portlets.user.geoportaldataviewer.server.util.HTTPRequestUtil; import org.gcube.portlets.user.geoportaldataviewer.server.util.SessionUtil; import org.gcube.portlets.user.geoportaldataviewer.server.util.TemporalComparatorUtil; import org.gcube.portlets.user.geoportaldataviewer.shared.GCubeCollection; -import org.gcube.portlets.user.geoportaldataviewer.shared.GeoNaSpatialQueryResult; +import org.gcube.portlets.user.geoportaldataviewer.shared.GeoportalSpatialQueryResult; import org.gcube.portlets.user.geoportaldataviewer.shared.ItemFieldsResponse; import org.gcube.portlets.user.geoportaldataviewer.shared.ResultSetPaginatedDataIDs; import org.gcube.portlets.user.geoportaldataviewer.shared.ViewerConfiguration; @@ -414,14 +414,14 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme * @return the WFS features */ @Override - public List getWFSFeatures(List layerObjects, String mapSrsName, + public List getWFSFeatures(List layerObjects, String mapSrsName, BoundsMap selectBBOX, int maxWFSFeature, double zoomLevel) { LOG.info("getWFSFeatures called"); - List listDAO = new ArrayList(layerObjects.size()); + List listDAO = new ArrayList(layerObjects.size()); for (LayerObject layerObject : layerObjects) { - GeoNaSpatialQueryResult geoDAO = new GeoNaSpatialQueryResult(); + GeoportalSpatialQueryResult geoDAO = new GeoportalSpatialQueryResult(); List features = FeatureParser.getWFSFeatures(layerObject.getLayerItem(), mapSrsName, selectBBOX, maxWFSFeature); LOG.debug("For layer name: " + layerObject.getLayerItem().getName() + " got features: " + features); @@ -1199,7 +1199,7 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme * @throws Exception the exception */ @Override - public List getDataResult(List layerObjects, String mapSrsName, + public List getDataResult(List layerObjects, String mapSrsName, BoundsMap selectBBOX, int maxWFSFeature, double zoomLevel) throws Exception { LOG.info("getDataResult called"); @@ -1214,13 +1214,13 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme + ", zoomLevel: " + zoomLevel); } - List listDAO = new ArrayList(layerObjects.size()); + List listDAO = new ArrayList(layerObjects.size()); try { new GeoportalServiceIdentityProxy(this.getThreadLocalRequest()); for (LayerObject layerObject : layerObjects) { - GeoNaSpatialQueryResult geoDAO = new GeoNaSpatialQueryResult(); + GeoportalSpatialQueryResult geoDAO = new GeoportalSpatialQueryResult(); List features = FeatureParser.getWFSFeatures(layerObject.getLayerItem(), mapSrsName, selectBBOX, maxWFSFeature); LOG.debug("For layer name: " + layerObject.getLayerItem().getName() + " got features: " + features); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/util/TemporalComparatorUtil.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/util/TemporalComparatorUtil.java index d4ccad0..e0c29dd 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/util/TemporalComparatorUtil.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/util/TemporalComparatorUtil.java @@ -3,7 +3,7 @@ package org.gcube.portlets.user.geoportaldataviewer.server.util; import java.util.Comparator; import org.gcube.application.geoportalcommon.shared.geoportal.project.ProjectDV; -import org.gcube.portlets.user.geoportaldataviewer.shared.GeoNaSpatialQueryResult; +import org.gcube.portlets.user.geoportaldataviewer.shared.GeoportalSpatialQueryResult; /** * The Class TemporalComparatorUtil. @@ -12,7 +12,7 @@ import org.gcube.portlets.user.geoportaldataviewer.shared.GeoNaSpatialQueryResul * * Nov 18, 2022 */ -public class TemporalComparatorUtil implements Comparator { +public class TemporalComparatorUtil implements Comparator { /** * Compare. @@ -22,7 +22,7 @@ public class TemporalComparatorUtil implements Comparator features; private LayerObject sourceLayerObject; - // Map with couple (mongoId concessione, list of uploaded GeoportalImages for the - // concessione) + // Map with couple (mongoId project, list of uploaded GeoportalImages for the + // project) private Map> mapImages = null; /** * Instantiates a new geo na data object. */ - public GeoNaSpatialQueryResult() { + public GeoportalSpatialQueryResult() { } @@ -91,7 +91,7 @@ public class GeoNaSpatialQueryResult implements Serializable { @Override public String toString() { StringBuilder builder = new StringBuilder(); - builder.append("GeoNaSpatialQueryResult [features="); + builder.append("GeoportalSpatialQueryResult [features="); builder.append(features); builder.append(", sourceLayerObject="); builder.append(sourceLayerObject); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/gis/DisplayCategory.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/gis/DisplayCategory.java deleted file mode 100644 index 030ab3f..0000000 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/gis/DisplayCategory.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.gcube.portlets.user.geoportaldataviewer.shared.gis; - -import java.io.Serializable; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; - -@Slf4j -@Data -public class DisplayCategory implements Serializable { - - - String title; - String description; - -} diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/gis/OverlayWMSLayer.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/gis/OverlayWMSLayer.java deleted file mode 100644 index 6707121..0000000 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/gis/OverlayWMSLayer.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.gcube.portlets.user.geoportaldataviewer.shared.gis; - -import java.util.Map; - -public class OverlayWMSLayer { - - private String title; - private String name; - private String wmsServiceBaseURL; - private boolean display; - private Map mapProperties; - -}