Fix/addtyping #494

krishnaglodha · 2023-07-16T06:00:32Z

fixed basemaps and bokehmap file

krishnaglodha · 2023-07-18T15:25:27Z

@giswqs can you please approve test CI file

giswqs · 2023-07-18T15:38:10Z

I just did. CI is automatically disabled for new contributors. It should run automatically after your first PR.

krishnaglodha · 2023-07-18T15:39:58Z

I see

krishnaglodha · 2023-07-18T15:40:38Z

I'll need a bit of to and fro for this PR as I am relying on testing from CI

giswqs · 2023-07-18T15:43:10Z

Check your email for the invite to become a collaborator for the project. CI should be able to run automatically for all collaborators.

giswqs · 2023-08-09T00:53:14Z

leafmap/common.py

@@ -286,7 +291,7 @@ def random_string(string_length=3):
    return "".join(random.choice(letters) for i in range(string_length))


-def open_image_from_url(url):
+def open_image_from_url(url: str) -> dict:


Removing the return data type -> dict, which is incorrect.

giswqs · 2023-08-09T00:56:52Z

leafmap/deck.py

@@ -3,7 +3,7 @@
 from .osm import *
 from .leafmap import basemaps
 from . import examples
-
+from geopandas import GeoDataFrame


Removing this line as GeoPandas is not a required dependency.

giswqs · 2023-08-09T01:01:13Z

leafmap/heremap.py

@@ -14,6 +14,9 @@
 from .basemaps import xyz_to_heremap
 from .common import shp_to_geojson, gdf_to_geojson, vector_to_geojson, random_string
 from . import examples
+from typing import Optional, Union, List, Dict, Callable, Any, Tuple


The heremap package has not update since October 2021. I am going to remove this module.
https://github.com/heremaps/here-map-widget-for-jupyter

giswqs · 2023-08-09T01:05:06Z

leafmap/foliumap.py

@@ -13,8 +13,14 @@
 from folium.elements import JSCSSMixin
 from folium.map import Layer
 from jinja2 import Template
+from geopandas import GeoDataFrame, GeoSeries


Removing this line. GeoPandas is not a required dependency.

giswqs · 2023-08-09T01:07:17Z

leafmap/foliumap.py

+from typing import Optional, Union, Any, Callable, Dict, Tuple
+import shapely
+from sqlalchemy.engine import Engine
+from ipywidgets.widgets import Image as ipywidgetsImage



Removing shapely and sqlalchemy that are not required dependencies.

giswqs · 2023-08-09T01:12:13Z

leafmap/foliumap.py

+        opacity: Optional[float] = 1.0,
+        shown: Optional[bool] = True,
+        bands: Optional[List] = None,
+        titiler_endpoint: Optional[str] = "https://titiler.xyz",


The default value should be None.

giswqs · 2023-08-09T01:15:38Z

leafmap/foliumap.py

@@ -1707,7 +1734,7 @@ def st_map_bounds(self, st_component):
        bounds = [[south, west], [north, east]]
        return bounds

-    def st_fit_bounds(self):
+    def st_fit_bounds(self) -> folium.Map:


The function does not return values. Removing -> folium.Map

giswqs · 2023-08-09T01:20:19Z

leafmap/foliumap.py

+        popup: Optional[List] = None,
+        min_width: Optional[int] = 100,
+        max_width: Optional[int] = 200,
+        layer_name: Optional[str] = "Points",


The default layer name is Marker Cluster, not Points

giswqs · 2023-08-09T01:21:34Z

leafmap/foliumap.py

+        layer_name: Optional[str] = "Points",
+        color_column: Optional[str] = None,
+        marker_colors: Optional[List] = None,
+        icon_colors: Optional[List] = None,


The default icon_colors is ["white"]

giswqs · 2023-08-09T01:21:55Z

leafmap/foliumap.py

+        color_column: Optional[str] = None,
+        marker_colors: Optional[List] = None,
+        icon_colors: Optional[List] = None,
+        icon_names: Optional[List] = None,


The default icon_names is ["info"]

giswqs · 2023-08-09T01:25:37Z

leafmap/kepler.py

@@ -9,6 +9,10 @@
 from .common import *
 from .osm import *
 from . import examples
+from typing import Optional, Union, Dict
+from geopandas import GeoDataFrame


Removing geopandas

giswqs · 2023-08-09T01:26:09Z

leafmap/kepler.py

+from typing import Optional, Union, Dict
+from geopandas import GeoDataFrame
+from pandas import DataFrame
+from sqlalchemy.engine import Engine


Removing sqlalchemy

giswqs · 2023-08-09T01:39:24Z

leafmap/osm.py


 warnings.filterwarnings("ignore")
+from geopandas import GeoDataFrame


Removing Geopandas

giswqs · 2023-08-09T01:41:28Z

leafmap/osm.py


 warnings.filterwarnings("ignore")
+from geopandas import GeoDataFrame
+from shapely.geometry import Polygon, MultiPolygon


Removing shapely. Not a required dependency.

giswqs · 2023-08-09T01:46:24Z

leafmap/osm.py

