diff --git a/prettymaps/draw.py b/prettymaps/draw.py index 93fba1d..d63a8bb 100644 --- a/prettymaps/draw.py +++ b/prettymaps/draw.py @@ -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 diff --git a/prettymaps/fetch.py b/prettymaps/fetch.py index 633a7e3..c116b17 100644 --- a/prettymaps/fetch.py +++ b/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 . """ -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) diff --git a/requirements.txt b/requirements.txt index 4267cc7..60f8357 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,4 @@ -osmnx==1.1.2 \ No newline at end of file +osmnx==1.1.2 +Shapely>=1.8,<2.0 +ipykernel==5.3.4 +pyyaml==6.0.0 \ No newline at end of file diff --git a/setup.py b/setup.py index ef082ae..7e64134 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ presets_dir = os.path.abspath(os.path.join(os.path.pardir, 'presets')) setup( name="prettymaps", - version="v0.1.7", + version="v0.1.8", 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",