update: split responses

server/main.py

@@ -2,7 +2,7 @@ from flask import Flask
 from http.server import HTTPServer, BaseHTTPRequestHandler
 from consts import SSL_CERT_PATH, SSL_KEY_PATH, HOST, PORT
 from map.get_measurements import get_all_markers
-from map.add_lake import cut_map
+from map.add_lake import fetch_divided_map
 from APIs.get_weather import get_weather
 from map.input_new_data import input_new_Lidar_data
 import ssl
@@ -40,7 +40,7 @@ class IceHTTP(BaseHTTPRequestHandler):
             get_all_markers(self, self.cursor, 'mjosa')  # Get all markers
             # NB: temporary hardcoded waterBodyName
         elif self.path == '/get_relation':
-            cut_map(self, 'Mjosa')  # NB temp hardcoded value
+            fetch_divided_map(self, 'mjosa')  # NB temp hardcoded value
 
     def do_POST(self):
         if self.path == '/get_weather_data':

server/map/add_lake.py

@@ -69,7 +69,7 @@ def cut_map(self, body_of_water: str):  # NB: implement body_of_water
             'type': 'Feature',
             'properties': {
                 'sub_div_id': str(sub_div_id),
-                'group_id': '',   # Initialised empty, will be set upon requesting the relation
+                'group_id': '',  # Initialised empty, will be set upon requesting the relation
                 'measurement_id': '',
                 'sub_div_center': center,
 
@@ -143,14 +143,21 @@ def write_json_to_file(path: str, file_name: str, json_data: dict):
         json.dump(json_data, f)
 
 
-def get_divided_map(file_name):
-    geo_data = gpd.read_file("server/map/" + file_name + ".geojson")
-    polygon_data = geo_data[geo_data['geometry'].geom_type == 'Polygon']
-    polygons = [Polygon(polygon.exterior) for polygon in polygon_data['geometry']]
+def fetch_divided_map(self, file_name):
+    self.send_response(200)
+    self.send_header("Content-type", "application/json")
+    self.end_headers()
+
+    # Extract contents from JSON file
+    with open("server/lake_relations/" + file_name + "_div.json", "r") as file:
+        data = file.read()
+
+    # Write contents of the JSON file to response
+    self.wfile.write(data.encode('utf-8'))
 
 
 # Returns a list of [(sub_div_id, sub_div_center)]
-def get_id_and_center(file_name): # NB buggy
+def get_id_and_center(file_name):  # NB buggy
     # Expected format: [(id, [x,y]), (id, [x,y])]
     geo_data = gpd.read_file("server/lake_relations/" + file_name + "_div.json")
     subdivisions = []
@@ -166,4 +173,3 @@ def get_id_and_center(file_name): # NB buggy
         }
         subdivisions.append(subdivision)
     return subdivisions
-

server/map/get_measurements.py

@@ -2,6 +2,7 @@ import json
 from datetime import datetime
 import random
 import geopandas as gpd
+from server.map.add_lake import write_json_to_file
 
 
 # get_markers requests all marker data or valid markers, converts the data to json, and writes
@@ -66,7 +67,7 @@ def get_all_markers(self, cursor, waterBodyName):
                     'Subdivisions': [sub_division],  # Array of sub_division objects
                 }
 
-        ########################### TEST DATA ###########################################
+        ##################################### TEST DATA ###########################################
         # Temporary test data
         test_measurements = []
         subdiv_id = 17
@@ -106,10 +107,10 @@ def get_all_markers(self, cursor, waterBodyName):
             }
 
             test_measurements.append(measurement)
-        ########################### TEST DATA ###########################################
+        ##################################### TEST DATA ###########################################
 
         # Convert dictionary values to list of measurements
-        measurements_list = list(measurement_data.values()) + test_measurements
+        data = list(measurement_data.values()) + test_measurements
 
         ######################### ADD GROUP_IDS TO RELATION DATA ##################################
 
@@ -118,7 +119,7 @@ def get_all_markers(self, cursor, waterBodyName):
         relation_data = geo_data[geo_data['geometry'].geom_type == 'Polygon']
 
         # Add group IDs to lake relation
-        for measurement in measurements_list:
+        for measurement in data:
             measurement_id = str(measurement['MeasurementID'])  # Extract measurement ID
             for subdivision in measurement['Subdivisions']:
                 subDivID = str(subdivision['SubdivID'])  # Convert to string to match format in feature
@@ -135,14 +136,13 @@ def get_all_markers(self, cursor, waterBodyName):
                         relation_data.at[index, 'measurement_id'] = measurement_id
                         # relation_data.at[index, 'sub_div_center'] = feature['sub_div_center']
 
-        ####################################################################################
-
-        # Convert GeoDataFrame to JSON
+        # Convert GeoDataFrame to JSON and update json file
         relation_data_json = json.loads(relation_data.to_json())
 
-        # Combine measurements_list and relation_data
-        data = [measurements_list, relation_data_json]
-        
+        write_json_to_file("server/lake_relations", "mjosa", relation_data_json)
+
+        ####################################################################################
+
         if len(rows) == 0 or len(data) == 0:  # Return 500 and empty list if no data is found
             print(f"No data which meets the condition found")
             marker_data = '[]'