#478 missing/wrong coord names

CCI-Tools · Dec 21, 2017 · c902806 · c902806
1 parent 6f90d57
commit c902806
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/cate/ds/esa_cci_odp.py b/cate/ds/esa_cci_odp.py
@@ -61,7 +61,7 @@
 from cate.core.types import PolygonLike, TimeLike, TimeRange, TimeRangeLike, VarNamesLike, VarNames
 from cate.ds.local import add_to_data_store_registry, LocalDataSource, LocalDataStore
 from cate.util.monitor import Cancellation, Monitor
-from cate.util.opimpl import subset_spatial_impl
+from cate.util.opimpl import subset_spatial_impl, normalize_impl
 
 ESA_CCI_ODP_DATA_STORE_ID = 'esa_cci_odp'
 
@@ -633,6 +633,7 @@ def open_dataset(self,
         try:
             ds = open_xarray_dataset(files)
             if region:
+                ds = normalize_impl(ds)
                 ds = subset_spatial_impl(ds, region)
             if var_names:
                 ds = ds.drop([var_name for var_name in ds.data_vars.keys() if var_name not in var_names])
@@ -733,6 +734,7 @@ def _make_local(self,
                                  if var_name not in var_names])
 
                         if region:
+                            remote_dataset = normalize_impl(remote_dataset)
                             remote_dataset = subset_spatial_impl(remote_dataset, region)
                             geo_lon_min, geo_lat_min, geo_lon_max, geo_lat_max = region.bounds
 

diff --git a/cate/ds/local.py b/cate/ds/local.py
@@ -56,7 +56,7 @@
     open_xarray_dataset
 from cate.core.types import Polygon, PolygonLike, TimeRange, TimeRangeLike, VarNames, VarNamesLike
 from cate.util.monitor import Monitor
-from cate.util.opimpl import subset_spatial_impl
+from cate.util.opimpl import subset_spatial_impl, normalize_impl
 
 __author__ = "Norman Fomferra (Brockmann Consult GmbH), " \
              "Marco Zühlke (Brockmann Consult GmbH), " \
@@ -168,6 +168,7 @@ def open_dataset(self,
             try:
                 ds = open_xarray_dataset(paths)
                 if region:
+                    ds = normalize_impl(ds)
                     ds = subset_spatial_impl(ds, region)
                 if var_names:
                     ds = ds.drop([var_name for var_name in ds.data_vars.keys() if var_name not in var_names])
@@ -250,6 +251,7 @@ def _make_local(self,
                                      if var_name not in var_names])
 
                             if region:
+                                remote_dataset = normalize_impl(remote_dataset)
                                 remote_dataset = subset_spatial_impl(remote_dataset, region)
                                 geo_lon_min, geo_lat_min, geo_lon_max, geo_lat_max = region.bounds