Spaces:
Sleeping
Sleeping
MaxAtoms
commited on
Commit
·
fc226d3
1
Parent(s):
1906e08
Change base map, add circles
Browse files- app/app.py +27 -7
- app/marker.png +0 -0
app/app.py
CHANGED
@@ -1,6 +1,6 @@
|
|
1 |
import faicons as fa
|
2 |
|
3 |
-
from ipyleaflet import Map, Marker, LayerGroup
|
4 |
|
5 |
import geopandas as gpd
|
6 |
from datetime import datetime
|
@@ -66,7 +66,10 @@ with ui.layout_columns(col_widths=[8, 4]):
|
|
66 |
|
67 |
@render_widget
|
68 |
def map():
|
69 |
-
return Map(
|
|
|
|
|
|
|
70 |
|
71 |
'''with ui.layout_column_wrap(width="250px"):
|
72 |
with ui.card(full_screen=False):
|
@@ -120,16 +123,33 @@ def _():
|
|
120 |
year = input.year()
|
121 |
stops = generateStops(year)
|
122 |
markers = []
|
|
|
123 |
|
124 |
for layer in map.widget.layers:
|
125 |
-
if layer.name
|
|
|
126 |
|
127 |
-
map.widget.remove_layer(existingLayers[])
|
128 |
for i in stops:
|
129 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
130 |
markers.append(marker)
|
131 |
|
132 |
-
layerGroup = LayerGroup(layers=markers, name=stops)
|
|
|
133 |
map.widget.add(layerGroup)
|
|
|
|
|
134 |
|
135 |
-
|
|
|
1 |
import faicons as fa
|
2 |
|
3 |
+
from ipyleaflet import Map, Marker, LayerGroup, Circle, Icon, AwesomeIcon, DivIcon, basemaps
|
4 |
|
5 |
import geopandas as gpd
|
6 |
from datetime import datetime
|
|
|
66 |
|
67 |
@render_widget
|
68 |
def map():
|
69 |
+
return Map(
|
70 |
+
basemap=basemaps.CartoDB.Positron,
|
71 |
+
center=(64.11,-21.90),
|
72 |
+
zoom=11.5)
|
73 |
|
74 |
'''with ui.layout_column_wrap(width="250px"):
|
75 |
with ui.card(full_screen=False):
|
|
|
123 |
year = input.year()
|
124 |
stops = generateStops(year)
|
125 |
markers = []
|
126 |
+
circles = []
|
127 |
|
128 |
for layer in map.widget.layers:
|
129 |
+
if layer.name == "stops" or layer.name == "radius":
|
130 |
+
map.widget.remove_layer(layer)
|
131 |
|
|
|
132 |
for i in stops:
|
133 |
+
circle = Circle()
|
134 |
+
circle.location = i
|
135 |
+
circle.radius = 400
|
136 |
+
circle.color = "green"
|
137 |
+
circle.fill_color = "green"
|
138 |
+
circles.append(circle)
|
139 |
+
|
140 |
+
icon = AwesomeIcon(name="bus", marker_color="black", icon_color="white")
|
141 |
+
icon1 = DivIcon(html = '<div style="border-radius:50%;background-color: black; width: 10px; height: 10px;"></div>')
|
142 |
+
icon2 = Icon(icon_url="marker.png")
|
143 |
+
|
144 |
+
marker = Marker(location=i,
|
145 |
+
icon=icon,
|
146 |
+
icon_anchor=(10,10),
|
147 |
+
icon_size=(0,0))
|
148 |
markers.append(marker)
|
149 |
|
150 |
+
layerGroup = LayerGroup(layers=markers, name="stops")
|
151 |
+
layerGroup2 = LayerGroup(layers=circles, name="radius")
|
152 |
map.widget.add(layerGroup)
|
153 |
+
map.widget.add(layerGroup2)
|
154 |
+
|
155 |
|
|
app/marker.png
ADDED
![]() |