diff --git a/app/assets/fonts/lato/Lato-Black.ttf b/app/assets/fonts/lato/Lato-Black.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/lato/Lato-BlackItalic.ttf b/app/assets/fonts/lato/Lato-BlackItalic.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/lato/Lato-Bold.ttf b/app/assets/fonts/lato/Lato-Bold.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/lato/Lato-BoldItalic.ttf b/app/assets/fonts/lato/Lato-BoldItalic.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/lato/Lato-Italic.ttf b/app/assets/fonts/lato/Lato-Italic.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/lato/Lato-Light.ttf b/app/assets/fonts/lato/Lato-Light.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/lato/Lato-LightItalic.ttf b/app/assets/fonts/lato/Lato-LightItalic.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/lato/Lato-Regular.ttf b/app/assets/fonts/lato/Lato-Regular.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/lato/Lato-Thin.ttf b/app/assets/fonts/lato/Lato-Thin.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/lato/Lato-ThinItalic.ttf b/app/assets/fonts/lato/Lato-ThinItalic.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/lato/OFL.txt b/app/assets/fonts/lato/OFL.txt
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/OFL.txt b/app/assets/fonts/rokkitt/OFL.txt
deleted file mode 100644
index 28dcbea4c24a053192736af9ccb6916717add176..0000000000000000000000000000000000000000
--- a/app/assets/fonts/rokkitt/OFL.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright 2016 The Rokkit Project Authors (https://github.com/googlefonts/RokkittFont)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/app/assets/fonts/rokkitt/README.txt b/app/assets/fonts/rokkitt/README.txt
deleted file mode 100644
index 7d629dc3a58aff08a64102ee3353e053c257903e..0000000000000000000000000000000000000000
--- a/app/assets/fonts/rokkitt/README.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-Rokkitt Variable Font
-=====================
-
-This download contains Rokkitt as both variable fonts and static fonts.
-
-Rokkitt is a variable font with this axis:
- wght
-
-This means all the styles are contained in these files:
- Rokkitt-VariableFont_wght.ttf
- Rokkitt-Italic-VariableFont_wght.ttf
-
-If your app fully supports variable fonts, you can now pick intermediate styles
-that aren’t available as static fonts. Not all apps support variable fonts, and
-in those cases you can use the static font files for Rokkitt:
- static/Rokkitt-Thin.ttf
- static/Rokkitt-ExtraLight.ttf
- static/Rokkitt-Light.ttf
- static/Rokkitt-Regular.ttf
- static/Rokkitt-Medium.ttf
- static/Rokkitt-SemiBold.ttf
- static/Rokkitt-Bold.ttf
- static/Rokkitt-ExtraBold.ttf
- static/Rokkitt-Black.ttf
- static/Rokkitt-ThinItalic.ttf
- static/Rokkitt-ExtraLightItalic.ttf
- static/Rokkitt-LightItalic.ttf
- static/Rokkitt-Italic.ttf
- static/Rokkitt-MediumItalic.ttf
- static/Rokkitt-SemiBoldItalic.ttf
- static/Rokkitt-BoldItalic.ttf
- static/Rokkitt-ExtraBoldItalic.ttf
- static/Rokkitt-BlackItalic.ttf
-
-Get started
------------
-
-1. Install the font files you want to use
-
-2. Use your app's font picker to view the font family and all the
-available styles
-
-Learn more about variable fonts
--------------------------------
-
- https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
- https://variablefonts.typenetwork.com
- https://medium.com/variable-fonts
-
-In desktop apps
-
- https://theblog.adobe.com/can-variable-fonts-illustrator-cc
- https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
-
-Online
-
- https://developers.google.com/fonts/docs/getting_started
- https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
- https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
-
-Installing fonts
-
- MacOS: https://support.apple.com/en-us/HT201749
- Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
- Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
-
-Android Apps
-
- https://developers.google.com/fonts/docs/android
- https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
-
-License
--------
-Please read the full license text (OFL.txt) to understand the permissions,
-restrictions and requirements for usage, redistribution, and modification.
-
-You can use them in your products & projects – print or digital,
-commercial or otherwise.
-
-This isn't legal advice, please consider consulting a lawyer and see the full
-license for all details.
diff --git a/app/assets/fonts/rokkitt/Rokkitt-Italic-VariableFont_wght.ttf b/app/assets/fonts/rokkitt/Rokkitt-Italic-VariableFont_wght.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/Rokkitt-VariableFont_wght.ttf b/app/assets/fonts/rokkitt/Rokkitt-VariableFont_wght.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-Black.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-Black.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-BlackItalic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-BlackItalic.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-Bold.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-Bold.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-BoldItalic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-BoldItalic.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-ExtraBold.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-ExtraBold.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-ExtraBoldItalic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-ExtraBoldItalic.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-ExtraLight.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-ExtraLight.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-ExtraLightItalic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-ExtraLightItalic.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-Italic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-Italic.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-Light.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-Light.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-LightItalic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-LightItalic.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-Medium.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-Medium.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-MediumItalic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-MediumItalic.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-Regular.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-Regular.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-SemiBold.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-SemiBold.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-SemiBoldItalic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-SemiBoldItalic.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-Thin.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-Thin.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-ThinItalic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-ThinItalic.ttf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/app/assets/icons/circle-red.png b/app/assets/icons/circle-red.png
deleted file mode 100644
index fe90f40a73fd928ff4ee1be33f12c21a63866829..0000000000000000000000000000000000000000
Binary files a/app/assets/icons/circle-red.png and /dev/null differ
diff --git a/app/assets/icons/frozen.png b/app/assets/icons/frozen.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c224e3c664cdb1628cff2a696e6ed9c045d0bf5
Binary files /dev/null and b/app/assets/icons/frozen.png differ
diff --git a/app/assets/icons/marker.png b/app/assets/icons/marker.png
deleted file mode 100644
index c9d6980c6ba0227597af40e6235257800076f17e..0000000000000000000000000000000000000000
Binary files a/app/assets/icons/marker.png and /dev/null differ
diff --git a/app/lib/pages/default_page.dart b/app/lib/pages/default_page.dart
index 81aec4857298dc51a9f9328c27f8de2f1a607b9c..6259afe5a9c2a725dd09b235a6c494d1c3862d74 100644
--- a/app/lib/pages/default_page.dart
+++ b/app/lib/pages/default_page.dart
@@ -102,23 +102,26 @@ class _DefaultPageState extends State<DefaultPage> {
body: FutureBuilder(
future: Future.wait([markerListFuture, relationFuture]),
builder: (BuildContext context, AsyncSnapshot<List<dynamic>> snapshot) {
+ // Display loading screen while app state is being set
if (snapshot.connectionState == ConnectionState.waiting) {
return Container(
- decoration: const BoxDecoration( // Background color for loading screen
+ decoration: const BoxDecoration( // Loading screen
color: darkestBlue,
),
- child: const Center(
- child: Icon(
- Icons.severe_cold, // Loading screen icon
+ child: Center(
+ child: Image.asset(
+ 'assets/icons/frozen.png', // Loading screen icon
+ // Icon from: https://www.flaticon.com/free-icons/cold-water"
color: lightBlue,
- size: 100,
+ width: 200,
+ height: 200,
),
),
);
} else if (snapshot.hasError) {
return Center(child: Text('Error: ${snapshot.error}'));
} else {
- // Alert the user after the build completes if there is no server connection
+ // If no server connection, alert user upon completing build
WidgetsBinding.instance.addPostFrameCallback((_) {
if (!serverConnection && !dialogShown) {
dialogShown = true;
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 573938f72754231ab167665c91e4d1823a032b8c..29d73faf2f2176169e74fbb8f582885e0ce22f44 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -9,15 +9,15 @@ environment:
dependencies:
flutter:
sdk: flutter
- flutter_map: ^4.0.0
- http: ^0.13.3
+ flutter_map: ^4.0.0 # Various maps
+ http: ^0.13.3 # HTTPS requests
latlong2: ^0.8.2
provider: ^5.0.0
- fl_chart: ^0.20.0-nullsafety1
- google_fonts: any
- syncfusion_flutter_maps: ^20.4.41
+ fl_chart: ^0.20.0-nullsafety1 # Charts and diagrams
+ google_fonts: any # Fonts
+ syncfusion_flutter_maps: ^20.4.41 # Choropleth map
path_provider: ^2.0.8
- shared_preferences: any
+ shared_preferences: any # Persistent data storage
dev_dependencies:
flutter_test:
@@ -27,4 +27,4 @@ dev_dependencies:
flutter:
uses-material-design: true
assets:
- - assets/
+ - assets/icons/
diff --git a/server/map/__pycache__/get_markers.cpython-311.pyc b/server/map/__pycache__/get_markers.cpython-311.pyc
index e5f3f09001f62f2c0a6fd0b6f4fc14e388ba52d8..4f43c2c643b83f93529a84b9aa51357effcc2699 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/input_new_data.py b/server/map/input_new_data.py
index c5e2e25cb2f0c9e0c8cf00c13825b055b35a08fd..906b358bbe64f53f26d8e45643f7130a6956a9a5 100644
--- a/server/map/input_new_data.py
+++ b/server/map/input_new_data.py
@@ -2,6 +2,7 @@ import json
from datetime import datetime
from server.data_processing.process_lidar_data import height_in_area
+
# input_new_Lidar_data send new data gathered from the lidar and send it to the database (from the drone, most likely)
def input_new_Lidar_data(self, cursor, sensorId, bodyOfWater):
try:
@@ -10,7 +11,7 @@ def input_new_Lidar_data(self, cursor, sensorId, bodyOfWater):
cursor.execute('''
INSERT INTO Measurement( SensorID, TimeMeasured, WaterBodyName, WholeAverageThickness) VALUES
(?,?,?,?);
- ''', ( sensorId, datetime.utcnow().replace(microsecond=0), bodyOfWater, 0))
+ ''', (sensorId, datetime.utcnow().replace(microsecond=0), bodyOfWater, 0))
# auto generate new measurement id
measurement_id = cursor.lastrowid
@@ -31,19 +32,21 @@ def input_new_Lidar_data(self, cursor, sensorId, bodyOfWater):
position_data = cursor.fetchall()
# soon to be removed
- if(position_data):
+ if (position_data):
for row in position_data:
latitude, longitude, subID, groupID = row
- heights = height_in_area((latitude,longitude))
- if(len(heights) > 0):
+ heights = height_in_area((latitude, longitude))
+ if (len(heights) > 0):
print(heights)
else:
print("No height found")
- average = sum(heights)/len(heights)
+ average = sum(heights) / len(heights)
cursor.execute('''
INSERT INTO SubDivision(MeasurementID, SubDivisionID, GroupID, MinimumThickness, AverageThickness, CenterLatitude, CenterLongitude, Accuracy) VALUES
(?,?,?,?,?,?,?,?);
- ''',(measurement_id, subID, groupID, float(min(heights)), float(average), float(latitude), float(longitude), float(1)))
+ ''', (
+ measurement_id, subID, groupID, float(min(heights)), float(average), float(latitude), float(longitude),
+ float(1)))
else:
print('No data')
@@ -56,4 +59,4 @@ def input_new_Lidar_data(self, cursor, sensorId, bodyOfWater):
except Exception as e:
print("An error occurred", e)
# rollback in case of error
- cursor.connection.rollback()
\ No newline at end of file
+ cursor.connection.rollback()
diff --git a/server/sql_db/icedb b/server/sql_db/icedb
index 2b47b60d052434b9a32c5fa7d5bb044f59cf1974..602683cee2f038cd7944555292871f26c31a5827 100644
Binary files a/server/sql_db/icedb and b/server/sql_db/icedb differ