Performed several improvements
This commit is contained in:
parent
84fcc7dbb3
commit
942744cf05
|
@ -238,7 +238,7 @@ public class GeoportalDataViewer implements EntryPoint {
|
||||||
}
|
}
|
||||||
GeoportalItemReferences gir = new GeoportalItemReferences(paramGeonaItemID,
|
GeoportalItemReferences gir = new GeoportalItemReferences(paramGeonaItemID,
|
||||||
paramGeonaItemType);
|
paramGeonaItemType);
|
||||||
applicationBus.fireEvent(new ShowDetailsEvent(gir, null, null, true));
|
applicationBus.fireEvent(new ShowDetailsEvent(gir, null, true));
|
||||||
}
|
}
|
||||||
|
|
||||||
mainPanel.openCollectionMenu();
|
mainPanel.openCollectionMenu();
|
||||||
|
@ -415,8 +415,6 @@ public class GeoportalDataViewer implements EntryPoint {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
GWT.log("onLayerRendered Timer PART MUST BE REVISITED");
|
|
||||||
|
|
||||||
attempt = 0;
|
attempt = 0;
|
||||||
|
|
||||||
if (paramGeonaItemID != null && initApplication) { // waiting for record retrieved by service before
|
if (paramGeonaItemID != null && initApplication) { // waiting for record retrieved by service before
|
||||||
|
|
|
@ -197,11 +197,6 @@ public class LayerManager {
|
||||||
|
|
||||||
GWT.log("GeoNaDataObject's is/are " + listGeonaDataObjects.size());
|
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())
|
if (listGeonaDataObjects == null || listGeonaDataObjects.isEmpty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -412,16 +407,9 @@ public class LayerManager {
|
||||||
List<String> productIds = fRow.getMapProperties().get("projectid");
|
List<String> productIds = fRow.getMapProperties().get("projectid");
|
||||||
if (productIds != null && productIds.size() > 0) {
|
if (productIds != null && productIds.size() > 0) {
|
||||||
String productId = productIds.get(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();
|
LayerObjectType layerObjectType = layerObject.getType();
|
||||||
return new ShowDetailsEvent(layerObjectType != null ? layerObjectType.name() : null,
|
return new ShowDetailsEvent(layerObjectType != null ? layerObjectType.name() : null,
|
||||||
layerObject.getProfileID(), productId, itemName, fRow, true);
|
layerObject.getProfileID(), productId, fRow, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
@ -765,8 +753,6 @@ public class LayerManager {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
GWT.log("showPopupInfoForLayer must be REVISITED");
|
|
||||||
|
|
||||||
String newProjectID = lo.getProjectID();
|
String newProjectID = lo.getProjectID();
|
||||||
if (prevProjectId.compareTo(newProjectID) != 0) {
|
if (prevProjectId.compareTo(newProjectID) != 0) {
|
||||||
// String projectIntro = newProjectID.length() > 100 ? StringUtil.ellipsize(newProjectID, 100)
|
// String projectIntro = newProjectID.length() > 100 ? StringUtil.ellipsize(newProjectID, 100)
|
||||||
|
@ -811,7 +797,7 @@ public class LayerManager {
|
||||||
public void onBrowserEvent(Event event) {
|
public void onBrowserEvent(Event event) {
|
||||||
if (Event.ONCLICK == event.getTypeInt()) {
|
if (Event.ONCLICK == event.getTypeInt()) {
|
||||||
applicationBus.fireEvent(new ShowDetailsEvent(lo.getType().name(),
|
applicationBus.fireEvent(new ShowDetailsEvent(lo.getType().name(),
|
||||||
lo.getProfileID(), newProjectID, null, null, true));
|
lo.getProfileID(), newProjectID, null, true));
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,7 @@ import com.google.gwt.event.shared.GwtEvent;
|
||||||
*
|
*
|
||||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||||
*
|
*
|
||||||
* Jul 30, 2021
|
* Nov 14, 2022
|
||||||
*/
|
*/
|
||||||
public class ShowDetailsEvent extends GwtEvent<ShowDetailsEventHandler> {
|
public class ShowDetailsEvent extends GwtEvent<ShowDetailsEventHandler> {
|
||||||
public static Type<ShowDetailsEventHandler> TYPE = new Type<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.
|
* Instantiates a new show details event.
|
||||||
*
|
*
|
||||||
* @param layerObjectType the geona item type
|
* @param layerObjectType the layer object type
|
||||||
* @param geonaMongoID the geona mongo ID
|
* @param profileID the profile ID
|
||||||
* @param itemName the item name
|
* @param projectID the project ID
|
||||||
* @param featureRow the feature row
|
* @param featureRow the feature row
|
||||||
|
* @param loadTimelineRelationships the load timeline relationships
|
||||||
*/
|
*/
|
||||||
public ShowDetailsEvent(String layerObjectType, String profileID, String projectID, String itemName,
|
public ShowDetailsEvent(String layerObjectType, String profileID, String projectID, FeatureRow featureRow,
|
||||||
FeatureRow featureRow, boolean loadTimelineRelationships) {
|
boolean loadTimelineRelationships) {
|
||||||
this.layerObjectType = layerObjectType;
|
this.layerObjectType = layerObjectType;
|
||||||
this.profileID = profileID;
|
this.profileID = profileID;
|
||||||
this.projectID = projectID;
|
this.projectID = projectID;
|
||||||
this.itemName = itemName;
|
|
||||||
this.featureRow = featureRow;
|
this.featureRow = featureRow;
|
||||||
this.loadTimelineRelationships = loadTimelineRelationships;
|
this.loadTimelineRelationships = loadTimelineRelationships;
|
||||||
}
|
}
|
||||||
|
@ -43,31 +43,49 @@ public class ShowDetailsEvent extends GwtEvent<ShowDetailsEventHandler> {
|
||||||
* Instantiates a new show details event.
|
* Instantiates a new show details event.
|
||||||
*
|
*
|
||||||
* @param gir the gir
|
* @param gir the gir
|
||||||
* @param itemName the item name
|
|
||||||
* @param featureRow the feature row
|
* @param featureRow the feature row
|
||||||
* @param loadTimelineRelationships the load timeline relationships
|
* @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.layerObjectType = gir.getLayerObjectType();
|
||||||
this.profileID = gir.getProfileID();
|
this.profileID = gir.getProfileID();
|
||||||
this.projectID = gir.getProjectID();
|
this.projectID = gir.getProjectID();
|
||||||
this.itemName = itemName;
|
|
||||||
this.featureRow = featureRow;
|
this.featureRow = featureRow;
|
||||||
this.loadTimelineRelationships = loadTimelineRelationships;
|
this.loadTimelineRelationships = loadTimelineRelationships;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the type.
|
||||||
|
*
|
||||||
|
* @return the type
|
||||||
|
*/
|
||||||
public static Type<ShowDetailsEventHandler> getTYPE() {
|
public static Type<ShowDetailsEventHandler> getTYPE() {
|
||||||
return TYPE;
|
return TYPE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the layer object type.
|
||||||
|
*
|
||||||
|
* @return the layer object type
|
||||||
|
*/
|
||||||
public String getLayerObjectType() {
|
public String getLayerObjectType() {
|
||||||
return layerObjectType;
|
return layerObjectType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the profile ID.
|
||||||
|
*
|
||||||
|
* @return the profile ID
|
||||||
|
*/
|
||||||
public String getProfileID() {
|
public String getProfileID() {
|
||||||
return profileID;
|
return profileID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the project ID.
|
||||||
|
*
|
||||||
|
* @return the project ID
|
||||||
|
*/
|
||||||
public String getProjectID() {
|
public String getProjectID() {
|
||||||
return projectID;
|
return projectID;
|
||||||
}
|
}
|
||||||
|
@ -102,24 +120,6 @@ public class ShowDetailsEvent extends GwtEvent<ShowDetailsEventHandler> {
|
||||||
return featureRow;
|
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.
|
* Checks if is load timeline relationships.
|
||||||
*
|
*
|
||||||
|
@ -138,6 +138,11 @@ public class ShowDetailsEvent extends GwtEvent<ShowDetailsEventHandler> {
|
||||||
return new GeoportalItemReferences(projectID, profileID, layerObjectType);
|
return new GeoportalItemReferences(projectID, profileID, layerObjectType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* To string.
|
||||||
|
*
|
||||||
|
* @return the string
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
StringBuilder builder = new StringBuilder();
|
StringBuilder builder = new StringBuilder();
|
||||||
|
@ -157,6 +162,4 @@ public class ShowDetailsEvent extends GwtEvent<ShowDetailsEventHandler> {
|
||||||
return builder.toString();
|
return builder.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
|
@ -38,7 +38,7 @@ public class RelationshipPanel extends Composite {
|
||||||
initWidget(uiBinder.createAndBindUi(this));
|
initWidget(uiBinder.createAndBindUi(this));
|
||||||
this.appManagerBus = appManagerBus;
|
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));
|
rootRow.add(new HTML(html));
|
||||||
|
|
||||||
showRelationsOf(fromProject);
|
showRelationsOf(fromProject);
|
||||||
|
|
|
@ -139,7 +139,7 @@ public class TimelineRelationPanel extends Composite {
|
||||||
String[] references = this.selectedProjectID.split(",");
|
String[] references = this.selectedProjectID.split(",");
|
||||||
|
|
||||||
GeoportalItemReferences gir = new GeoportalItemReferences(references[1], references[0]);
|
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);
|
GWT.log("fireEvetn: " + showDetailsEvent);
|
||||||
|
|
||||||
applicationBus.fireEvent(showDetailsEvent);
|
applicationBus.fireEvent(showDetailsEvent);
|
||||||
|
|
|
@ -331,7 +331,7 @@ public class SearchFacilityUI extends Composite {
|
||||||
public void onClick(ClickEvent event) {
|
public void onClick(ClickEvent event) {
|
||||||
GeoportalItemReferences gir = new GeoportalItemReferences(resultDoc.getProjectID(),
|
GeoportalItemReferences gir = new GeoportalItemReferences(resultDoc.getProjectID(),
|
||||||
profileID);
|
profileID);
|
||||||
appManagerBus.fireEvent(new ShowDetailsEvent(gir, null, null, true));
|
appManagerBus.fireEvent(new ShowDetailsEvent(gir, null, true));
|
||||||
|
|
||||||
GeoJSON spatialReference = resultDoc.getSpatialReference();
|
GeoJSON spatialReference = resultDoc.getSpatialReference();
|
||||||
Coordinate transfCoord = MapUtils.geoJSONTToBBoxCenter(spatialReference, null,
|
Coordinate transfCoord = MapUtils.geoJSONTToBBoxCenter(spatialReference, null,
|
||||||
|
|
|
@ -72,7 +72,8 @@ public class DragDropLayer extends FlowPanel {
|
||||||
if (result != null) {
|
if (result != null) {
|
||||||
for (String key : result.keySet()) {
|
for (String key : result.keySet()) {
|
||||||
result.get(key);
|
result.get(key);
|
||||||
referProject = key + ": " + result.get(key);
|
//referProject = key + ": " + result.get(key);
|
||||||
|
referProject = result.get(key)+"";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -218,7 +218,7 @@ body {
|
||||||
}
|
}
|
||||||
|
|
||||||
.style-layer table {
|
.style-layer table {
|
||||||
width: 100%;
|
width: 98%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.info-interaction {
|
.info-interaction {
|
||||||
|
|
Loading…
Reference in New Issue