merge: solve merge

app/assets/australia.json

app/assets/mjosa.geojson

app/lib/pages/consts.dart

app/lib/pages/default_page.dart

app/lib/pages/marker_handler/get_markers.dart

app/lib/pages/marker_handler/get_relation.dart

app/lib/pages/widgets/cloropleth_map.dart

app/lib/pages/widgets/map_widget.dart

app/lib/pages/widgets/stat_charts.dart

app/macos/Flutter/GeneratedPluginRegistrant.swift

app/pubspec.lock

app/pubspec.yaml

server/__pycache__/data_structs.cpython-311.pyc

server/certificates/MongoCert.pem

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

server/data_structs.py

server/icedb

server/lake_relations/overpass_query.txt

server/main.py

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