diff --git a/src/main/java/org/gcube/dataanalysis/geo/retrieval/GeoIntersector.java b/src/main/java/org/gcube/dataanalysis/geo/retrieval/GeoIntersector.java index 927fc03..22fccea 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/retrieval/GeoIntersector.java +++ b/src/main/java/org/gcube/dataanalysis/geo/retrieval/GeoIntersector.java @@ -38,14 +38,14 @@ public class GeoIntersector { } public LinkedHashMap getFeaturesInTime(String layerTitle, double x, double y) throws Exception { - return getFeaturesInTime(layerTitle, x, y, 0); + return getFeaturesInAllTimes(layerTitle, x, y, 0); } - public LinkedHashMap getFeaturesInTime(String layerTitle, double x, double y, double z) throws Exception { + public LinkedHashMap getFeaturesInAllTimes(String layerTitle, double x, double y, double z) throws Exception { LinkedHashMap features = new LinkedHashMap(); // get the layer // Metadata meta = featurer.getGNInfobyTitle(layerTitle); - Metadata meta = featurer.checkForMetadatabyTitle(FeaturesManager.treatTitleForGN(layerTitle), layerTitle); + Metadata meta = featurer.getGNInfobyUUIDorName(layerTitle); // if the layer is good if (meta != null) { String layer = featurer.getLayerName(meta); @@ -72,7 +72,7 @@ public class GeoIntersector { public List getFeaturesInTimeInstant(String layerTitle, int time, List> triplets, double xL,double xR, double yL, double yR) throws Exception { List features = new ArrayList(); // get the layer - Metadata meta = featurer.checkForMetadatabyTitle(FeaturesManager.treatTitleForGN(layerTitle), layerTitle); + Metadata meta = featurer.getGNInfobyUUIDorName(layerTitle); // if the layer is good if (meta != null) { String layer = featurer.getLayerName(meta); @@ -99,7 +99,7 @@ public class GeoIntersector { } */ } else { - AnalysisLogger.getLogger().debug("found a Geo Layer with title " + layerTitle + " and layer name " + layer); + AnalysisLogger.getLogger().debug("found a Geo Layer with reference " + layerTitle + " and layer name " + layer); // AnalysisLogger.getLogger().debug("Taking point: (" + x + "," + y + ")"); List featuresInTime = new ArrayList(); AnalysisLogger.getLogger().debug("taking WFS features");