openforis · 12rambau · May 31, 2022 · May 4, 2022 · May 4, 2022 · May 4, 2022
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
 
     steps:
       - uses: actions/checkout@v2

diff --git a/docs/source/modules/sepal_ui.mapping.DrawControl.rst b/docs/source/modules/sepal_ui.mapping.DrawControl.rst
@@ -0,0 +1,22 @@
+sepal\_ui.mapping.DrawControl
+=============================
+
+.. autoclass:: sepal_ui.mapping.DrawControl
+
+    .. rubric:: Attributes
+
+    .. autosummary::
+
+        ~DrawControl.m
+
+    .. rubric:: Methods
+
+    .. autosummary::
+        :nosignatures:
+
+        ~DrawControl.show
+        ~DrawControl.hide
+
+.. automethod:: sepal_ui.mapping.DrawControl.show
+
+.. automethod:: sepal_ui.mapping.DrawControl.hide
diff --git a/docs/source/modules/sepal_ui.mapping.FullScreenControl.rst b/docs/source/modules/sepal_ui.mapping.FullScreenControl.rst
@@ -1,52 +1,23 @@
-sepal\_ui.mapping.SepalMap
-==========================
+sepal\_ui.mapping.FullScreenControl
+===================================
 
-.. autoclass:: sepal_ui.mapping.SepalMap
+.. autoclass:: sepal_ui.mapping.FullScreenControl
 
     .. rubric:: Attributes
 
     .. autosummary::
 
-        ~SepalMap.ee
-        ~SepalMap.vinspector
-        ~SepalMap.loaded_rasters
-        ~SepalMap.dc
+        ~FullScreenControl.ICONS
+        ~FullScreenControl.METHODS
+        ~FullScreenControl.zoomed
+        ~FullScreenControl.w_btn
+        ~FullScreenControl.template
 
     .. rubric:: Methods
 
     .. autosummary::
         :nosignatures:
 
-        ~SepalMap.set_drawing_controls
-        ~SepalMap.remove_last_layer
-        ~SepalMap.zoom_ee_object
-        ~SepalMap.zoom_bounds
-        ~SepalMap.add_raster
-        ~SepalMap.show_dc
-        ~SepalMap.hide_dc
-        ~SepalMap.add_colorbar
-        ~SepalMap.addLayer
-        ~SepalMap.get_basemap_list
-        ~SepalMap.get_viz_params
+        ~FullScreenControl.toggle_fullscreen
 
-.. automethod:: sepal_ui.mapping.SepalMap.set_drawing_controls
-
-.. automethod:: sepal_ui.mapping.SepalMap.remove_last_layer
-
-.. automethod:: sepal_ui.mapping.SepalMap.zoom_ee_object
-
-.. automethod:: sepal_ui.mapping.SepalMap.zoom_bounds
-
-.. automethod:: sepal_ui.mapping.SepalMap.add_raster
-
-.. automethod:: sepal_ui.mapping.SepalMap.show_dc
-
-.. automethod:: sepal_ui.mapping.SepalMap.hide_dc
-
-.. automethod:: sepal_ui.mapping.SepalMap.add_colorbar
-
-.. automethod:: sepal_ui.mapping.SepalMap.addLayer
-
-.. automethod:: sepal_ui.mapping.SepalMap.get_basemap_list
-
-.. automethod:: sepal_ui.mapping.SepalMap.get_viz_params
+.. automethod:: sepal_ui.mapping.FullScreenControl.toggle_fullscreen
diff --git a/docs/source/modules/sepal_ui.mapping.Layer.rst b/docs/source/modules/sepal_ui.mapping.Layer.rst
@@ -0,0 +1,10 @@
+sepal\_ui.mapping.Layer
+=======================
+
+.. autoclass:: sepal_ui.mapping.Layer
+
+    .. rubric:: Attributes
+
+    .. autosummary::
+
+        ~Layer.ee_object
diff --git a/docs/source/modules/sepal_ui.mapping.MapBtn.rst b/docs/source/modules/sepal_ui.mapping.MapBtn.rst
@@ -0,0 +1,11 @@
+sepal\_ui.mapping.MapBtn
+========================
+
+.. autoclass:: sepal_ui.mapping.MapBtn
+
+    .. rubric:: Attributes
+
+    .. autosummary::
+
+        ~MapBtn.logo
+
diff --git a/docs/source/modules/sepal_ui.mapping.SepalMap.rst b/docs/source/modules/sepal_ui.mapping.SepalMap.rst
@@ -1,23 +1,80 @@
-sepal\_ui.mapping.FullScreenControl
-===================================
+sepal\_ui.mapping.SepalMap
+==========================
 
