From 6e6dd09361a6d7f499b27b206a4f8139c818b271 Mon Sep 17 00:00:00 2001 From: Gianpaolo Coro Date: Thu, 16 Apr 2015 09:22:04 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/EcologicalEngineGeoSpatialExtension@114100 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../gcube/dataanalysis/geo/algorithms/CSquaresCreator.java | 1 + .../geo/algorithms/FAOOceanAreaCreatorQuadrant.java | 3 +++ .../gcube/dataanalysis/geo/utils/CSquareCodesConverter.java | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gcube/dataanalysis/geo/algorithms/CSquaresCreator.java b/src/main/java/org/gcube/dataanalysis/geo/algorithms/CSquaresCreator.java index 48f8a40..e8eb923 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/algorithms/CSquaresCreator.java +++ b/src/main/java/org/gcube/dataanalysis/geo/algorithms/CSquaresCreator.java @@ -161,6 +161,7 @@ public class CSquaresCreator extends StandardLocalExternalAlgorithm { while (true) { String select = selectInformationForTransformation(config, table, limit, initIdx); + AnalysisLogger.getLogger().debug("CodeCreator: executing query: "+select); AnalysisLogger.getLogger().debug("CodeCreator: from " + initIdx + " to " + (initIdx + limit) + " limit "+limit); List rows = DatabaseFactory.executeSQLQuery(select, connection); diff --git a/src/main/java/org/gcube/dataanalysis/geo/algorithms/FAOOceanAreaCreatorQuadrant.java b/src/main/java/org/gcube/dataanalysis/geo/algorithms/FAOOceanAreaCreatorQuadrant.java index 6fd811c..8cefa5d 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/algorithms/FAOOceanAreaCreatorQuadrant.java +++ b/src/main/java/org/gcube/dataanalysis/geo/algorithms/FAOOceanAreaCreatorQuadrant.java @@ -3,6 +3,7 @@ package org.gcube.dataanalysis.geo.algorithms; import java.util.ArrayList; import java.util.List; +import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.gcube.dataanalysis.ecoengine.datatypes.ColumnType; import org.gcube.dataanalysis.ecoengine.datatypes.DatabaseType; @@ -53,6 +54,8 @@ public class FAOOceanAreaCreatorQuadrant extends FAOOceanAreaCreator { String quadrant = IOHelper.getInputParameter(config, quadrantDim); String select = "select *," + x + " as loforcs01," + y +" as laforcs01,"+quadrant+ " from " + table + " limit " + limit + " offset " + offset; + + return select; } @Override diff --git a/src/main/java/org/gcube/dataanalysis/geo/utils/CSquareCodesConverter.java b/src/main/java/org/gcube/dataanalysis/geo/utils/CSquareCodesConverter.java index f56726c..ab07e3c 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/utils/CSquareCodesConverter.java +++ b/src/main/java/org/gcube/dataanalysis/geo/utils/CSquareCodesConverter.java @@ -34,7 +34,9 @@ public class CSquareCodesConverter { // System.out.println(it.cnr.aquamaps.CSquare.centroidToCode(35.75,-50, 0.5)); // System.out.println(it.cnr.aquamaps.CSquare.centroidToCode(0.75,31.25, 0.5)); //System.out.println(it.cnr.aquamaps.CSquare.centroidToCode(31.25, 0.75,0.1)); - System.out.println(it.cnr.aquamaps.CSquare.centroidToCode(0.75,31.25, 0.1)); +// System.out.println(it.cnr.aquamaps.CSquare.centroidToCode(0.75,31.25, 0.1)); + System.out.println(it.cnr.aquamaps.CSquare.centroidToCode(50.006,-127.211, 0.5)); + } }