From f29a8c3ef0cde118741681f9b0afeb0646307973 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Fri, 5 Aug 2022 18:06:09 +0200 Subject: [PATCH] Introduced collections, start event refactoring --- .../client/GeoportalDataViewer.java | 687 +++++++----------- .../client/LayerManager.java | 10 +- .../client/OLMapManager.java | 2 +- .../client/StartParameters.java | 69 ++ .../client/events/OpenCollectionsEvent.java | 18 + .../events/OpenCollectionsEventHandler.java | 8 + .../AddedLayerToMapEvent.java | 2 +- .../AddedLayerToMapEventHandler.java | 2 +- .../ChangeBaseMapLayerEvent.java} | 14 +- .../ChangeBaseMapLayerEventHandler.java} | 8 +- .../ClosedViewDetailsEvent.java | 2 +- .../ClosedViewDetailsEventHandler.java | 2 +- .../DoActionOnDetailLayersEvent.java | 2 +- .../DoActionOnDetailLayersEventHandler.java | 2 +- .../{ => application}/MapExtentToEvent.java | 2 +- .../MapExtentToEventHandler.java | 2 +- .../SearchPerformedEvent.java | 2 +- .../SearchPerformedEventHandler.java | 2 +- .../{ => application}/ShowDetailsEvent.java | 2 +- .../ShowDetailsEventHandler.java | 3 +- .../ShowPopupOnCentroiEvent.java | 2 +- .../ShowPopupOnCentroiEventHandler.java | 2 +- .../ZoomOutOverMinimumEvent.java | 2 +- .../ZoomOutOverMinimumEventHandler.java | 2 +- .../client/gis/OpenLayerMap.java | 6 +- .../client/ui/DetailsPanel.java | 2 +- .../client/ui/GeonaDataViewMainPanel.java | 6 +- .../client/ui/SearchFacilityUI.java | 6 +- .../client/ui/dandd/DragDropLayer.java | 6 +- .../client/ui/dandd/RangeSlider.java | 4 +- .../client/util/OGCUtils.java | 46 ++ .../shared/GCubeCollection.java | 12 + 32 files changed, 475 insertions(+), 462 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/StartParameters.java create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/OpenCollectionsEvent.java create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/OpenCollectionsEventHandler.java rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ => application}/AddedLayerToMapEvent.java (99%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ => application}/AddedLayerToMapEventHandler.java (97%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ChangeMapLayerEvent.java => application/ChangeBaseMapLayerEvent.java} (65%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ChangeMapLayerEventHandler.java => application/ChangeBaseMapLayerEventHandler.java} (61%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ => application}/ClosedViewDetailsEvent.java (98%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ => application}/ClosedViewDetailsEventHandler.java (97%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ => application}/DoActionOnDetailLayersEvent.java (99%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ => application}/DoActionOnDetailLayersEventHandler.java (97%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ => application}/MapExtentToEvent.java (98%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ => application}/MapExtentToEventHandler.java (97%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ => application}/SearchPerformedEvent.java (98%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ => application}/SearchPerformedEventHandler.java (97%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ => application}/ShowDetailsEvent.java (99%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ => application}/ShowDetailsEventHandler.java (96%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ => application}/ShowPopupOnCentroiEvent.java (98%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ => application}/ShowPopupOnCentroiEventHandler.java (97%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ => application}/ZoomOutOverMinimumEvent.java (98%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/{ => application}/ZoomOutOverMinimumEventHandler.java (96%) create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/util/OGCUtils.java create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/GCubeCollection.java 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 664bfdd..6c2b90d 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 @@ -1,51 +1,29 @@ package org.gcube.portlets.user.geoportaldataviewer.client; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; +import java.util.*; import org.gcube.application.geoportalcommon.shared.GNADataViewerConfigProfile; -import org.gcube.application.geoportalcommon.shared.GeoNaItemRef; -import org.gcube.application.geoportalcommon.shared.ItemField; -import org.gcube.application.geoportalcommon.shared.LayerItem; -import org.gcube.application.geoportalcommon.shared.SearchingFilter; -import org.gcube.application.geoportalcommon.shared.SearchingFilter.ORDER; import org.gcube.application.geoportalcommon.shared.products.ConcessioneDV; import org.gcube.application.geoportalcommon.shared.products.model.RecordDV; -import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerConstants.MAP_PROJECTION; -import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerConstants.MapEventType; -import org.gcube.portlets.user.geoportaldataviewer.client.events.AddedLayerToMapEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.AddedLayerToMapEvent.LAYER_TYPE; -import org.gcube.portlets.user.geoportaldataviewer.client.events.AddedLayerToMapEventHandler; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ChangeMapLayerEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ChangeMapLayerEventHandler; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ClosedViewDetailsEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ClosedViewDetailsEventHandler; -import org.gcube.portlets.user.geoportaldataviewer.client.events.DoActionOnDetailLayersEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.DoActionOnDetailLayersEvent.DO_LAYER_ACTION; -import org.gcube.portlets.user.geoportaldataviewer.client.events.DoActionOnDetailLayersEvent.SwapLayer; -import org.gcube.portlets.user.geoportaldataviewer.client.events.DoActionOnDetailLayersEventHandler; -import org.gcube.portlets.user.geoportaldataviewer.client.events.MapExtentToEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.MapExtentToEventHandler; -import org.gcube.portlets.user.geoportaldataviewer.client.events.QueryDataEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.SearchPerformedEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.SearchPerformedEventHandler; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ShowDetailsEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ShowDetailsEventHandler; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ShowPopupOnCentroiEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ShowPopupOnCentroiEventHandler; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ZoomOutOverMinimumEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ZoomOutOverMinimumEventHandler; -import org.gcube.portlets.user.geoportaldataviewer.client.gis.ExtentWrapped; -import org.gcube.portlets.user.geoportaldataviewer.client.gis.MapUtils; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.AddedLayerToMapEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.AddedLayerToMapEvent.LAYER_TYPE; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.AddedLayerToMapEventHandler; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.ChangeBaseMapLayerEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.ClosedViewDetailsEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.DoActionOnDetailLayersEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.DoActionOnDetailLayersEvent.DO_LAYER_ACTION; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.DoActionOnDetailLayersEvent.SwapLayer; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.MapExtentToEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.SearchPerformedEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.ShowDetailsEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.ShowPopupOnCentroiEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.ZoomOutOverMinimumEvent; import org.gcube.portlets.user.geoportaldataviewer.client.gis.OpenLayerMap; import org.gcube.portlets.user.geoportaldataviewer.client.ui.GeonaDataViewMainPanel; import org.gcube.portlets.user.geoportaldataviewer.client.util.LoaderIcon; -import org.gcube.portlets.user.geoportaldataviewer.client.util.URLUtil; +import org.gcube.portlets.user.geoportaldataviewer.client.util.OGCUtils; +import org.gcube.portlets.user.geoportaldataviewer.shared.GCubeCollection; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.BaseMapLayer; -import org.gcube.portlets.user.geoportaldataviewer.shared.gis.GeoQuery; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; @@ -61,7 +39,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.RootPanel; -import ol.Coordinate; import ol.layer.Image; /** @@ -82,23 +59,13 @@ public class GeoportalDataViewer implements EntryPoint { /** The main panel. */ private GeonaDataViewMainPanel mainPanel; - /** The param wms request. */ - private String paramWmsRequest; - - /** The param UUID. */ - // private String paramUUID; - - private String paramGeonaItemType; - - /** The param layer title. */ - private String paramLayerTitle; + private StartParameters startParameters = null; private HandlerManager applicationBus = new HandlerManager(""); /** The layer manager. */ private LayerManager layerManager = new LayerManager(applicationBus); - private String paramGeonaItemID; private GNADataViewerConfigProfile geonaDataViewerProfile; @@ -109,12 +76,13 @@ public class GeoportalDataViewer implements EntryPoint { private LoaderIcon loaderApp = new LoaderIcon("Loading application... please wait"); private HTML attributionDiv = new HTML(); - + private static List listBaseMapLayers = null; - - private List displayFields = new ArrayList(); - private List sortByFields = new ArrayList(); - private List searchByFields = new ArrayList(); + +// Configuration by UCD +// Map : UCID -> Collection description + private Map openedCollections=new HashMap<>(); + /** * This is the entry point method. @@ -123,59 +91,16 @@ public class GeoportalDataViewer implements EntryPoint { loaderApp.getElement().addClassName("loader-gna-app"); RootPanel.get(APP_DIV).add(loaderApp); - - paramWmsRequest = Window.Location.getParameter(GeoportalDataViewerConstants.GET_WMS_PARAMETER); - paramGeonaItemType = Window.Location.getParameter(GeoportalDataViewerConstants.GET_GEONA_ITEM_TYPE); - paramGeonaItemID = Window.Location.getParameter(GeoportalDataViewerConstants.GET_GEONA_ITEM_ID); - paramLayerTitle = Window.Location.getParameter(GeoportalDataViewerConstants.GET_LAYER_TITLE); - GWT.log(GeoportalDataViewerConstants.GET_WMS_PARAMETER + " = " + paramWmsRequest); - GWT.log(GeoportalDataViewerConstants.GET_GEONA_ITEM_TYPE + " = " + paramGeonaItemType); - GWT.log(GeoportalDataViewerConstants.GET_GEONA_ITEM_ID + " = " + paramGeonaItemID); - GWT.log(GeoportalDataViewerConstants.GET_LAYER_TITLE + " = " + paramLayerTitle); - - RootPanel.get(APP_DIV).add(loaderApp); - - GeoportalDataViewerServiceAsync.Util.getInstance().listOfFieldsForSearching(new AsyncCallback>() { - @Override - public void onFailure(Throwable caught) { - Window.alert(caught.getMessage()); - - } + startParameters = new StartParameters(Window.Location.getParameterMap()); - @Override - public void onSuccess(List result) { - GWT.log("Loaded item fields: "+result); - - for (ItemField itemField : result) { - if(itemField.isDisplayAsResult()) { - displayFields.add(itemField); - } - - if(itemField.isSearchable()) { - searchByFields.add(itemField); - } - - if(itemField.isSortable()) { - sortByFields.add(itemField); - } - } - - - GWT.log("List display fields: "+result); - SearchingFilter initialSortFilter = new SearchingFilter(); - initialSortFilter.setOrder(ORDER.ASC); - initialSortFilter.setOrderByFields(Arrays.asList(new ItemField("Name", Arrays.asList("name"), true, true, true))); - - mainPanel = new GeonaDataViewMainPanel(applicationBus, getClientHeight(),sortByFields,searchByFields,initialSortFilter); - RootPanel.get(APP_DIV).add(mainPanel); - - initApplication(); - } + // Fields configurations are read on open collection event + + mainPanel = new GeonaDataViewMainPanel(applicationBus, getClientHeight(),null,null,null); + RootPanel.get(APP_DIV).add(mainPanel); + + initApplication(); - - }); - } private void initApplication() { @@ -196,14 +121,16 @@ public class GeoportalDataViewer implements EntryPoint { @Override public void onSuccess(List listBaseMapLayers) { + + // ?? Maybe remove after load collection / project? try { - RootPanel.get(APP_DIV).remove(loaderApp); + RootPanel.get(APP_DIV).remove(loaderApp); }catch (Exception e) { loaderApp.setVisible(false); } - GeoportalDataViewer.listBaseMapLayers = listBaseMapLayers; + //now the map is loaded and I'm sure that I can load the GeonaDataViewer Profile - loadGeonaDataViewerProfile(); + GeoportalDataViewer.listBaseMapLayers = listBaseMapLayers; mainPanel.setBaseLayers(listBaseMapLayers); BaseMapLayer firstBaseLayer = listBaseMapLayers.get(0); @@ -217,7 +144,21 @@ public class GeoportalDataViewer implements EntryPoint { updateSize(); ScriptInjector.fromUrl("//cdnjs.cloudflare.com/ajax/libs/nanogallery2/3.0.5/jquery.nanogallery2.min.js") .setWindow(ScriptInjector.TOP_WINDOW).inject(); - + + if(!startParameters.toOpenCollections().isEmpty()){ + // Fire + } + + if(!startParameters.toOpenProjects().isEmpty()){ + // open projects by projectID list + } + + if(!startParameters.toOpenLayers().isEmpty()){ + + } + + + } @@ -243,65 +184,65 @@ public class GeoportalDataViewer implements EntryPoint { return listBaseMapLayers; } - private void loadGeonaDataViewerProfile() { - - Scheduler.get().scheduleDeferred(new ScheduledCommand() { - - @Override - public void execute() { - GeoportalDataViewerServiceAsync.Util.getInstance() - .getGeoNaDataViewProfile(new AsyncCallback() { - - @Override - public void onFailure(Throwable caught) { - Window.alert(caught.getMessage()); - - } - - @Override - public void onSuccess(GNADataViewerConfigProfile profile) { - geonaDataViewerProfile = profile; - GWT.log("Profile: " + geonaDataViewerProfile); - Iterator it; - String theItemType = paramGeonaItemType; - if (theItemType == null) { - it = geonaDataViewerProfile.getMapLayers().keySet().iterator(); - it.hasNext(); - theItemType = it.next(); - } - - LayerItem layerItem = geonaDataViewerProfile.getMapLayers().get(theItemType); - - if (layerItem == null) { - Window.alert("Not detected any layer with type: " + theItemType); - return; - } - - GWT.log("ON module load The layerItem is: " + layerItem); - String layerName = URLUtil.getValueOfParameter("layers", layerItem.getWmsLink()); - layerItem.setName(layerName); - layerManager.setBaseLayerFromIsProfile(layerItem); - layerManager.addLayer(theItemType, null, null, layerItem.getWmsLink(), false, false, - null, false, null, null, null); - - if (paramGeonaItemID != null) { - if (paramGeonaItemType == null) { - Window.alert( - "Missing parameter " + GeoportalDataViewerConstants.GET_GEONA_ITEM_TYPE - + " (GeoNa Data Type) where to search the item id: " - + paramGeonaItemID); - return; - } - GeoNaItemRef gir = new GeoNaItemRef(paramGeonaItemID, paramGeonaItemType); - applicationBus.fireEvent(new ShowDetailsEvent(gir, null, null)); - } - - } - }); - } - }); - - } +// private void loadGeonaDataViewerProfile() { +// +// Scheduler.get().scheduleDeferred(new ScheduledCommand() { +// +// @Override +// public void execute() { +// GeoportalDataViewerServiceAsync.Util.getInstance() +// .getGeoNaDataViewProfile(new AsyncCallback() { +// +// @Override +// public void onFailure(Throwable caught) { +// Window.alert(caught.getMessage()); +// +// } +// +// @Override +// public void onSuccess(GNADataViewerConfigProfile profile) { +// geonaDataViewerProfile = profile; +// GWT.log("Profile: " + geonaDataViewerProfile); +// Iterator it; +// String theItemType = paramGeonaItemType; +// if (theItemType == null) { +// it = geonaDataViewerProfile.getMapLayers().keySet().iterator(); +// it.hasNext(); +// theItemType = it.next(); +// } +// +// LayerItem layerItem = geonaDataViewerProfile.getMapLayers().get(theItemType); +// +// if (layerItem == null) { +// Window.alert("Not detected any layer with type: " + theItemType); +// return; +// } +// +// GWT.log("ON module load The layerItem is: " + layerItem); +// String layerName = URLUtil.getValueOfParameter("layers", layerItem.getWmsLink()); +// layerItem.setName(layerName); +// layerManager.setBaseLayerFromIsProfile(layerItem); +// layerManager.addLayer(theItemType, null, null, layerItem.getWmsLink(), false, false, +// null, false, null, null, null); +// +// if (paramGeonaItemID != null) { +// if (paramGeonaItemType == null) { +// Window.alert( +// "Missing parameter " + GeoportalDataViewerConstants.GET_GEONA_ITEM_TYPE +// + " (GeoNa Data Type) where to search the item id: " +// + paramGeonaItemID); +// return; +// } +// GeoNaItemRef gir = new GeoNaItemRef(paramGeonaItemID, paramGeonaItemType); +// applicationBus.fireEvent(new ShowDetailsEvent(gir, null, null)); +// } +// +// } +// }); +// } +// }); +// +// } /** * Update window size. @@ -322,302 +263,220 @@ public class GeoportalDataViewer implements EntryPoint { return rootHeight; } + + //************************************************************************************************************************ + + + /** * Bind events. */ private void bindEvents() { - applicationBus.addHandler(ShowDetailsEvent.TYPE, new ShowDetailsEventHandler() { - @Override - public void onShowDetails(ShowDetailsEvent showDetailsEvent) { - GWT.log("Fired event: " + showDetailsEvent); + // + applicationBus.addHandler(ShowDetailsEvent.TYPE, showDetailsEvent -> { + GWT.log("Fired event: " + showDetailsEvent); - String geonaMongoId = showDetailsEvent.getGeonaMongoID(); + String geonaMongoId = showDetailsEvent.getGeonaMongoID(); - if (geonaMongoId == null) { - Window.alert("Item Id not found"); - return; - } - - // TODO - boolean found = false; - GWT.log("Product with id: " + geonaMongoId + " found? " + found); - - if (!found) { - - if (showDetailsEvent.getGeonaItemType().equalsIgnoreCase("Concessione")) { - - GeoportalDataViewerServiceAsync.Util.getInstance().getConcessioneForId(geonaMongoId, - new AsyncCallback() { - - @Override - public void onFailure(Throwable caught) { - Window.alert(caught.getMessage()); - mainPanel.hidePanelDetails(); - - } - - @Override - public void onSuccess(ConcessioneDV concessioneDV) { - GWT.log("Showing: " + concessioneDV); - mainPanel.showAsDetails(concessioneDV, showDetailsEvent.getGeonaItemRef()); - } - }); - } - } + if (geonaMongoId == null) { + Window.alert("Item Id not found"); + return; } - }); + // TODO + boolean found = false; + GWT.log("Product with id: " + geonaMongoId + " found? " + found); - applicationBus.addHandler(AddedLayerToMapEvent.TYPE, new AddedLayerToMapEventHandler() { - - @Override - public void onLayerRendered(AddedLayerToMapEvent addedLayerToMapEvent) { - GWT.log("Fired AddedLayerToMapEvent " + addedLayerToMapEvent.getLayerItem() + "layer type: "+addedLayerToMapEvent.getLayerType()); - - try { - - attempt = 0; - - if (paramGeonaItemID != null) { - // waiting for record retrieved by service before calling the WFS - final int MAX_RETRY = 15; - Timer timer = new com.google.gwt.user.client.Timer() { - @Override - public void run() { - attempt++; - GWT.log("waiting get record: " + attempt); - RecordDV record = mainPanel.getDisplayedRecord(); - if (record != null) { - this.cancel(); - GWT.log("cancelled timer"); - performWFSQueryOnCentroid(record); - } - - if (attempt > MAX_RETRY) { - GWT.log("MAX_RETRY reached, cancelled timer"); - this.cancel(); - } - - } - }; - timer.scheduleRepeating(1000); - - } - } catch (Exception e) { - // TODO: handle exception - } - - LAYER_TYPE layerType = addedLayerToMapEvent.getLayerType(); - - if (layerType != null) { - - switch (layerType) { - case BASE: - - break; - case OVERLAY: - mainPanel.showOverlayLayers(layerManager.getOverlayLayerManager().getPanel()); - break; - - default: - break; - } - } + if (!found) { +// if (showDetailsEvent.getGeonaItemType().equalsIgnoreCase("Concessione")) { +// +// GeoportalDataViewerServiceAsync.Util.getInstance().getConcessioneForId(geonaMongoId, +// new AsyncCallback() { +// +// @Override +// public void onFailure(Throwable caught) { +// Window.alert(caught.getMessage()); +// mainPanel.hidePanelDetails(); +// +// } +// +// @Override +// public void onSuccess(ConcessioneDV concessioneDV) { +// GWT.log("Showing: " + concessioneDV); +// mainPanel.showAsDetails(concessioneDV, showDetailsEvent.getGeonaItemRef()); +// } +// }); +// } } }); - applicationBus.addHandler(ZoomOutOverMinimumEvent.TYPE, new ZoomOutOverMinimumEventHandler() { + applicationBus.addHandler(AddedLayerToMapEvent.TYPE, addedLayerToMapEvent -> { + GWT.log("Fired AddedLayerToMapEvent " + addedLayerToMapEvent.getLayerItem() + "layer type: "+addedLayerToMapEvent.getLayerType()); - @Override - public void onZoomOut(ZoomOutOverMinimumEvent zoomOutEvent) { + try { - if (mainPanel.getDisplayedRecord() == null && !olMapMng.isQueryPointActive()) { - olMapMng.hidePopInfo(); - layerManager.removeAllDetailLayers(); - - } - - mainPanel.hideOverlayLayers(); - // layerManager.getOverlayLayerManager().hide(); - // hidePopupLayers(); + attempt = 0; +// if (paramGeonaItemID != null) { +// // waiting for record retrieved by service before calling the WFS +// final int MAX_RETRY = 15; +// Timer timer = new com.google.gwt.user.client.Timer() { +// @Override +// public void run() { +// attempt++; +// GWT.log("waiting get record: " + attempt); +// RecordDV record = mainPanel.getDisplayedRecord(); +// if (record != null) { +// this.cancel(); +// GWT.log("cancelled timer"); +// OGCUtils.performWFSQueryOnCentroid(record); +// } +// +// if (attempt > MAX_RETRY) { +// GWT.log("MAX_RETRY reached, cancelled timer"); +// this.cancel(); +// } +// +// } +// }; +// timer.scheduleRepeating(1000); +// +// } + } catch (Exception e) { + // TODO: handle exception } - }); - applicationBus.addHandler(ClosedViewDetailsEvent.TYPE, new ClosedViewDetailsEventHandler() { + LAYER_TYPE layerType = addedLayerToMapEvent.getLayerType(); - @Override - public void onClosed(ClosedViewDetailsEvent closedViewDetailsEvent) { - olMapMng.hidePopInfo(); - } - }); + if (layerType != null) { - applicationBus.addHandler(MapExtentToEvent.TYPE, new MapExtentToEventHandler() { + switch (layerType) { + case BASE: - @Override - public void onExtentEvent(MapExtentToEvent mapExtentToEvent) { - // TODO Auto-generated method stub - - } - }); - - applicationBus.addHandler(DoActionOnDetailLayersEvent.TYPE, new DoActionOnDetailLayersEventHandler() { - - @Override - public void onDoActionOnDetailLayers(DoActionOnDetailLayersEvent doLayerActionEvent) { - - DO_LAYER_ACTION doAction = doLayerActionEvent.getDoAction(); - GWT.log("event: "+doAction); - GWT.log("layer source: "+doLayerActionEvent.getLayerItem().getName()); - OpenLayerMap olMap = olMapMng.getOLMap(); - - switch (doAction) { - case OPACITY: - GWT.log("opacity: "+doLayerActionEvent.getOpacity()); - olMap.setWMSDetailLayerOpacity(doLayerActionEvent.getLayerItem(), - doLayerActionEvent.getOpacity()); break; - - case SWAP: - SwapLayer swLS = doLayerActionEvent.getSourceLayerSwap(); - SwapLayer swLT = doLayerActionEvent.getTargetLayerSwap(); - GWT.log("SWAPPING source "+swLS.getLayerItem().getName() +", target: "+swLT.getLayerItem().getName()); - olMap.swapDetailsLayers(swLS, swLT); - break; - - case VISIBILITY: - GWT.log("visibility: "+doLayerActionEvent.getVisibility()); - olMap.setWMSDetailLayerVisible(doLayerActionEvent.getLayerItem(), - doLayerActionEvent.getVisibility()); - + case OVERLAY: + mainPanel.showOverlayLayers(layerManager.getOverlayLayerManager().getPanel()); break; default: break; } + } + + }); + + applicationBus.addHandler(ZoomOutOverMinimumEvent.TYPE, zoomOutEvent -> { + + if (mainPanel.getDisplayedRecord() == null && !olMapMng.isQueryPointActive()) { + olMapMng.hidePopInfo(); + layerManager.removeAllDetailLayers(); } + mainPanel.hideOverlayLayers(); + // layerManager.getOverlayLayerManager().hide(); + // hidePopupLayers(); + }); + + + applicationBus.addHandler(ClosedViewDetailsEvent.TYPE, closedViewDetailsEvent -> olMapMng.hidePopInfo()); + + applicationBus.addHandler(MapExtentToEvent.TYPE, mapExtentToEvent -> {// TODO Auto-generated method stub + }); + + applicationBus.addHandler(DoActionOnDetailLayersEvent.TYPE, doLayerActionEvent -> { + + DO_LAYER_ACTION doAction = doLayerActionEvent.getDoAction(); + GWT.log("event: "+doAction); + GWT.log("layer source: "+doLayerActionEvent.getLayerItem().getName()); + OpenLayerMap olMap = olMapMng.getOLMap(); + + switch (doAction) { + case OPACITY: + GWT.log("opacity: "+doLayerActionEvent.getOpacity()); + olMap.setWMSDetailLayerOpacity(doLayerActionEvent.getLayerItem(), + doLayerActionEvent.getOpacity()); + break; + + case SWAP: + SwapLayer swLS = doLayerActionEvent.getSourceLayerSwap(); + SwapLayer swLT = doLayerActionEvent.getTargetLayerSwap(); + GWT.log("SWAPPING source "+swLS.getLayerItem().getName() +", target: "+swLT.getLayerItem().getName()); + olMap.swapDetailsLayers(swLS, swLT); + break; + + case VISIBILITY: + GWT.log("visibility: "+doLayerActionEvent.getVisibility()); + olMap.setWMSDetailLayerVisible(doLayerActionEvent.getLayerItem(), + doLayerActionEvent.getVisibility()); + + break; + + default: + break; + } + }); - applicationBus.addHandler(ChangeMapLayerEvent.TYPE, new ChangeMapLayerEventHandler() { + applicationBus.addHandler(ChangeBaseMapLayerEvent.TYPE, changeMapLayerEvent -> { - @Override - public void onChangeBaseMapLayer(ChangeMapLayerEvent changeMapLayerEvent) { + BaseMapLayer baseLayer = changeMapLayerEvent.getBaseMapLayer(); - BaseMapLayer baseLayer = changeMapLayerEvent.getBaseMapLayer(); + if (baseLayer == null) + return; - if (baseLayer == null) - return; + String attributionHTML = "
" + + baseLayer.getAttribution() + "
"; + olMapMng.getOLMap().changeBaseMap(baseLayer); - String attributionHTML = "
" - + baseLayer.getAttribution() + "
"; - olMapMng.getOLMap().changeBaseMap(baseLayer); + // THE OSM Contributors are automatically added by gwt-ol, others ones not. + if (!baseLayer.getType().equals(BaseMapLayer.OL_BASE_MAP.OSM)) { + attributionDiv.setHTML(attributionHTML); + } else + attributionDiv.setHTML(""); - // THE OSM Contributors are automatically added by gwt-ol, others ones not. - if (!baseLayer.getType().equals(BaseMapLayer.OL_BASE_MAP.OSM)) { - attributionDiv.setHTML(attributionHTML); - } else - attributionDiv.setHTML(""); - - } }); - applicationBus.addHandler(ShowPopupOnCentroiEvent.TYPE, new ShowPopupOnCentroiEventHandler() { - - @Override - public void onShowPopup(ShowPopupOnCentroiEvent showPopupOnCentroiEvent) { - - if(showPopupOnCentroiEvent.getRecord()!=null) - performWFSQueryOnCentroid(showPopupOnCentroiEvent.getRecord()); - - } + applicationBus.addHandler(ShowPopupOnCentroiEvent.TYPE, showPopupOnCentroiEvent -> { + + if(showPopupOnCentroiEvent.getRecord()!=null) + OGCUtils.performWFSQueryOnCentroid(showPopupOnCentroiEvent.getRecord()); + }); - applicationBus.addHandler(SearchPerformedEvent.TYPE, new SearchPerformedEventHandler() { - - @Override - public void onSearchDone(SearchPerformedEvent searchPerformedEvent) { - - if(searchPerformedEvent!=null) { - - - - LinkedHashMap wmsMap = olMapMng.getOLMap().getWmsLayerMap(); - String firstWMSKey = wmsMap.keySet().iterator().next(); - List result = searchPerformedEvent.getData(); - - if(result!=null && result.size()>0) { - String cqlFilter = "product_id IN("; - for (ConcessioneDV concessioneDV : result) { - cqlFilter+="'"+concessioneDV.getItemId()+"',"; - } - cqlFilter = cqlFilter.substring(0,cqlFilter.length()-1)+")"; - - olMapMng.getOLMap().setCQLFilterToWMSLayer(firstWMSKey, cqlFilter); - }else { - olMapMng.getOLMap().setCQLFilterToWMSLayer(firstWMSKey, null); - } - - if(searchPerformedEvent.isSearchReset()) { - olMapMng.getOLMap().setCQLFilterToWMSLayer(firstWMSKey, null); + applicationBus.addHandler(SearchPerformedEvent.TYPE, searchPerformedEvent -> { + + if(searchPerformedEvent!=null) { + + LinkedHashMap wmsMap = olMapMng.getOLMap().getWmsLayerMap(); + String firstWMSKey = wmsMap.keySet().iterator().next(); + List result = searchPerformedEvent.getData(); + + if(result!=null && result.size()>0) { + String cqlFilter = "product_id IN("; + for (ConcessioneDV concessioneDV : result) { + cqlFilter+="'"+concessioneDV.getItemId()+"',"; } + cqlFilter = cqlFilter.substring(0,cqlFilter.length()-1)+")"; + olMapMng.getOLMap().setCQLFilterToWMSLayer(firstWMSKey, cqlFilter); + }else { + olMapMng.getOLMap().setCQLFilterToWMSLayer(firstWMSKey, null); } - - + + if(searchPerformedEvent.isSearchReset()) { + olMapMng.getOLMap().setCQLFilterToWMSLayer(firstWMSKey, null); + } + } + + }); } -// /** -// * Handler popu closer. -// * -// * @param divId the div id -// * @param overlayId the overlay id -// */ -// public static native void handlerPopuCloser(String divId, String overlayId) /*-{ -// var closer = $doc.getElementById(divId); -// var overlay = $doc.getElementById(overlayId); -// closer.onclick = function() { -// overlay.setPosition(undefined); -// closer.blur(); -// return false; -// }; -// -// }-*/; - - private void performWFSQueryOnCentroid(RecordDV record) { - if (record != null) { - GWT.log("record instanceof ConcessioneDV: " + (record instanceof ConcessioneDV) + " with mongo item id: " - + record.getItemId()); - // GeoportalDataViewerConstants.print("record instanceof ConcessioneDV: " - // +(record instanceof ConcessioneDV)); - if (record instanceof ConcessioneDV) { - ConcessioneDV concessioneDV = (ConcessioneDV) record; - Double x = concessioneDV.getCentroidLong(); - Double y = concessioneDV.getCentroidLat(); - GWT.log("X: " + x + ", Y:" + y); - if (x != null && y != null) { - Coordinate transfCoord = MapUtils.transformCoordiante(new Coordinate(x, y), - MAP_PROJECTION.EPSG_4326.getName(), MAP_PROJECTION.EPSG_3857.getName()); - GeoQuery select = olMapMng.toDataPointQuery(transfCoord, false); - GWT.log("GeoQuery: " + select); - // GeoportalDataViewerConstants.print("fireEvent QueryDataEvent"); - ExtentWrapped toExt = new ExtentWrapped(transfCoord.getX(), transfCoord.getY(), transfCoord.getX(), - transfCoord.getY()); - layerManager.getLayerManagerBus().fireEvent(new QueryDataEvent(select, toExt, record.getItemId(), - true, MapEventType.ADDED_CENTROID_LAYER_TO_MAP)); - } else { - GeoportalDataViewerConstants.printJs( - "I cannot select the point one or both coordiantes are null. X: " + x + ", Y:" + y); - } - } - } - } } 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 a843390..10093f6 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 @@ -17,13 +17,13 @@ import org.gcube.application.geoportalcommon.shared.products.model.UploadedImage import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerConstants.LayerType; import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerConstants.MAP_PROJECTION; import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerConstants.MapEventType; -import org.gcube.portlets.user.geoportaldataviewer.client.events.AddedLayerToMapEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.AddedLayerToMapEventHandler; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.AddedLayerToMapEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.AddedLayerToMapEventHandler; import org.gcube.portlets.user.geoportaldataviewer.client.events.QueryDataEvent; import org.gcube.portlets.user.geoportaldataviewer.client.events.QueryDataEventHandler; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ShowDetailsEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ZoomOutOverMinimumEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ZoomOutOverMinimumEventHandler; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.ShowDetailsEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.ZoomOutOverMinimumEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.ZoomOutOverMinimumEventHandler; import org.gcube.portlets.user.geoportaldataviewer.client.gis.ExtentWrapped; import org.gcube.portlets.user.geoportaldataviewer.client.gis.MapUtils; import org.gcube.portlets.user.geoportaldataviewer.client.gis.OpenLayerMap; 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..4cad5ee 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 @@ -3,7 +3,7 @@ package org.gcube.portlets.user.geoportaldataviewer.client; import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerConstants.MAP_PROJECTION; import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerConstants.MapEventType; import org.gcube.portlets.user.geoportaldataviewer.client.events.QueryDataEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ZoomOutOverMinimumEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.ZoomOutOverMinimumEvent; import org.gcube.portlets.user.geoportaldataviewer.client.gis.ExtentWrapped; import org.gcube.portlets.user.geoportaldataviewer.client.gis.MapUtils; import org.gcube.portlets.user.geoportaldataviewer.client.gis.OpenLayerMap; 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 new file mode 100644 index 0000000..26139f0 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/StartParameters.java @@ -0,0 +1,69 @@ +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()) + GWT.log("!!!! NB : NO QUERY PARAMETERS"); + else { + 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); + } + } + + // retro usage? + /** WMS Link -> Layer Name [optional]*/ + public Map toOpenLayers() { + return Collections.emptyMap(); + } + + public Set toOpenCollections(){ + return Collections.emptySet(); + } + + public Set toOpenProjects(){ + return Collections.emptySet(); + } + + + private String getFirst(Map> parameters, String key) { + List values = parameters.get(key); + if (values != null && !values.isEmpty()) { + GWT.log("Param " + key + "Getting First value of : " + values); + return values.get(0); + } else return null; + } + + /** + * The param wms request. + */ + private String paramWmsRequest; + + /** + * The param UUID. + */ + // private String paramUUID; + + private String paramGeonaItemType; + /** + * The param layer title. + */ + private String paramLayerTitle; + + private String 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 new file mode 100644 index 0000000..ea7cfe9 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/OpenCollectionsEvent.java @@ -0,0 +1,18 @@ +package org.gcube.portlets.user.geoportaldataviewer.client.events; + +import com.google.gwt.event.shared.GwtEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.MapExtentToEventHandler; + +public class OpenCollectionsEvent extends GwtEvent { + public static Type TYPE = new Type(); + + @Override + public Type getAssociatedType() { + return null; + } + + @Override + protected void dispatch(OpenCollectionsEventHandler h) { + h. + } +} diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/OpenCollectionsEventHandler.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/OpenCollectionsEventHandler.java new file mode 100644 index 0000000..3f5a354 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/OpenCollectionsEventHandler.java @@ -0,0 +1,8 @@ +package org.gcube.portlets.user.geoportaldataviewer.client.events; + +import com.google.gwt.event.shared.EventHandler; + +public interface OpenCollectionsEventHandler extends EventHandler { + + +} diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/AddedLayerToMapEvent.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/AddedLayerToMapEvent.java similarity index 99% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/AddedLayerToMapEvent.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/AddedLayerToMapEvent.java index cb94887..f504c9a 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/AddedLayerToMapEvent.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/AddedLayerToMapEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.LayerItem; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/AddedLayerToMapEventHandler.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/AddedLayerToMapEventHandler.java similarity index 97% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/AddedLayerToMapEventHandler.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/AddedLayerToMapEventHandler.java index ac28a58..dbac7a5 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/AddedLayerToMapEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/AddedLayerToMapEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ChangeMapLayerEvent.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ChangeBaseMapLayerEvent.java similarity index 65% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ChangeMapLayerEvent.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ChangeBaseMapLayerEvent.java index 2ace889..03878c6 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ChangeMapLayerEvent.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ChangeBaseMapLayerEvent.java @@ -1,18 +1,18 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.BaseMapLayer; import com.google.gwt.event.shared.GwtEvent; /** - * The Class ChangeMapLayerEvent. + * The Class ChangeBaseMapLayerEvent. * * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it * * Nov 12, 2021 */ -public class ChangeMapLayerEvent extends GwtEvent { - public static Type TYPE = new Type(); +public class ChangeBaseMapLayerEvent extends GwtEvent { + public static Type TYPE = new Type(); private BaseMapLayer baseMapLayer; /** @@ -20,7 +20,7 @@ public class ChangeMapLayerEvent extends GwtEvent { * * @param baseMapLayer the base map layer */ - public ChangeMapLayerEvent(BaseMapLayer baseMapLayer) { + public ChangeBaseMapLayerEvent(BaseMapLayer baseMapLayer) { this.baseMapLayer = baseMapLayer; } @@ -31,7 +31,7 @@ public class ChangeMapLayerEvent extends GwtEvent { * @return the associated type */ @Override - public Type getAssociatedType() { + public Type getAssociatedType() { return TYPE; } @@ -41,7 +41,7 @@ public class ChangeMapLayerEvent extends GwtEvent { * @param handler the handler */ @Override - protected void dispatch(ChangeMapLayerEventHandler handler) { + protected void dispatch(ChangeBaseMapLayerEventHandler handler) { handler.onChangeBaseMapLayer(this); } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ChangeMapLayerEventHandler.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ChangeBaseMapLayerEventHandler.java similarity index 61% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ChangeMapLayerEventHandler.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ChangeBaseMapLayerEventHandler.java index 143eac0..489dc93 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ChangeMapLayerEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ChangeBaseMapLayerEventHandler.java @@ -1,20 +1,20 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import com.google.gwt.event.shared.EventHandler; /** - * The Interface ChangeMapLayerEventHandler. + * The Interface ChangeBaseMapLayerEventHandler. * * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it * * Nov 12, 2021 */ -public interface ChangeMapLayerEventHandler extends EventHandler { +public interface ChangeBaseMapLayerEventHandler extends EventHandler { /** * On change base map layer. * * @param changeMapLayerEvent the change map layer event */ - void onChangeBaseMapLayer(ChangeMapLayerEvent changeMapLayerEvent); + void onChangeBaseMapLayer(ChangeBaseMapLayerEvent changeMapLayerEvent); } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ClosedViewDetailsEvent.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ClosedViewDetailsEvent.java similarity index 98% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ClosedViewDetailsEvent.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ClosedViewDetailsEvent.java index ecc72d7..0f24fd8 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ClosedViewDetailsEvent.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ClosedViewDetailsEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import com.google.gwt.event.shared.GwtEvent; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ClosedViewDetailsEventHandler.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ClosedViewDetailsEventHandler.java similarity index 97% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ClosedViewDetailsEventHandler.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ClosedViewDetailsEventHandler.java index ac652c1..ece333c 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ClosedViewDetailsEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ClosedViewDetailsEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/DoActionOnDetailLayersEvent.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/DoActionOnDetailLayersEvent.java similarity index 99% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/DoActionOnDetailLayersEvent.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/DoActionOnDetailLayersEvent.java index 6259a65..c085e07 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/DoActionOnDetailLayersEvent.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/DoActionOnDetailLayersEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.LayerItem; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/DoActionOnDetailLayersEventHandler.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/DoActionOnDetailLayersEventHandler.java similarity index 97% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/DoActionOnDetailLayersEventHandler.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/DoActionOnDetailLayersEventHandler.java index b11bac8..1cab731 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/DoActionOnDetailLayersEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/DoActionOnDetailLayersEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/MapExtentToEvent.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/MapExtentToEvent.java similarity index 98% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/MapExtentToEvent.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/MapExtentToEvent.java index af4c60e..39bec1b 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/MapExtentToEvent.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/MapExtentToEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import org.gcube.portlets.user.geoportaldataviewer.client.ui.map.ExtentMapUtil.Location; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/MapExtentToEventHandler.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/MapExtentToEventHandler.java similarity index 97% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/MapExtentToEventHandler.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/MapExtentToEventHandler.java index 172c6ac..28aee8c 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/MapExtentToEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/MapExtentToEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/SearchPerformedEvent.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/SearchPerformedEvent.java similarity index 98% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/SearchPerformedEvent.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/SearchPerformedEvent.java index 0074ce9..8ce4b1d 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/SearchPerformedEvent.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/SearchPerformedEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import java.util.List; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/SearchPerformedEventHandler.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/SearchPerformedEventHandler.java similarity index 97% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/SearchPerformedEventHandler.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/SearchPerformedEventHandler.java index de6a195..23855ca 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/SearchPerformedEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/SearchPerformedEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ShowDetailsEvent.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ShowDetailsEvent.java similarity index 99% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ShowDetailsEvent.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ShowDetailsEvent.java index 2e61b8e..8f188f4 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ShowDetailsEvent.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ShowDetailsEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import org.gcube.application.geoportalcommon.shared.GeoNaItemRef; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.wfs.FeatureRow; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ShowDetailsEventHandler.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ShowDetailsEventHandler.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ShowDetailsEventHandler.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ShowDetailsEventHandler.java index 4a6fd28..5993553 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ShowDetailsEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ShowDetailsEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import com.google.gwt.event.shared.EventHandler; @@ -18,4 +18,5 @@ public interface ShowDetailsEventHandler extends EventHandler { * @param showDetailsEvent the show details event */ void onShowDetails(ShowDetailsEvent showDetailsEvent); + } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ShowPopupOnCentroiEvent.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ShowPopupOnCentroiEvent.java similarity index 98% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ShowPopupOnCentroiEvent.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ShowPopupOnCentroiEvent.java index 07c07af..9f5897a 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ShowPopupOnCentroiEvent.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ShowPopupOnCentroiEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import org.gcube.application.geoportalcommon.shared.products.model.RecordDV; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ShowPopupOnCentroiEventHandler.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ShowPopupOnCentroiEventHandler.java similarity index 97% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ShowPopupOnCentroiEventHandler.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ShowPopupOnCentroiEventHandler.java index c668c23..85e0fed 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ShowPopupOnCentroiEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ShowPopupOnCentroiEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ZoomOutOverMinimumEvent.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ZoomOutOverMinimumEvent.java similarity index 98% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ZoomOutOverMinimumEvent.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ZoomOutOverMinimumEvent.java index 4e4e743..e30527e 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ZoomOutOverMinimumEvent.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ZoomOutOverMinimumEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import com.google.gwt.event.shared.GwtEvent; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ZoomOutOverMinimumEventHandler.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ZoomOutOverMinimumEventHandler.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ZoomOutOverMinimumEventHandler.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ZoomOutOverMinimumEventHandler.java index 65e893a..8277f6b 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ZoomOutOverMinimumEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/application/ZoomOutOverMinimumEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.geoportaldataviewer.client.events; +package org.gcube.portlets.user.geoportaldataviewer.client.events.application; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OpenLayerMap.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OpenLayerMap.java index 9f8e73e..d1dac6e 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OpenLayerMap.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OpenLayerMap.java @@ -5,9 +5,9 @@ import java.util.LinkedHashMap; import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerConstants; import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerConstants.MAP_PROJECTION; -import org.gcube.portlets.user.geoportaldataviewer.client.events.AddedLayerToMapEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.AddedLayerToMapEvent.LAYER_TYPE; -import org.gcube.portlets.user.geoportaldataviewer.client.events.DoActionOnDetailLayersEvent.SwapLayer; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.AddedLayerToMapEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.AddedLayerToMapEvent.LAYER_TYPE; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.DoActionOnDetailLayersEvent.SwapLayer; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.BaseMapLayer; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.LayerItem; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/DetailsPanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/DetailsPanel.java index 94b16cb..b5b459b 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/DetailsPanel.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/DetailsPanel.java @@ -3,7 +3,7 @@ package org.gcube.portlets.user.geoportaldataviewer.client.ui; import org.gcube.application.geoportalcommon.shared.GeoNaItemRef; import org.gcube.application.geoportalcommon.shared.products.ConcessioneDV; import org.gcube.application.geoportalcommon.shared.products.model.RecordDV; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ClosedViewDetailsEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.ClosedViewDetailsEvent; import org.gcube.portlets.user.geoportaldataviewer.client.ui.products.concessioni.ConcessioneView; import com.github.gwtbootstrap.client.ui.Button; 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 37803a9..59c4313 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 @@ -8,8 +8,8 @@ import org.gcube.application.geoportalcommon.shared.SearchingFilter; import org.gcube.application.geoportalcommon.shared.products.ConcessioneDV; import org.gcube.application.geoportalcommon.shared.products.model.RecordDV; import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerConstants.MAP_PROJECTION; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ChangeMapLayerEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.MapExtentToEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.ChangeBaseMapLayerEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.MapExtentToEvent; import org.gcube.portlets.user.geoportaldataviewer.client.gis.OpenLayerMap; import org.gcube.portlets.user.geoportaldataviewer.client.resources.GNAIcons; import org.gcube.portlets.user.geoportaldataviewer.client.resources.GNAImages; @@ -413,7 +413,7 @@ public class GeonaDataViewMainPanel extends Composite { @Override public void onValueChange(ValueChangeEvent event) { - applicationBus.fireEvent(new ChangeMapLayerEvent(baseMapLayer)); + applicationBus.fireEvent(new ChangeBaseMapLayerEvent(baseMapLayer)); } }); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/SearchFacilityUI.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/SearchFacilityUI.java index d89d048..0451430 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/SearchFacilityUI.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/SearchFacilityUI.java @@ -16,9 +16,9 @@ import org.gcube.application.geoportalcommon.shared.WhereClause; import org.gcube.application.geoportalcommon.shared.products.ConcessioneDV; import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerConstants; import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerServiceAsync; -import org.gcube.portlets.user.geoportaldataviewer.client.events.SearchPerformedEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ShowDetailsEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.ShowPopupOnCentroiEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.SearchPerformedEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.ShowDetailsEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.ShowPopupOnCentroiEvent; import org.gcube.portlets.user.geoportaldataviewer.client.util.LoaderIcon; import org.gcube.portlets.user.geoportaldataviewer.client.util.StringUtil; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/DragDropLayer.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/DragDropLayer.java index 6c53001..9a9405a 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/DragDropLayer.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/DragDropLayer.java @@ -1,9 +1,9 @@ package org.gcube.portlets.user.geoportaldataviewer.client.ui.dandd; import org.gcube.application.geoportalcommon.shared.products.BaseConcessioneDV; -import org.gcube.portlets.user.geoportaldataviewer.client.events.DoActionOnDetailLayersEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.DoActionOnDetailLayersEvent.DO_LAYER_ACTION; -import org.gcube.portlets.user.geoportaldataviewer.client.events.DoActionOnDetailLayersEvent.SwapLayer; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.DoActionOnDetailLayersEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.DoActionOnDetailLayersEvent.DO_LAYER_ACTION; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.DoActionOnDetailLayersEvent.SwapLayer; import org.gcube.portlets.user.geoportaldataviewer.client.resources.GNAImages; import org.gcube.portlets.user.geoportaldataviewer.client.util.StringUtil; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.LayerItem; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/RangeSlider.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/RangeSlider.java index 55ee827..9f217fa 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/RangeSlider.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/RangeSlider.java @@ -1,7 +1,7 @@ package org.gcube.portlets.user.geoportaldataviewer.client.ui.dandd; -import org.gcube.portlets.user.geoportaldataviewer.client.events.DoActionOnDetailLayersEvent; -import org.gcube.portlets.user.geoportaldataviewer.client.events.DoActionOnDetailLayersEvent.DO_LAYER_ACTION; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.DoActionOnDetailLayersEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.events.application.DoActionOnDetailLayersEvent.DO_LAYER_ACTION; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.LayerItem; import com.google.gwt.core.client.GWT; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/util/OGCUtils.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/util/OGCUtils.java new file mode 100644 index 0000000..350864d --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/util/OGCUtils.java @@ -0,0 +1,46 @@ +package org.gcube.portlets.user.geoportaldataviewer.client.util; + +import com.google.gwt.core.client.GWT; +import ol.Coordinate; +import org.gcube.application.geoportalcommon.shared.products.ConcessioneDV; +import org.gcube.application.geoportalcommon.shared.products.model.RecordDV; +import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerConstants; +import org.gcube.portlets.user.geoportaldataviewer.client.events.QueryDataEvent; +import org.gcube.portlets.user.geoportaldataviewer.client.gis.ExtentWrapped; +import org.gcube.portlets.user.geoportaldataviewer.client.gis.MapUtils; +import org.gcube.portlets.user.geoportaldataviewer.shared.gis.GeoQuery; + +public class OGCUtils { + + public static void performWFSQueryOnCentroid(RecordDV record) { + GWT.log("WFS Query for : "+record); + + if (record != null) { +// GWT.log("record instanceof ConcessioneDV: " + (record instanceof ConcessioneDV) + " with mongo item id: " +// + record.getItemId()); + // GeoportalDataViewerConstants.print("record instanceof ConcessioneDV: " + // +(record instanceof ConcessioneDV)); +// if (record instanceof ConcessioneDV) { +// ConcessioneDV concessioneDV = (ConcessioneDV) record; +// Double x = concessioneDV.getCentroidLong(); +// Double y = concessioneDV.getCentroidLat(); +// GWT.log("X: " + x + ", Y:" + y); +// if (x != null && y != null) { +// Coordinate transfCoord = MapUtils.transformCoordiante(new Coordinate(x, y), +// GeoportalDataViewerConstants.MAP_PROJECTION.EPSG_4326.getName(), GeoportalDataViewerConstants.MAP_PROJECTION.EPSG_3857.getName()); +// GeoQuery select = olMapMng.toDataPointQuery(transfCoord, false); +// GWT.log("GeoQuery: " + select); +// // GeoportalDataViewerConstants.print("fireEvent QueryDataEvent"); +// ExtentWrapped toExt = new ExtentWrapped(transfCoord.getX(), transfCoord.getY(), transfCoord.getX(), +// transfCoord.getY()); +// layerManager.getLayerManagerBus().fireEvent(new QueryDataEvent(select, toExt, record.getItemId(), +// true, GeoportalDataViewerConstants.MapEventType.ADDED_CENTROID_LAYER_TO_MAP)); +// } else { +// GeoportalDataViewerConstants.printJs( +// "I cannot select the point one or both coordiantes are null. X: " + x + ", Y:" + y); +// } +// } + } + } + +} 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 new file mode 100644 index 0000000..a143791 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/GCubeCollection.java @@ -0,0 +1,12 @@ +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; +}