merge:

app/lib/pages/marker_handler/get_relation.dart

app/lib/pages/marker_handler/marker_data.dart

app/lib/pages/widgets/cloropleth_map.dart

app/lib/pages/widgets/map_widget.dart

app/lib/pages/widgets/osm_map.dart

app/lib/pages/widgets/quick_view_chart.dart

app/lib/pages/widgets/sat_layer.dart

app/lib/pages/widgets/stat_charts.dart

app/lib/widgets/choropleth_map.dart

app/lib/widgets/main_layout.dart

app/pubspec.lock

app/pubspec.yaml

...ta_processing/__pycache__/area_processing.cpython-311.pyc

...processing/__pycache__/process_lidar_data.cpython-311.pyc

server/data_processing/process_lidar_data.py

server/lake_relations/mjosa_div.json

server/main.py

server/map/__pycache__/get_markers.cpython-311.pyc

server/map/__pycache__/get_relation.cpython-311.pyc

server/map/__pycache__/input_new_data.cpython-311.pyc