From 14f7a8a02527608b620eabcb250c1aac81d28e39 Mon Sep 17 00:00:00 2001
From: Hoa Ben The Nguyen <hbnguye@stud.ntnu.no>
Date: Tue, 19 Mar 2024 19:04:52 +0100
Subject: [PATCH] removed: self calculation of points
---
server/data_processing/area_processing.py | 4 ++--
server/data_processing/process_lidar_data.py | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/data_processing/area_processing.py b/server/data_processing/area_processing.py
index acccd9f1..9c7bd0d0 100644
--- a/server/data_processing/area_processing.py
+++ b/server/data_processing/area_processing.py
@@ -50,7 +50,7 @@ def define_gridareas(lat, lng, area_offset, grid_size):
lat_pos = main_area[3][0] + relative_size_lat * area_size[0] + dist_to_subcenter[0]
lng_pos = main_area[3][1] + relative_size_lng * area_size[1] + dist_to_subcenter[1]
# id of each subarea
- sub_id = x % grid_size + grid_size * y
+ #sub_id = x % grid_size + grid_size * y
if (x+(y*grid_size)) % ((grid_size*2) + 1) == grid_size * 2:
group_id += 2
@@ -60,7 +60,7 @@ def define_gridareas(lat, lng, area_offset, grid_size):
# use the center of sub areas to find the corner of each subarea
corners = calculate_corners(lat_pos, lng_pos, subarea_offset)
- grided_area.append((sub_id, group_id + i%2, corners))
+ grided_area.append((group_id + i%2, corners))
return grided_area
#[1,2,2,3,4,5,6,3,4,6,8,9,5,3,5.7,8,5,3]
diff --git a/server/data_processing/process_lidar_data.py b/server/data_processing/process_lidar_data.py
index 484beffd..af2588a7 100644
--- a/server/data_processing/process_lidar_data.py
+++ b/server/data_processing/process_lidar_data.py
@@ -124,8 +124,8 @@ def calculate_area_data(center, cell_size, body_of_water):
# find the heights of each sub-area => area-heights
for sub_area in grid_area_heights:
- start = min(sub_area[2])
- end = max(sub_area[2])
+ start = min(sub_area[1])
+ end = max(sub_area[1])
#test data
# zone coordinates sett to be relative to the lidar data
@@ -143,7 +143,7 @@ def calculate_area_data(center, cell_size, body_of_water):
# filter data within sub-area zones
points_in_area = list(filter(lambda point_position: inArea(point_position, areazone), ice_points))
- area_heights.append((current_zone_id,sub_area[1], sub_center, find_height(points_in_area)))
+ area_heights.append((current_zone_id,sub_area[0], sub_center, find_height(points_in_area)))
return area_heights
--
GitLab