Dash update

.gitignore

@@ -145,3 +145,4 @@ dmypy.json
 .github/desktop.ini
 *.ini
 
+configs/configuraciones_generales.yaml

run_all_urbantrips.py

@@ -0,0 +1,21 @@
+from urbantrips import initialize_environment
+from urbantrips import process_transactions
+from urbantrips import run_postprocessing
+from urbantrips import create_viz
+from urbantrips import run_dashboard
+
+import warnings
+
+# Filter and suppress specific warnings
+warnings.filterwarnings("ignore")
+
+def main():
+
+    initialize_environment.main()
+    process_transactions.main()
+    run_postprocessing.main()
+    create_viz.main()
+    run_dashboard.main()
+
+if __name__ == "__main__":
+    main()

urbantrips/dashboard/dash_utils.py

@@ -12,7 +12,8 @@
 from shapely import wkt
 from matplotlib import colors as mcolors
 from folium import Figure
-from shapely.geometry import LineString, Point, Polygon
+from shapely.geometry import LineString, Point, Polygon, shape, mapping
+import h3
 
 
 def leer_configs_generales():
@@ -127,12 +128,16 @@ def calculate_weighted_means(df,
 
 def normalize_vars(tabla):
     if 'dia' in tabla.columns:
-        tabla.loc[tabla.dia == 'weekday', 'dia'] = 'Día hábil'
+        tabla.loc[tabla.dia == 'weekday', 'dia'] = 'Hábil'
         tabla.loc[tabla.dia == 'weekend', 'dia'] = 'Fin de semana'
     if 'day_type' in tabla.columns:
-        tabla.loc[tabla.day_type == 'weekday', 'day_type'] = 'Día hábil'
+        tabla.loc[tabla.day_type == 'weekday', 'day_type'] = 'Hábil'
         tabla.loc[tabla.day_type == 'weekend', 'day_type'] = 'Fin de semana'
+    if 'tipo_dia' in tabla.columns:
+        tabla.loc[tabla.tipo_dia == 'Dia habil', 'tipo_dia'] = 'Hábil'
+        # tabla.loc[tabla.tipo_dia == 'weekend', 'tipo_dia'] = 'Fin de semana'
 
+
     if 'nombre_linea' in tabla.columns:
         tabla['nombre_linea'] = tabla['nombre_linea'].str.replace(' -', '')
     if 'Modo' in tabla.columns:
@@ -624,4 +629,10 @@ def traigo_zonas_values(tipo = 'etapas'):
                             (zonas_values.inicio_norm.notna())&
                             (zonas_values.inicio_norm!=' (cuenca)')].sort_values(['zona', 'inicio_norm']).rename(columns={'inicio_norm':'Nombre'})
 
-    return zonas_values
+    return zonas_values
+
+# Convert geometry to H3 indices
+def get_h3_indices_in_geometry(geometry, resolution):
+    geojson = mapping(geometry)
+    h3_indices = list(h3.polyfill(geojson, resolution, geo_json_conformant=True))
+    return h3_indices

urbantrips/dashboard/dashboard.py

@@ -17,7 +17,7 @@
 from folium import Figure
 from shapely.geometry import LineString
 
-from dash_utils import levanto_tabla_sql, get_logo
+from dash_utils import levanto_tabla_sql, get_logo, traigo_indicadores
 
 
 st.set_page_config(layout="wide")
@@ -79,26 +79,24 @@
 
     # Inject CSS with Markdown
     col3.markdown(hide_table_row_index, unsafe_allow_html=True)
-
-
     col3.table(df)
 
     df = indicadores.loc[indicadores.orden == 3, ['Indicador', 'Valor']].copy()
     titulo = indicadores.loc[indicadores.orden == 3].Titulo.unique()[0]
 
-    col2.text(titulo)
-    # CSS to inject contained in a string
-    hide_table_row_index = """
-                <style>
-                thead tr th:first-child {display:none}
-                tbody th {display:none}
-                </style>
-                """
+    # col2.text(titulo)
+    # # CSS to inject contained in a string
+    # hide_table_row_index = """
+    #             <style>
+    #             thead tr th:first-child {display:none}
+    #             tbody th {display:none}
+    #             </style>
+    #             """
 
-    # Inject CSS with Markdown
-    col2.markdown(hide_table_row_index, unsafe_allow_html=True)
+    # # Inject CSS with Markdown
+    # col2.markdown(hide_table_row_index, unsafe_allow_html=True)
 
-    col2.table(df)
+    # col2.table(df)
 else:
 
     # Usar HTML para personalizar el estilo del texto
@@ -127,3 +125,21 @@
         """   
     col2.markdown(texto_html, unsafe_allow_html=True)
 
+with st.expander('Indicadores', True):
+    col1, col2, col3 = st.columns([2, 2, 2])
+
+    general, modal, distancias = traigo_indicadores('all')
+
+    st.session_state.general_ = general.loc[general.mes==desc_dia_i, ['Tipo', 'Indicador', 'Valor']].set_index('Tipo')
+    st.session_state.modal_ = modal.loc[modal.mes==desc_dia_i, ['Tipo', 'Indicador', 'Valor']].set_index('Tipo')
+    st.session_state.distancias_ = distancias.loc[distancias.mes==desc_dia_i, ['Tipo', 'Indicador', 'Valor']].set_index('Tipo')
+
+
+    st.session_state.general_ = st.session_state.general_[~st.session_state.general_.Indicador.isin(['Cantidad de Usuarios', 'Cantidad de Viajes'])]
+    if len(st.session_state.general_) > 0:
+        col1.write(f'Periodo: {desc_dia_i}')
+        col1.table(st.session_state.general_)
+        # col2.write('')
+        # col2.table(st.session_state.modal_)
+        col3.write('')
+        col3.table(st.session_state.distancias_)