Update app.py

app.py

@@ -225,78 +225,78 @@ st.write(df)
 st.subheader('Интерактивная карта')
 # PLOT(df['serv'][0],df['food'][0],df['metro'][0],df['highway'][0],df['area_forest'][0],df['forest'][0],df['school'][0],df['railway'][0])
 m = folium.Map(location=[55.87890, 37.71943], zoom_start=10, tiles='CartoDB positron')
-locations_gpd = geopandas.GeoDataFrame(Eda.geometry)
-locations_gpd.geometry = locations_gpd.geometry.buffer(df['serv'][0],resolution=2)
-K = locations_gpd.geometry.unary_union
-locations_gpd1 = geopandas.GeoDataFrame(Uslugi.geometry)
-locations_gpd1.geometry = locations_gpd1.geometry.buffer(df['food'][0],resolution=2)
-T = locations_gpd1.geometry.unary_union
-
-locations_gpd_m = geopandas.GeoDataFrame(Metro.geometry)
-locations_gpd_m.geometry = locations_gpd_m.geometry.buffer(df['metro'][0],resolution=2)
-M = locations_gpd_m.geometry.unary_union
-locations_gpd_H = geopandas.GeoDataFrame(Shosse.geometry)
-locations_gpd_H.geometry = locations_gpd_H.geometry.buffer(df['highway'][0],resolution=2)
-H = locations_gpd_H.geometry.unary_union
-
-Forests = geopandas.GeoDataFrame(Lesa.geometry)
-Forests = Forests[Forests.geometry.area > df['area_forest'][0]]
-Forests.geometry = Forests.geometry.buffer(df['forest'][0],resolution=2)
-F = Forests.geometry.unary_union
-
-locations_gpd_Sc = geopandas.GeoDataFrame(Shkoly.geometry)
-locations_gpd_Sc.geometry = locations_gpd_Sc.geometry.buffer(df['school'][0],resolution=2)
-Sc = locations_gpd_Sc.geometry.unary_union
-
-locations_gpd_R = geopandas.GeoDataFrame(Zhd.geometry)
-locations_gpd_R.geometry = locations_gpd_R.geometry.buffer(df['railway'][0],resolution=2)
-Ra = locations_gpd_R.geometry.unary_union
-
-url = "https://cdn-icons-png.flaticon.com/512/746/746859.png{}".format
-beerGlass_img = url("")
-custom_icon = folium.CustomIcon(beerGlass_img, icon_size=(35, 35), popup_anchor=(0, -22))
-insta_post = 'https://www.instagram.com/p/CjcvNysq8om/'
-website = 'vk.com'
-name = 'bebra'
-directions = 'https://yandex.ru/maps/213/moscow/stops/2057340510/?ll=37.593517%2C55.775694&tab=overview&z=12.32'
-realty_html = folium.Html(f"""<p style="text-align: center;"><span style="font-family: Didot, serif; font-size: 21px;">{name}</span></p>
-<p style="text-align: center;"><iframe src={insta_post}embed width="240" height="290" frameborder="0" scrolling="auto" allowtransparency="true"></iframe>
-<p style="text-align: center;"><a href={website} target="_blank" title="{name} Website"><span style="font-family: Didot, serif; font-size: 17px;">{name} Website</span></a></p>
-<p style="text-align: center;"><a href={directions} target="_blank" title="Directions to {name}"><span style="font-family: Didot, serif; font-size: 17px;">Directions to {name}</span></a></p> 
-# """, script=True)
-
-popup = folium.Popup(realty_html, max_width=700)
-
-custom_marker = folium.Marker(location=[55.87890,37.71943], icon=custom_icon, tooltip=name, popup=popup)
-
-
-R = K.intersection(T)
-R = R.intersection(M)
-R= R.difference(H)
-R = R.intersection(F)
-R = R.intersection(Sc)
-R= R.difference(Ra)
-wgs84 = pyproj.CRS('EPSG:25837')
-utm = pyproj.CRS('EPSG:4326')
-
-project = pyproj.Transformer.from_crs(wgs84, utm, always_xy=True).transform
-utm_point = transform(project, R)
-R = folium.GeoJson(data=utm_point,  style_function=lambda x: {'fillColor': 'orange'})
-b = folium.GeoJson(data=M,  style_function=lambda x: {'fillColor': '#00000000', 'color': '#00000000'})
-AH = folium.GeoJson(data=(Data1),  style_function=lambda x: {'fillColor': '#00000000', 'color': 'black'})
-
-fg1 = folium.map.FeatureGroup(name='Metro').add_to(m)
-fg2 = folium.map.FeatureGroup(name='Plot').add_to(m)
-fg3 = folium.map.FeatureGroup(name='Districts').add_to(m)
+# locations_gpd = geopandas.GeoDataFrame(Eda.geometry)
+# locations_gpd.geometry = locations_gpd.geometry.buffer(df['serv'][0],resolution=2)
+# K = locations_gpd.geometry.unary_union
+# locations_gpd1 = geopandas.GeoDataFrame(Uslugi.geometry)
+# locations_gpd1.geometry = locations_gpd1.geometry.buffer(df['food'][0],resolution=2)
+# T = locations_gpd1.geometry.unary_union
+
+# locations_gpd_m = geopandas.GeoDataFrame(Metro.geometry)
+# locations_gpd_m.geometry = locations_gpd_m.geometry.buffer(df['metro'][0],resolution=2)
+# M = locations_gpd_m.geometry.unary_union
+# locations_gpd_H = geopandas.GeoDataFrame(Shosse.geometry)
+# locations_gpd_H.geometry = locations_gpd_H.geometry.buffer(df['highway'][0],resolution=2)
+# H = locations_gpd_H.geometry.unary_union
+
+# Forests = geopandas.GeoDataFrame(Lesa.geometry)
+# Forests = Forests[Forests.geometry.area > df['area_forest'][0]]
+# Forests.geometry = Forests.geometry.buffer(df['forest'][0],resolution=2)
+# F = Forests.geometry.unary_union
+
+# locations_gpd_Sc = geopandas.GeoDataFrame(Shkoly.geometry)
+# locations_gpd_Sc.geometry = locations_gpd_Sc.geometry.buffer(df['school'][0],resolution=2)
+# Sc = locations_gpd_Sc.geometry.unary_union
+
+# locations_gpd_R = geopandas.GeoDataFrame(Zhd.geometry)
+# locations_gpd_R.geometry = locations_gpd_R.geometry.buffer(df['railway'][0],resolution=2)
+# Ra = locations_gpd_R.geometry.unary_union
+
+# url = "https://cdn-icons-png.flaticon.com/512/746/746859.png{}".format
+# beerGlass_img = url("")
+# custom_icon = folium.CustomIcon(beerGlass_img, icon_size=(35, 35), popup_anchor=(0, -22))
+# insta_post = 'https://www.instagram.com/p/CjcvNysq8om/'
+# website = 'vk.com'
+# name = 'bebra'
+# directions = 'https://yandex.ru/maps/213/moscow/stops/2057340510/?ll=37.593517%2C55.775694&tab=overview&z=12.32'
+# realty_html = folium.Html(f"""<p style="text-align: center;"><span style="font-family: Didot, serif; font-size: 21px;">{name}</span></p>
+# <p style="text-align: center;"><iframe src={insta_post}embed width="240" height="290" frameborder="0" scrolling="auto" allowtransparency="true"></iframe>
+# <p style="text-align: center;"><a href={website} target="_blank" title="{name} Website"><span style="font-family: Didot, serif; font-size: 17px;">{name} Website</span></a></p>
+# <p style="text-align: center;"><a href={directions} target="_blank" title="Directions to {name}"><span style="font-family: Didot, serif; font-size: 17px;">Directions to {name}</span></a></p> 
+# # """, script=True)
+
+# popup = folium.Popup(realty_html, max_width=700)
+
+# custom_marker = folium.Marker(location=[55.87890,37.71943], icon=custom_icon, tooltip=name, popup=popup)
+
+
+# R = K.intersection(T)
+# R = R.intersection(M)
+# R= R.difference(H)
+# R = R.intersection(F)
+# R = R.intersection(Sc)
+# R= R.difference(Ra)
+# wgs84 = pyproj.CRS('EPSG:25837')
+# utm = pyproj.CRS('EPSG:4326')
+
+# project = pyproj.Transformer.from_crs(wgs84, utm, always_xy=True).transform
+# utm_point = transform(project, R)
+# R = folium.GeoJson(data=utm_point,  style_function=lambda x: {'fillColor': 'orange'})
+# b = folium.GeoJson(data=M,  style_function=lambda x: {'fillColor': '#00000000', 'color': '#00000000'})
+# AH = folium.GeoJson(data=(Data1),  style_function=lambda x: {'fillColor': '#00000000', 'color': 'black'})
+
+# fg1 = folium.map.FeatureGroup(name='Metro').add_to(m)
+# fg2 = folium.map.FeatureGroup(name='Plot').add_to(m)
+# fg3 = folium.map.FeatureGroup(name='Districts').add_to(m)
 fg4 = folium.map.FeatureGroup(name='rightzhk').add_to(m)
 # fg5 = folium.map.FeatureGroup(name='badzhk').add_to(m)
-R.add_child(folium.Popup('Plot'))
-b.add_child(folium.Popup('Метро'))
-AH.add_child(folium.Popup('Районы'))
-custom_marker.add_to(fg2)
-fg1.add_child(b)
-fg2.add_child(R)
-fg3.add_child(AH)
+# R.add_child(folium.Popup('Plot'))
+# b.add_child(folium.Popup('Метро'))
+# AH.add_child(folium.Popup('Районы'))
+# custom_marker.add_to(fg2)
+# fg1.add_child(b)
+# fg2.add_child(R)
+# fg3.add_child(AH)
 MATRIX = A
 MATRIX = MATRIX.loc[(MATRIX.Food<df['food'][0])& (MATRIX.Service<df['serv'][0])&(MATRIX.Metro<df['metro'][0])& (MATRIX.Forest<df['forest'][0])& (MATRIX.Schools<df['school'][0])& (MATRIX.Railway>df['railway'][0])& (MATRIX.Highway>df['highway'][0])]
 for i,row in MATRIX.iterrows():