fix: 🐛 fixed issue in both back and frontend that would prevent geojson data from beeing loaded

This commit is contained in:
2025-01-09 01:15:20 +01:00
parent 77cf71e288
commit c97499196c
12 changed files with 6308 additions and 187 deletions

52
app.py
View File

@@ -7,7 +7,7 @@ from sqlalchemy.orm import sessionmaker, Session
from modules.driverHandler import DriverHandler
from modules.gpxInterpreter import GPXHandler
from modules.vehicleHandler import VehicleHandler
from modules.geoObjects import create_table, db_connect
from modules.geoObjects import Waypoint, create_table, db_connect, Driver, Vehicle
from flask_cors import CORS, cross_origin
root = logging.getLogger()
@@ -52,7 +52,9 @@ def serve_vue_app():
@cross_origin()
def getTrack():
if "start" in request.args and "end" in request.args or "track" in request.args:
app.logger.debug(f"found arguments {request.args}")
if ("start" in request.args and "end" in request.args) or ("id" in request.args):
if "start" in request.args and "end" in request.args:
# get tracks by filter
start = request.args["start"]
@@ -60,21 +62,23 @@ def getTrack():
try:
return gpxHandler.getTracksInTime(start, request.args["end"]), 200
except Exception as e:
app.logger.debug(f"failed to search tracks error {
e} values: start={start}, end={end}")
app.logger.debug(f"failed to search tracks error {e} values: start={start}, end={end}")
return f"error {e}", 500
elif "track" in request.args:
elif "id" in request.args:
# get track by id
track = int(request.args["track"])
trackID = int(request.args["id"])
try:
return gpxHandler.getTrack(track), 200
app.logger.debug(f"Request args: {request.args}")
app.logger.debug(f"track id {trackID}")
track = gpxHandler.getTrack(trackID)
app.logger.debug(f"returned track {track}")
return jsonify(track), 200
except Exception as e:
app.logger.debug(f"fetching track {
track} failed with error {e}")
app.logger.debug(f"fetching track failed with error {e}")
return f"error {e}", 500
pass
else:
try:
# gets all tracks as list
@@ -181,18 +185,32 @@ def uploadFile():
app.logger.debug("no file was found in clients request")
return "no file provided", 400
if request.args["routeName"] == '':
app.logger.debug("client did not provide any name for uploaded route")
return "no route name provided", 400
file = request.files['file']
if file.filename == '':
app.logger.debug("filename was found empty")
return "no file selected", 400
try:
app.logger.debug(f"attempting to parse file: {file.name}")
gpxHandler.parse(file, request.args["routeName"])
app.logger.debug(f"Received file: {file.filename}, size: {len(file.read())} bytes")
file.seek(0) # Setzt den Datei-Zeiger zurück, nachdem die Größe abgerufen wurde.
file_path = f'./uploads/{file.filename}'
with open(file_path, 'wb') as f:
f.write(file.read())
driver = driverHandler.getDriver(1)
vehicle = vehicleHandler.getVehicle(1)
app.logger.debug(f"driver {driver.id}")
app.logger.debug(f"vehicle {vehicle.id}")
if not driver or not vehicle:
raise ValueError("Driver or vehicle not found")
app.logger.debug(f"attempting to parse file: {file.filename}")
gpxHandler.parse(file.filename, driver, vehicle)
return "file stored succesfull", 200
except Exception as e:
app.logger.debug(f"storing gpx file failed with error {e}")