voxcity 0.6.12__tar.gz → 0.6.13__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of voxcity might be problematic. Click here for more details.
- {voxcity-0.6.12 → voxcity-0.6.13}/PKG-INFO +1 -1
- {voxcity-0.6.12 → voxcity-0.6.13}/pyproject.toml +1 -1
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/geoprocessor/draw.py +15 -5
- {voxcity-0.6.12 → voxcity-0.6.13}/AUTHORS.rst +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/LICENSE +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/README.md +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/__init__.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/downloader/__init__.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/downloader/citygml.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/downloader/eubucco.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/downloader/gee.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/downloader/mbfp.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/downloader/oemj.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/downloader/osm.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/downloader/overture.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/downloader/utils.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/exporter/__init__.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/exporter/cityles.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/exporter/envimet.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/exporter/magicavoxel.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/exporter/obj.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/generator.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/geoprocessor/__init__.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/geoprocessor/grid.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/geoprocessor/mesh.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/geoprocessor/network.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/geoprocessor/polygon.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/geoprocessor/utils.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/simulator/__init__.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/simulator/solar.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/simulator/utils.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/simulator/view.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/utils/__init__.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/utils/lc.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/utils/material.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/utils/visualization.py +0 -0
- {voxcity-0.6.12 → voxcity-0.6.13}/src/voxcity/utils/weather.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[tool.poetry]
|
|
2
2
|
name = "voxcity"
|
|
3
|
-
version = "0.6.
|
|
3
|
+
version = "0.6.13"
|
|
4
4
|
description = "voxcity is an easy and one-stop tool to output 3d city models for microclimate simulation by integrating multiple geospatial open-data"
|
|
5
5
|
readme = "README.md"
|
|
6
6
|
license = "MIT"
|
|
@@ -33,7 +33,8 @@ from ipyleaflet import (
|
|
|
33
33
|
WidgetControl,
|
|
34
34
|
Circle,
|
|
35
35
|
basemaps,
|
|
36
|
-
basemap_to_tiles
|
|
36
|
+
basemap_to_tiles,
|
|
37
|
+
TileLayer
|
|
37
38
|
)
|
|
38
39
|
from geopy import distance
|
|
39
40
|
import shapely.geometry as geom
|
|
@@ -885,12 +886,21 @@ def draw_additional_trees(tree_gdf=None, initial_center=None, zoom=17, rectangle
|
|
|
885
886
|
|
|
886
887
|
# Create map
|
|
887
888
|
m = Map(center=(center_lat, center_lon), zoom=zoom, scroll_wheel_zoom=True)
|
|
888
|
-
# Add
|
|
889
|
+
# Add Google Satellite basemap with Esri fallback
|
|
889
890
|
try:
|
|
890
|
-
|
|
891
|
+
google_sat = TileLayer(
|
|
892
|
+
url='https://mt1.google.com/vt/lyrs=s&x={x}&y={y}&z={z}',
|
|
893
|
+
name='Google Satellite',
|
|
894
|
+
attribution='Google Satellite'
|
|
895
|
+
)
|
|
896
|
+
# Replace default base layer with Google Satellite
|
|
897
|
+
m.layers = tuple([google_sat])
|
|
891
898
|
except Exception:
|
|
892
|
-
|
|
893
|
-
|
|
899
|
+
try:
|
|
900
|
+
m.layers = tuple([basemap_to_tiles(basemaps.Esri.WorldImagery)])
|
|
901
|
+
except Exception:
|
|
902
|
+
# Fallback silently if basemap cannot be added
|
|
903
|
+
pass
|
|
894
904
|
|
|
895
905
|
# If rectangle_vertices provided, draw its edges on the map
|
|
896
906
|
if rectangle_vertices is not None and len(rectangle_vertices) >= 4:
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|