diff --git a/README.md b/README.md
index 709b9a666cfc59a5f4ccaff60cd16599a714e1e6..b033a30410705a742f4498310bac635e1bce73c6 100644
--- a/README.md
+++ b/README.md
@@ -1,50 +1,20 @@
# PROG2900
-## Database setup
-This project requires the use of MongoDB. To use the application, a MongoDB Atlas database must first be set up and configured. The following is a step by step guide of how to set up the database:
-1. Create a user/Log into MongoDB Atlas (https://www.mongodb.com/atlas)
-2. ?Create an organization?
-3. On the left-hand side in the menu under "Organization", press the "Project" tab.
+## Dependencies
+### Python
+To run the server...
-
+### Dart & Flutter
-4. In the right-hand corner, press "New Project" and name it as you wish.
-
+### Database
+This project requires SQLite3. Download the precompiled binary for your operating system.
+Precompiled binaries can be found on https://www.sqlite.org/download.html. Extract the downloaded
+binary in a folder and note its path. Add the path to your system environment variables. Now you can
+manage the SQLite database.
-5. After successful creation, you should be taken to a page called "Overview". In the middle of the page right below "Create a deployment", press the button that says "+ Create"
+## Endpoints
-
+## Bugs
-6. When creating a database deployment, select the M10 template. The provider and region can be selected as is most fit to the organization.
-
-
-
-7. Name your cluster appropriately. Optionally, give your cluster tags. Press "Create".
-
-
-
-8. After deploying the database you will be taken to the Security Quickstart page. Choose the option "certificate", and chose an appropriate "Common Name". Toggle the "Download certificate when user is added" on, and select a certificate expiration. Then press the "Add User" button.
-
-
-
-9. After pressing "Add User", the access certificate will automatically be downloaded to your PC. The certificate will be used to access your database, and should be kept in a safe location to prevent unauthorized access.
-
-
-
-10. Still in the Security Quickstart page, scroll down to the "Where would you like to connect from?" section. Press "Add My Current IP Address", and then press "Finish and close" at the bottom of the page.
-
-
-
-
-
-11. You have now created a database deployment, but you will still have to configure the connection to the database.
-
-### Database connection
-1. To create a connection with the database, locate your newly created database deployment and press "Connect"
-
-
-
-2. Select "Drivers"
-
-
\ No newline at end of file
+## Developers
diff --git a/images/image-1.png b/images/image-1.png
deleted file mode 100644
index 4a01edda1b1b0624db6bc0bfa067d187cda7544d..0000000000000000000000000000000000000000
Binary files a/images/image-1.png and /dev/null differ
diff --git a/images/image-10.png b/images/image-10.png
deleted file mode 100644
index 74a20ec788593028d6aeafab58e39e08d3197f3a..0000000000000000000000000000000000000000
Binary files a/images/image-10.png and /dev/null differ
diff --git a/images/image-11.png b/images/image-11.png
deleted file mode 100644
index 8ecd4ac7e1395a76620f9aaca863c40e8fcec1c3..0000000000000000000000000000000000000000
Binary files a/images/image-11.png and /dev/null differ
diff --git a/images/image-12.png b/images/image-12.png
deleted file mode 100644
index e37a41e9e6c2e8a707dd138dc758db14acb0f783..0000000000000000000000000000000000000000
Binary files a/images/image-12.png and /dev/null differ
diff --git a/images/image-2.png b/images/image-2.png
deleted file mode 100644
index ef5e7c891df03b5b346631bb9026f67374cceb03..0000000000000000000000000000000000000000
Binary files a/images/image-2.png and /dev/null differ
diff --git a/images/image-3.png b/images/image-3.png
deleted file mode 100644
index 75c4259c2d093959cfacd40abaf28135b767ba42..0000000000000000000000000000000000000000
Binary files a/images/image-3.png and /dev/null differ
diff --git a/images/image-4.png b/images/image-4.png
deleted file mode 100644
index aba6cbcf1d59db141118ebf4e996782ea506f6cb..0000000000000000000000000000000000000000
Binary files a/images/image-4.png and /dev/null differ
diff --git a/images/image-5.png b/images/image-5.png
deleted file mode 100644
index 32b4cbbe9adf893879521b95cd0684f70c7b554f..0000000000000000000000000000000000000000
Binary files a/images/image-5.png and /dev/null differ
diff --git a/images/image-6.png b/images/image-6.png
deleted file mode 100644
index 639d2e7a538e5483b1331dc4e6ca8b7163248995..0000000000000000000000000000000000000000
Binary files a/images/image-6.png and /dev/null differ
diff --git a/images/image-7.png b/images/image-7.png
deleted file mode 100644
index d75d8313fb384adb26df0accd2fa4554573657c8..0000000000000000000000000000000000000000
Binary files a/images/image-7.png and /dev/null differ
diff --git a/images/image-8.png b/images/image-8.png
deleted file mode 100644
index 3b81d810090e75499b1055c308c7b55d47075179..0000000000000000000000000000000000000000
Binary files a/images/image-8.png and /dev/null differ
diff --git a/images/image-9.png b/images/image-9.png
deleted file mode 100644
index 79c53a4381985e84bf4e4aff560c68ff054915f8..0000000000000000000000000000000000000000
Binary files a/images/image-9.png and /dev/null differ
diff --git a/images/image.png b/images/image.png
deleted file mode 100644
index 847917d85ceaf24ded183cfb356e56f449fb487c..0000000000000000000000000000000000000000
Binary files a/images/image.png and /dev/null differ
diff --git a/server/main.py b/server/main.py
index 8d2a01bae1921be008ab27d8b9628038f68d2101..d5ed93ee1e3635059ca10aad893ccfcc9af65cdf 100644
--- a/server/main.py
+++ b/server/main.py
@@ -10,7 +10,6 @@ import sqlite3
app = Flask(__name__)
terminate_server = 0
-
class IceHTTPServer(HTTPServer):
def __init__(self, server_address, handler_class, cursor):
super().__init__(server_address, handler_class)
diff --git a/server/map/__pycache__/get_markers.cpython-311.pyc b/server/map/__pycache__/get_markers.cpython-311.pyc
index 9022d0973498de25e88a2027322312cc421a0be4..7dbac2b7ec9e41b54e8502402b73e37c0dd244fc 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 74d2678cf85d0df7f35710cff88cd0138f9b8575..48ce0673ae784d89649013246a802d65c874d6c5 100644
--- a/server/map/get_markers.py
+++ b/server/map/get_markers.py
@@ -33,22 +33,22 @@ def get_all_markers(self, cursor, valid: bool, waterBodyName):
for row in rows:
measurement_id = row[0]
- # Create subdivision object for current row
+ # Create subdivision new object
sub_division = {
- 'SubDivisionID': row[6],
+ 'SubdivID': row[6],
'GroupID': row[7],
- 'MinimumThickness': row[8],
- 'AverageThickness': row[9],
- 'CenterLatitude': row[10],
- 'CenterLongitude': row[11],
+ 'MinThickness': row[8],
+ 'AvgThickness': row[9],
+ 'CenLatitude': row[10],
+ 'CenLongitude': row[11],
'Accuracy': row[12]
}
# Check if measurement ID already exists in measurement_data
if measurement_id in measurement_data:
# Check if the data object already exists in the list
- if sub_division not in measurement_data[measurement_id]['SubDivision']:
- measurement_data[measurement_id]['SubDivision'].append(sub_division)
+ if sub_division not in measurement_data[measurement_id]['Subdivisions']:
+ measurement_data[measurement_id]['Subdivisions'].append(sub_division)
else:
# Create a new entry for measurement_id if it does not already exist in the list
@@ -60,14 +60,14 @@ def get_all_markers(self, cursor, valid: bool, waterBodyName):
'SensorType': row[3],
'Active': bool(row[4])
},
- 'SubDivision': [sub_division], # Array of sub_division objects
+ 'Subdivisions': [sub_division], # Array of sub_division objects
}
# Convert dictionary values to list of measurements
data = list(measurement_data.values())
if len(rows) == 0 or len(data) == 0: # Return 500 and empty list if no data is found
- print(f"An error occurred while querying the database")
+ print(f"Error in querying database")
resp_code = 500
marker_data = '[]'
else: