amarillo/amarillo-enhancer
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Changed 'amarillo.app' to 'amarillo'

Browse source
This commit is contained in:
Csaba 2024-01-30 11:16:05 +01:00 committed by Holger Bruch
parent d491c42f25
commit 4da7d134fb
6 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
amarillo/plugins/enhancer/configuration.py
View file

@ -1,16 +1,16 @@
# separate file so that it can be imported without initializing FastAPI
from amarillo.app.utils.container import container
from amarillo.utils.container import container
import json
import logging
from glob import glob
from amarillo.app.models.Carpool import Carpool
from amarillo.app.services import stops
from amarillo.models.Carpool import Carpool
from amarillo.services import stops
from amarillo.plugins.enhancer.services import trips
from amarillo.plugins.enhancer.services.carpools import CarpoolService
from amarillo.plugins.enhancer.services import gtfs_generator
from amarillo.app.configuration import configure_services
from amarillo.configuration import configure_services
logger = logging.getLogger(__name__)

6
amarillo/plugins/enhancer/enhancer.py
View file

@ -6,9 +6,9 @@ from watchdog.observers import Observer
from watchdog.events import FileSystemEventHandler
from amarillo.plugins.enhancer.configuration import configure_enhancer_services
from amarillo.app.utils.container import container
from amarillo.app.models.Carpool import Carpool
from amarillo.app.utils.utils import agency_carpool_ids_from_filename
from amarillo.utils.container import container
from amarillo.models.Carpool import Carpool
from amarillo.utils.utils import agency_carpool_ids_from_filename
logging.config.fileConfig('logging.conf', disable_existing_loggers=False)
logger = logging.getLogger("enhancer")

4
amarillo/plugins/enhancer/services/carpools.py
View file

@ -2,8 +2,8 @@ import json
import logging
from datetime import datetime
from typing import Dict
from amarillo.app.models.Carpool import Carpool
from amarillo.app.utils.utils import yesterday, is_older_than_days
from amarillo.models.Carpool import Carpool
from amarillo.utils.utils import yesterday, is_older_than_days
logger = logging.getLogger(__name__)

8
amarillo/plugins/enhancer/services/gtfs_export.py
View file

@ -7,10 +7,10 @@ import gettext
import logging
import re
from amarillo.app.utils.utils import assert_folder_exists
from amarillo.app.models.gtfs import GtfsTimeDelta, GtfsFeedInfo, GtfsAgency, GtfsRoute, GtfsStop, GtfsStopTime, GtfsTrip, GtfsCalendar, GtfsCalendarDate, GtfsShape
from amarillo.app.services.stops import is_carpooling_stop
from amarillo.app.services.gtfs_constants import *
from amarillo.utils.utils import assert_folder_exists
from amarillo.models.gtfs import GtfsTimeDelta, GtfsFeedInfo, GtfsAgency, GtfsRoute, GtfsStop, GtfsStopTime, GtfsTrip, GtfsCalendar, GtfsCalendarDate, GtfsShape
from amarillo.services.stops import is_carpooling_stop
from amarillo.services.gtfs_constants import *
logger = logging.getLogger(__name__)

6
amarillo/plugins/enhancer/services/gtfs_generator.py
View file

@ -1,7 +1,7 @@
from amarillo.app.models.Carpool import Region
from amarillo.models.Carpool import Region
from amarillo.plugins.enhancer.services.gtfs_export import GtfsExport, GtfsFeedInfo, GtfsAgency
from amarillo.app.services.gtfs import GtfsRtProducer
from amarillo.app.utils.container import container
from amarillo.services.gtfs import GtfsRtProducer
from amarillo.utils.container import container
from glob import glob
import json
import schedule

12
amarillo/plugins/enhancer/services/trips.py
View file

@ -1,9 +1,9 @@
from amarillo.app.models.gtfs import GtfsTimeDelta, GtfsStopTime
from amarillo.app.models.Carpool import MAX_STOPS_PER_TRIP, Carpool, Weekday, StopTime, PickupDropoffType
from amarillo.app.services.gtfs_constants import *
from amarillo.app.services.routing import RoutingService, RoutingException
from amarillo.app.services.stops import is_carpooling_stop
from amarillo.app.utils.utils import assert_folder_exists, is_older_than_days, yesterday, geodesic_distance_in_m
from amarillo.models.gtfs import GtfsTimeDelta, GtfsStopTime
from amarillo.models.Carpool import MAX_STOPS_PER_TRIP, Carpool, Weekday, StopTime, PickupDropoffType
from amarillo.services.gtfs_constants import *
from amarillo.services.routing import RoutingService, RoutingException
from amarillo.services.stops import is_carpooling_stop
from amarillo.utils.utils import assert_folder_exists, is_older_than_days, yesterday, geodesic_distance_in_m
from shapely.geometry import Point, LineString, box
from geojson_pydantic.geometries import LineString as GeoJSONLineString
from datetime import datetime, timedelta