gCubeSystem
/
geoportal-data-viewer-app
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Performed several improvements

This commit is contained in:
Francesco Mangiacrapa 2022-11-14 16:24:49 +01:00
parent 84fcc7dbb3
commit 942744cf05
8 changed files with 45 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java
View File

@ -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

18
src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java
View File

@ -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<String> 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<String> 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));
}
}

69
src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/events/ShowDetailsEvent.java
View File

@ -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<ShowDetailsEventHandler> {
public static Type<ShowDetailsEventHandler> TYPE = new Type<ShowDetailsEventHandler>();
@ -24,17 +24,17 @@ public class ShowDetailsEvent extends GwtEvent<ShowDetailsEventHandler> {
/**
* 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<ShowDetailsEventHandler> {
/**
* 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<ShowDetailsEventHandler> 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<ShowDetailsEventHandler> {
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<ShowDetailsEventHandler> {
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<ShowDetailsEventHandler> {
builder.append("]");
return builder.toString();
}
}

2
src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/relation/RelationshipPanel.java
View File

@ -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);

2
src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/relation/TimelineRelationPanel.java
View File

@ -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);

2
src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/search/SearchFacilityUI.java
View File

@ -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,

3
src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/DragDropLayer.java
View File

@ -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;
}
}

2
src/main/webapp/GeoportalDataViewer.css
View File

@ -218,7 +218,7 @@ body {
}
.style-layer table {
width: 100%;
width: 98%;
}
.info-interaction {