refactor: rename all the accessors (#195)

gee-community · Feb 4, 2024 · 61fbd50 · 61fbd50
2 parents 273e1dd + ab8442d
commit 61fbd50
Show file tree

Hide file tree

Showing 18 changed files with 1,282 additions and 119 deletions.
diff --git a/docs/usage/layout.rst b/docs/usage/layout.rst
diff --git a/geetools/Array/__init__.py b/geetools/Array/__init__.py
@@ -7,7 +7,7 @@
 
     .. code-block:: python
 
-        from geetools.Array import Array
+        from geetools.Array import ArrayAccessor
 """
 from __future__ import annotations
 
@@ -22,7 +22,7 @@
 
 
 @register_class_accessor(ee.Array, "geetools")
-class Array:
+class ArrayAccessor:
     """Toolbox for the ``ee.Array`` class."""
 
     def __init__(self, obj: ee.Array):

diff --git a/geetools/Date/__init__.py b/geetools/Date/__init__.py
@@ -11,7 +11,7 @@
 
 
 @register_class_accessor(ee.Date, "geetools")
-class Date:
+class DateAccessor:
     """Toolbox for the ``ee.Date`` class."""
 
     def __init__(self, obj: ee.Date):

diff --git a/geetools/DateRange/__init__.py b/geetools/DateRange/__init__.py
@@ -8,7 +8,7 @@
 
 
 @register_class_accessor(ee.DateRange, "geetools")
-class DateRange:
+class DateRangeAccessor:
     """Toolbox for the ``ee.DateRange`` class."""
 
     def __init__(self, obj: ee.DateRange):

diff --git a/geetools/Dictionary/__init__.py b/geetools/Dictionary/__init__.py
@@ -8,7 +8,7 @@
 
 
 @register_class_accessor(ee.Dictionary, "geetools")
-class Dictionary:
+class DictionaryAccessor:
     """Toolbox for the ``ee.Dictionary`` class."""
 
     def __init__(self, obj: ee.Dictionary):

diff --git a/geetools/Feature/__init__.py b/geetools/Feature/__init__.py
@@ -7,7 +7,7 @@
 
 
 @register_class_accessor(ee.Feature, "geetools")
-class Feature:
+class FeatureAccessor:
     """Toolbox for the ``ee.Feature`` class."""
 
     def __init__(self, obj: ee.Feature):

diff --git a/geetools/FeatureCollection/__init__.py b/geetools/FeatureCollection/__init__.py
@@ -10,7 +10,7 @@
 
 
 @register_class_accessor(ee.FeatureCollection, "geetools")
-class FeatureCollection:
+class FeatureCollectionAccessor:
     """Toolbox for the `ee.FeatureCollection` class."""
 
     def __init__(self, obj: ee.FeatureCollection):

diff --git a/geetools/Filter/__init__.py b/geetools/Filter/__init__.py
@@ -9,7 +9,7 @@
 
 
 @register_class_accessor(ee.Filter, "geetools")
-class Filter:
+class FilterAccessor:
     """Toolbox for the ``ee.Filter`` class."""
 
     def __init__(self, obj: ee.Filter):

diff --git a/geetools/Geometry/__init__.py b/geetools/Geometry/__init__.py
@@ -7,7 +7,7 @@
 
 
 @register_class_accessor(ee.Geometry, "geetools")
-class Geometry:
+class GeometryAccessor:
     """Toolbox for the ``ee.Geometry`` class."""
 
     def __init__(self, obj: ee.Geometry):

diff --git a/geetools/Image/__init__.py b/geetools/Image/__init__.py
@@ -20,7 +20,7 @@
 
 
 @register_class_accessor(ee.Image, "geetools")
-class Image:
+class ImageAccessor:
     """Toolbox for the ``ee.Image`` class."""
 
     def __init__(self, obj: ee.Image):

diff --git a/geetools/ImageCollection/__init__.py b/geetools/ImageCollection/__init__.py
@@ -11,7 +11,7 @@
 
 
 @register_class_accessor(ee.ImageCollection, "geetools")
-class ImageCollection:
+class ImageCollectionAccessor:
     """Toolbox for the ``ee.ImageCollection`` class."""
 
     def __init__(self, obj: ee.ImageCollection):

diff --git a/geetools/Join/__init__.py b/geetools/Join/__init__.py
@@ -8,7 +8,7 @@
 
 
 @register_class_accessor(ee.Join, "geetools")
-class Join:
+class JoinAccessor:
     """Toolbox for the ``ee.Join`` class."""
 
     def __init__(self, obj: ee.join):

diff --git a/geetools/List/__init__.py b/geetools/List/__init__.py
@@ -8,7 +8,7 @@
 
 
 @register_class_accessor(ee.List, "geetools")
-class List:
+class ListAccessor:
     """Toolbox for the ``ee.List`` class."""
 
     def __init__(self, obj: ee.List):

diff --git a/geetools/Number/__init__.py b/geetools/Number/__init__.py
@@ -8,7 +8,7 @@
 
 
 @register_class_accessor(ee.Number, "geetools")
-class Number:
+class NumberAccessor:
     """toolbox for the ``ee.Number`` class."""
 
     def __init__(self, obj: ee.Number):

diff --git a/geetools/String/__init__.py b/geetools/String/__init__.py
@@ -8,7 +8,7 @@
 
 
 @register_class_accessor(ee.String, "geetools")
-class String:
+class StringAccessor:
     """Toolbox for the ``ee.String`` class."""
 
     def __init__(self, obj: ee.String):

diff --git a/geetools/__init__.py b/geetools/__init__.py
@@ -27,21 +27,21 @@
 from .tools import imagecollection
 
 # then we extend all the other classes
-from .Date import Date
-from .DateRange import DateRange
-from .Dictionary import Dictionary
-from .Feature import Feature
-from .FeatureCollection import FeatureCollection
-from .Filter import Filter
+from .Date import DateAccessor
+from .DateRange import DateRangeAccessor
+from .Dictionary import DictionaryAccessor
+from .Feature import FeatureAccessor
+from .FeatureCollection import FeatureCollectionAccessor
+from .Filter import FilterAccessor
 from .ComputedObject import Float
-from .Geometry import Geometry
+from .Geometry import GeometryAccessor
 from .ComputedObject import Integer
-from .Image import Image
-from .Join import Join
-from .List import List
-from .Number import Number
-from .String import String
-from .ImageCollection import ImageCollection
+from .Image import ImageAccessor
+from .Join import JoinAccessor
+from .List import ListAccessor
+from .Number import NumberAccessor
+from .String import StringAccessor
+from .ImageCollection import ImageCollectionAccessor
 from .Initialize import InitializeAccessor
 from .Authenticate import AuthenticateAccessor
 

diff --git a/tests/test_Array.py b/tests/test_Array.py
@@ -3,7 +3,7 @@
 import pytest
 
 import geetools
-from geetools.Array import Array  # noqa: F401
+from geetools.Array import ArrayAccessor  # noqa: F401
 
 
 class TestFull:

diff --git a/warnings.txt b/warnings.txt