Change % to pct

app.py

@@ -111,7 +111,7 @@ def server(input, output, session):
         apply_filter = input.split_filter()
 
         if apply_filter == "Filtro":
-            split = '%total_trees'
+            split = 'pct_total_trees'
         else:
             split = False
 
@@ -158,7 +158,7 @@ def server(input, output, session):
         apply_filter = input.split_filter()
 
         if apply_filter == "Filtro":
-            split = '%total_trees'
+            split = 'pct_total_trees'
         else:
             split = False
 
@@ -170,7 +170,7 @@ def server(input, output, session):
         if simulation_mode == "Usar control deslizante":
             title = f"Estimación de cobertura arbórea necesaria para una disminución de {value_temp}°C"
         try:
-            fig = show_two_plots(gdf_temp, '%total_trees', 'Pct_CoberturaVeg', 
+            fig = show_two_plots(gdf_temp, 'pct_total_trees', 'Pct_CoberturaVeg', 
              min_cobertura_veg, max_cobertura, 'YlGn', 
              title,"Cobertura arbórea antes",
              "Cobertura arbórea (%)", split=split)

data_utils.py

@@ -63,8 +63,8 @@ def run_treatment_increase(X, T, original_df, df, value, name, simulation_mode):
         print("Request failed:", response.status_code, response.text)
     
     treatment_df[name] = result["effect"]
-    treatment_df['%total_trees'] = T_sim
-    treatment_df['pp_trees_increase'] = treatment_df['%total_trees'] - treatment_df['Pct_CoberturaVeg']
+    treatment_df['pct_total_trees'] = T_sim
+    treatment_df['pp_trees_increase'] = treatment_df['pct_total_trees'] - treatment_df['Pct_CoberturaVeg']
 
     return treatment_df
 
@@ -76,10 +76,10 @@ def process_data_trees_to_temp(value, simulation_mode, original_df, df, X, Y, T)
 
     #add columns translated to square meters
     treatment_df['sqm_trees_increase'] = (treatment_df['pp_trees_increase']/100)*cell_area
-    treatment_df['sqm_total_trees'] = (treatment_df['%total_trees']/100)*cell_area
+    treatment_df['sqm_total_trees'] = (treatment_df['pct_total_trees']/100)*cell_area
 
     col_order = ['index', 'x', 'y', 'Pct_CoberturaVeg', 'Pct_Construccion', 'LST','temp_decrease', 
-    'new_temp', 'pp_trees_increase','%total_trees', 'sqm_trees_increase','sqm_total_trees',]  # to match gdf trees
+    'new_temp', 'pp_trees_increase','pct_total_trees', 'sqm_trees_increase','sqm_total_trees',]  # to match gdf trees
 
     treatment_df = treatment_df[col_order]
 
@@ -115,14 +115,14 @@ def process_data_temp_to_trees(goal, simulation_mode, original_df, df, X, Y, T):
     name = 'pp_trees_increase'
     treatment_df = run_temp_decrease(X, original_df, df, goal, name,simulation_mode)
 
-    treatment_df['%total_trees'] = treatment_df['Pct_CoberturaVeg'] + treatment_df[name]
+    treatment_df['pct_total_trees'] = treatment_df['Pct_CoberturaVeg'] + treatment_df[name]
 
     #add columns translated to square meters
-    treatment_df['sqm_total_trees'] = (treatment_df['%total_trees']/100)*cell_area
+    treatment_df['sqm_total_trees'] = (treatment_df['pct_total_trees']/100)*cell_area
     treatment_df['sqm_trees_increase'] = (treatment_df['pp_trees_increase']/100)*cell_area
 
     col_order = ['index', 'x', 'y', 'Pct_CoberturaVeg', 'Pct_Construccion', 'LST','temp_decrease', 
-    'new_temp', 'pp_trees_increase','%total_trees', 'sqm_trees_increase','sqm_total_trees',]  # to match gdf trees
+    'new_temp', 'pp_trees_increase','pct_total_trees', 'sqm_trees_increase','sqm_total_trees',]  # to match gdf trees
 
     treatment_df = treatment_df[col_order]