From f5a5bc1fcb9d6137b27a7030424f8489f2d8f8f8 Mon Sep 17 00:00:00 2001
From: Gianpaolo Coro <gianpaolo.coro@isti.cnr.it>
Date: Fri, 7 Jun 2013 11:07:55 +0000
Subject: [PATCH] git-svn-id:
 https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/EcologicalEngineGeoSpatialExtension@76860
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 .../dataanalysis/geo/retrieval/GeoIntersector.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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<String, Double> getFeaturesInTime(String layerTitle, double x, double y) throws Exception {
-		return getFeaturesInTime(layerTitle, x, y, 0);
+		return getFeaturesInAllTimes(layerTitle, x, y, 0);
 	}
 
-	public LinkedHashMap<String, Double> getFeaturesInTime(String layerTitle, double x, double y, double z) throws Exception {
+	public LinkedHashMap<String, Double> getFeaturesInAllTimes(String layerTitle, double x, double y, double z) throws Exception {
 		LinkedHashMap<String, Double> features = new LinkedHashMap<String, Double>();
 		// 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<Double> getFeaturesInTimeInstant(String layerTitle, int time, List<Tuple<Double>> triplets, double xL,double xR, double yL, double yR) throws Exception {
 		List<Double> features = new ArrayList<Double>();
 		// 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<FeaturedPolygon> featuresInTime = new ArrayList<FeaturedPolygon>();
 					AnalysisLogger.getLogger().debug("taking WFS features");