earthengine-api 1.6.12__py3-none-any.whl → 1.6.13rc0__py3-none-any.whl

{earthengine_api-1.6.12.dist-info → earthengine_api-1.6.13rc0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: earthengine-api
-Version: 1.6.12
+Version: 1.6.13rc0
 Summary: Earth Engine Python API
 Author-email: Google LLC <noreply@google.com>
 License: Apache-2.0

{earthengine_api-1.6.12.dist-info → earthengine_api-1.6.13rc0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-earthengine_api-1.6.12.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ee/__init__.py,sha256=L2apEDNlsV3UxIikUyUzdClLNt6hVoms8B6oj3VMsMs,16804
+earthengine_api-1.6.13rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ee/__init__.py,sha256=sPUQ-hmeq6MSAXUmmwZtJ0NGQFXFLJsowJrQencR-7o,16807
 ee/_arg_types.py,sha256=nrJrnPFnAS8fzMxAGmG3TbUOi_yFVrnSGW5IP8ATzDQ,2662
 ee/_cloud_api_utils.py,sha256=06xr56VvGeQHl6DTeoC9_YE0hKVtE11tMnDCv98TKSA,32998
 ee/_helpers.py,sha256=71xYDbCO_1usY3SnedoA9zi7j6dnPBijru1eUh4o25g,4859
@@ -34,7 +34,7 @@ ee/feature.py,sha256=WItnwlQp8U3D0E0YkgJNXIAk2JviwloS9c8j2XqbKEM,30292
 ee/featurecollection.py,sha256=XbDgzYEEyhim0_y2AOD5Wi-TRIl90OnB1DHtAJXgvg8,14424
 ee/filter.py,sha256=GKz3IqeZSrK4X26TjWaw_uOE8KjZgSx1pS1zM07PXfI,35321
 ee/function.py,sha256=X-Mz0AvF_l809NZXK8RM6fa2h-nP7YU2sUFp6hvIbdU,7049
-ee/geometry.py,sha256=6r2Y2E6H_adrBaWq9zzZZRFgq0KIe543rOSHaDHeNzY,59264
+ee/geometry.py,sha256=D__UeT72DDaJFakmyaPnmfHwxNtDxLJW7Vbze0Hh2Y4,59517
 ee/image.py,sha256=LDidnOBIQaZ1Rv9X8H6DcNUzClRYxXcy2lHGoe5L6pA,170921
 ee/image_converter.py,sha256=CdeM5zMy0T_HylcFeoIcfZxjczWwOA2SklDLg6p9le8,1494
 ee/imagecollection.py,sha256=RcOd5j11x7324MYmvZG62ehyjzaGAnKqakhhXkYlOCc,27102
@@ -88,7 +88,7 @@ ee/tests/featurecollection_test.py,sha256=b3SwieXb8nyRzAlwKK_nSa4xGcy5AynIDZ1A3s
 ee/tests/filter_test.py,sha256=d-KQ_zI-r7BAMazKqqHMMzNUZdeC46BZiciMfthKEO8,35033
 ee/tests/function_test.py,sha256=0hv7H-Q21vdDvqHNH_3NvFj_nPEWM2Fh7CD0wgjXE2M,3131
 ee/tests/geometry_point_test.py,sha256=w9MYTwvw2Co9rIjffFB0ezQ_jZz8nxbdgOcyhqTTmjk,15093
-ee/tests/geometry_test.py,sha256=8KAevJgLpw38BzelpENiSOn0t0tGuHatxDiN1aKLUBk,31653
+ee/tests/geometry_test.py,sha256=5cNblTtXg4gg0k1_6go4XL2EldY2StOfD7sQ7Bu0WZU,32424
 ee/tests/image_converter_test.py,sha256=uRXYOCU3a0ZaRTHw-ovVP8FJC2mVE9wbHd3JzoExkPs,1885
 ee/tests/image_test.py,sha256=_SJmee7orPot26vbxKEZcNZ6OsrNrxv3ToInWYLNZLM,150917
 ee/tests/imagecollection_test.py,sha256=qosRZXCbhwFuy8qR7DbA-FMl4ktW7Y2cUJHeXLcszpg,38444
@@ -102,8 +102,8 @@ ee/tests/reducer_test.py,sha256=NYJTmX6AmBZyXGjOkgUh4t3tB6E8_vGlPYQIxJQbV9Q,3151
 ee/tests/serializer_test.py,sha256=9t2jaDqrdxAAi3QOXZ0QbWnjExWdLODHdMVJSrtTBvU,8824
 ee/tests/table_converter_test.py,sha256=2F7DyEj-iHVbt9-W1iwAHDl-K1GA_2QHalTXzac2ot8,3373
 ee/tests/terrain_test.py,sha256=8TmvGconOR-GkGrll4joXhpU9zi0b_8GFxvX_JlcCos,4328
-earthengine_api-1.6.12.dist-info/METADATA,sha256=3UsVlBbhtRVYz55WRRZFItcyFazYmwc3h3SmUyOUYLY,2194
-earthengine_api-1.6.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-earthengine_api-1.6.12.dist-info/entry_points.txt,sha256=-Ax4SCU-S474r8OD2LIxata6PRmkZoDrppQ4fP_exNc,50
-earthengine_api-1.6.12.dist-info/top_level.txt,sha256=go5zOwCgm5lIS3yTR-Vsxp1gNI4qdS-MP5eY-7zMxVY,3
-earthengine_api-1.6.12.dist-info/RECORD,,
+earthengine_api-1.6.13rc0.dist-info/METADATA,sha256=VwxhScSEXzHn3NcW5nIm2wcWnZGjTJh1SLlRaMzDB9I,2197
+earthengine_api-1.6.13rc0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+earthengine_api-1.6.13rc0.dist-info/entry_points.txt,sha256=-Ax4SCU-S474r8OD2LIxata6PRmkZoDrppQ4fP_exNc,50
+earthengine_api-1.6.13rc0.dist-info/top_level.txt,sha256=go5zOwCgm5lIS3yTR-Vsxp1gNI4qdS-MP5eY-7zMxVY,3
+earthengine_api-1.6.13rc0.dist-info/RECORD,,

ee/__init__.py

@@ -1,6 +1,6 @@
 """The EE Python library."""
 
-__version__ = '1.6.12'
+__version__ = '1.6.13rc0'
 
 # Using lowercase function naming to match the JavaScript names.
 # pylint: disable=g-bad-name

ee/geometry.py

@@ -43,6 +43,9 @@ class Geometry(computedobject.ComputedObject):
   ):
     """Creates a geometry.
 
+    Note that a creating a Geometry from a ComputedObject cannot have have any
+    overrides from the arguments proj, geodesic, or evenOdd.
+
     Args:
       geo_json: The GeoJSON object describing the geometry or a computed object
         to be reinterpred as a Geometry. Supports CRS specifications as per the
@@ -56,8 +59,8 @@ class Geometry(computedobject.ComputedObject):
       geodesic: Whether line segments should be interpreted as spherical
         geodesics. If false, indicates that line segments should be interpreted
         as planar lines in the specified CRS. If absent, defaults to true if the
-        CRS is geographic (including the default
-          EPSG:4326), or to false if the CRS is projected.
+        CRS is geographic (including the default EPSG:4326), or to false if the
+        CRS is projected.
       evenOdd: If true, polygon interiors will be determined by the even/odd
         rule, where a point is inside if it crosses an odd number of edges to
         reach a point at infinity. Otherwise polygons use the left-inside rule,
@@ -70,10 +73,11 @@ class Geometry(computedobject.ComputedObject):
     self.initialize()
 
     # pylint: disable-next=protected-access
+    has_resolved_geometry_type = getattr(geo_json, '_type', None) is not None
     computed = isinstance(geo_json, computedobject.ComputedObject) and not (
-        isinstance(geo_json, Geometry) and geo_json._type is not None
+        isinstance(geo_json, Geometry) and has_resolved_geometry_type
     )
-    options = proj or geodesic or evenOdd
+    options = proj is not None or geodesic is not None or evenOdd is not None
     if computed:
       if options:
         raise ee_exception.EEException(

ee/tests/geometry_test.py

@@ -691,7 +691,7 @@ class GeometryTest(apitestcase.ApiTestCase, parameterized.TestCase):
       1) A geoJSON object.
       2) A not-computed geometry.
       3) A not-computed geometry with overrides.
-      4) A computed geometry.
+      4) A computed geometry with no overrides.
       5) something to cast to geometry.
     """
     line = ee.Geometry.LineString(1, 2, 3, 4)
@@ -729,6 +729,25 @@ class GeometryTest(apitestcase.ApiTestCase, parameterized.TestCase):
     self.assertEqual(computed.func, geom.func)
     self.assertEqual(computed.args, geom.args)
 
+  @parameterized.named_parameters(
+      ('_proj', {'proj': 'some-proj'}),
+      ('_geodesic', {'geodesic': False}),
+      ('_geodesic_true', {'geodesic': True}),
+      ('_evenOdd', {'evenOdd': False}),
+      ('_evenOdd_true', {'evenOdd': True}),
+  )
+  def test_constructor_error_for_computed_geometry_with_overrides(self, kwargs):
+    """Verifies that Geometry raises for computed geometries with overrides."""
+    computed_geometry = ee.Geometry.Polygon(
+        coords=[[[-35, -10], [-35, 10], [35, 10], [35, -10], [-35, -10]]],
+        geodesic=True,
+    )
+    with self.assertRaisesRegex(
+        ee.EEException,
+        'Setting the CRS or geodesic on a computed Geometry is not supported.',
+    ):
+      ee.Geometry(computed_geometry, **kwargs)
+
   def test_computed_geometries(self):
     """Verifies the computed object behavior of the Geometry constructor."""
     line = ee.Geometry.LineString(1, 2, 3, 4)