xee 0.0.3__tar.gz → 0.0.4__tar.gz

{xee-0.0.3 → xee-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xee
-Version: 0.0.3
+Version: 0.0.4
 Summary: A Google Earth Engine extension for Xarray.
 Author-email: Google LLC <noreply@google.com>
 License: Apache-2.0

{xee-0.0.3 → xee-0.0.4}/xee/ext.py

@@ -105,12 +105,14 @@ class EarthEngineStore(common.AbstractDataStore):
       'degree': 1,
       'metre': 10_000,
       'meter': 10_000,
+      'm': 10_000,
   }
 
   DIMENSION_NAMES: Dict[str, Tuple[str, str]] = {
       'degree': ('lon', 'lat'),
       'metre': ('X', 'Y'),
       'meter': ('X', 'Y'),
+      'm': ('X', 'Y'),
   }
 
   DEFAULT_MASK_VALUE = np.iinfo(np.int32).max
@@ -465,9 +467,9 @@ class EarthEngineStore(common.AbstractDataStore):
     # `raw` is a structured array of all the same dtype (i.e. number of images).
     arr = np.array(raw.tolist(), dtype=dtype)
     data = arr.T
-
+    current_mask_value = np.array(self.mask_value, dtype=data.dtype)
     # Sets EE nodata masked value to NaNs.
-    data = np.where(data == self.mask_value, np.nan, data)
+    data = np.where(data == current_mask_value, np.nan, data)
     return data
 
   @functools.lru_cache()
@@ -637,8 +639,8 @@ class EarthEngineBackendArray(backends.BackendArray):
 
     x_min, y_min, x_max, y_max = self.bounds
 
-    x_size = int(np.ceil((x_max - x_min) / np.abs(self.store.scale_x)))
-    y_size = int(np.ceil((y_max - y_min) / np.abs(self.store.scale_y)))
+    x_size = int(np.round((x_max - x_min) / np.abs(self.store.scale_x)))
+    y_size = int(np.round((y_max - y_min) / np.abs(self.store.scale_y)))
 
     self.shape = (ee_store.n_images, x_size, y_size)
     self._apparent_chunks = {k: 1 for k in self.store.PREFERRED_CHUNKS.keys()}
@@ -821,7 +823,7 @@ class EarthEngineBackendEntrypoint(backends.BackendEntrypoint):
 
   def guess_can_open(
       self, filename_or_obj: Union[str, os.PathLike[Any], ee.ImageCollection]
-  ) -> bool:
+  ) -> bool:  # type: ignore
     """Returns True if the candidate is a valid ImageCollection."""
     if isinstance(filename_or_obj, ee.ImageCollection):
       return True
@@ -853,7 +855,7 @@ class EarthEngineBackendEntrypoint(backends.BackendEntrypoint):
       primary_dim_property: Optional[str] = None,
       ee_mask_value: Optional[float] = None,
       request_byte_limit: int = REQUEST_BYTE_LIMIT,
-  ) -> xarray.Dataset:
+  ) -> xarray.Dataset:  # type: ignore
     """Open an Earth Engine ImageCollection as an Xarray Dataset.
 
     Args:

{xee-0.0.3 → xee-0.0.4}/xee/ext_integration_test.py

@@ -281,7 +281,7 @@ class EEBackendEntrypointTest(absltest.TestCase):
         scale=25.0,  # in degrees
         n_images=3,
     )
-    self.assertEqual(dict(ds.dims), {'time': 3, 'lon': 15, 'lat': 8})
+    self.assertEqual(dict(ds.dims), {'time': 3, 'lon': 14, 'lat': 7})
     self.assertNotEmpty(dict(ds.coords))
     self.assertEqual(
         list(ds.data_vars.keys()),
@@ -290,7 +290,7 @@ class EEBackendEntrypointTest(absltest.TestCase):
     for v in ds.values():
       self.assertIsNotNone(v.data)
       self.assertFalse(v.isnull().all(), 'All values are null!')
-      self.assertEqual(v.shape, (3, 15, 8))
+      self.assertEqual(v.shape, (3, 14, 7))
 
   def test_open_dataset__n_images(self):
     ds = self.entry.open_dataset(
@@ -330,7 +330,7 @@ class EEBackendEntrypointTest(absltest.TestCase):
         engine=xee.EarthEngineBackendEntrypoint,
     )
 
-    self.assertEqual(ds.dims, {'time': 4248, 'lon': 41, 'lat': 35})
+    self.assertEqual(ds.dims, {'time': 4248, 'lon': 40, 'lat': 35})
     self.assertNotEqual(ds.dims, standard_ds.dims)
 
   def test_honors_projection(self):
@@ -357,14 +357,14 @@ class EEBackendEntrypointTest(absltest.TestCase):
         scale=25.0,  # in degrees
         n_images=3,
     )
-    self.assertEqual(dict(ds.dims), {'time': 3, 'lon': 15, 'lat': 8})
+    self.assertEqual(dict(ds.dims), {'time': 3, 'lon': 14, 'lat': 7})
     ds = self.entry.open_dataset(
         'ee:LANDSAT/LC08/C01/T1',
         drop_variables=tuple(f'B{i}' for i in range(3, 12)),
         scale=25.0,  # in degrees
         n_images=3,
     )
-    self.assertEqual(dict(ds.dims), {'time': 3, 'lon': 15, 'lat': 8})
+    self.assertEqual(dict(ds.dims), {'time': 3, 'lon': 14, 'lat': 7})
 
   def test_data_sanity_check(self):
     # This simple test uncovered a bug with the default definition of `scale`.

{xee-0.0.3 → xee-0.0.4}/xee.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xee
-Version: 0.0.3
+Version: 0.0.4
 Summary: A Google Earth Engine extension for Xarray.
 Author-email: Google LLC <noreply@google.com>
 License: Apache-2.0