diff --git a/.classpath b/.classpath
index 1e06bac..a0b38b1 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -35,5 +35,5 @@
-
+
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index c7e650c..bb4ca41 100644
--- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs
+++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
@@ -1,4 +1,4 @@
eclipse.preferences.version=1
-lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-3.3.1-SNAPSHOT
+lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-3.3.1
warSrcDir=src/main/webapp
warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 9a5da7b..ab17e12 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
-
+
@@ -58,8 +58,14 @@
-
-
+
+
+
+
+
+
+
+
@@ -119,7 +125,10 @@
-
+
+
+
+
@@ -179,7 +188,10 @@
-
+
+
+
+
@@ -239,7 +251,10 @@
-
+
+
+
+
@@ -299,7 +314,10 @@
-
+
+
+
+
@@ -362,7 +380,13 @@
uses
-
+
+ uses
+
+
+
+
+
@@ -422,7 +446,10 @@
-
+
+
+
+
@@ -482,7 +509,10 @@
-
+
+
+
+
@@ -542,7 +572,10 @@
-
+
+
+
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 236459d..06b5b37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [v3.4.0-SNAPSHOT] - 2023-04-13
+
+- Integrated the geoportal-data-mapper component [#24978]
+
## [v3.3.1] - 2023-03-30
- Just including new dependencies
diff --git a/pom.xml b/pom.xml
index 3d7d692..b2b58c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
org.gcube.portlets.user
geoportal-data-viewer-app
war
- 3.3.1
+ 3.4.0-SNAPSHOT
GeoPortal Data Viewer App
The GeoPortal Data Viewer App is an application to access, discovery and navigate the Geoportal projects/documents by a Web-Map Interface
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 746fc71..6ae6b18 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
@@ -124,7 +124,7 @@ public class SectionViewer extends Composite {
List files = subDocumentView.getListFiles();
if (files != null) {
for (FilesetDV fileset : files) {
- showLinkToDownloadWsContent(fileset.getName(), fileset.getListPayload());
+ showLinkToDownloadWsContent(fileset.getGcubeProfileFieldName(), fileset.getListPayload());
}
}
}
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/Geoportal_JSON_Mapper.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/Geoportal_JSON_Mapper.java
index e30f206..ee9bd11 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/Geoportal_JSON_Mapper.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/Geoportal_JSON_Mapper.java
@@ -101,7 +101,7 @@ public class Geoportal_JSON_Mapper {
String filesetJSONPath = String.format("%s.%s", JSON_$_POINTER, FILESET);
List listPayloads = readPayloadsForFileset(filesetJSONPath, wholeSectionDoc);
FilesetDV filesetDV = new FilesetDV();
- filesetDV.setName(FILESET);
+ filesetDV.setGcubeProfileFieldName(FILESET);
for (Payload payload : listPayloads) {
PayloadDV payloadDV = ConvertToDataValueObjectModel.toPayloadDV(payload);
filesetDV.addPayloadDV(payloadDV);
@@ -267,7 +267,7 @@ public class Geoportal_JSON_Mapper {
String filesetJSONPath = String.format("%s.%s", JSON_$_POINTER, filePath.getFieldName());
List listPayloads = readPayloadsForFileset(filesetJSONPath, fromSectionDocJSON);
FilesetDV filesetDV = new FilesetDV();
- filesetDV.setName(filePath.getGcubeProfileFieldName());
+ filesetDV.setGcubeProfileFieldName(filePath.getGcubeProfileFieldName());
for (Payload payload : listPayloads) {
PayloadDV payloadDV = ConvertToDataValueObjectModel.toPayloadDV(payload);
filesetDV.addPayloadDV(payloadDV);
@@ -392,7 +392,7 @@ public class Geoportal_JSON_Mapper {
String filesetJSONPath = String.format("%s.%s", JSON_$_POINTER, FILESET);
List listPayloads = readPayloadsForFileset(filesetJSONPath, wholeSectionDoc);
FilesetDV filesetDV = new FilesetDV();
- filesetDV.setName(FILESET);
+ filesetDV.setGcubeProfileFieldName(FILESET);
for (Payload payload : listPayloads) {
PayloadDV payloadDV = ConvertToDataValueObjectModel.toPayloadDV(payload);
filesetDV.addPayloadDV(payloadDV);
@@ -545,11 +545,11 @@ public class Geoportal_JSON_Mapper {
boolean isImage = ImageDetector.isImage(payload.getMimetype());
if (isImage) {
- filesetImages.setName(filePath.getGcubeProfileFieldName());
+ filesetImages.setGcubeProfileFieldName(filePath.getGcubeProfileFieldName());
filesetImages.addPayloadDV(payloadDV);
} else {
filesetFiles.addPayloadDV(payloadDV);
- filesetFiles.setName(filePath.getGcubeProfileFieldName());
+ filesetFiles.setGcubeProfileFieldName(filePath.getGcubeProfileFieldName());
}
}
@@ -972,7 +972,7 @@ public class Geoportal_JSON_Mapper {
System.out.println("***** Files");
if (subDocument.getListFiles() != null) {
for (FilesetDV filesetDV : subDocument.getListFiles()) {
- System.out.println("******* File Fileset name: " + filesetDV.getName());
+ System.out.println("******* File Fileset name: " + filesetDV.getGcubeProfileFieldName());
for (PayloadDV payload : filesetDV.getListPayload()) {
System.out.println("********* Payload: " + payload);
}
@@ -981,7 +981,7 @@ public class Geoportal_JSON_Mapper {
System.out.println("***** Images");
if (subDocument.getListImages() != null) {
for (FilesetDV filesetDV : subDocument.getListImages()) {
- System.out.println("******* Image Fileset name: " + filesetDV.getName());
+ System.out.println("******* Image Fileset name: " + filesetDV.getGcubeProfileFieldName());
for (PayloadDV payload : filesetDV.getListPayload()) {
System.out.println("********* Payload: " + payload);
}