-.. autoclass:: sepal_ui.mapping.FullScreenControl
+.. autoclass:: sepal_ui.mapping.SepalMap
 
     .. rubric:: Attributes
 
     .. autosummary::
 
-        ~FullScreenControl.ICONS
-        ~FullScreenControl.METHODS
-        ~FullScreenControl.zoomed
-        ~FullScreenControl.w_btn
-        ~FullScreenControl.template
+        ~SepalMap.ee
+        ~SepalMap.dc
+        ~SepalMap.v_inspector
 
     .. rubric:: Methods
 
     .. autosummary::
         :nosignatures:
 
-        ~FullScreenControl.toggle_fullscreen
+        ~SepalMap.remove_last_layer
+        ~SepalMap.set_center
+        ~SepalMap.zoom_ee_object
+        ~SepalMap.zoom_bounds
+        ~SepalMap.add_raster
+        ~SepalMap.show_dc
+        ~SepalMap.hide_dc
+        ~SepalMap.add_colorbar
+        ~SepalMap.add_ee_Layer
+        ~SepalMap.get_basemap_list
+        ~SepalMap.get_viz_params
+        ~SepalMap.remove_layer
+        ~SepalMap.remove_all
+        ~SepalMap.add_layer
+        ~SepalMap.add_basemap
+        ~SepalMap.get_scale
+        ~SepalMap.setCenter
+        ~SepalMap.getScale
+        ~SepalMap.addLayer
+        ~SepalMap.centerObject
 
-.. automethod:: sepal_ui.mapping.FullScreenControl.toggle_fullscreen
+.. automethod:: sepal_ui.mapping.SepalMap.remove_last_layer
+
+.. automethod:: sepal_ui.mapping.SepalMap.set_center
+
+.. automethod:: sepal_ui.mapping.SepalMap.zoom_ee_object
+
+.. automethod:: sepal_ui.mapping.SepalMap.zoom_bounds
+
+.. automethod:: sepal_ui.mapping.SepalMap.add_raster
+
+.. automethod:: sepal_ui.mapping.SepalMap.show_dc
+
+.. automethod:: sepal_ui.mapping.SepalMap.hide_dc
+
+.. automethod:: sepal_ui.mapping.SepalMap.add_colorbar
+
+.. automethod:: sepal_ui.mapping.SepalMap.add_ee_Layer
+
+.. autofunction:: sepal_ui.mapping.SepalMap.get_basemap_list
+
+.. automethod:: sepal_ui.mapping.SepalMap.get_viz_params
+
+.. automethod:: sepal_ui.mapping.SepalMap.remove_layer
+
+.. automethod:: sepal_ui.mapping.SepalMap.remove_all
+
+.. automethod:: sepal_ui.mapping.SepalMap.add_layer
+
+.. automethod:: sepal_ui.mapping.SepalMap.add_basemap
+
+.. automethod:: sepal_ui.mapping.SepalMap.get_scale
+
+.. automethod:: sepal_ui.mapping.SepalMap.find_layer
+
+.. automethod:: sepal_ui.mapping.SepalMap.setCenter
+
+.. automethod:: sepal_ui.mapping.SepalMap.addLayer
+
+.. automethod:: sepal_ui.mapping.SepalMap.getScale
+
+.. automethod:: sepal_ui.mapping.SepalMap.centerObject
diff --git a/docs/source/modules/sepal_ui.mapping.ValueInspector.rst b/docs/source/modules/sepal_ui.mapping.ValueInspector.rst
@@ -0,0 +1,25 @@
+sepal\_ui.mapping.ValueInspector
+================================
+
+.. autoclass:: sepal_ui.mapping.ValueInspector
+
+    .. rubric:: Attributes
+
+    .. autosummary::
+
+        ~ValueInspector.m
+        ~ValueInspector.w_loading
+        ~ValueInspector.menu
+        ~ValueInspector.text
+
+    .. rubric:: Methods
+
+    .. autosummary::
+        :nosignatures:
+
+        ~ValueInspector.toggle_cursor
+        ~ValueInspector.read_data
+
+.. automethod:: sepal_ui.mapping.ValueInspector.toggle_cursor
+
+.. automethod:: sepal_ui.mapping.ValueInspector.read_data
diff --git a/docs/source/modules/sepal_ui.mapping.basemaps.rst b/docs/source/modules/sepal_ui.mapping.basemaps.rst
@@ -0,0 +1,16 @@
+sepal\_ui.mapping.basemaps
+==========================
+
+.. automodule:: sepal_ui.mapping.basemaps
+
+    .. rubric:: Functions
+
+    .. autosummary::
+        :nosignatures:
+
+        get_xyz_dict
+        xyz_to_leaflet
+
+.. autofunction:: sepal_ui.mapping.basemaps.get_xyz_dict
+
+.. autofunction:: sepal_ui.mapping.basemaps.xyz_to_leaflet
diff --git a/docs/source/modules/sepal_ui.mapping.rst b/docs/source/modules/sepal_ui.mapping.rst
@@ -3,10 +3,22 @@ sepal\_ui.mapping
 
 .. automodule:: sepal_ui.mapping
 
