diff --git a/app/lib/pages/widgets/cloropleth_map.dart b/app/lib/pages/widgets/cloropleth_map.dart index 9c59c4fd33b7759eaf2883783c657c982d3aa1e4..55afa8df331cbf51ff6643185f8f699f57cb4639 100644 --- a/app/lib/pages/widgets/cloropleth_map.dart +++ b/app/lib/pages/widgets/cloropleth_map.dart @@ -54,7 +54,7 @@ class _ChoroplethMapState extends State<ChoroplethMap> { MapShapeLayer( source: MapShapeSource.memory( // Map polygon widget.relation, // JSON coordinates from server - shapeDataField: 'properties.SubDivID', + shapeDataField: 'properties.sub_div_id', dataCount: iceThicknessList.length, primaryValueMapper: (int index) => iceThicknessList[index].subDivID, shapeColorValueMapper: (int index) => iceThicknessList[index].thickness, diff --git a/server/consts.py b/server/consts.py index 5653feea29bda21aae6d6ea43c0365f22b8a73c3..6be29cfbf4d5c8d8470413ecead84c6ade7f37b9 100644 --- a/server/consts.py +++ b/server/consts.py @@ -10,4 +10,4 @@ SSL_KEY_PATH = CERT_DIR + "testKey.key" SSL_CERT_PATH = CERT_DIR + "testCert.crt" # Measurement specs -AREA_SIZE = 20 \ No newline at end of file +AREA_SIZE = 20 diff --git a/server/main.py b/server/main.py index 96c92a657a499c70b5611efe364cf3efa654a4bf..aeef2812c6c1cb28501bd88d531585e8b372791a 100644 --- a/server/main.py +++ b/server/main.py @@ -5,7 +5,6 @@ from map.get_markers import get_all_markers from map.get_relation import get_relation from APIs.get_weather import get_weather import ssl -import keyboard import sqlite3 app = Flask(__name__) diff --git a/server/map/__pycache__/get_relation.cpython-311.pyc b/server/map/__pycache__/get_relation.cpython-311.pyc index c39929327b028a8136b9df0ac343f1ad815472bc..f1c6cf7ea12c878cb3569f08bb47975056cfc912 100644 Binary files a/server/map/__pycache__/get_relation.cpython-311.pyc and b/server/map/__pycache__/get_relation.cpython-311.pyc differ diff --git a/server/map/get_relation.py b/server/map/get_relation.py index 27b285b652ac4708b0123fae107d62150b11c197..c51de74d84b898c7d9c37ec27581cc6ea6e47be8 100644 --- a/server/map/get_relation.py +++ b/server/map/get_relation.py @@ -17,8 +17,7 @@ def get_relation(self, body_of_water: str): # NB: implement body_of_water polygons = [Polygon(polygon.exterior) for polygon in polygon_data['geometry']] if len(polygons) <= 1: - print("Failed to convert to polygons") - return + raise Exception("Failed to convert JSON object to Shapely Polygons") divided_map = [] @@ -54,11 +53,11 @@ def get_relation(self, body_of_water: str): # NB: implement body_of_water for tile in divided_map: tile_feature = { 'type': 'Feature', - 'geometry': tile.__geo_interface__, 'properties': { 'sub_div_id': sub_div_id, 'sub_div_center': tile.centroid.coords[0] - } + }, + 'geometry': tile.__geo_interface__ } features.append(tile_feature) sub_div_id += 1