Steev/GeoTracking
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
steev
2025-01-09 01:15:20 +01:00
parent 77cf71e288
commit c97499196c
12 changed files with 6308 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/driverHandler.py
View File

@ -1,5 +1,6 @@
from sqlalchemy.orm import Session
from errors.NotFoundException import NotFoundError
from modules.geoObjects import Driver
@ -27,14 +28,13 @@ class DriverHandler:
raise RuntimeError(f"failed to create driver with errors{e}")
# handles getting a driver by its id from the database
def getDriver(self, driverID: int):
def getDriver(self, driverID: int) -> Driver:
try:
driver = self.dbSession.query(Driver).filter_by(id=driverID).first()
return {
"id": driver.id,
"name": driver.name
}
if driver:
return driver
else:
raise NotFoundError(f"Driver with ID {driverID} not found", errors=[])
except Exception as e:
raise RuntimeError(f"failed to get driver with errors{e}")

32
modules/geoObjects.py
View File

@ -1,7 +1,7 @@
from sqlalchemy import create_engine, Column, Table, ForeignKey, Index, UniqueConstraint, MetaData, SmallInteger, Integer, String, Date, DateTime, Float, Boolean, Text, Numeric, DateTime
from sqlalchemy.orm import relationship, sessionmaker
from sqlalchemy import create_engine, Column, ForeignKey, Integer, String, Date, Float, DateTime
from sqlalchemy.orm import relationship, sessionmaker
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.pool import NullPool
from sqlalchemy.pool import NullPool
from sqlalchemy.exc import OperationalError
Base = declarative_base()
@ -28,7 +28,7 @@ def create_table(engine):
print("Keine Verbindung zur Datenbank verfügbar.")
except Exception as e:
print(f"Fehler bei der Tabellenerstellung: {e}")
class Track(Base):
__tablename__ = 'track'
id = Column(Integer, primary_key=True, autoincrement=True)
@ -38,14 +38,10 @@ class Track(Base):
date = Column(Date, nullable=True)
distance = Column(Float, nullable=False, default=0)
speed = Column(Float, nullable=False, default=0)
start = Column(DateTime, nullable=False)
end = Column(DateTime, nullable=False)
# Beziehungen zu anderen Tabellen
driver = relationship("Driver", backref="vehicle_tracks") # 'vehicle_tracks' als backref
vehicle = relationship("Vehicle", backref="driver_tracks") # 'driver_tracks' als backref
waypoints = relationship('Waypoint', backref='track', lazy=True)
driver = relationship('Driver', back_populates='tracks')
vehicle = relationship('Vehicle', back_populates='tracks')
class Waypoint(Base):
__tablename__ = 'waypoint'
@ -57,20 +53,16 @@ class Waypoint(Base):
time = Column(DateTime, nullable=True)
track_id = Column(Integer, ForeignKey('track.id'), nullable=False)
class Driver(Base):
__tablename__ = 'driver'
id = Column(Integer, primary_key=True, autoincrement=True)
name = Column(String, nullable=False)
# Beziehung zu Track, zurück über 'tracks' auf Track-Seite
tracks = relationship("Track", back_populates='driver')
id = Column(Integer, primary_key=True)
name = Column(String, nullable=False)
tracks = relationship("Track", back_populates="driver") # Beziehung von Track -> Driver
class Vehicle(Base):
__tablename__ = 'vehicle'
id = Column(Integer, primary_key=True, autoincrement=True)
id = Column(Integer, primary_key=True)
name = Column(String, nullable=False)
# Beziehung zu Track, zurück über 'tracks' auf Track-Seite
tracks = relationship('Track', back_populates='vehicle')
tracks = relationship("Track", back_populates="vehicle") # Beziehung von Track -> Vehicle

54
modules/gpxInterpreter.py
View File

