From 20c4da197e71d628c837a751fff93af20f902670 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 18 Nov 2022 11:06:47 +0100 Subject: [PATCH 1/4] Added Table Of Contents (TOC) and "Go to Top" --- .../client/ui/cms/project/ProjectViewer.java | 64 ++++++++++++++----- .../ui/cms/project/ProjectViewer.ui.xml | 13 +++- .../client/ui/cms/project/SectionViewer.java | 16 ++++- .../ui/cms/project/SectionViewer.ui.xml | 1 + src/main/webapp/GeoportalDataViewer.css | 53 +++++++++++++-- 5 files changed, 122 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java index 411cfde..04d599c 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java @@ -20,17 +20,18 @@ import org.gcube.portlets.user.geoportaldataviewer.client.ui.map.ExtentMapUtil; import org.gcube.portlets.user.geoportaldataviewer.client.ui.map.ExtentMapUtil.Location; import org.gcube.portlets.user.geoportaldataviewer.client.ui.map.ExtentMapUtil.PLACE; import org.gcube.portlets.user.geoportaldataviewer.client.ui.map.MapView; -import org.gcube.portlets.user.geoportaldataviewer.client.ui.util.CustomFlexTable; import com.github.gwtbootstrap.client.ui.Button; import com.github.gwtbootstrap.client.ui.constants.ButtonType; import com.github.gwtbootstrap.client.ui.constants.IconType; import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.UListElement; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.shared.HandlerManager; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.Random; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Composite; @@ -45,7 +46,7 @@ import ol.Coordinate; * * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it * - * Nov 9, 2022 + * Nov 9, 2022 */ public class ProjectViewer extends Composite { @@ -56,7 +57,7 @@ public class ProjectViewer extends Composite { * * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it * - * Nov 9, 2022 + * Nov 9, 2022 */ interface ProjectViewerUiBinder extends UiBinder { } @@ -66,10 +67,16 @@ public class ProjectViewer extends Composite { @UiField HTMLPanel pageViewDetails; + + @UiField + HTMLPanel projectViewerMainPanel; @UiField HTMLPanel centroidPanel; + @UiField + HTMLPanel tableOfContentPanel; + @UiField Button shareButton; @@ -82,9 +89,10 @@ public class ProjectViewer extends Composite { @UiField Button addLayersToMap; - private ProjectView theProjectView; + @UiField + UListElement toc_list_anchors; - private CustomFlexTable customTable = new CustomFlexTable(); + private ProjectView theProjectView; private GeoportalItemReferences geoportalItemReferences; @@ -92,20 +100,26 @@ public class ProjectViewer extends Composite { private HandlerManager applicationBus; + private HandlerManager projectViewerBus; + + private String projectViewerMainPanelID; + /** * Instantiates a new project viewer. */ private ProjectViewer() { initWidget(uiBinder.createAndBindUi(this)); - pageViewDetails.getElement().setId("page-view-details"); + pageViewDetails.getElement().addClassName("page-view-details"); + projectViewerMainPanelID = "projectViewer-"+Random.nextInt(); + projectViewerMainPanel.getElement().setId(projectViewerMainPanelID); } /** * Instantiates a new project viewer. * - * @param applicationBus the application bus + * @param applicationBus the application bus * @param geoportalItemRefs the geoportal item refs - * @param projectView the project view + * @param projectView the project view */ public ProjectViewer(HandlerManager applicationBus, GeoportalItemReferences geoportalItemRefs, final ProjectView projectView) { @@ -114,6 +128,7 @@ public class ProjectViewer extends Composite { this.theProjectView = projectView; this.geoportalItemReferences = geoportalItemRefs; this.applicationBus = applicationBus; + this.projectViewerBus = new HandlerManager(null); final String theTitle = projectView.getTheProjectDV().getProfileName() != null ? projectView.getTheProjectDV().getProfileName() @@ -149,8 +164,9 @@ public class ProjectViewer extends Composite { cv.setAddLayersToMapVisible(false); int width = Window.getClientWidth() * 75 / 100; int height = Window.getClientHeight() * 70 / 100; - - String modalTitle = ProjectUtil.toHMLCode(false, theProjectView.getTheProjectDV().getTheDocument(), theProjectView.getTheProjectDV().getId()); + + String modalTitle = ProjectUtil.toHMLCode(false, theProjectView.getTheProjectDV().getTheDocument(), + theProjectView.getTheProjectDV().getId()); ModalWindow mw = new ModalWindow(modalTitle, width, height); mw.add(cv); mw.setCaller(ProjectViewer.this); @@ -192,7 +208,7 @@ public class ProjectViewer extends Composite { applicationBus.fireEvent(new AddLayerToMapEvent(theProjectView.getTheProjectDV(), true)); } }); - + setAddLayersToMapVisible(false); GeoportalDataViewerServiceAsync.Util.getInstance().getMyLogin(new AsyncCallback() { @@ -207,19 +223,35 @@ public class ProjectViewer extends Composite { public void onFailure(Throwable caught) { } }); - + for (SectionView sectionView : projectView.getListSections()) { if (!sectionView.isEmpty()) { - SectionViewer sectionViewer = new SectionViewer(sectionView); + SectionViewer sectionViewer = new SectionViewer(sectionView, projectViewerMainPanelID); + String sectionId = sectionView.getSectionTitle().replaceAll("[^A-Za-z0-9]", "-") + "_" + + Random.nextInt(); + String divTarget = "
"; + sectionViewer.getElement().insertFirst(new HTML(divTarget).getElement()); + addAnchorToSection(sectionId, sectionView.getSectionTitle()); pageViewDetails.add(sectionViewer); } - - if(sectionView.hasSpatialLayers()) { + + if (sectionView.hasSpatialLayers()) { setAddLayersToMapVisible(true); } - + } + + if (toc_list_anchors.getChildCount() > 0) { + tableOfContentPanel.setVisible(true); + } + } + + private void addAnchorToSection(String id, String text) { +// Anchor anchor = new Anchor(text); +// anchor.setHref("#"+id); + String htmlAnchor = "" + text + ""; + toc_list_anchors.appendChild(new HTML("
  • " + htmlAnchor + "
    • ").getElement()); } /** diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.ui.xml index 1e81553..31cb3c5 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.ui.xml @@ -29,20 +29,29 @@ width: 100%; } - + - + Share Expand Relationships Add Layers to Map + +
    +

    Contents

    +
      +
    +
    +     \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/SectionViewer.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/SectionViewer.java index 1c60d5a..9d43642 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/SectionViewer.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/SectionViewer.java @@ -12,7 +12,10 @@ import org.gcube.portlets.user.geoportaldataviewer.client.ui.cms.gallery.ImagesS import org.gcube.portlets.user.geoportaldataviewer.client.ui.cms.layers.LayersSectionViewer; import org.gcube.portlets.user.geoportaldataviewer.client.ui.util.CustomFlexTable; +import com.github.gwtbootstrap.client.ui.Button; import com.github.gwtbootstrap.client.ui.PageHeader; +import com.github.gwtbootstrap.client.ui.constants.ButtonType; +import com.github.gwtbootstrap.client.ui.constants.IconType; import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; @@ -36,14 +39,23 @@ public class SectionViewer extends Composite { @UiField PageHeader sectionTitle; - public SectionViewer(SectionView sectionView) { + public SectionViewer(SectionView sectionView, String topTargetId) { initWidget(uiBinder.createAndBindUi(this)); this.sectionView = sectionView; - + List subDocuments = sectionView.getListSubDocuments(); sectionTitle.setTitle(sectionView.getSectionTitle()); sectionTitle.setText(sectionView.getSectionTitle()); + + Button goToTop = new Button(""); + goToTop.setType(ButtonType.LINK); + goToTop.setIcon(IconType.DOUBLE_ANGLE_UP); + goToTop.setHref("#"+topTargetId); + goToTop.setTitle("Go to top"); + goToTop.getElement().setClassName("go-top-right"); + + sectionTitle.add(goToTop); boolean displayAsGallery = false; for (SubDocumentView subDocumentView : subDocuments) { diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/SectionViewer.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/SectionViewer.ui.xml index 0ebc229..60951c2 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/SectionViewer.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/SectionViewer.ui.xml @@ -10,6 +10,7 @@ .font-size-h1-22 h1 { font-size: 22px; + margin-top: 5px; } .align-to-right { diff --git a/src/main/webapp/GeoportalDataViewer.css b/src/main/webapp/GeoportalDataViewer.css index ac96008..997c8d2 100644 --- a/src/main/webapp/GeoportalDataViewer.css +++ b/src/main/webapp/GeoportalDataViewer.css @@ -77,6 +77,17 @@ body { font-size: 14px; } +.go-top-right { + float: right; + margin-right: 20px; + top: -35px; + position: relative; + font-size: 18px; +} +.go-top-right a:visited { + color: #08c !important; +} + .data-click-img { max-width: 395px; } @@ -93,18 +104,18 @@ body { font-weight: bold; } -#page-view-details { +.page-view-details { margin: 10px; text-rendering: optimizelegibility; font-family: Lato, 'Helvetica Neue', Arial, Helvetica, sans-serif; } -#page-view-details .page-header { +.page-view-details .page-header { margin-bottom: 22px; padding-top: 5px; } -#page-view-details p { +.page-view-details p { font-size: 14px; padding: 10px; color: #333; @@ -632,10 +643,42 @@ body { border-radius: 2px; } +/****************************** +Table Of Contents (TOC) +*******************************/ +#toc_container { + background: #f9f9f9 none repeat scroll 0 0; + border: 1px solid #eee; + display: table; + font-size: 95%; + padding: 20px; + width: auto; +} -/***** +.toc_title { + font-weight: 700; + text-align: center; +} + +#toc_container li, #toc_container ul, #toc_container ul li { + list-style: outside none none !important; +} + +#toc_container ul li a:visited { + color: #08c !important; +} + +.anchor-target { + top: -35px; + position: relative; + display: block; + visibility: hidden; +} + + +/****************************** RESPONSIVE -***/ +*******************************/ @media all and (max-width: 2350px) { #timeline-data { -- 2.17.1 From 1f3b3c2be1d156487bba592248eb9397deba2673 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 18 Nov 2022 16:50:01 +0100 Subject: [PATCH 2/4] Improved GUI. Added Temporal Comparator --- .../client/GeoportalDataViewer.java | 3 -- .../client/LayerManager.java | 25 +++++------ .../client/ui/cms/project/ProjectUtil.java | 1 - .../client/ui/cms/project/ProjectViewer.java | 39 ++++++++++++---- .../ui/cms/project/ProjectViewer.ui.xml | 20 ++++++--- .../GeoportalDataViewerServiceImpl.java | 15 ++++--- .../server/util/TemporalComparatorUtil.java | 45 +++++++++++++++++++ src/main/webapp/GeoportalDataViewer.css | 39 +++++++++++----- 8 files changed, 137 insertions(+), 50 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/util/TemporalComparatorUtil.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 dd414c2..08bcffa 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 @@ -505,9 +505,6 @@ public class GeoportalDataViewer implements EntryPoint { } mainPanel.hideOverlayLayers(); - // layerManager.getOverlayLayerManager().hide(); - // hidePopupLayers(); - } }); 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 92f72e3..c43f58d 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 @@ -171,16 +171,6 @@ public class LayerManager { GWT.log("From querying removing layername: " + layerName + ", it is not visible"); listLO.remove(layerObject); } -// else { -// ExtentWrapped layerExtent = olMap.getSourceExtentForLayer(layerName); -// if(layerExtent!=null) { -// ExtentWrapped centerQueryPoint = new ExtentWrapped(minX, minY, maxX,maxY); -// -// boolean contains = layerExtent.containsExtent(centerQueryPoint); -// GWT.log("layer: "+layerName + " contains the queried BBOX: "+contains); -// } -// } -// } } @@ -714,6 +704,13 @@ public class LayerManager { }); } }); + +// //Ordering for temporal dimension +// try { +// Collections.sort(listGeoNaDataObject, new TemporalComparatorUtil()); +// }catch (Exception e) { +// // TODO: handle exception +// } String prevProjectId = ""; for (GeoNaSpatialQueryResult geoNaSpatialQueryResult : listGeoNaDataObject) { @@ -753,7 +750,7 @@ public class LayerManager { headingPanel.add(headingProfileName); flowPanel.add(headingPanel); flowPanel.add(new HTML(projectIntro)); - + TemporalReferenceDV tempRef = projectDV.getTemporalReference(); if (tempRef != null) { flowPanel.add(new HTML(ProjectUtil.toHTMLCode(tempRef))); @@ -901,8 +898,8 @@ public class LayerManager { Object theValue = map.get(key); String toStringValue = theValue + ""; // intFlex.setHTML(i, 0, key); - intFlex.setHTML(intFlex.getRowCount() + 1, 0, - "" + StringUtil.ellipsize(toStringValue, 100) + ""); + intFlex.setHTML(intFlex.getRowCount() + 1, 0, "" + + StringUtil.ellipsize(toStringValue, 100) + ""); // i++; } catch (Exception e) { // TODO: handle exception @@ -914,7 +911,7 @@ public class LayerManager { TemporalReferenceDV tempRef = projectDV.getTemporalReference(); if (tempRef != null) { - + flex.setHTML(flex.getRowCount() + 1, 0, ProjectUtil.toHTMLCode(tempRef)); } } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectUtil.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectUtil.java index b588cd0..6de4d13 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectUtil.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectUtil.java @@ -82,5 +82,4 @@ public class ProjectUtil { return htmlCode; } - } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java index 04d599c..9ee7b7c 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java @@ -67,7 +67,7 @@ public class ProjectViewer extends Composite { @UiField HTMLPanel pageViewDetails; - + @UiField HTMLPanel projectViewerMainPanel; @@ -88,6 +88,15 @@ public class ProjectViewer extends Composite { @UiField Button addLayersToMap; + + @UiField + HTMLPanel toc_container; + + @UiField + HTMLPanel toc_list_container; + + @UiField + Button reduceToc; @UiField UListElement toc_list_anchors; @@ -100,8 +109,6 @@ public class ProjectViewer extends Composite { private HandlerManager applicationBus; - private HandlerManager projectViewerBus; - private String projectViewerMainPanelID; /** @@ -110,7 +117,7 @@ public class ProjectViewer extends Composite { private ProjectViewer() { initWidget(uiBinder.createAndBindUi(this)); pageViewDetails.getElement().addClassName("page-view-details"); - projectViewerMainPanelID = "projectViewer-"+Random.nextInt(); + projectViewerMainPanelID = "projectViewer-" + Random.nextInt(); projectViewerMainPanel.getElement().setId(projectViewerMainPanelID); } @@ -128,7 +135,6 @@ public class ProjectViewer extends Composite { this.theProjectView = projectView; this.geoportalItemReferences = geoportalItemRefs; this.applicationBus = applicationBus; - this.projectViewerBus = new HandlerManager(null); final String theTitle = projectView.getTheProjectDV().getProfileName() != null ? projectView.getTheProjectDV().getProfileName() @@ -223,7 +229,26 @@ public class ProjectViewer extends Composite { public void onFailure(Throwable caught) { } }); - + + reduceToc.setType(ButtonType.LINK); + reduceToc.setIcon(IconType.PLUS_SIGN_ALT); + toc_list_container.setVisible(false); + reduceToc.addClickHandler(new ClickHandler() { + + @Override + public void onClick(ClickEvent event) { + boolean visible = toc_list_container.isVisible(); + if(visible) { + toc_list_container.setVisible(false); + reduceToc.setIcon(IconType.PLUS_SIGN_ALT); + } + else { + toc_list_container.setVisible(true); + reduceToc.setIcon(IconType.MINUS_SIGN_ALT); + } + } + }); + for (SectionView sectionView : projectView.getListSections()) { if (!sectionView.isEmpty()) { @@ -248,8 +273,6 @@ public class ProjectViewer extends Composite { } private void addAnchorToSection(String id, String text) { -// Anchor anchor = new Anchor(text); -// anchor.setHref("#"+id); String htmlAnchor = "" + text + ""; toc_list_anchors.appendChild(new HTML("
  • " + htmlAnchor + "
    • ").getElement()); } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.ui.xml index 31cb3c5..bad5cda 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.ui.xml @@ -28,6 +28,10 @@ .width-100 { width: 100%; } + + .display-item-list { + display: inline-table; + } @@ -45,12 +49,16 @@ -
    -

    Contents

    -
      -
    -
    + visible="false" addStyleNames="{style.display-item-list}"> + + +
    Contents
    + +
      +       +       diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java index 25aad17..c216ab9 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java @@ -5,6 +5,7 @@ import static org.gcube.application.geoportal.client.plugins.GeoportalAbstractPl import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; @@ -59,6 +60,7 @@ import org.gcube.portlets.user.geoportaldataviewer.server.gis.WMSUrlValidator; import org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.GeoportalServiceIdentityProxy; import org.gcube.portlets.user.geoportaldataviewer.server.util.ContextRequest; import org.gcube.portlets.user.geoportaldataviewer.server.util.SessionUtil; +import org.gcube.portlets.user.geoportaldataviewer.server.util.TemporalComparatorUtil; import org.gcube.portlets.user.geoportaldataviewer.shared.GCubeCollection; import org.gcube.portlets.user.geoportaldataviewer.shared.GeoNaSpatialQueryResult; import org.gcube.portlets.user.geoportaldataviewer.shared.ItemFieldsResponse; @@ -92,14 +94,8 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet; @SuppressWarnings("serial") public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet implements GeoportalDataViewerService { - // private static final String TIMELINE_CONFIG_TJT_DOCUMENT = - // UseCaseDescriptorCaller.TIMELINE_CONFIG_TJT_DOCUMENT; - private static final Logger LOG = LoggerFactory.getLogger(GeoportalDataViewerServiceImpl.class); - // private static final String CACHE_IMAGE_PREVIEW_FOR_CONCESSIONE = - // "MAP_IMAGE_PREVIEW_FOR_CONCESSIONE"; - /** * The Enum COMMON_IMAGES_FORMAT. * @@ -1075,6 +1071,13 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme + " feature/s"); listDAO.add(geoDAO); + // Ordering for temporal dimension + try { + Collections.sort(listDAO, new TemporalComparatorUtil()); + } catch (Exception e) { + // silent + } + } default: diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/util/TemporalComparatorUtil.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/util/TemporalComparatorUtil.java new file mode 100644 index 0000000..d4ccad0 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/util/TemporalComparatorUtil.java @@ -0,0 +1,45 @@ +package org.gcube.portlets.user.geoportaldataviewer.server.util; + +import java.util.Comparator; + +import org.gcube.application.geoportalcommon.shared.geoportal.project.ProjectDV; +import org.gcube.portlets.user.geoportaldataviewer.shared.GeoNaSpatialQueryResult; + +/** + * The Class TemporalComparatorUtil. + * + * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it + * + * Nov 18, 2022 + */ +public class TemporalComparatorUtil implements Comparator { + + /** + * Compare. + * + * @param a the a + * @param b the b + * @return the int + */ + @Override + public int compare(GeoNaSpatialQueryResult a, GeoNaSpatialQueryResult b) { + if (a == null || a.getSourceLayerObject() == null || a.getSourceLayerObject().getProjectDV() == null) { + return -1; + } + if (b == null || b.getSourceLayerObject() == null || b.getSourceLayerObject().getProjectDV() == null) { + return 1; + } + + ProjectDV project1 = a.getSourceLayerObject().getProjectDV(); + ProjectDV project2 = b.getSourceLayerObject().getProjectDV(); + + if (project1.getTemporalReference() == null || project1.getTemporalReference().getStart() == null) + return -1; + + if (project2.getTemporalReference() == null || project2.getTemporalReference().getStart() == null) + return 1; + + return project1.getTemporalReference().getStart().compareTo(project2.getTemporalReference().getStart()); + + } +} \ No newline at end of file diff --git a/src/main/webapp/GeoportalDataViewer.css b/src/main/webapp/GeoportalDataViewer.css index 997c8d2..1addef1 100644 --- a/src/main/webapp/GeoportalDataViewer.css +++ b/src/main/webapp/GeoportalDataViewer.css @@ -25,14 +25,15 @@ body { position: absolute; background-color: white; box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2); - padding: 15px; - border-radius: 10px; + padding: 10px; + border-radius: 2px; border: 1px solid #cccccc; bottom: 12px; left: -50px; min-width: 280px; max-width: 500px; visibility: hidden; + padding-top: 20px; } .ol-popup img { @@ -70,11 +71,11 @@ body { position: absolute; top: 2px; right: 8px; + font-size: 12px; } .ol-popup-closer:after { content: "✖"; - font-size: 14px; } .go-top-right { @@ -84,7 +85,7 @@ body { position: relative; font-size: 18px; } -.go-top-right a:visited { +.go-top-right:visited { color: #08c !important; } @@ -126,11 +127,13 @@ body { margin-bottom: 10px; position: sticky; top: 0; - background-color: white !important; + background-color: #f9f9f9 !important; opacity: 0.9; border-radius: 5px; z-index: 2000; + border: 1px #eee solid; } + .ol-mouse-position { top: 8px !important; right: 60px !important; @@ -646,28 +649,40 @@ body { /****************************** Table Of Contents (TOC) *******************************/ -#toc_container { +.toc_container { background: #f9f9f9 none repeat scroll 0 0; border: 1px solid #eee; display: table; - font-size: 95%; - padding: 20px; - width: auto; + font-size: 13px; + padding: 5px 15px; + min-width: 120px; } .toc_title { font-weight: 700; - text-align: center; } -#toc_container li, #toc_container ul, #toc_container ul li { +.toc_list_container { + display: inline-block; +} + +.toc_list_container ul { + margin-left: 35px; +} + +.toc_list_container ul li { list-style: outside none none !important; } -#toc_container ul li a:visited { +.toc_list_container ul li a:visited { color: #08c !important; } +.toc_container_reduce_button { + float: left; + padding: 0px 10px !important; +} + .anchor-target { top: -35px; position: relative; -- 2.17.1 From 2e2ecfa41dc74ce2c40a67c543df55d4fd7bbef7 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 18 Nov 2022 17:07:13 +0100 Subject: [PATCH 3/4] setTocContent visibility --- .../client/ui/cms/project/ProjectViewer.java | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java index 9ee7b7c..bdda6f9 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java @@ -88,10 +88,10 @@ public class ProjectViewer extends Composite { @UiField Button addLayersToMap; - + @UiField HTMLPanel toc_container; - + @UiField HTMLPanel toc_list_container; @@ -168,6 +168,7 @@ public class ProjectViewer extends Composite { cv.setExpandViewButtonVisible(false); cv.setRelationshipsButtonVisible(false); cv.setAddLayersToMapVisible(false); + cv.setTocContentVisible(true); int width = Window.getClientWidth() * 75 / 100; int height = Window.getClientHeight() * 70 / 100; @@ -238,14 +239,15 @@ public class ProjectViewer extends Composite { @Override public void onClick(ClickEvent event) { boolean visible = toc_list_container.isVisible(); - if(visible) { - toc_list_container.setVisible(false); - reduceToc.setIcon(IconType.PLUS_SIGN_ALT); - } - else { - toc_list_container.setVisible(true); - reduceToc.setIcon(IconType.MINUS_SIGN_ALT); - } + setTocContentVisible(!visible); + +// if (visible) { +// toc_list_container.setVisible(false); +// reduceToc.setIcon(IconType.PLUS_SIGN_ALT); +// } else { +// toc_list_container.setVisible(true); +// reduceToc.setIcon(IconType.MINUS_SIGN_ALT); +// } } }); @@ -277,6 +279,18 @@ public class ProjectViewer extends Composite { toc_list_anchors.appendChild(new HTML("
    • " + htmlAnchor + "
      • ").getElement()); } + protected void setTocContentVisible(boolean bool) { + + toc_list_container.setVisible(bool); + + if (bool) { + reduceToc.setIcon(IconType.MINUS_SIGN_ALT); + } else { + reduceToc.setIcon(IconType.PLUS_SIGN_ALT); + } + + } + /** * Adds the centroid map. */ -- 2.17.1 From c4ebdcf003354e90cad2fe6e0ef5478556fba7ae Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Mon, 21 Nov 2022 15:16:36 +0100 Subject: [PATCH 4/4] Synchronized the Timeline selected project with the showing popoup on centroid --- .../client/GeoportalDataViewer.java | 25 +++++--- .../client/GeoportalDataViewerService.java | 10 ++++ .../GeoportalDataViewerServiceAsync.java | 3 + .../events/ShowPopupOnCentroiEvent.java | 45 +++++++++------ .../relation/TimelineRelationPanel.java | 57 +++++++++++++------ .../ui/cms/search/SearchFacilityUI.java | 19 +------ .../GeoportalDataViewerServiceImpl.java | 10 ++-- 7 files changed, 105 insertions(+), 64 deletions(-) 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 08bcffa..6b067a2 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 @@ -88,7 +88,7 @@ import ol.layer.Image; public class GeoportalDataViewer implements EntryPoint { public static final String DIV_TIMELINE_DATA = "timeline-data"; - + public static final String APP_NOTIFIER = "app-notifier"; /** The Constant APP_DIV. */ @@ -229,7 +229,8 @@ public class GeoportalDataViewer implements EntryPoint { GWT.log("Loading collections, count " + result.getAvailableCollections().size()); - mainPanel.setAvailableCollections(result.getAvailableCollections().values(), paramGeonaItemType); + mainPanel.setAvailableCollections(result.getAvailableCollections().values(), + paramGeonaItemType); if (paramGeonaItemID != null) { if (paramGeonaItemType == null) { @@ -243,9 +244,9 @@ public class GeoportalDataViewer implements EntryPoint { paramGeonaItemType); applicationBus.fireEvent(new ShowDetailsEvent(gir, null, true)); } - + mainPanel.openCollectionMenu(); - + GWT.log("DONE INIT LOAD"); } @@ -357,7 +358,8 @@ public class GeoportalDataViewer implements EntryPoint { if (addLayerToMapEvent.getTheProjectDV() != null) { layerManager.addLayerToMapForProject(addLayerToMapEvent.getTheProjectDV().getProfileID(), - addLayerToMapEvent.getTheProjectDV().getId(), addLayerToMapEvent.getTheProjectDV(), addLayerToMapEvent.isNotifyClashing()); + addLayerToMapEvent.getTheProjectDV().getId(), addLayerToMapEvent.getTheProjectDV(), + addLayerToMapEvent.isNotifyClashing()); } } @@ -612,9 +614,14 @@ public class GeoportalDataViewer implements EntryPoint { @Override public void onShowPopup(ShowPopupOnCentroiEvent showPopupOnCentroiEvent) { - if (showPopupOnCentroiEvent.getDocument() != null) - performWFSQueryOnCentroid(showPopupOnCentroiEvent.getDocument().getProjectID(), - showPopupOnCentroiEvent.getCentroidLong(), showPopupOnCentroiEvent.getCentroidLat()); + if (showPopupOnCentroiEvent.getProfileID() != null && showPopupOnCentroiEvent.getProjectID() != null) { + GWT.log("ShowPopupOnCentroiEvent: "+showPopupOnCentroiEvent); + Coordinate transfCoord = MapUtils + .geoJSONTToBBoxCenter(showPopupOnCentroiEvent.getSpatialReference(), null, null); + + performWFSQueryOnCentroid(showPopupOnCentroiEvent.getProjectID(), transfCoord.getX(), + transfCoord.getY()); + } } }); @@ -693,7 +700,7 @@ public class GeoportalDataViewer implements EntryPoint { } } - + public static void showPopover(final Widget w, String message, String heading) { final Popover popover = new Popover(); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerService.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerService.java index 3e30683..15e0752 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerService.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerService.java @@ -7,6 +7,7 @@ import org.gcube.application.geoportalcommon.shared.GNADataViewerConfigProfile; import org.gcube.application.geoportalcommon.shared.GeoportalItemReferences; import org.gcube.application.geoportalcommon.shared.ResultSetPaginatedData; import org.gcube.application.geoportalcommon.shared.SearchingFilter; +import org.gcube.application.geoportalcommon.shared.geoportal.geojson.GeoJSON; import org.gcube.application.geoportalcommon.shared.geoportal.materialization.GCubeSDIViewerLayerDV; import org.gcube.application.geoportalcommon.shared.geoportal.view.ProjectView; import org.gcube.application.geoportalcommon.shared.gis.BoundsMap; @@ -169,4 +170,13 @@ public interface GeoportalDataViewerService extends RemoteService { */ List getRelationshipsForTimeline(String profileID, String projectID) throws Exception; + /** + * Gets the spatial reference. + * + * @param profileID the profile ID + * @param projectID the project ID + * @return the spatial reference + */ + GeoJSON getSpatialReference(String profileID, String projectID); + } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerServiceAsync.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerServiceAsync.java index 63bd285..080e2ef 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerServiceAsync.java @@ -7,6 +7,7 @@ import org.gcube.application.geoportalcommon.shared.GNADataViewerConfigProfile; import org.gcube.application.geoportalcommon.shared.GeoportalItemReferences; import org.gcube.application.geoportalcommon.shared.ResultSetPaginatedData; import org.gcube.application.geoportalcommon.shared.SearchingFilter; +import org.gcube.application.geoportalcommon.shared.geoportal.geojson.GeoJSON; import org.gcube.application.geoportalcommon.shared.geoportal.materialization.GCubeSDIViewerLayerDV; import org.gcube.application.geoportalcommon.shared.geoportal.view.ProjectView; import org.gcube.application.geoportalcommon.shared.gis.BoundsMap; @@ -72,4 +73,6 @@ public interface GeoportalDataViewerServiceAsync { void getRelationshipsForTimeline(String profileID, String projectID, AsyncCallback> callback); + void getSpatialReference(String profileID, String projectID, AsyncCallback callback); + } 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/ShowPopupOnCentroiEvent.java index cfc8895..c07ad23 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/ShowPopupOnCentroiEvent.java @@ -1,6 +1,6 @@ package org.gcube.portlets.user.geoportaldataviewer.client.events; -import org.gcube.application.geoportalcommon.shared.geoportal.DocumentDV; +import org.gcube.application.geoportalcommon.shared.geoportal.geojson.GeoJSON; import com.google.gwt.event.shared.GwtEvent; @@ -13,9 +13,9 @@ import com.google.gwt.event.shared.GwtEvent; */ public class ShowPopupOnCentroiEvent extends GwtEvent { public static Type TYPE = new Type(); - private DocumentDV document; - private Double centroidLong; - private Double centroidLat; + private String profileID; + private String projectID; + private GeoJSON spatialReference; /** * Instantiates a new show details event. @@ -25,10 +25,10 @@ public class ShowPopupOnCentroiEvent extends GwtEvent() { + + @Override + public void onFailure(Throwable caught) { + // TODO Auto-generated method stub + + } + + @Override + public void onSuccess(GeoJSON spatialReference) { + if (spatialReference != null) { + applicationBus.fireEvent( + new ShowPopupOnCentroiEvent(thePofileID, theProjectID, spatialReference)); + } + + } + }); + } public String getSelectedProjectID() { - return selectedProjectID; + return selectedTimelineProjectID; } public static native String instanceTimeline(String idDivContainer, JSONArray jsonItems, 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 15279ad..dca2ec5 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 @@ -15,12 +15,10 @@ import org.gcube.application.geoportalcommon.shared.WhereClause; import org.gcube.application.geoportalcommon.shared.geoportal.DocumentDV; import org.gcube.application.geoportalcommon.shared.geoportal.ResultDocumentDV; import org.gcube.application.geoportalcommon.shared.geoportal.config.ItemFieldDV; -import org.gcube.application.geoportalcommon.shared.geoportal.geojson.GeoJSON; 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.gis.MapUtils; import org.gcube.portlets.user.geoportaldataviewer.client.util.LoaderIcon; import org.gcube.portlets.user.geoportaldataviewer.client.util.StringUtil; @@ -52,8 +50,6 @@ import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Widget; -import ol.Coordinate; - /** * The Class SearchFacilityUI. * @@ -332,21 +328,8 @@ public class SearchFacilityUI extends Composite { GeoportalItemReferences gir = new GeoportalItemReferences(resultDoc.getProjectID(), profileID); appManagerBus.fireEvent(new ShowDetailsEvent(gir, null, true)); - - GeoJSON spatialReference = resultDoc.getSpatialReference(); - Coordinate transfCoord = MapUtils.geoJSONTToBBoxCenter(spatialReference, null, - null); - - Double centerLong = null; - Double centerLat = null; - - if (transfCoord != null) { - centerLong = transfCoord.getX(); - centerLat = transfCoord.getY(); - } - appManagerBus - .fireEvent(new ShowPopupOnCentroiEvent(resultDoc, centerLong, centerLat)); + .fireEvent(new ShowPopupOnCentroiEvent(profileID, resultDoc.getProjectID(), resultDoc.getSpatialReference())); } }); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java index c216ab9..ea86346 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java @@ -1035,7 +1035,8 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme } if (layerObject.getProjectDV().getSpatialReference() == null) { - GeoJSON geoJson = spatialReference(layerObject.getProfileID(), layerObject.getProjectID()); + GeoJSON geoJson = getSpatialReference(layerObject.getProfileID(), + layerObject.getProjectID()); layerObject.getProjectDV().setSpatialReference(geoJson); } @@ -1149,13 +1150,14 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme } /** - * Spatial reference. + * Gets the spatial reference. * * @param profileID the profile ID * @param projectID the project ID - * @return the geo JSON + * @return the spatial reference */ - private GeoJSON spatialReference(String profileID, String projectID) { + @Override + public GeoJSON getSpatialReference(String profileID, String projectID) { LOG.trace("spatialReference for profileID: " + profileID + ", projectID: " + projectID + "called"); try { new GeoportalServiceIdentityProxy(this.getThreadLocalRequest()); -- 2.17.1