gCubeSystem
/
gcube-cms-suite
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#24859 integrated the Geoportal Gis Link

This commit is contained in:
Francesco Mangiacrapa 2023-03-28 15:45:21 +02:00
parent e902fadce2
commit 07730153ca
4 changed files with 293 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdi-plugins/CHANGELOG.md
View File

@ -1,5 +1,9 @@
# Changelog for org.gcube.application.cms.sdi-plugins # Changelog for org.gcube.application.cms.sdi-plugins
## [v1.1.0-SNAPSHOT]
- Integrated the field 'geov_link' (Geoportal GisViewer link) in the centroid layer [#24859]
## [v1.0.4] - 2023-03-06 ## [v1.0.4] - 2023-03-06
- Fixed the import from joda-time to java.time - Fixed the import from joda-time to java.time
- [#24702] Fixed the default-lc-managers dependency - [#24702] Fixed the default-lc-managers dependency

9
sdi-plugins/pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>sdi-plugins</artifactId> <artifactId>sdi-plugins</artifactId>
<version>1.0.4</version> <version>1.1.0-SNAPSHOT</version>
<name>gCube CMS - SDI Plugins</name> <name>gCube CMS - SDI Plugins</name>
@ -85,12 +85,19 @@
<version>1.14</version> <version>1.14</version>
</dependency> </dependency>
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>uri-resolver-manager</artifactId>
<version>[1.0.0,2.0.0-SNAPSHOT)</version>
</dependency>
<dependency> <dependency>
<groupId>org.gcube.application.cms</groupId> <groupId>org.gcube.application.cms</groupId>
<artifactId>cms-test-commons</artifactId> <artifactId>cms-test-commons</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

2
sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/DBConstants.java
View File

@ -19,6 +19,8 @@ public class DBConstants {
public static final String DISPLAYED="displayed_project"; public static final String DISPLAYED="displayed_project";
public static final String GEOVIEWER_LINK_FIELD="geov_link";
public static final String XCOORD_FIELD="xcoord"; public static final String XCOORD_FIELD="xcoord";
public static final String YCOORD_FIELD="ycoord"; public static final String YCOORD_FIELD="ycoord";

247
sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIIndexerPlugin.java
View File

@ -33,6 +33,9 @@ import org.gcube.application.geoportal.common.model.plugins.IndexerPluginDescrip
import org.gcube.application.geoportal.common.model.plugins.PluginDescriptor; import org.gcube.application.geoportal.common.model.plugins.PluginDescriptor;
import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.model.rest.ConfigurationException;
import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor;
import org.gcube.portlets.user.uriresolvermanager.UriResolverManager;
import org.gcube.portlets.user.uriresolvermanager.resolvers.query.GeoportalResolverQueryStringBuilder;
import org.gcube.portlets.user.uriresolvermanager.resolvers.query.GeoportalResolverQueryStringBuilder.RESOLVE_AS;
import org.geojson.Crs; import org.geojson.Crs;
import org.geojson.GeoJsonObject; import org.geojson.GeoJsonObject;
import org.geojson.LngLatAlt; import org.geojson.LngLatAlt;
@ -42,29 +45,23 @@ import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map;
@Slf4j @Slf4j
public class SDIIndexerPlugin extends SDIAbstractPlugin implements IndexerPluginInterface { public class SDIIndexerPlugin extends SDIAbstractPlugin implements IndexerPluginInterface {
static final PluginDescriptor DESCRIPTOR = new PluginDescriptor(Constants.INDEXER_PLUGIN_ID,
static final PluginDescriptor DESCRIPTOR=new PluginDescriptor(Constants.INDEXER_PLUGIN_ID,
IndexerPluginDescriptor.INDEXER); IndexerPluginDescriptor.INDEXER);
static final ArrayList<BBOXEvaluator> BBOX_EVALUATORS = new ArrayList<>();
static final ArrayList<BBOXEvaluator> BBOX_EVALUATORS=new ArrayList<>();
static { static {
DESCRIPTOR.setDescription("SDI Indexer. " + DESCRIPTOR.setDescription("SDI Indexer. " + "Manage Centroids layers.");
"Manage Centroids layers.");
DESCRIPTOR.setVersion(new Semver("1.0.0")); DESCRIPTOR.setVersion(new Semver("1.0.0"));
BBOX_EVALUATORS.add(new BBOXPathScanner()); BBOX_EVALUATORS.add(new BBOXPathScanner());
BBOX_EVALUATORS.add(new BBOXByCoordinatePaths()); BBOX_EVALUATORS.add(new BBOXByCoordinatePaths());
} }
@Override @Override
@ -72,7 +69,6 @@ public class SDIIndexerPlugin extends SDIAbstractPlugin implements IndexerPlugin
return DESCRIPTOR; return DESCRIPTOR;
} }
@Override @Override
public InitializationReport initInContext() throws InitializationException { public InitializationReport initInContext() throws InitializationException {
InitializationReport report = new InitializationReport(); InitializationReport report = new InitializationReport();
@ -81,10 +77,8 @@ public class SDIIndexerPlugin extends SDIAbstractPlugin implements IndexerPlugin
} }
/** /**
* Expected parameters : * Expected parameters : - indexName (unique) - workspace - flagInternalIndex:
* - indexName (unique) * boolean - centroidRecord (OPT)
* - workspace
* - centroidRecord (OPT)
* *
* @param request * @param request
* @return * @return
@ -93,44 +87,69 @@ public class SDIIndexerPlugin extends SDIAbstractPlugin implements IndexerPlugin
@Override @Override
public IndexDocumentReport index(IndexDocumentRequest request) throws InvalidPluginRequestException { public IndexDocumentReport index(IndexDocumentRequest request) throws InvalidPluginRequestException {
log.info("Indexer {} : Serving Index Request {} ",this.getDescriptor().getId(),request); log.info("Indexer {} : Serving Index Request {} ", this.getDescriptor().getId(), request);
Project project =request.getDocument(); Project project = request.getDocument();
UseCaseDescriptor useCaseDescriptor = request.getUseCaseDescriptor(); UseCaseDescriptor useCaseDescriptor = request.getUseCaseDescriptor();
Document requestArguments=request.getCallParameters(); Document requestArguments = request.getCallParameters();
IndexDocumentReport report= new IndexDocumentReport(request); IndexDocumentReport report = new IndexDocumentReport(request);
try {
try{
// ********* INIT INDEX // ********* INIT INDEX
// TODO CACHE // TODO CACHE
PostgisIndexer indexer = getIndexer(useCaseDescriptor,requestArguments); PostgisIndexer indexer = getIndexer(useCaseDescriptor, requestArguments);
Document profileConfiguration =getConfigurationFromProfile(useCaseDescriptor).getConfiguration();
log.debug("UseCaseDescriptor Configuration is {} ",profileConfiguration);
Document profileConfiguration = getConfigurationFromProfile(useCaseDescriptor).getConfiguration();
log.debug("UseCaseDescriptor Configuration is {} ", profileConfiguration);
// ************* PREPARE RECORD // ************* PREPARE RECORD
JSONPathWrapper documentNavigator = new JSONPathWrapper(Serialization.write(project));
JSONPathWrapper documentNavigator=new JSONPathWrapper(Serialization.write(project));
Document centroidDoc = new Document(); Document centroidDoc = new Document();
if(requestArguments.containsKey("centroidRecord")) if (requestArguments.containsKey("centroidRecord"))
centroidDoc.putAll(requestArguments.get("centroidRecords",Document.class)); centroidDoc.putAll(requestArguments.get("centroidRecords", Document.class));
// DEFAULT VALUES // DEFAULT VALUES
centroidDoc.put(DBConstants.Defaults.PROJECT_ID, project.getId()); centroidDoc.put(DBConstants.Defaults.PROJECT_ID, project.getId());
centroidDoc.put(DBConstants.Defaults.DISPLAYED,true); centroidDoc.put(DBConstants.Defaults.DISPLAYED, true);
boolean isInternalIndex = false;
try {
isInternalIndex = requestArguments.getBoolean("flagInternalIndex");
log.debug("flagInternalIndex read as {} ", isInternalIndex);
} catch (Exception e) {
// TODO: handle exception
}
log.info("flagInternalIndex is {} ", isInternalIndex);
try {
log.debug("Trying to generate Geoportal Gis Link...");
//Contacting the Geoportal-Resolver via UriResolverManager
UriResolverManager uriResolverManager = new UriResolverManager("GEO");
GeoportalResolverQueryStringBuilder builder = new GeoportalResolverQueryStringBuilder(project.getProfileID(),project.getId());
builder.scope(request.getContext().getId());
if(isInternalIndex) {
builder.resolverAs(RESOLVE_AS.PRIVATE);
}else {
builder.resolverAs(RESOLVE_AS.PUBLIC);
}
Map<String, String> params = builder.buildQueryParameters();
String shortLink = uriResolverManager.getLink(params, true);
log.info("Geoportal GisViewer link is {} ", shortLink);
centroidDoc.put(DBConstants.Defaults.GEOVIEWER_LINK_FIELD, shortLink);
}catch (Exception e) {
// TODO: handle exception
}
// ********************** EVALAUTE POSITION // ********************** EVALAUTE POSITION
log.debug("indexing UseCaseDescriptor {} : Evaluating Centroid... ", useCaseDescriptor.getId()); log.debug("indexing UseCaseDescriptor {} : Evaluating Centroid... ", useCaseDescriptor.getId());
SpatialReference reference =null; SpatialReference reference = null;
List<IdentificationReference> refs=project.getIdentificationReferenceByType(SpatialReference.SPATIAL_REFERENCE_TYPE); List<IdentificationReference> refs = project
if(!refs.isEmpty()){ .getIdentificationReferenceByType(SpatialReference.SPATIAL_REFERENCE_TYPE);
if (!refs.isEmpty()) {
// Use existing Reference // Use existing Reference
@ -138,120 +157,116 @@ public class SDIIndexerPlugin extends SDIAbstractPlugin implements IndexerPlugin
log.debug("Using already defined spatial reference " + reference); log.debug("Using already defined spatial reference " + reference);
GeoJsonObject object = Serialization.convert(reference.getGeoJson(), GeoJsonObject.class); GeoJsonObject object = Serialization.convert(reference.getGeoJson(), GeoJsonObject.class);
GCubeSDILayer.BBOX bbox = GCubeSDILayer.BBOX.fromGeoJSON(object.getBbox()); GCubeSDILayer.BBOX bbox = GCubeSDILayer.BBOX.fromGeoJSON(object.getBbox());
log.info("Found declared BBOX {} ", bbox); log.info("Found declared BBOX {} ", bbox);
Double pointX = (bbox.getMaxX() + bbox.getMinX())/2; Double pointX = (bbox.getMaxX() + bbox.getMinX()) / 2;
Double pointY = (bbox.getMaxY() + bbox.getMinY())/2; Double pointY = (bbox.getMaxY() + bbox.getMinY()) / 2;
String wkt = String.format("POINT (%1$f %2$f) ", String wkt = String.format("POINT (%1$f %2$f) ", pointX, pointY);
pointX, pointY);
centroidDoc.put("geom", wkt); centroidDoc.put("geom", wkt);
} else{ } else {
// unable to use current Spatial reference, try evaluating it // unable to use current Spatial reference, try evaluating it
log.debug("UseCaseDescriptor {} : Getting evaluation paths from useCaseDescriptor.. ", useCaseDescriptor.getId()); log.debug("UseCaseDescriptor {} : Getting evaluation paths from useCaseDescriptor.. ",
useCaseDescriptor.getId());
// for each configuration option try until found // for each configuration option try until found
GCubeSDILayer.BBOX toSet = null; GCubeSDILayer.BBOX toSet = null;
for(BBOXEvaluator evaluator : BBOX_EVALUATORS){ for (BBOXEvaluator evaluator : BBOX_EVALUATORS) {
log.trace("UCD {}, Project {}. Evaluating BBOX with {}",useCaseDescriptor.getId(),project.getId(),evaluator); log.trace("UCD {}, Project {}. Evaluating BBOX with {}", useCaseDescriptor.getId(), project.getId(),
try{ evaluator);
if(evaluator.isConfigured(profileConfiguration)){ try {
toSet=evaluator.evaluate(profileConfiguration,useCaseDescriptor,documentNavigator); if (evaluator.isConfigured(profileConfiguration)) {
if(toSet!=null) { toSet = evaluator.evaluate(profileConfiguration, useCaseDescriptor, documentNavigator);
if (toSet != null) {
log.info("UCD {}, Project {}. Evaluated BBOX {} with method {}", log.info("UCD {}, Project {}. Evaluated BBOX {} with method {}",
useCaseDescriptor.getId(),project.getId(),toSet,evaluator); useCaseDescriptor.getId(), project.getId(), toSet, evaluator);
break; break;
} }
} }
}catch (Throwable t){ } catch (Throwable t) {
log.warn("UCD {}, Project {}. Exception with {}", log.warn("UCD {}, Project {}. Exception with {}", useCaseDescriptor.getId(), project.getId(),
useCaseDescriptor.getId(),project.getId(),evaluator,t); evaluator, t);
} }
} }
if(toSet== null) if (toSet == null)
throw new IndexingException("No BBOX has been evaluated from project"); throw new IndexingException("No BBOX has been evaluated from project");
Double pointX=(toSet.getMaxX()+toSet.getMinX())/2; Double pointX = (toSet.getMaxX() + toSet.getMinX()) / 2;
Double pointY = (toSet.getMaxY()+toSet.getMinY())/2; Double pointY = (toSet.getMaxY() + toSet.getMinY()) / 2;
log.info("Evaluated BBOX {} ",toSet); log.info("Evaluated BBOX {} ", toSet);
String wkt = String .format("POINT (%1$f %2$f) ", String wkt = String.format("POINT (%1$f %2$f) ", pointX, pointY);
pointX, pointY); // TODO support altitude
//TODO support altitude Double pointZ = 0d;
Double pointZ= 0d;
centroidDoc.put("geom", wkt);
centroidDoc.put("geom",wkt);
Point point = new Point(); Point point = new Point();
point.setCoordinates(new LngLatAlt(pointX,pointY,pointZ)); point.setCoordinates(new LngLatAlt(pointX, pointY, pointZ));
point.setBbox(toSet.asGeoJSONArray()); point.setBbox(toSet.asGeoJSONArray());
//TODO Manage CRS // TODO Manage CRS
point.setCrs(new Crs()); point.setCrs(new Crs());
reference = new SpatialReference(Serialization.asDocument(point)); reference = new SpatialReference(Serialization.asDocument(point));
log.info("UCD {} project {}, Setting Spatial Reference {} ",useCaseDescriptor.getId(),project.getId(),Serialization.write(reference)); log.info("UCD {} project {}, Setting Spatial Reference {} ", useCaseDescriptor.getId(), project.getId(),
Serialization.write(reference));
report.addIdentificationReference(reference); report.addIdentificationReference(reference);
} }
// *********** Additional Values from useCaseDescriptor
//*********** Additional Values from useCaseDescriptor
log.info("Setting additional values to centroid from mappings .."); log.info("Setting additional values to centroid from mappings ..");
for(MappingObject m : getMappings(useCaseDescriptor)){ for (MappingObject m : getMappings(useCaseDescriptor)) {
List<Object> foundValues = documentNavigator.getByPath(m.getPath()); List<Object> foundValues = documentNavigator.getByPath(m.getPath());
Object toSetValue=null; Object toSetValue = null;
if(!foundValues.isEmpty()) { if (!foundValues.isEmpty()) {
// NB CSV for multiple values // NB CSV for multiple values
StringBuilder b=new StringBuilder(); StringBuilder b = new StringBuilder();
foundValues.forEach(o-> { foundValues.forEach(o -> {
// Parser returns list of list // Parser returns list of list
if (o instanceof Collection) ((Collection<?>) o).forEach(v ->b.append(v + ",")); if (o instanceof Collection)
else b.append(o+","); ((Collection<?>) o).forEach(v -> b.append(v + ","));
else
b.append(o + ",");
}); });
b.deleteCharAt(b.length()-1); b.deleteCharAt(b.length() - 1);
toSetValue = b.toString(); toSetValue = b.toString();
} }
log.trace("Setting {} = {} in centroid doc ",m.getName(),toSetValue); log.trace("Setting {} = {} in centroid doc ", m.getName(), toSetValue);
centroidDoc.put(m.getName(),toSetValue); centroidDoc.put(m.getName(), toSetValue);
} }
log.info("Inserting Centroid {} into {} ",Serialization.write(centroidDoc.toJson()),indexer); log.info("Inserting Centroid {} into {} ", Serialization.write(centroidDoc.toJson()), indexer);
indexer.insert(centroidDoc); indexer.insert(centroidDoc);
// Support to HIDE AND DISPLAY as requested by invoker // Support to HIDE AND DISPLAY as requested by invoker
if(requestArguments.containsKey("_toHideIds")){ if (requestArguments.containsKey("_toHideIds")) {
List<String> ids = Serialization.convert(requestArguments.get("_toHideIds"),List.class); List<String> ids = Serialization.convert(requestArguments.get("_toHideIds"), List.class);
log.info("Requested to hide centroids {} ",ids); log.info("Requested to hide centroids {} ", ids);
indexer.updateIsVisible(false,ids); indexer.updateIsVisible(false, ids);
} }
if(requestArguments.containsKey("_toDisplayIds")){ if (requestArguments.containsKey("_toDisplayIds")) {
List<String> ids = Serialization.convert(requestArguments.get("_toDisplayIds"),List.class); List<String> ids = Serialization.convert(requestArguments.get("_toDisplayIds"), List.class);
log.info("Requested to display centroids {} ",ids); log.info("Requested to display centroids {} ", ids);
indexer.updateIsVisible(true,ids); indexer.updateIsVisible(true, ids);
} }
report.setStatus(Report.Status.OK); report.setStatus(Report.Status.OK);
}catch (SDIInteractionException e){ } catch (SDIInteractionException e) {
log.error("Unable to index "+request,e); log.error("Unable to index " + request, e);
report.setStatus(Report.Status.ERROR); report.setStatus(Report.Status.ERROR);
report.putMessage(e.getMessage()); report.putMessage(e.getMessage());
}catch (Throwable t){ } catch (Throwable t) {
log.error("Unable to index "+request,t); log.error("Unable to index " + request, t);
report.setStatus(Report.Status.ERROR); report.setStatus(Report.Status.ERROR);
report.putMessage(t.getMessage()); report.putMessage(t.getMessage());
}finally{ } finally {
return report; return report;
} }
} }
@ -262,28 +277,26 @@ public class SDIIndexerPlugin extends SDIAbstractPlugin implements IndexerPlugin
@Override @Override
public IndexDocumentReport deindex(IndexDocumentRequest request) throws InvalidPluginRequestException { public IndexDocumentReport deindex(IndexDocumentRequest request) throws InvalidPluginRequestException {
log.info("Indexer {} : Serving Index Request {} ",this.getDescriptor().getId(),request); log.info("Indexer {} : Serving Index Request {} ", this.getDescriptor().getId(), request);
IndexDocumentReport report= new IndexDocumentReport(request); IndexDocumentReport report = new IndexDocumentReport(request);
try{ try {
PostgisIndexer indexer = getIndexer(request.getUseCaseDescriptor(),request.getCallParameters()); PostgisIndexer indexer = getIndexer(request.getUseCaseDescriptor(), request.getCallParameters());
indexer.removeByFieldValue(PostgisIndexer.StandardFields.PROJECT_ID,request.getDocument().getId()); indexer.removeByFieldValue(PostgisIndexer.StandardFields.PROJECT_ID, request.getDocument().getId());
}catch (SDIInteractionException e){ } catch (SDIInteractionException e) {
log.error("Unable to index "+request,e); log.error("Unable to index " + request, e);
report.setStatus(Report.Status.ERROR); report.setStatus(Report.Status.ERROR);
report.putMessage(e.getMessage()); report.putMessage(e.getMessage());
}catch (Throwable t){ } catch (Throwable t) {
log.error("Unable to index "+request,t); log.error("Unable to index " + request, t);
report.setStatus(Report.Status.ERROR); report.setStatus(Report.Status.ERROR);
report.putMessage(t.getMessage()); report.putMessage(t.getMessage());
}finally{ } finally {
return report; return report;
} }
} }
/** /**
* Expected parameters : * Expected parameters : workspace indexName
* workspace
* indexName
* *
* @param request * @param request
* @return * @return
@ -293,32 +306,24 @@ public class SDIIndexerPlugin extends SDIAbstractPlugin implements IndexerPlugin
public Index getIndex(BaseRequest request) throws ConfigurationException { public Index getIndex(BaseRequest request) throws ConfigurationException {
try { try {
return getIndexer(request.getUseCaseDescriptor(), request.getCallParameters()).getIndexConfiguration(); return getIndexer(request.getUseCaseDescriptor(), request.getCallParameters()).getIndexConfiguration();
}catch(Throwable t ){ } catch (Throwable t) {
throw new ConfigurationException("Unable to get Postgis index for ucd "+request.getUseCaseDescriptor().getId()+" in "+ request.getContext(),t); throw new ConfigurationException("Unable to get Postgis index for ucd "
+ request.getUseCaseDescriptor().getId() + " in " + request.getContext(), t);
} }
} }
// Inits index // Inits index
// TODO CACHE // TODO CACHE
private PostgisIndexer getIndexer(UseCaseDescriptor ucd,Document params) throws ConfigurationException, SQLException, InvalidProfileException, SDIInteractionException { private PostgisIndexer getIndexer(UseCaseDescriptor ucd, Document params)
throws ConfigurationException, SQLException, InvalidProfileException, SDIInteractionException {
PostgisIndexer indexer = new PostgisIndexer(sdiCache.getObject(), ucd, postgisCache.getObject()); PostgisIndexer indexer = new PostgisIndexer(sdiCache.getObject(), ucd, postgisCache.getObject());
List<MappingObject> mappingObjects = getMappings(ucd); List<MappingObject> mappingObjects = getMappings(ucd);
List<PostgisTable.Field> fields = PostgisTable.Field.fromMappings(mappingObjects); List<PostgisTable.Field> fields = PostgisTable.Field.fromMappings(mappingObjects);
indexer.initIndex(params.getString("indexName"), indexer.initIndex(params.getString("indexName"), fields, params.getString("workspace"),
fields,
params.getString("workspace"),
params.getString("indexName")); params.getString("indexName"));
return indexer; return indexer;
} }
} }