Merge branch 'main' of github.com:marceloprates/prettymaps into main

prettymaps/draw.py

@@ -20,7 +20,7 @@ import re
 import os
 import json
 import yaml
-import IPython
+#import IPython
 import pathlib
 import warnings
 import matplotlib
@@ -37,8 +37,8 @@ from matplotlib import pyplot as plt
 from matplotlib.colors import hex2color
 from matplotlib.patches import Path, PathPatch
 from typing import Optional, Union, Tuple, List, Dict, Any, Iterable
-from shapely.geometry import Point, LineString, MultiLineString, Polygon, MultiPolygon, GeometryCollection, box
 from shapely.geometry.base import BaseGeometry
+from shapely.geometry import Point, LineString, MultiLineString, Polygon, MultiPolygon, GeometryCollection, box
 
 #import vsketch
 
@@ -78,6 +78,7 @@ class Preset:
     """
     params: dict
 
+    '''
     def _ipython_display_(self):
         """
         Implements the _ipython_display_() function for the Preset class.
@@ -104,7 +105,7 @@ class Preset:
         params.iloc[1:, 2:] = ''
 
         IPython.display.display(IPython.display.Markdown(params.to_markdown()))
-
+    '''
 
 def transform_gdfs(
     gdfs: Dict[str, gp.GeoDataFrame],

prettymaps/fetch.py

@@ -16,19 +16,11 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-from ast import Dict
-from functools import reduce
-from tokenize import Number, String
-from typing import Optional, Union, Tuple
-
-# from unittest.runner import _ResultClassType
-from xmlrpc.client import Boolean
-
 import re
-import osmnx as ox
-from osmnx import utils_geo
-from osmnx._errors import EmptyOverpassResponse
+import warnings
 import numpy as np
+import osmnx as ox
+from copy import deepcopy
 from shapely.geometry import (
     box,
     Point,
@@ -37,12 +29,10 @@ from shapely.geometry import (
     LineString,
     MultiLineString,
 )
+from geopandas import GeoDataFrame
 from shapely.affinity import rotate
 from shapely.ops import unary_union
-from geopandas import GeoDataFrame, read_file
-import warnings
 from shapely.errors import ShapelyDeprecationWarning
-from copy import deepcopy
 
 
 # Parse query (by coordinates, OSMId or name)

requirements.txt

@@ -1,6 +1,5 @@
-osmnx==1.2.2
+osmnx==1.1.2
 tabulate==0.8.9
 Shapely>=1.8,<2.0
 descartes==1.1.0
-ipykernel==5.3.4
-pyyaml==6.0.0
+pyyaml==6.0.0

setup.py

@@ -7,7 +7,7 @@ presets_dir = os.path.abspath(os.path.join(os.path.pardir, 'presets'))
 
 setup(
     name="prettymaps",
-    version="v0.1.4",
+    version="v0.2-beta.2",
     description="A simple python library to draw pretty maps from OpenStreetMap data",
     long_description=parent_dir.joinpath("README.md").read_text(),
     long_description_content_type="text/markdown",
@@ -22,6 +22,6 @@ setup(
     classifiers=[
         "Intended Audience :: Science/Research",
     ],
-    package_dir={'prettymaps': '.'},
+    package_dir={'prettymaps': 'prettymaps'},
     package_data={'prettymaps': ['presets/*.json']},
 )