Spaces:
Sleeping
Sleeping
:speak_no_evil:
Browse files- app.py +1 -1
- utilities.py +39 -34
app.py
CHANGED
@@ -161,7 +161,7 @@ if submitted:
|
|
161 |
layer = HexagonLayer(url, v_scale)
|
162 |
|
163 |
|
164 |
-
m = leafmap.Map(style=
|
165 |
if gdf is not None:
|
166 |
m.add_gdf(gdf[[gdf.geometry.name]], "fill", paint = {"fill-opacity": 0.2}) # adds area of interest & zooms in
|
167 |
m.add_pmtiles(mappinginequality, style=redlines, visible=True, opacity = 0.9, fit_bounds=False)
|
|
|
161 |
layer = HexagonLayer(url, v_scale)
|
162 |
|
163 |
|
164 |
+
m = leafmap.Map(style=terrain_styling(), center=[-120, 37.6], zoom=2, pitch=35, bearing=10)
|
165 |
if gdf is not None:
|
166 |
m.add_gdf(gdf[[gdf.geometry.name]], "fill", paint = {"fill-opacity": 0.2}) # adds area of interest & zooms in
|
167 |
m.add_pmtiles(mappinginequality, style=redlines, visible=True, opacity = 0.9, fit_bounds=False)
|
utilities.py
CHANGED
@@ -63,7 +63,7 @@ def set_secrets(con):
|
|
63 |
if secret is None:
|
64 |
secret = st.secrets["MINIO_SECRET"]
|
65 |
|
66 |
-
|
67 |
if key is None:
|
68 |
key = st.secrets["MINIO_KEY"]
|
69 |
|
@@ -136,40 +136,45 @@ def DeckGlobe(layer):
|
|
136 |
)
|
137 |
return deck
|
138 |
|
139 |
-
|
140 |
-
|
141 |
-
"
|
142 |
-
|
143 |
-
"
|
144 |
-
|
145 |
-
|
146 |
-
|
147 |
-
"
|
148 |
-
|
149 |
-
|
150 |
-
|
151 |
-
|
152 |
-
|
153 |
-
|
154 |
-
|
155 |
-
|
156 |
-
|
157 |
-
|
158 |
-
|
159 |
-
|
160 |
-
|
161 |
-
|
162 |
-
|
163 |
-
|
164 |
-
"id": "hills",
|
165 |
-
"type": "hillshade",
|
166 |
-
"source": "hillshadeSource",
|
167 |
-
"layout": {"visibility": "visible"},
|
168 |
-
"paint": {"hillshade-shadow-color": "#473B24"},
|
169 |
},
|
170 |
-
|
171 |
-
|
172 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
173 |
####
|
174 |
|
175 |
|
|
|
63 |
if secret is None:
|
64 |
secret = st.secrets["MINIO_SECRET"]
|
65 |
|
66 |
+
key = os.getenv("MINIO_KEY")
|
67 |
if key is None:
|
68 |
key = st.secrets["MINIO_KEY"]
|
69 |
|
|
|
136 |
)
|
137 |
return deck
|
138 |
|
139 |
+
|
140 |
+
def terrain_styling():
|
141 |
+
maptiler_key = os.getenv("MAPTILER_KEY")
|
142 |
+
if maptiler_key is None:
|
143 |
+
maptiler_key = st.secrets["MAPTILER_KEY"]
|
144 |
+
terrain_style = {
|
145 |
+
"version": 8,
|
146 |
+
"sources": {
|
147 |
+
"osm": {
|
148 |
+
"type": "raster",
|
149 |
+
"tiles": ["https://server.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/tile/{z}/{y}/{x}.png"],
|
150 |
+
"tileSize": 256,
|
151 |
+
"attribution": "© National Geographic",
|
152 |
+
"maxzoom": 19,
|
153 |
+
},
|
154 |
+
"terrainSource": {
|
155 |
+
"type": "raster-dem",
|
156 |
+
"url": f"https://api.maptiler.com/tiles/terrain-rgb-v2/tiles.json?key={maptiler_key}",
|
157 |
+
"tileSize": 256,
|
158 |
+
},
|
159 |
+
"hillshadeSource": {
|
160 |
+
"type": "raster-dem",
|
161 |
+
"url": f"https://api.maptiler.com/tiles/terrain-rgb-v2/tiles.json?key={maptiler_key}",
|
162 |
+
"tileSize": 256,
|
163 |
+
},
|
|
|
|
|
|
|
|
|
|
|
164 |
},
|
165 |
+
"layers": [
|
166 |
+
{"id": "osm", "type": "raster", "source": "osm"},
|
167 |
+
{
|
168 |
+
"id": "hills",
|
169 |
+
"type": "hillshade",
|
170 |
+
"source": "hillshadeSource",
|
171 |
+
"layout": {"visibility": "visible"},
|
172 |
+
"paint": {"hillshade-shadow-color": "#473B24"},
|
173 |
+
},
|
174 |
+
],
|
175 |
+
"terrain": {"source": "terrainSource", "exaggeration": .1},
|
176 |
+
}
|
177 |
+
return terrain_style
|
178 |
####
|
179 |
|
180 |
|