diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 2ee7531d..473ba15a 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -954,6 +954,7 @@
+
@@ -1260,6 +1261,7 @@
+
@@ -1394,6 +1396,7 @@
+
@@ -1428,6 +1431,7 @@
+
@@ -1508,6 +1512,7 @@
+
@@ -1521,6 +1526,7 @@
+
@@ -1533,6 +1539,7 @@
+
@@ -1992,6 +1999,7 @@
+
@@ -2083,6 +2091,8 @@
+
+
@@ -2228,6 +2238,7 @@
+
@@ -2654,6 +2665,7 @@
+
@@ -2662,6 +2674,7 @@
+
@@ -2697,6 +2710,7 @@
+
@@ -2752,6 +2766,7 @@
+
@@ -2771,6 +2786,7 @@
+
diff --git a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/geo/MapPlot.java b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/geo/MapPlot.java
index f5e45f11..284bc293 100644
--- a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/geo/MapPlot.java
+++ b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/geo/MapPlot.java
@@ -660,7 +660,9 @@ public class MapPlot extends Plot2D implements IWebMapPanel {
return graphic;
} else {
Graphic nGraphic = GraphicProjectionUtil.projectClipGraphic(graphic, proj, toProj);
- this.addGraphic(nGraphic);
+ if (nGraphic != null) {
+ this.addGraphic(nGraphic);
+ }
return nGraphic;
}
}
diff --git a/meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java b/meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java
index bb9ddedd..45665915 100644
--- a/meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java
+++ b/meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java
@@ -67,7 +67,7 @@ import java.util.zip.ZipInputStream;
public static String getVersion(){
String version = GlobalUtil.class.getPackage().getImplementationVersion();
if (version == null || version.equals("")) {
- version = "3.8.7";
+ version = "3.8.8";
}
return version;
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/meteodata/netcdf/NetCDFDataInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/meteodata/netcdf/NetCDFDataInfo.java
index e2ac747b..01c03ea4 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/meteodata/netcdf/NetCDFDataInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/meteodata/netcdf/NetCDFDataInfo.java
@@ -3613,7 +3613,17 @@ public class NetCDFDataInfo extends DataInfo implements IGridDataInfo, IStationD
nvar.addAttribute(new ucar.nc2.Attribute("axis", "T"));
} else {
for (ucar.nc2.Attribute attr : var.getAttributes()) {
- nvar.addAttribute(attr);
+ switch (attr.getDataType()) {
+ case BYTE:
+ case CHAR:
+ case STRING:
+ case SHORT:
+ case INT:
+ case FLOAT:
+ case DOUBLE:
+ nvar.addAttribute(attr);
+ break;
+ }
}
}
}
diff --git a/meteoinfo-lab/milconfig.xml b/meteoinfo-lab/milconfig.xml
index 3b105684..4c0a085b 100644
--- a/meteoinfo-lab/milconfig.xml
+++ b/meteoinfo-lab/milconfig.xml
@@ -1,9 +1,6 @@
-
-
-
-
+
@@ -12,21 +9,24 @@
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
@@ -34,5 +34,5 @@
-
+
diff --git a/meteoinfo-lab/pylib/mipylib/dataframe/series$py.class b/meteoinfo-lab/pylib/mipylib/dataframe/series$py.class
index bc270ec7..177c0ebb 100644
Binary files a/meteoinfo-lab/pylib/mipylib/dataframe/series$py.class and b/meteoinfo-lab/pylib/mipylib/dataframe/series$py.class differ
diff --git a/meteoinfo-lab/pylib/mipylib/dataframe/series.py b/meteoinfo-lab/pylib/mipylib/dataframe/series.py
index e6d9a645..cf09225a 100644
--- a/meteoinfo-lab/pylib/mipylib/dataframe/series.py
+++ b/meteoinfo-lab/pylib/mipylib/dataframe/series.py
@@ -329,7 +329,7 @@ class Series(object):
:returns: Top rows
"""
- print self._series.head(n)
+ print(self._series.head(n))
def tail(self, n=5):
"""
@@ -339,7 +339,7 @@ class Series(object):
:returns: Bottom rows
"""
- print self._series.tail(n)
+ print(self._series.tail(n))
def asarray(self):
"""
diff --git a/meteoinfo-lab/pylib/mipylib/plotlib/_mapaxes$py.class b/meteoinfo-lab/pylib/mipylib/plotlib/_mapaxes$py.class
index a2770b8b..3daae73e 100644
Binary files a/meteoinfo-lab/pylib/mipylib/plotlib/_mapaxes$py.class and b/meteoinfo-lab/pylib/mipylib/plotlib/_mapaxes$py.class differ
diff --git a/meteoinfo-lab/pylib/mipylib/plotlib/_mapaxes.py b/meteoinfo-lab/pylib/mipylib/plotlib/_mapaxes.py
index 038d3b6c..188475ea 100644
--- a/meteoinfo-lab/pylib/mipylib/plotlib/_mapaxes.py
+++ b/meteoinfo-lab/pylib/mipylib/plotlib/_mapaxes.py
@@ -839,11 +839,11 @@ class MapAxes(Axes):
proj = kwargs.pop('proj', migeo.projinfo())
# Create graphics
if a.ndim == 0:
- #graphics = GraphicFactory.createPoints(x._array, y._array, ls.getLegendBreak(0))
- graphics = Point2DCollection(x._array, y._array, legend=ls.getLegendBreak(0))
+ graphics = GraphicFactory.createPoints(x._array, y._array, ls.getLegendBreak(0))
+ #graphics = Point2DCollection(x._array, y._array, legend=ls.getLegendBreak(0))
else:
- #graphics = GraphicFactory.createPoints(x._array, y._array, a._array, ls)
- graphics = Point2DCollection(x._array, y._array, a._array, ls)
+ graphics = GraphicFactory.createPoints(x._array, y._array, a._array, ls)
+ #graphics = Point2DCollection(x._array, y._array, a._array, ls)
antialias = kwargs.pop('antialias', None)
if antialias is not None:
diff --git a/meteoinfo-map/config.xml b/meteoinfo-map/config.xml
index 7d1dc95f..86b11392 100644
--- a/meteoinfo-map/config.xml
+++ b/meteoinfo-map/config.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/pom.xml b/pom.xml
index 0eb41d3d..73725389 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
UTF-8
1.8
- 3.8.7
+ 3.8.8
8
8
8