+    webbrowser.open_new_tab("https://wiki.openstreetmap.org/wiki/Map_features")
+
+
+"""The module contains functions for downloading OpenStreetMap data. It wraps the geometries module of the osmnx package 


Duplicate copy of the modules. Removing all lines after 426

giswqs · 2023-08-09T01:48:01Z

leafmap/plotlymap.py

@@ -7,6 +7,9 @@
 from .common import *
 from .osm import *
 from . import examples
+from typing import Optional, List, Union, Dict, Tuple
+from plotly import graph_objects


Removing graph_objects import

giswqs · 2023-08-09T01:49:39Z

leafmap/plotlymap.py

+        attribution: Optional[str] = "",
+        opacity: Optional[float] = 1.0,
+        bands: Optional[List] = None,
+        titiler_endpoint: Optional[str] = "https://titiler.xyz",


The default value should be None

giswqs · 2023-08-09T01:52:32Z

leafmap/stac.py

@@ -1,16 +1,20 @@
 import os
 import pystac
 import requests
+from typing import Optional, Dict, List, Callable, Any, Tuple, Union
+import pystac_client.item_search


Removing pystac_client.item_search

giswqs · 2023-08-09T01:53:11Z

leafmap/stac.py

@@ -105,7 +109,7 @@ def url_for_mosaic_lat_lon_assets(self, searchid, lon, lat):
        return f"{self.endpoint}/mosaic/{searchid}/{lon},{lat}/assets"


-def check_titiler_endpoint(titiler_endpoint=None):
+def check_titiler_endpoint(titiler_endpoint: Optional[str] = None) -> Dict:


The return type is not Dict.

giswqs · 2023-08-09T01:57:27Z

leafmap/toolbar.py

@@ -8,9 +8,14 @@
 from ipyfilechooser import FileChooser
 from .common import *
 from .pc import *
+from typing import Optional, Union, Dict, List
+from leafmap import Map as leafMap
+from ipyleaflet import Map as ipyleafletMap


Removing leafMap and ipyleafletMap

giswqs · 2023-08-09T01:58:47Z

leafmap/toolbar.py

@@ -579,7 +584,7 @@ def layers_btn_click(change):
    m.add(toolbar_control)


-def open_data_widget(m):
+def open_data_widget(m: Dict):


m is not Dict type.

giswqs · 2023-08-09T02:21:35Z

All issues have been resolved. It is ready to be merged now. Thank you very much for your contribution, @krishnaglodha

* first init * added typing for map * added colormaps * working on common * fix spell error * added deck * working on folium * worked on folium map * fixed common * added heremap * added kepler * added osm * updated pc * changed Tuple to tuple * added plotlymap * working on stack * updated osm.py and req * updated stac * updated all py files * removed stac_io type hint * tuple to Tuple * tuple to Tuple * fixed typos * updated bokehmap to Sequency * updated stac and plotlymap * updated plotlymap * access_token - None * updated with black * removed kml * updated basemap and stac * updated bokeh * updated notebook * Update mkdocs.yml added "notebooks/38_plotly.ipynb", in execute_ignore * updated req * updated mkdocs * removed geemap * made collection as Optional * added None to Collection * Fix bokeh error * Fix bokehmap typing * Pin pyymal version * Fix pyymal error * Skip notebook 71 * Fix button width error * Fix basemap notebook error * Improve typing * Improve typing --------- Co-authored-by: Qiusheng Wu <giswqs@gmail.com>

krishnaglodha added 19 commits July 15, 2023 21:00

first init

6083d96

added typing for map

fc2be1d

added colormaps

64df97f

working on common

dcb8364

fix spell error

87ca1a6

added deck

3f433b5

working on folium

afc49d2

worked on folium map

addaae4

fixed common

cc1b3d5

added heremap

f78e85b

added kepler

0763cc8

added osm

3c459ee

updated pc

4cf157b

changed Tuple to tuple

661b9e7

added plotlymap

43d03d8

working on stack

4598bc3

updated osm.py and req

5ad9fcc

updated stac

ffaea01

updated all py files

fd43fbf

removed stac_io type hint

2481732

krishnaglodha added 5 commits July 18, 2023 23:18

tuple to Tuple

c5e670e

tuple to Tuple

52ae83d

fixed typos

f6184f3

updated bokehmap to Sequency

1172614

updated stac and plotlymap

5ccb401

giswqs added 2 commits August 8, 2023 14:39

Fix button width error

e6bf16b

Fix basemap notebook error

e0ecdf5

giswqs reviewed Aug 9, 2023

View reviewed changes

Improve typing

1224dcc

giswqs reviewed Aug 9, 2023

View reviewed changes

leafmap/osm.py Outdated

warnings.filterwarnings("ignore")

from geopandas import GeoDataFrame

Copy link

Member

giswqs Aug 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing Geopandas

giswqs reviewed Aug 9, 2023

View reviewed changes

Improve typing

6ba14b8

giswqs merged commit 1dc8e24 into opengeos:master Aug 9, 2023
11 checks passed

giswqs mentioned this pull request Aug 9, 2023

Add type hints #324

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix/addtyping #494

Fix/addtyping #494

krishnaglodha commented Jul 16, 2023

krishnaglodha commented Jul 18, 2023

giswqs commented Jul 18, 2023

krishnaglodha commented Jul 18, 2023

krishnaglodha commented Jul 18, 2023

giswqs commented Jul 18, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs Aug 9, 2023

giswqs commented Aug 9, 2023


		warnings.filterwarnings("ignore")
		from geopandas import GeoDataFrame

		webbrowser.open_new_tab("https://wiki.openstreetmap.org/wiki/Map_features")


		"""The module contains functions for downloading OpenStreetMap data. It wraps the geometries module of the osmnx package

Fix/addtyping #494

Fix/addtyping #494

Conversation

krishnaglodha commented Jul 16, 2023

krishnaglodha commented Jul 18, 2023

giswqs commented Jul 18, 2023

krishnaglodha commented Jul 18, 2023

krishnaglodha commented Jul 18, 2023

giswqs commented Jul 18, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

giswqs commented Aug 9, 2023