AG-7: Added Boundary Type for markers

agstack · May 5, 2023 · f5be3bf · f5be3bf
1 parent a94b677
commit f5be3bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/app.py b/app.py
@@ -355,13 +355,14 @@ def fetch_fields_for_a_point():
         lat = data.get('latitude')
         long = data.get('longitude')
         domain = data.get('domain')
+        boundary_type = data.get('boundary_type')
         s2_index = data.get('s2_index')
         if not lat or not long:
             return make_response(jsonify({
                 "message": "Latitude and Longitude are required."
             }), 400)
         s2_cell_token_13, s2_cell_token_20 = S2Service.get_cell_token_for_lat_long(lat, long)
-        fetched_fields = Utils.fetch_fields_for_a_point_two_way(s2_cell_token_13, s2_cell_token_20, domain, s2_index)
+        fetched_fields = Utils.fetch_fields_for_a_point_two_way(s2_cell_token_13, s2_cell_token_20, domain, s2_index, boundary_type)
         return make_response(jsonify({
             "Fetched fields": fetched_fields
         }), 200)

diff --git a/utils.py b/utils.py
@@ -317,7 +317,7 @@ def fetch_fields_for_cell_tokens(s2_cell_tokens_13, s2_cell_tokens_20, s2_index=
         return fields_to_return
 
     @staticmethod
-    def fetch_fields_for_a_point_two_way(s2_cell_token_13, s2_cell_token_20, domain, s2_index=None):
+    def fetch_fields_for_a_point_two_way(s2_cell_token_13, s2_cell_token_20, domain, s2_index=None, boundary_type=None):
         """
         Checks if token exists in L13, then further checks for L20
         Returns the fields if token exists at both the levels
@@ -340,11 +340,15 @@ def fetch_fields_for_a_point_two_way(s2_cell_token_13, s2_cell_token_20, domain,
         else:
             geo_ids = db.session.query(GeoIds.geo_id).distinct().join(CellsGeosMiddle).join(S2CellTokens).filter(
                 S2CellTokens.cell_token == s2_cell_token_13)
+        if boundary_type:
+            geo_ids = geo_ids.filter(GeoIds.boundary_type == boundary_type)
         geo_ids = [r.geo_id for r in geo_ids]
         fields_to_return = []
         for geo_id in geo_ids:
             geo_data_to_return = {}
-            geo_data = json.loads(GeoIds.query.filter(GeoIds.geo_id == geo_id).first().geo_data)
+            geo_data_obj = GeoIds.query.filter(GeoIds.geo_id == geo_id).first()
+            geo_data = json.loads(geo_data_obj.geo_data)
+            geo_data['boundary_type'] = geo_data_obj.boundary_type
             if s2_index and s2_indexes_to_remove != -1:
                 geo_data_to_return = Utils.get_specific_s2_index_geo_data(json.dumps(geo_data), s2_indexes_to_remove)
             if s2_cell_token_13 in geo_data['13'] and s2_cell_token_20 in geo_data['20']: