gCubeSystem
/
ecological-engine-geospatial-extensions
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/EcologicalEngineGeoSpatialExtension@76860 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Gianpaolo Coro 2013-06-07 11:07:55 +00:00
parent f112b50e35
commit f5a5bc1fcb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/gcube/dataanalysis/geo/retrieval/GeoIntersector.java
View File

@ -38,14 +38,14 @@ public class GeoIntersector {
} }
public LinkedHashMap<String, Double> getFeaturesInTime(String layerTitle, double x, double y) throws Exception { 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>(); LinkedHashMap<String, Double> features = new LinkedHashMap<String, Double>();
// get the layer // get the layer
// Metadata meta = featurer.getGNInfobyTitle(layerTitle); // Metadata meta = featurer.getGNInfobyTitle(layerTitle);
Metadata meta = featurer.checkForMetadatabyTitle(FeaturesManager.treatTitleForGN(layerTitle), layerTitle); Metadata meta = featurer.getGNInfobyUUIDorName(layerTitle);
// if the layer is good // if the layer is good
if (meta != null) { if (meta != null) {
String layer = featurer.getLayerName(meta); 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 { 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>(); List<Double> features = new ArrayList<Double>();
// get the layer // get the layer
Metadata meta = featurer.checkForMetadatabyTitle(FeaturesManager.treatTitleForGN(layerTitle), layerTitle); Metadata meta = featurer.getGNInfobyUUIDorName(layerTitle);
// if the layer is good // if the layer is good
if (meta != null) { if (meta != null) {
String layer = featurer.getLayerName(meta); String layer = featurer.getLayerName(meta);
@ -99,7 +99,7 @@ public class GeoIntersector {
} }
*/ */
} else { } 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 + ")"); // AnalysisLogger.getLogger().debug("Taking point: (" + x + "," + y + ")");
List<FeaturedPolygon> featuresInTime = new ArrayList<FeaturedPolygon>(); List<FeaturedPolygon> featuresInTime = new ArrayList<FeaturedPolygon>();
AnalysisLogger.getLogger().debug("taking WFS features"); AnalysisLogger.getLogger().debug("taking WFS features");