diff --git a/agent/src/data/parking.csv b/agent/src/data/parking.csv new file mode 100644 index 0000000..c006344 --- /dev/null +++ b/agent/src/data/parking.csv @@ -0,0 +1,22 @@ +longitude,latitude,empty_count +50.450386085935094,30.524547100067142,10 +50.450386085935094,30.524547100067142,11 +50.450386085935094,30.524547100067142,13 +50.450386085935094,30.524547100067142,15 +50.450386085935094,30.524547100067142,7 +50.450386085935094,30.524547100067142,9 +50.450386085935094,30.524547100067142,4 +50.450386085935094,30.524547100067142,0 +50.450386085935094,30.524547100067142,0 +50.450386085935094,30.524547100067142,3 +50.450386085935094,30.524547100067142,4 +50.450069433207545,30.52406822530458,16 +50.450069433207545,30.52406822530458,20 +50.450069433207545,30.52406822530458,25 +50.450069433207545,30.52406822530458,30 +50.450069433207545,30.52406822530458,29 +50.450069433207545,30.52406822530458,12 +50.450069433207545,30.52406822530458,10 +50.450069433207545,30.52406822530458,14 +50.450069433207545,30.52406822530458,3 +50.450069433207545,30.52406822530458,2 diff --git a/agent/src/domain/aggregated_data.py b/agent/src/domain/aggregated_data.py index 22de049..8d76335 100644 --- a/agent/src/domain/aggregated_data.py +++ b/agent/src/domain/aggregated_data.py @@ -2,9 +2,9 @@ from dataclasses import dataclass from datetime import datetime -from agent.src.domain.accelerometer import Accelerometer -from agent.src.domain.gps import Gps -from agent.src.domain.parking import Parking +from domain.accelerometer import Accelerometer +from domain.gps import Gps +from domain.parking import Parking @dataclass diff --git a/agent/src/domain/parking.py b/agent/src/domain/parking.py index 1f84043..9783148 100644 --- a/agent/src/domain/parking.py +++ b/agent/src/domain/parking.py @@ -1,6 +1,6 @@ from dataclasses import dataclass -from agent.src.domain.gps import Gps +from domain.gps import Gps @dataclass diff --git a/agent/src/file_datasource.py b/agent/src/file_datasource.py index de6d8a9..0425ca6 100644 --- a/agent/src/file_datasource.py +++ b/agent/src/file_datasource.py @@ -192,5 +192,5 @@ class FileDatasource: return Parking( gps=Gps(longitude=lon, latitude=lat), - empty_count=empty_count, + empty_count=empty_count ) diff --git a/agent/src/schema/aggregated_data_schema.py b/agent/src/schema/aggregated_data_schema.py index e6fa482..74fe497 100644 --- a/agent/src/schema/aggregated_data_schema.py +++ b/agent/src/schema/aggregated_data_schema.py @@ -1,10 +1,12 @@ from marshmallow import Schema, fields from schema.accelerometer_schema import AccelerometerSchema from schema.gps_schema import GpsSchema +from schema.parking_schema import ParkingSchema class AggregatedDataSchema(Schema): accelerometer = fields.Nested(AccelerometerSchema) gps = fields.Nested(GpsSchema) + parking = fields.Nested(ParkingSchema) timestamp = fields.DateTime("iso") user_id = fields.Int() diff --git a/agent/src/schema/parking_schema.py b/agent/src/schema/parking_schema.py index c6ecb1b..eabf208 100644 --- a/agent/src/schema/parking_schema.py +++ b/agent/src/schema/parking_schema.py @@ -1,6 +1,6 @@ from marshmallow import Schema, fields -from agent.src.schema.gps_schema import GpsSchema +from schema.gps_schema import GpsSchema class ParkingSchema(Schema):