DavMelchi commited on
Commit
9cd5e21
·
1 Parent(s): d52245c

addind atoll site DB

Browse files
queries/process_all_db.py CHANGED
@@ -1,4 +1,4 @@
1
- from queries.process_atoll_db import process_lte_for_atoll
2
  from queries.process_gsm import combined_gsm_database, gsm_analaysis
3
  from queries.process_invunit import process_invunit_data
4
  from queries.process_lte import lte_fdd_analaysis, lte_tdd_analaysis, process_lte_data
@@ -56,4 +56,4 @@ def process_all_tech_db_with_stats(
56
 
57
  def process_atoll_db(filepath: str):
58
  clear_all_dbs()
59
- process_lte_for_atoll(filepath)
 
1
+ from queries.process_atoll_db import process_data_for_atoll
2
  from queries.process_gsm import combined_gsm_database, gsm_analaysis
3
  from queries.process_invunit import process_invunit_data
4
  from queries.process_lte import lte_fdd_analaysis, lte_tdd_analaysis, process_lte_data
 
56
 
57
  def process_atoll_db(filepath: str):
58
  clear_all_dbs()
59
+ process_data_for_atoll(filepath)
queries/process_atoll_db.py CHANGED
@@ -53,16 +53,25 @@ GSM_ATOLL_COLUMNS = [
53
  "BSIC",
54
  ]
55
 
 
 
 
 
 
 
56
 
57
  ########################### PROCESS LTE DATA FOR ATOLL#########################
58
 
59
 
60
- def process_lte_for_atoll(file_path: str):
61
  df: pd.DataFrame = process_lte_data(file_path)
62
  lte_fdd_df = df[0]
63
  lte_tdd_df = df[1]
64
 
 
 
65
  lte_atoll_df = pd.concat([lte_fdd_df, lte_tdd_df], ignore_index=True)
 
66
  lte_atoll_emetteur_df = lte_atoll_df[LTE_ATOLL_EMETTEUR_COLUMNS]
67
  lte_atoll_cellule_df = lte_atoll_df[LTE_ATOLL_CELLULE_COLUMNS]
68
 
@@ -200,6 +209,7 @@ def process_lte_for_atoll(file_path: str):
200
  ########################### PROCESS WCDMA DATA FOR ATOLL#########################
201
 
202
  wcdma_atoll_df: pd.DataFrame = process_wcdma_data(file_path)
 
203
  wcdma_atoll_emetteur_df = wcdma_atoll_df[WCDMA_ATOLL_EMETTEUR_COLUMNS]
204
 
205
  # rename columns
@@ -325,6 +335,7 @@ def process_lte_for_atoll(file_path: str):
325
  ########################### PROCESS GSM DATA FOR ATOLL#########################
326
 
327
  gsm_atoll_df: pd.DataFrame = process_gsm_data(file_path)
 
328
  gsm_atoll_df = gsm_atoll_df[GSM_ATOLL_COLUMNS]
329
 
330
  # rename columns
@@ -412,6 +423,36 @@ def process_lte_for_atoll(file_path: str):
412
  # save_dataframe(lte_atoll_emetteur_df, "LTE_ATOLL_EMETTEUR")
413
  # save_dataframe(lte_atoll_cellule_df, "LTE_ATOLL_CELLULE")
414
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
415
  UtilsVars.final_atoll_database = convert_dfs(
416
  [
417
  gsm_atoll_df,
@@ -419,6 +460,7 @@ def process_lte_for_atoll(file_path: str):
419
  wcdma_atoll_cellule_df,
420
  lte_atoll_emetteur_df,
421
  lte_atoll_cellule_df,
 
422
  ],
423
  [
424
  "GSM",
@@ -426,5 +468,6 @@ def process_lte_for_atoll(file_path: str):
426
  "WCDMA_CELLULE",
427
  "LTE_EMETTEUR",
428
  "LTE_CELLULE",
 
429
  ],
430
  )
 
53
  "BSIC",
54
  ]
55
 
56
+ SITE_COLUMNS = [
57
+ "code",
58
+ "Longitude",
59
+ "Latitude",
60
+ "Hauteur",
61
+ ]
62
 
63
  ########################### PROCESS LTE DATA FOR ATOLL#########################
64
 
65
 
66
+ def process_data_for_atoll(file_path: str):
67
  df: pd.DataFrame = process_lte_data(file_path)
68
  lte_fdd_df = df[0]
