Merge branch 'master' into updating_seletion_condition

instat/static/InstatObject/R/data_object_R6.R

@@ -1000,6 +1000,11 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne
         }
 
         self$update_selection(column_names, private$.current_column_selection$name)
+        if(any(c("sfc", "sfc_MULTIPOLYGON") %in% class(private$data[[curr_col_name]]))){
+          # Update the geometry column reference
+          sf::st_geometry(private$data) <- new_col_name
+        } 
+        names(private$data)[names(private$data) == curr_col_name] <- new_col_name
 
         self$append_to_variables_metadata(new_col_name, name_label, new_col_name)
         # TODO decide if we need to do these 2 lines
@@ -1031,6 +1036,13 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne
 
       self$update_selection(column_names, private$.current_column_selection$name)
 
+      if(self$column_selection_applied()) self$remove_current_column_selection()
+      if(any(c("sfc", "sfc_MULTIPOLYGON") %in% class(private$dataprivate$data)[cols_changed_index])){
+        # Update the geometry column reference
+        sf::st_geometry(private$data) <- new_col_names
+      } 
+      names(private$data)[cols_changed_index] <- new_col_names
+
       for (i in seq_along(cols_changed_index)) {
         self$append_to_variables_metadata(new_col_names[i], name_label, new_col_names[i])
       }
@@ -1055,6 +1067,8 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne
         .fn = .fn,
         .cols = {{ .cols }}, ...
       )
+
+    if(self$column_selection_applied()) self$remove_current_column_selection()
     new_col_names <- names(private$data)
     if (!all(new_col_names %in% curr_col_names)) {
       new_col_names <- new_col_names[!(new_col_names %in% curr_col_names)]