Update app.py

app.py

@@ -1,9 +1,8 @@
-#%%
 import pandas as pd
 import streamlit as st
 import plotly.graph_objects as go
 
-df = pd.read_excel("preprocessed_geodata_v2.xlsx")
+df = pd.read_excel("data/geo_data/result.xlsx")
 def get_lat_lon(row):
     row = eval(row['result_dadata'])[0]
     lat = row['geo_lat']
@@ -12,26 +11,14 @@ def get_lat_lon(row):
 
     return lat, lon, adress
 
-
-
-
-dct_colors = {'red':'больше 6000',
-              'blue':'6000-3000',
-              'yellow':'3000-1000',
-              # 'green':'400-200',
-              # 'purple':'200-100',
-              # 'orange':'100-30',
-              'black':'меньше 1000'
-             }
-
 def get_colors(row):
-    if row > 6000:
+    if row > 10000:
         return 'red'
-    elif row <= 6000 and row > 3000:
+    elif row <= 10000 and row > 4000:
         return 'blue'
-    elif row <= 3000 and row > 1000:
+    elif row <= 4000 and row > 2000:
         return 'yellow'
-    # elif row <= 400 and row > 200:
+    # elif row <= 2000 and row > 1000:
     #     return 'green'
     # elif row <= 200 and row > 100:
     #     return 'purple'
@@ -41,22 +28,22 @@ def get_colors(row):
         return 'black'
 
 df[['lat', 'lon', 'adress']] = df.apply(get_lat_lon, axis=1, result_type='expand')
+viz_df = df[['lpu_name','lat', 'lon', 'adress', 'MT_SUM_RUR']].copy()
+viz_df['MT_SUM_RUR'] = viz_df['MT_SUM_RUR']/1000
 
-viz_df = df[['lpu_name','lat', 'lon', 'adress', 'count_gp']].copy()
 viz_df[['lat','lon']] = viz_df[['lat','lon']].astype(float)
-viz_df['colors'] = viz_df['count_gp'].apply(get_colors)
+viz_df['colors'] = viz_df['MT_SUM_RUR'].apply(get_colors)
 
-text_series ="Название клиники: "+ viz_df['lpu_name'] + "<br>" + "Адрес: " + viz_df["adress"] + "<br>" + "Количество гарантийных писем:" + viz_df['count_gp'].astype(str)
-#%%
+text_series ="Название клиники: "+ viz_df['lpu_name'] + "<br>" + "Адрес: " + viz_df["adress"] + "<br>" + "Сумма:" + viz_df['MT_SUM_RUR'].astype(str) + " тыс.руб"
 fig_bubbles_coords = go.Figure(data=go.Scattermapbox(
     lat=viz_df['lat'],
     lon=viz_df['lon'],
     mode='markers',
     marker=go.scattermapbox.Marker(
-        size=viz_df['count_gp'],
+        size=viz_df['MT_SUM_RUR'],
         color='red',
         sizemode='area',
-        sizeref=10,
+        sizeref=5,
         opacity=0.6
     ),
     text=text_series,
@@ -75,14 +62,12 @@ fig_bubbles_coords.update_layout(
     height=900
 )
 
-# fig_bubbles_coords.show()
-#%%
 fig_bubbles = go.Figure(data=go.Scattermapbox(
     lat=viz_df['lat'],
     lon=viz_df['lon'],
     mode='markers',
     marker=go.scattermapbox.Marker(
-        size=viz_df['count_gp'],
+        size=viz_df['MT_SUM_RUR'],
         color='red',
         sizemode='area',
         sizeref=5,
@@ -106,19 +91,17 @@ fig_bubbles.update_layout(
 
 fig_bubbles.update_traces(hovertemplate='<b>%{customdata}</b>')
 
-# fig_bubbles.show()
-#%%
 fig_heatbar = go.Figure(data=go.Scattermapbox(
     lat=viz_df['lat'],
     lon=viz_df['lon'],
     mode='markers',
     marker=go.scattermapbox.Marker(
-        color=viz_df['count_gp'],
+        color=viz_df['MT_SUM_RUR'],
         sizemode='area',
         sizeref=5,
         opacity=1,
         colorscale='rdylbu',  # Градиент цветов от светло-синего до темно-синего
-        colorbar=dict(title='count_gp')
+        colorbar=dict(title='MT_SUM_RUR')
     ),
     customdata=text_series,
 ))
@@ -138,29 +121,26 @@ fig_heatbar.update_layout(
 
 fig_heatbar.update_traces(hovertemplate='<b>%{customdata}</b>')
 
-# fig_heatbar.show()
-#%%
-dct_colors = {'red':'больше 6000',
-              'blue':'6000-3000',
-              'yellow':'3000-1000',
-              # 'green':'400-200',
-              # 'purple':'200-100',
-              # 'orange':'100-30',
-              'black':'меньше 1000'
-             }
+dct_colors = {'red':'больше 10000',
+              'blue':'10000-4000',
+              'yellow':'4000-2000',
+            #   'green':'400-200',
+            #   'purple':'200-100',
+            #   'orange':'100-30',
+              'black':'меньше 2000'}
 colors = ['red',
-          'blue',
-          'yellow',
-          # 'green',
-          # 'purple',
-          # 'orange',
+          'blue', 
+          'yellow', 
+        #   'green',
+        #   'purple',
+        #   'orange',
           'black']
 
 fig_colored = go.Figure()
 
 for color in colors:
     temp_df = viz_df[viz_df['colors'] == color]
-    text_series_temp = "Название клиники: "+ temp_df['lpu_name'] + "<br>" + "Адрес: " + temp_df["adress"] + "<br>" + "Количество гарантийных писем:" + temp_df['count_gp'].astype(str)
+    text_series_temp = "Название клиники: "+ temp_df['lpu_name'] + "<br>" + "Адрес: " + temp_df["adress"] + "<br>" + "Сумма: " + temp_df['MT_SUM_RUR'].astype(str) + " тыс.руб"
     fig_colored.add_trace(go.Scattermapbox(
         lat=temp_df['lat'],
         lon=temp_df['lon'],
@@ -190,14 +170,11 @@ fig_colored.update_layout(
 )
 fig_colored.update_traces(hovertemplate='<b>%{customdata}</b>')
 
+viz_df = viz_df.rename(columns={"MT_SUM_RUR":"Сумма"})
 
-# fig_colored.show()
-# %%
-viz_df = viz_df.rename(columns={"count_gp":"Число_ГП"})
-#%%
-st.dataframe(data=viz_df[['lpu_name', 'Число_ГП', 'adress']])
-# st.plotly_chart(fig_bubbles_coords)
+st.dataframe(data=viz_df[['lpu_name', 'Сумма', 'adress']])
 st.plotly_chart(fig_bubbles)
 st.plotly_chart(fig_heatbar)
 st.plotly_chart(fig_colored)
-# st.table(df)
+
+# %%