Rename 3G cell ID to SAC

apps/core_dump_page.py

@@ -67,11 +67,37 @@ if uploaded_files:
         all_data_wcdma_service_area_number.extend(data_wcdma_service_area_number)
         all_data_wcdma_service_area_name.extend(data_wcdma_service_area_name)
 
+    ################################################### 2G CORE DUMP DATA ###################################################
     # Create a DataFrame from the extracted data
     df_global_cell_id = pd.DataFrame(
         all_data_global_cell_id, columns=["Global cell ID"]
     )
     df_la_cell_name = pd.DataFrame(all_data_la_cell_name, columns=["LA cell name"])
+
+    # add index column df_global_cell_id and df_la_cell_name  and dfa_wcdma_service_area_numbera and df_wcdma_service_area_name
+    df_global_cell_id.insert(0, "index", range(0, len(df_global_cell_id)))
+    df_la_cell_name.insert(0, "index", range(0, len(df_la_cell_name)))
+
+    # Merge global_cell_id and la_cell_name on index
+    df_la_cell_name = df_la_cell_name.merge(df_global_cell_id, on="index")
+
+    # extract LAC and Cell ID from Global cell ID
+    df_la_cell_name["LAC & Cell ID"] = df_la_cell_name["Global cell ID"].str[5:]
+
+    # extract LAC and Cell ID from LAC_ID and SAC_ID
+    df_la_cell_name["LAC"] = df_la_cell_name["LAC & Cell ID"].str[:4]
+    df_la_cell_name["Cell ID"] = df_la_cell_name["LAC & Cell ID"].str[4:]
+
+    # convert LAC to from HEXadecimal to DECimal
+    df_la_cell_name["LAC_DECIMAL"] = df_la_cell_name["LAC"].apply(lambda x: int(x, 16))
+    df_la_cell_name["Cell_ID_DECIMAL"] = df_la_cell_name["Cell ID"].apply(
+        lambda x: int(x, 16)
+    )
+    df_la_cell_name = df_la_cell_name.reset_index(drop=True)
+
+    ################################################### 3G CORE DUMP DATA ###################################################
+
+    # WCDMA Service Area Number and Name
     df_wcdma_service_area_number = pd.DataFrame(
         all_data_wcdma_service_area_number, columns=["3G service area number"]
     )
@@ -79,47 +105,36 @@ if uploaded_files:
         all_data_wcdma_service_area_name, columns=["3G service area name"]
     )
 
-    # add index column df_global_cell_id and df_la_cell_name  and dfa_wcdma_service_area_numbera and df_wcdma_service_area_name
-    df_global_cell_id.insert(0, "index", range(0, len(df_global_cell_id)))
-    df_la_cell_name.insert(0, "index", range(0, len(df_la_cell_name)))
     df_wcdma_service_area_number.insert(
         0, "index", range(0, len(df_wcdma_service_area_number))
     )
     df_wcdma_service_area_name.insert(
         0, "index", range(0, len(df_wcdma_service_area_name))
     )
-
-    # Merge global_cell_id and la_cell_name on index
-    df_la_cell_name = df_la_cell_name.merge(df_global_cell_id, on="index")
-
-    # merge wcdma_service_area_number and wcdma_service_area_name on index
     df_wcdma_service_area_name = df_wcdma_service_area_name.merge(
         df_wcdma_service_area_number, on="index"
     )
 
-    df_la_cell_name["LAC_ID"] = df_la_cell_name["Global cell ID"].str[5:]
-    df_wcdma_service_area_name["LAC_ID"] = df_wcdma_service_area_name[
+    df_wcdma_service_area_name["LAC & SAC_ID"] = df_wcdma_service_area_name[
         "3G service area number"
     ].str[5:]
-    df_la_cell_name["LAC"] = df_la_cell_name["LAC_ID"].str[:4]
-    df_la_cell_name["Cell ID"] = df_la_cell_name["LAC_ID"].str[4:]
-    df_wcdma_service_area_name["LAC"] = df_wcdma_service_area_name["LAC_ID"].str[:4]
-    df_wcdma_service_area_name["Cell ID"] = df_wcdma_service_area_name["LAC_ID"].str[4:]
+
+    df_wcdma_service_area_name["LAC"] = df_wcdma_service_area_name["LAC & SAC_ID"].str[
+        :4
+    ]
+    df_wcdma_service_area_name["SAC_ID"] = df_wcdma_service_area_name[
+        "LAC & SAC_ID"
+    ].str[4:]
 
     # convert LAC to from HEXadecimal to DECimal
-    df_la_cell_name["LAC_DECIMAL"] = df_la_cell_name["LAC"].apply(lambda x: int(x, 16))
-    df_la_cell_name["Cell_ID_DECIMAL"] = df_la_cell_name["Cell ID"].apply(
-        lambda x: int(x, 16)
-    )
     df_wcdma_service_area_name["LAC_DECIMAL"] = df_wcdma_service_area_name["LAC"].apply(
         lambda x: int(x, 16)
     )
-    df_wcdma_service_area_name["Cell_ID_DECIMAL"] = df_wcdma_service_area_name[
-        "Cell ID"
+    # convert SAC_ID to from HEXadecimal to DECimal
+    df_wcdma_service_area_name["SAC_ID_DECIMAL"] = df_wcdma_service_area_name[
+        "SAC_ID"
     ].apply(lambda x: int(x, 16))
 
-    df_la_cell_name = df_la_cell_name.reset_index(drop=True)
-
     # Display the DataFrame
     st.subheader("2G CORE DUMP DATA")
     st.write(df_la_cell_name)