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 c8f3d3e..5371497 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 @@ -238,7 +238,7 @@ public class GeoportalDataViewer implements EntryPoint { } GeoportalItemReferences gir = new GeoportalItemReferences(paramGeonaItemID, paramGeonaItemType); - applicationBus.fireEvent(new ShowDetailsEvent(gir, null, null, true)); + applicationBus.fireEvent(new ShowDetailsEvent(gir, null, true)); } mainPanel.openCollectionMenu(); @@ -415,8 +415,6 @@ public class GeoportalDataViewer implements EntryPoint { try { - GWT.log("onLayerRendered Timer PART MUST BE REVISITED"); - attempt = 0; if (paramGeonaItemID != null && initApplication) { // waiting for record retrieved by service before 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 15aff16..6f82655 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 @@ -197,11 +197,6 @@ public class LayerManager { GWT.log("GeoNaDataObject's is/are " + listGeonaDataObjects.size()); - // GWT.log("GeoNaDataObject's: " + listGeonaDataObjects); -// GeoportalDataViewerConstants.print("GeoNaDataObject's: -// "+listGeonaDataObjects); - GWT.log("GeoNaDataObject's must be revisited"); - if (listGeonaDataObjects == null || listGeonaDataObjects.isEmpty()) return; @@ -412,16 +407,9 @@ public class LayerManager { List productIds = fRow.getMapProperties().get("projectid"); if (productIds != null && productIds.size() > 0) { String productId = productIds.get(0); - String itemName = "Dettagli Prodotto"; - GWT.log("Dettagli prodotto must be revisited"); -// List listName = fRow.getMapProperties().get("nome"); -// if (listName != null && listName.size() > 0) { -// itemName = listName.get(0); -// } - LayerObjectType layerObjectType = layerObject.getType(); return new ShowDetailsEvent(layerObjectType != null ? layerObjectType.name() : null, - layerObject.getProfileID(), productId, itemName, fRow, true); + layerObject.getProfileID(), productId, fRow, true); } return null; @@ -765,8 +753,6 @@ public class LayerManager { continue; } - GWT.log("showPopupInfoForLayer must be REVISITED"); - String newProjectID = lo.getProjectID(); if (prevProjectId.compareTo(newProjectID) != 0) { // String projectIntro = newProjectID.length() > 100 ? StringUtil.ellipsize(newProjectID, 100) @@ -811,7 +797,7 @@ public class LayerManager { public void onBrowserEvent(Event event) { if (Event.ONCLICK == event.getTypeInt()) { applicationBus.fireEvent(new ShowDetailsEvent(lo.getType().name(), - lo.getProfileID(), newProjectID, null, null, true)); + lo.getProfileID(), newProjectID, null, true)); } } 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/ShowDetailsEvent.java index 0b6713d..4f5128a 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/ShowDetailsEvent.java @@ -10,7 +10,7 @@ import com.google.gwt.event.shared.GwtEvent; * * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it * - * Jul 30, 2021 + * Nov 14, 2022 */ public class ShowDetailsEvent extends GwtEvent { public static Type TYPE = new Type(); @@ -24,17 +24,17 @@ public class ShowDetailsEvent extends GwtEvent { /** * Instantiates a new show details event. * - * @param layerObjectType the geona item type - * @param geonaMongoID the geona mongo ID - * @param itemName the item name - * @param featureRow the feature row + * @param layerObjectType the layer object type + * @param profileID the profile ID + * @param projectID the project ID + * @param featureRow the feature row + * @param loadTimelineRelationships the load timeline relationships */ - public ShowDetailsEvent(String layerObjectType, String profileID, String projectID, String itemName, - FeatureRow featureRow, boolean loadTimelineRelationships) { + public ShowDetailsEvent(String layerObjectType, String profileID, String projectID, FeatureRow featureRow, + boolean loadTimelineRelationships) { this.layerObjectType = layerObjectType; this.profileID = profileID; this.projectID = projectID; - this.itemName = itemName; this.featureRow = featureRow; this.loadTimelineRelationships = loadTimelineRelationships; } @@ -42,32 +42,50 @@ public class ShowDetailsEvent extends GwtEvent { /** * Instantiates a new show details event. * - * @param gir the gir - * @param itemName the item name - * @param featureRow the feature row + * @param gir the gir + * @param featureRow the feature row * @param loadTimelineRelationships the load timeline relationships */ - public ShowDetailsEvent(GeoportalItemReferences gir, String itemName, FeatureRow featureRow, boolean loadTimelineRelationships) { + public ShowDetailsEvent(GeoportalItemReferences gir, FeatureRow featureRow, boolean loadTimelineRelationships) { this.layerObjectType = gir.getLayerObjectType(); this.profileID = gir.getProfileID(); this.projectID = gir.getProjectID(); - this.itemName = itemName; this.featureRow = featureRow; this.loadTimelineRelationships = loadTimelineRelationships; } + /** + * Gets the type. + * + * @return the type + */ public static Type getTYPE() { return TYPE; } + /** + * Gets the layer object type. + * + * @return the layer object type + */ public String getLayerObjectType() { return layerObjectType; } + /** + * Gets the profile ID. + * + * @return the profile ID + */ public String getProfileID() { return profileID; } + /** + * Gets the project ID. + * + * @return the project ID + */ public String getProjectID() { return projectID; } @@ -102,24 +120,6 @@ public class ShowDetailsEvent extends GwtEvent { return featureRow; } - /** - * Gets the item name. - * - * @return the item name - */ - public String getItemName() { - return itemName; - } - - /** - * Sets the item name. - * - * @param itemName the new item name - */ - public void setItemName(String itemName) { - this.itemName = itemName; - } - /** * Checks if is load timeline relationships. * @@ -138,6 +138,11 @@ public class ShowDetailsEvent extends GwtEvent { return new GeoportalItemReferences(projectID, profileID, layerObjectType); } + /** + * To string. + * + * @return the string + */ @Override public String toString() { StringBuilder builder = new StringBuilder(); @@ -156,7 +161,5 @@ public class ShowDetailsEvent extends GwtEvent { builder.append("]"); return builder.toString(); } - - } \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/relation/RelationshipPanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/relation/RelationshipPanel.java index 0e2c91d..abac3b3 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/relation/RelationshipPanel.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/relation/RelationshipPanel.java @@ -38,7 +38,7 @@ public class RelationshipPanel extends Composite { initWidget(uiBinder.createAndBindUi(this)); this.appManagerBus = appManagerBus; - String html = ProjectUtil.toHMLCode(fromProject.getTheDocument(), fromProject.getId()); + String html = ProjectUtil.toHMLCode(false, fromProject.getTheDocument(), fromProject.getId()); rootRow.add(new HTML(html)); showRelationsOf(fromProject); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/relation/TimelineRelationPanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/relation/TimelineRelationPanel.java index 4980dad..9064a23 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/relation/TimelineRelationPanel.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/relation/TimelineRelationPanel.java @@ -139,7 +139,7 @@ public class TimelineRelationPanel extends Composite { String[] references = this.selectedProjectID.split(","); GeoportalItemReferences gir = new GeoportalItemReferences(references[1], references[0]); - ShowDetailsEvent showDetailsEvent = new ShowDetailsEvent(gir, null, null, false); + ShowDetailsEvent showDetailsEvent = new ShowDetailsEvent(gir, null, false); GWT.log("fireEvetn: " + showDetailsEvent); applicationBus.fireEvent(showDetailsEvent); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/search/SearchFacilityUI.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/search/SearchFacilityUI.java index 91d122e..15279ad 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/search/SearchFacilityUI.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/search/SearchFacilityUI.java @@ -331,7 +331,7 @@ public class SearchFacilityUI extends Composite { public void onClick(ClickEvent event) { GeoportalItemReferences gir = new GeoportalItemReferences(resultDoc.getProjectID(), profileID); - appManagerBus.fireEvent(new ShowDetailsEvent(gir, null, null, true)); + appManagerBus.fireEvent(new ShowDetailsEvent(gir, null, true)); GeoJSON spatialReference = resultDoc.getSpatialReference(); Coordinate transfCoord = MapUtils.geoJSONTToBBoxCenter(spatialReference, null, 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 0ee6c8c..b22214c 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 @@ -72,7 +72,8 @@ public class DragDropLayer extends FlowPanel { if (result != null) { for (String key : result.keySet()) { result.get(key); - referProject = key + ": " + result.get(key); + //referProject = key + ": " + result.get(key); + referProject = result.get(key)+""; break; } } diff --git a/src/main/webapp/GeoportalDataViewer.css b/src/main/webapp/GeoportalDataViewer.css index a1c2d9b..4a19fda 100644 --- a/src/main/webapp/GeoportalDataViewer.css +++ b/src/main/webapp/GeoportalDataViewer.css @@ -218,7 +218,7 @@ body { } .style-layer table { - width: 100%; + width: 98%; } .info-interaction {