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

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