+.. rubric:: Modules
+
+.. autosummary::
+   :toctree:
+   :recursive:
+
+   sepal_ui.mapping.basemaps
+
 .. rubric:: Classes
 
 .. autosummary::
       :toctree:
 
       sepal_ui.mapping.SepalMap
-      sepal_ui.mapping.FullScreenControl
+      sepal_ui.mapping.FullScreenControl
+      sepal_ui.mapping.DrawControl
+      sepal_ui.mapping.EELayer
+      sepal_ui.mapping.MapBtn
+      sepal_ui.mapping.ValueInspector
diff --git a/docs/source/modules/sepal_ui.scripts.utils.rst b/docs/source/modules/sepal_ui.scripts.utils.rst
@@ -25,6 +25,7 @@ sepal\_ui.scripts.utils
         set_config_locale
         set_config_theme
         set_type
+        geojson_to_ee
 
 .. autofunction:: sepal_ui.scripts.utils.catch_errors
 
@@ -60,19 +61,5 @@ sepal\_ui.scripts.utils
 
 .. autofunction:: sepal_ui.scripts.utils.set_type
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+.. autofunction:: sepal_ui.scripts.utils.geojson_to_ee
 
diff --git a/sepal_ui/aoi/aoi_model.py b/sepal_ui/aoi/aoi_model.py
@@ -7,7 +7,6 @@
 import pandas as pd
 import geopandas as gpd
 from ipyleaflet import GeoJSON
-import geemap
 import ee
 
 from sepal_ui import color
@@ -260,6 +259,7 @@ def _from_asset(self, asset_name):
             if asset_name["value"] is None:
                 raise Exception(ms.aoi_sel.exception.no_value)
 
+        # set the name
         self.name = Path(asset_name["pathname"]).stem.replace(self.ASSET_SUFFIX, "")
         ee_col = ee.FeatureCollection(asset_name["pathname"])
 
@@ -274,11 +274,8 @@ def _from_asset(self, asset_name):
         self.feature_collection = ee_col
 
         # create a gdf form te feature_collection
-        # cannot be used before geemap 0.8.17 (not released)
-        # self.gdf = geemap.ee_to_geopandas(self.feature_collection)
-        self.gdf = gpd.GeoDataFrame.from_features(
-            self.feature_collection.getInfo()["features"]
-        ).set_crs(epsg=4326)
+        features = self.feature_collection.getInfo()["features"]
+        self.gdf = gpd.GeoDataFrame.from_features(features).set_crs(epsg=4326)
 
         return self
 
@@ -311,7 +308,7 @@ def _from_points(self, point_json):
 
         if self.ee:
             # transform the gdf to ee.FeatureCollection
-            self.feature_collection = geemap.geojson_to_ee(self.gdf.__geo_interface__)
+            self.feature_collection = ee.FeatureCollection(self.gdf.__geo_interface__)
 
             # export as a GEE asset
             self.export_to_asset()
@@ -344,7 +341,7 @@ def _from_vector(self, vector_json):
 
         if self.ee:
             # transform the gdf to ee.FeatureCollection
-            self.feature_collection = geemap.geojson_to_ee(self.gdf.__geo_interface__)
+            self.feature_collection = su.geojson_to_ee(self.gdf.__geo_interface__)
 
             # export as a GEE asset
             self.export_to_asset()
@@ -370,7 +367,7 @@ def _from_geo_json(self, geo_json):
 
         if self.ee:
             # transform the gdf to ee.FeatureCollection
-            self.feature_collection = geemap.geojson_to_ee(self.gdf.__geo_interface__)
+            self.feature_collection = su.geojson_to_ee(self.gdf.__geo_interface__)
 
             # export as a GEE asset
             self.export_to_asset()
@@ -415,11 +412,8 @@ def _from_admin(self, admin):
             ).filter(ee.Filter.eq(f"ADM{level}_CODE", admin))
 
             # transform it into gdf
-            # cannot be used before geemap 0.8.17 (not released)
-            # self.gdf = geemap.ee_to_geopandas(self.feature_collection)
-            self.gdf = gpd.GeoDataFrame.from_features(
-                self.feature_collection.getInfo()["features"]
-            ).set_crs(epsg=4326)
+            features = self.feature_collection.getInfo()["features"]
+            self.gdf = gpd.GeoDataFrame.from_features(features).set_crs(epsg=4326)
 
         else:
             # save the country iso_code