diff --git a/app/lib/data_classes.dart b/app/lib/data_classes.dart index c2eae490c3754ae00b81dd2c8a1d382fd5264e10..8de99433b443b8ddcb9f3ed213c34e6496ffa034 100644 --- a/app/lib/data_classes.dart +++ b/app/lib/data_classes.dart @@ -9,7 +9,6 @@ class Measurement { String bodyOfWater; LatLng center; List <SubDiv> subDivs; - List <LatLng> corners; Measurement({ required this.measurementID, @@ -18,7 +17,6 @@ class Measurement { required this.bodyOfWater, required this.center, required this.subDivs, - required this.corners, }); factory Measurement.fromJson(Map<String, dynamic> json) { @@ -29,7 +27,6 @@ class Measurement { bodyOfWater: json['BodyOfWater'] ?? 'nil', center: LatLng(json['CenterLat'], json['CenterLon']), subDivs: (json['Subdivisions'] as List<dynamic>).map((data) => SubDiv.fromJson(data)).toList(), - corners: (json['Corners'] as List<dynamic>).map((corner) => LatLng(corner[0], corner[1])).toList(), ); } } diff --git a/server/map/__pycache__/get_markers.cpython-311.pyc b/server/map/__pycache__/get_markers.cpython-311.pyc index 73cd772e302589d49fcad61810dfeecc73eafbdd..e5f3f09001f62f2c0a6fd0b6f4fc14e388ba52d8 100644 Binary files a/server/map/__pycache__/get_markers.cpython-311.pyc and b/server/map/__pycache__/get_markers.cpython-311.pyc differ diff --git a/server/map/get_markers.py b/server/map/get_markers.py index 2c8c4039928fa112a8d1feb2cb0cdd2b2b3253f2..799f723a0ec44299c30751498051c1a06d0499d6 100644 --- a/server/map/get_markers.py +++ b/server/map/get_markers.py @@ -38,7 +38,8 @@ def get_all_markers(self, cursor, waterBodyName): 'AvgThickness': row[11], 'CenLatitude': row[12], 'CenLongitude': row[13], - 'Accuracy': row[14] + 'Accuracy': row[14], + 'Color': calculateColor(row[11]) # NB color calculated based on average thickness, should be minimum } # Check if measurement ID already exists in measurement_data @@ -60,7 +61,6 @@ def get_all_markers(self, cursor, waterBodyName): 'Active': bool(row[6]) }, 'Subdivisions': [sub_division], # Array of sub_division objects - 'Corners': [], # NB remove value if not used } # Convert dictionary values to list of measurements @@ -85,6 +85,7 @@ def get_all_markers(self, cursor, waterBodyName): # Write marker data to response object self.wfile.write(marker_data.encode('utf-8')) + def calculateColor(thickness: int): # NB not final colors nor ranges if 0 < thickness < 4: return 0xFFff0000 # Red @@ -96,4 +97,3 @@ def calculateColor(thickness: int): # NB not final colors nor ranges return 0xFF00d6ff # Blue else: return 0xFF939393 # Gray -