introduce grid metadata

Author: wuan

blitzortung/geom.py

@@ -91,15 +91,14 @@ def __repr__(self):
 class Grid(Envelope):
     """ grid characteristics"""
 
-    __slots__ = ['x_div', 'y_div', '__x_bin_count', '__y_bin_count', '_baselength']
+    __slots__ = ['x_div', 'y_div', '__x_bin_count', '__y_bin_count']
 
-    def __init__(self, x_min, x_max, y_min, y_max, x_div, y_div, baselength, srid=Geometry.default_srid):
+    def __init__(self, x_min, x_max, y_min, y_max, x_div, y_div, srid=Geometry.default_srid):
         super().__init__(x_min, x_max, y_min, y_max, srid)
         self.x_div = x_div
         self.y_div = y_div
         self.__x_bin_count = None
         self.__y_bin_count = None
-        self._baselength = baselength
 
     def get_x_bin(self, x_pos):
         return int(math.ceil(float(x_pos - self.x_min) / self.x_div)) - 1
@@ -168,7 +167,7 @@ def get_for(self, base_length):
             max_lat = self.fix_max(self.min_lat, self.max_lat, delta_lat)
 
             self.grid_data[base_length] = Grid(self.min_lon, max_lon, self.min_lat, max_lat,
-                                               delta_lon, delta_lat, base_length,
+                                               delta_lon, delta_lat,
                                                Geometry.default_srid)
 
         return self.grid_data[base_length]

blitzortung/service/strike_grid.py

@@ -28,12 +28,19 @@
 from .. import db
 
 
+@dataclass(frozen=True)
+class GridMetadata:
+    base_length: int
+    region: Optional[int] = None
+
+
 class StrikeGridState(TimingState):
-    __slots__ = ['grid_parameters', 'time_interval']
+    __slots__ = ['grid_parameters', 'grid_metadata', 'time_interval']
 
-    def __init__(self, statsd_client, grid_parameters, time_interval):
+    def __init__(self, statsd_client, grid_parameters, grid_metadata, time_interval):
         super().__init__("strikes_grid", statsd_client)
         self.grid_parameters = grid_parameters
+        self.grid_metadata = grid_metadata
         self.time_interval = time_interval
 
 
@@ -42,10 +49,11 @@ class StrikeGridQuery:
     def __init__(self, strike_query_builder: db.query_builder.Strike):
         self.strike_query_builder = strike_query_builder
 
-    def create(self, grid_parameters, minute_length, minute_offset, count_threshold, connection, statsd_client):
+    def create(self, grid_parameters, grid_metadata, minute_length, minute_offset, count_threshold, connection,
+               statsd_client):
         time_interval = create_time_interval(minute_length, minute_offset)
 
-        state = StrikeGridState(statsd_client, grid_parameters, time_interval)
+        state = StrikeGridState(statsd_client, grid_parameters, grid_metadata, time_interval)
 
         query = self.strike_query_builder.grid_query(db.table.Strike.table_name, grid_parameters,
                                                      time_interval=time_interval, count_threshold=count_threshold)
@@ -92,6 +100,10 @@ def build_grid_response(results, state):
         histogram_data = results[1]
 
         state.log_gauge('strikes_grid.size', len(grid_data) if grid_data else 0)
+        state.log_gauge(f'strikes_grid.size.{state.grid_metadata.baselength}', len(grid_data))
+        if state.grid_metadata.region is None:
+            state.log_gauge('local_strikes_grid.size', len(grid_data) if grid_data else 0)
+            state.log_gauge(f'local_strikes_grid.size.baselength.{state.grid_metadata.baselength}', len(grid_data))
         state.log_incr('strikes_grid')
 
         grid_parameters = state.grid_parameters
@@ -118,10 +130,11 @@ class GlobalStrikeGridQuery:
     def __init__(self, strike_query_builder: db.query_builder.Strike):
         self.strike_query_builder = strike_query_builder
 
-    def create(self, grid_parameters, minute_length, minute_offset, count_threshold, connection, statsd_client):
+    def create(self, grid_parameters, grid_metadata, minute_length, minute_offset, count_threshold, connection,
+               statsd_client):
         time_interval = create_time_interval(minute_length, minute_offset)
 
-        state = StrikeGridState(statsd_client, grid_parameters, time_interval)
+        state = StrikeGridState(statsd_client, grid_parameters, grid_metadata, time_interval)
 
         query = self.strike_query_builder.global_grid_query(db.table.Strike.table_name, grid_parameters,
                                                             time_interval=time_interval,
@@ -168,7 +181,7 @@ def build_grid_response(results, state):
         histogram_data = results[1]
 
         state.log_gauge('global_strikes_grid.size', len(grid_data))
-        state.log_gauge(f'global_strikes_grid.size.{state.grid_parameters.baselength}', len(grid_data))
+        state.log_gauge(f'global_strikes_grid.size.{state.grid_metadata.baselength}', len(grid_data))
         state.log_incr('global_strikes_grid')
 
         grid_parameters = state.grid_parameters

tests/db/test_db_query.py

@@ -225,7 +225,7 @@ def test_add_parameters(self):
 
 class GridQueryTest(TestCase):
     def test_with_raster(self):
-        raster = blitzortung.geom.Grid(-10, 20, 15, 35, 1.5, 1, 5000)
+        raster = blitzortung.geom.Grid(-10, 20, 15, 35, 1.5, 1)
 
         query = blitzortung.db.query.GridQuery(raster)
         query.set_table_name('strikes')

tests/test_geom.py

@@ -102,7 +102,7 @@ def test_str(self):
 
 class TestGrid(TestCase):
     def setUp(self):
-        self.grid = blitzortung.geom.Grid(-5, 4, -3, 2, 0.5, 1.25, 5000)
+        self.grid = blitzortung.geom.Grid(-5, 4, -3, 2, 0.5, 1.25)
 
     def test_get_x_div(self):
         assert_that(self.grid.x_div).is_equal_to(0.5)