@ -6,7 +6,7 @@ from geojson import Feature, LineString
from geopy.distance import geodesic
from errors.NotFoundException import NotFoundError
from modules.geoObjects import Track, Waypoint
from modules.geoObjects import Driver, Track, Vehicle, Waypoint
class GPXHandler:
__dbSession: Session
@ -16,8 +16,9 @@ class GPXHandler:
pass
# handles converting a gpx file into usable data
def parse(self, file, driver, vehicle):
self.__gpx = gpxpy.parse(file)
def parse(self, file, driver:Driver, vehicle:Vehicle):
print(f"filename: {file}")
self.__gpx = gpxpy.parse(open(f"./uploads/{file}"))
if not driver:
raise ValueError("no driver found")
@ -34,47 +35,45 @@ class GPXHandler:
trackName = track.name or f"Track-{datetime.now().isoformat()}" # todo using time.now might end up being misleading and to be reworked
# initializes track values
self.__startTime,
self.__endTime,
self.__trackDistance,
self.__waypoints = None, None, 0, []
self.startTime = None
self.endTime = None
self.trackDistance = 0
self.waypoints = []
# grab all waypoints from a track
for segment in track.segments:
for point in segment.points:
self.__waypoints.append(point)
if start_time is None or point.time < start_time:
start_time = point.time
if end_time is None or point.time > end_time:
end_time = point.time
self.waypoints.append(point)
if self.startTime is None or point.time < self.startTime:
self.startTime = point.time
if self.endTime is None or point.time > self.endTime:
self.endTime = point.time
# calculate distance between 2 waypoints
for i in range(1, len(self.__waypoints)):
total_distance += self.__waypoints[i - 1].distance_3d(self.__waypoints[i])
for i in range(1, len(self.waypoints)):
self.trackDistance += self.waypoints[i - 1].distance_3d(self.waypoints[i])
# push values to the database
track = Track(
trackName=trackName,
vehicle=vehicle.id,
driver=driver.id,
date=start_time.date() if start_time else None,
distance=total_distance,
vehicle=vehicle,
driver=driver,
date=self.startTime.date() if self.startTime else None,
distance=self.trackDistance,
speed=0,
start=start_time,
end=end_time
)
self.__dbSession.add(track)
self.__dbSession.commit()
for point in self.__waypoints:
for point in self.waypoints:
waypoint = Waypoint(
lat=point.latitude,
lon=point.longitude,
ele=point.elevation,
speed=None,
time=point.time,
track=track.id
track=track
)
self.__dbSession.add(waypoint)
@ -84,10 +83,11 @@ class GPXHandler:
def getTrack(self, trackID):
track = self.__dbSession.query(Track).filter_by(id=trackID).first()
if not track:
raise NotFoundError(f"track with id {trackID} not found")
raise NotFoundError(f"track with id {trackID} not found", errors=[])
# fetches waypoints for a given track and converts them into geoJSON
waypoints = self.__dbSession.query(Waypoint).filter_by(track=track.id).all()
waypoints = track.waypoints
coordinates = [(wp.lon, wp.lat) for wp in waypoints]
feature = Feature(geometry=LineString(coordinates))
return feature
@ -109,8 +109,8 @@ class GPXHandler:
# "name": track.vehicle.name
# } if track.vehicle else None,
# "distance": track.distance,
# "start_time": track.start.isoformat() if track.start else None,
# "end_time": track.end.isoformat() if track.end else None,
# "startTime": track.start.isoformat() if track.start else None,
# "endTime": track.end.isoformat() if track.end else None,
}
for track in tracks # iterates all tracks and appends them to the list
]
@ -134,7 +134,7 @@ class GPXHandler:
"name": track.vehicle.name
} if track.vehicle else None,
"distance": track.distance,
"start_time": track.start.isoformat() if track.start else None,
"startTime": track.start.isoformat() if track.start else None,
"end_time": track.end.isoformat() if track.end else None,
}
for track in tracks # iterates all tracks and appends them to the list

7
modules/vehicleHandler.py
View File

@ -22,13 +22,10 @@ class VehicleHandler:
return vehicle
# handles getting a vehicle identified with its id from the database
def getVehicle(self, vehicleID:int):
def getVehicle(self, vehicleID:int) -> Vehicle:
vehicle = self.dbSession.query(Vehicle).filter_by(id=vehicleID).first()
return {
"id": vehicle.id,
"name": vehicle.name
}
return vehicle
# handles getting all vehicles from database
def getVehicles(self):