From 34ebb8d648ed31081e74b001deaee0c3bdacdf33 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 2 Dec 2020 17:52:06 +0100 Subject: [PATCH] added js logs. Commented common maps --- pom.xml | 2 +- .../client/GeoportalDataViewer.java | 4 ++++ .../geoportaldataviewer/client/LayerManager.java | 5 ++++- .../client/events/QueryDataEvent.java | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 941bf1a..185a540 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ org.gcube.core common-scope-maps - compile + org.gcube.common.portal 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 9781f55..c4629e6 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 @@ -121,6 +121,7 @@ public class GeoportalDataViewer implements EntryPoint { Long.parseLong(paramGeonaItemID); }catch (Exception e) { Window.alert("Bad format for parameter "+GeoportalDataViewerConstants.GET_GEONA_ITEM_ID+". It must be a Long"); + paramGeonaItemID = null; } Scheduler.get().scheduleDeferred(new ScheduledCommand() { @@ -247,17 +248,20 @@ public class GeoportalDataViewer implements EntryPoint { @Override public void onLayerRendered(AddedLayerToMapEvent addedLayerToMapEvent) { GWT.log("Fired AddedLayerToMapEvent "+addedLayerToMapEvent.getLayerItem()); + GeoportalDataViewerConstants.print("Fired AddedLayerToMapEvent "+addedLayerToMapEvent.getLayerItem()); //the parameter gid has been passed in the query string if(paramGeonaItemID!=null && mainPanel.getDisplyedRecord()!=null) { RecordDV record = mainPanel.getDisplyedRecord(); GWT.log("record instanceof ConcessioneDV: " +(record instanceof ConcessioneDV)); + GeoportalDataViewerConstants.print("record instanceof ConcessioneDV: " +(record instanceof ConcessioneDV)); if(record instanceof ConcessioneDV) { ConcessioneDV concessioneDV = (ConcessioneDV) record; Double x = concessioneDV.getCentroidLong(); Double y = concessioneDV.getCentroidLat(); Coordinate transfCoord = MapUtils.transformCoordiante(new Coordinate(x, y), GeoportalDataViewerConstants.EPSG_4326, GeoportalDataViewerConstants.EPSG_3857); GeoQuery select = olMapMng.toDataPointQuery(transfCoord); + GeoportalDataViewerConstants.print("fireEvent QueryDataEvent"); layerManager.getLayerManagerBus().fireEvent(new QueryDataEvent(select, transfCoord, record.getId())); } } 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 ffd49ce..dddc18a 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 @@ -90,6 +90,7 @@ public class LayerManager { @Override public void onQueryInteraction(final QueryDataEvent queryEvent) { + GeoportalDataViewerConstants.print("fired QueryDataEvent: "+queryEvent.toString()); if(queryEvent.getGeoQuery()!=null) { GeoQuery selectDataInfo = queryEvent.getGeoQuery(); @@ -135,7 +136,9 @@ public class LayerManager { GWT.log("Bounds is: "+mapBBOX); GWT.log("MAX_WFS_FEATURES is: "+GeoportalDataViewerConstants.MAX_WFS_FEATURES); - + + GeoportalDataViewerConstants.print("calling getDataResult"); + GeoportalDataViewerServiceAsync.Util.getInstance().getDataResult(layerObjects, olMap.getProjectionCode(), mapBBOX, GeoportalDataViewerConstants.MAX_WFS_FEATURES, olMap.getCurrentZoomLevel(), new AsyncCallback>() { @Override diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/QueryDataEvent.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/QueryDataEvent.java index d319f26..94ce306 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/QueryDataEvent.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/QueryDataEvent.java @@ -67,4 +67,19 @@ public class QueryDataEvent extends GwtEvent { public Coordinate getoLCoordinate() { return oLCoordinate; } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("QueryDataEvent [select="); + builder.append(select); + builder.append(", oLCoordinate="); + builder.append(oLCoordinate); + builder.append(", recordId="); + builder.append(recordId); + builder.append("]"); + return builder.toString(); + } + + } \ No newline at end of file