Add OOB handling for updated neighborhoods, update default cat B OOB distance to 0

Author: FW-ccaparanga

src/harness/reference_models/dpa/dpa_mgr.py

@@ -876,7 +876,9 @@ def BuildDpa(dpa_name, protection_points_method=None, portal_dpa_filename=None,
                           dpa_zone.catA_Outdoor_NeighborhoodDistanceKm,
                           dpa_zone.catA_Outdoor_6m_NeighborhoodDistanceKm,
                           dpa_zone.catBNeighborhoodDistanceKm,
-                          dpa_zone.catB_6m_NeighborhoodDistanceKm)
+                          dpa_zone.catB_6m_NeighborhoodDistanceKm,
+                          dpa_zone.catAOOBNeighborhoodDistanceKm,
+                          dpa_zone.catBOOBNeighborhoodDistanceKm)
   else:
     neighbor_distances = (dpa_zone.catANeighborhoodDistanceKm,
                           dpa_zone.catBNeighborhoodDistanceKm,

src/harness/reference_models/dpa/move_list.py

@@ -183,23 +183,29 @@ def findGrantsInsideNeighborhood(grants, constraint,
           neighbor_dist = neighbor_distances[2]
         else:
           neighbor_dist = neighbor_distances[3]
-    elif len(neighbor_distances) == 6:
-      if grant.cbsd_category == 'A':
-        if grant.indoor_deployment:
-          if grant.height_agl > 6:
-            neighbor_dist = neighbor_distances[0]
+    elif len(neighbor_distances) == 8:
+      if dpa_type is DpaType.OUT_OF_BAND:
+        if grant.cbsd_category == 'A':
+          neighbor_dist = neighbor_distances[6]
+        else:
+          neighbor_dist = neighbor_distances[7]
+      else:
+        if grant.cbsd_category == 'A':
+          if grant.indoor_deployment:
+            if grant.height_agl > 6:
+              neighbor_dist = neighbor_distances[0]
+            else:
+              neighbor_dist = neighbor_distances[1]
           else:
-            neighbor_dist = neighbor_distances[1]
+            if grant.height_agl > 6:
+              neighbor_dist = neighbor_distances[2]
+            else:
+              neighbor_dist = neighbor_distances[3]
         else:
           if grant.height_agl > 6:
-            neighbor_dist = neighbor_distances[2]
+            neighbor_dist = neighbor_distances[4]
           else:
-            neighbor_dist = neighbor_distances[3]
-      else:
-        if grant.height_agl > 6:
-          neighbor_dist = neighbor_distances[4]
-        else:
-          neighbor_dist = neighbor_distances[5]
+            neighbor_dist = neighbor_distances[5]
     else:
       raise ValueError('Invalid neighborhood distances size')
     if dist_km > neighbor_dist:

src/harness/reference_models/geo/zones.py

@@ -437,7 +437,7 @@ def _LoadDpaZones(kml_path, properties, fix_invalid=True):
     if np.isnan(zone.catAOOBNeighborhoodDistanceKm):
       zone.catAOOBNeighborhoodDistanceKm = 0
     if np.isnan(zone.catBOOBNeighborhoodDistanceKm):
-      zone.catBOOBNeighborhoodDistanceKm = 25
+      zone.catBOOBNeighborhoodDistanceKm = 0
 
   return dpa_zones