diff --git a/pom.xml b/pom.xml
index 1a89218..dbe1f57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,11 +9,28 @@
org.gcube.dataanalysis
ecological-engine-geospatial-extensions
- 1.3.7-SNAPSHOT
- ecological-engine-geospatial-extension
+ 1.3.8-SNAPSHOT
+ ecological-engine-geospatial-extension library
ecological-engine-geospatial-extension
+
+ https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/EcologicalEngineGeoSpatialExtension
+
+
+
+ Gianpaolo Coro
+ gianpaolo.coro@isti.cnr.it
+ CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
+
+ architect
+ developer
+
+
+
- ${project.basedir}/distro
+ ${project.build.directory}/${project.build.finalName}
+ distro
+ UTF-8
+ UTF-8
@@ -125,8 +142,11 @@
+
+
maven-compiler-plugin
+ 3.1
1.6
@@ -135,37 +155,14 @@
org.apache.maven.plugins
maven-surefire-plugin
- 2.12
+ 2.18.1
true
-
- org.apache.maven.plugins
- maven-resources-plugin
- 2.5
-
-
- copy-profile
- install
-
- copy-resources
-
-
- target
-
-
- ${distroDirectory}
- true
-
- profile.xml
-
-
-
-
-
-
-
+
+
+
org.apache.maven.plugins
maven-assembly-plugin
diff --git a/src/main/java/org/gcube/dataanalysis/geo/connectors/netcdf/NetCDFDataExplorer.java b/src/main/java/org/gcube/dataanalysis/geo/connectors/netcdf/NetCDFDataExplorer.java
index 9b79aea..ab60673 100644
--- a/src/main/java/org/gcube/dataanalysis/geo/connectors/netcdf/NetCDFDataExplorer.java
+++ b/src/main/java/org/gcube/dataanalysis/geo/connectors/netcdf/NetCDFDataExplorer.java
@@ -87,7 +87,9 @@ public class NetCDFDataExplorer {
}
}
} catch (Exception e) {
+ e.printStackTrace();
AnalysisLogger.getLogger().debug("NetCDF Explorer Error:" + e.getLocalizedMessage());
+ AnalysisLogger.getLogger().debug(e);
}
}
@@ -207,7 +209,7 @@ public class NetCDFDataExplorer {
xmin = -180;
is0_360 = true;
}
-
+ AnalysisLogger.getLogger().debug("Assigning "+tsize+" grid elements to the NetCDF values");
for (int i = 0; i < tsize; i++) {
int zint = 0;
int xint = 0;
@@ -239,7 +241,7 @@ public class NetCDFDataExplorer {
x = xmax;
-
+ try{
int[] idxbb = gcs.findXYindexFromLatLon(75,10, null);
int[] idxo = gcs.findXYindexFromLatLon(0,0, null);
LatLonPoint inverseOrigin = gcs.getLatLon(idxo[0],idxo[1]);
@@ -247,14 +249,20 @@ public class NetCDFDataExplorer {
//correction to origin offset
x = x - inverseOrigin.getLongitude();
y = y - inverseOrigin.getLatitude();
-
if (i==0)
AnalysisLogger.getLogger().debug("bb: " + idxbb[0] +","+idxbb[1]+" origin: "+idxo[0]+","+idxo[1]+" middle "+xD/2+","+yD/2+" shift "+(idxo[0]-(xD/2))+" inverse shift on origin "+inverseOrigin);
+ }catch(Exception e){
+ AnalysisLogger.getLogger().debug("Error getting x,y corrections "+e.getLocalizedMessage());
+ e.printStackTrace();
+ }
+
int[] idx = gcs.findXYindexFromLatLon(y,x, null);
xint = idx[0];
yint = idx[1];
+
+
if (yint < 0) {
yint = 0;
}
@@ -295,7 +303,21 @@ public class NetCDFDataExplorer {
val = Double.valueOf(data2Double.get(yint, xint));
else if (data2Long != null)
val = Double.valueOf(data2Long.get(yint, xint));
-
+
+ AnalysisLogger.getLogger().debug("Choice "+ (data3Float!=null)+","+
+ (data3Int!=null)+","+
+ (data3Double!=null)+","+
+ (data3Long!=null)+","+
+ (data2Float!=null)+","+
+ (data2Int!=null)+","+
+ (data2Double!=null)+","+
+ (data2Long!=null));
+
+// AnalysisLogger.getLogger().debug("Assigning "+val+" to "+x+","+y+" ["+xint+","+yint+"]");
+// AnalysisLogger.getLogger().debug("checking "+data2Float.get(yint, xint)+" vs ");
+// try{AnalysisLogger.getLogger().debug("checking2 "+data2Float.get(xint,yint));}catch(Exception e){}
+
+
values.add(val);
}
break;
diff --git a/src/main/java/org/gcube/dataanalysis/geo/matrixmodel/MatrixExtractor.java b/src/main/java/org/gcube/dataanalysis/geo/matrixmodel/MatrixExtractor.java
index dc81d25..5a2d63e 100644
--- a/src/main/java/org/gcube/dataanalysis/geo/matrixmodel/MatrixExtractor.java
+++ b/src/main/java/org/gcube/dataanalysis/geo/matrixmodel/MatrixExtractor.java
@@ -208,6 +208,7 @@ public class MatrixExtractor {
if (log) {
AnalysisLogger.getLogger().debug("MatrixExtractor->Building the points grid according to YRes:" + yResolution + " and XRes:" + xResolution);
+ AnalysisLogger.getLogger().debug("MatrixExtractor->Assigning "+tuples.size()+" values to the grid");
}
// long t0=System.currentTimeMillis();