69
  lte_tdd_df = df[1]
70
 
71
+ lte_tdd_df = lte_tdd_df.rename(columns={"earfcn": "earfcnDL"})
72
+
73
  lte_atoll_df = pd.concat([lte_fdd_df, lte_tdd_df], ignore_index=True)
74
+ lte_site_df = lte_atoll_df[SITE_COLUMNS]
75
  lte_atoll_emetteur_df = lte_atoll_df[LTE_ATOLL_EMETTEUR_COLUMNS]
76
  lte_atoll_cellule_df = lte_atoll_df[LTE_ATOLL_CELLULE_COLUMNS]
77
 
 
209
  ########################### PROCESS WCDMA DATA FOR ATOLL#########################
210
 
211
  wcdma_atoll_df: pd.DataFrame = process_wcdma_data(file_path)
212
+ wcdma_site_df = wcdma_atoll_df[SITE_COLUMNS]
213
  wcdma_atoll_emetteur_df = wcdma_atoll_df[WCDMA_ATOLL_EMETTEUR_COLUMNS]
214
 
215
  # rename columns
 
335
  ########################### PROCESS GSM DATA FOR ATOLL#########################
336
 
337
  gsm_atoll_df: pd.DataFrame = process_gsm_data(file_path)
338
+ gsm_site_df = gsm_atoll_df[SITE_COLUMNS]
339
  gsm_atoll_df = gsm_atoll_df[GSM_ATOLL_COLUMNS]
340
 
341
  # rename columns
 
423
  # save_dataframe(lte_atoll_emetteur_df, "LTE_ATOLL_EMETTEUR")
424
  # save_dataframe(lte_atoll_cellule_df, "LTE_ATOLL_CELLULE")
425
 
426
+ ################################ SITE ########################################
427
+
428
+ site_df: pd.DataFrame = pd.concat(
429
+ [gsm_site_df, wcdma_site_df, lte_site_df], ignore_index=True
430
+ )
431
+ site_df.drop_duplicates(subset=["code"], keep="first", inplace=True)
432
+ # order by code
433
+ site_df.sort_values(by=["code"], inplace=True)
434
+ # rename columns
435
+ site_df.rename(
436
+ columns={
437
+ "code": "Nom",
438
+ "Longitude": "Longitude",
439
+ "Latitude": "Latitude",
440
+ "Hauteur": "Hauteur du support (m)",
441
+ },
442
+ inplace=True,
443
+ )
444
+
445
+ site_df["Altitude (m)"] = None
446
+ site_df["Commentaires"] = None
447
+ site_df["Type de support"] = "Pylône haubané"
448
+ site_df["Nb max CEs UL"] = 1200
449
+ site_df["Nb max CEs DL"] = 1200
450
+ site_df["Débit Iub Backhaul max UL (kbps)"] = 300000
451
+ site_df["Débit Iub Backhaul max DL (kbps)"] = 500000
452
+ site_df["Equipement"] = None
453
+ site_df["Débit max interface S1 (DL) (kbps)"] = 500000
454
+ site_df["Débit max interface S1 (UL) (kbps)"] = 300000
455
+
456
  UtilsVars.final_atoll_database = convert_dfs(
457
  [
458
  gsm_atoll_df,
 
460
  wcdma_atoll_cellule_df,
461
  lte_atoll_emetteur_df,
462
  lte_atoll_cellule_df,
463
+ site_df,
464
  ],
465
  [
466
  "GSM",
 
468
  "WCDMA_CELLULE",
469
  "LTE_EMETTEUR",
470
  "LTE_CELLULE",
471
+ "SITE",
472
  ],
473
  )
utils/utils_vars.py CHANGED
@@ -30,6 +30,7 @@ class UtilsVars:
30
  "L1800": "OML E-UTRA Band 3 - 20MHz",
31
  "L800": "OML E-UTRA Band 20 - 20MHz",
32
  "L2300": "OML E-UTRA Band 43 - 20MHz",
 
33
  }
34
  porteuse_mapping = {
35
  3004: "OML UTRA Band VIII",
 
30
  "L1800": "OML E-UTRA Band 3 - 20MHz",
31
  "L800": "OML E-UTRA Band 20 - 20MHz",
32
  "L2300": "OML E-UTRA Band 43 - 20MHz",
33
+ "L2600": "OML E-UTRA Band 7 - 20MHz",
34
  }
35
  porteuse_mapping = {
36
  3004: "OML UTRA Band VIII",