From 44dcda731f1d103520430308733711a8bbb30d0b Mon Sep 17 00:00:00 2001 From: Francia Csaba Date: Mon, 5 Feb 2024 15:33:09 +0100 Subject: [PATCH] fix import paths --- amarillo/plugins/enhancer/configuration.py | 2 +- amarillo/plugins/enhancer/services/gtfs.py | 2 +- amarillo/plugins/enhancer/services/gtfs_export.py | 2 +- amarillo/plugins/enhancer/services/trips.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/amarillo/plugins/enhancer/configuration.py b/amarillo/plugins/enhancer/configuration.py index dec2e88..b361d5d 100644 --- a/amarillo/plugins/enhancer/configuration.py +++ b/amarillo/plugins/enhancer/configuration.py @@ -5,7 +5,7 @@ import logging from glob import glob from amarillo.models.Carpool import Carpool -from amarillo.services import stops +from amarillo.plugins.enhancer.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 diff --git a/amarillo/plugins/enhancer/services/gtfs.py b/amarillo/plugins/enhancer/services/gtfs.py index c45a626..daafa98 100644 --- a/amarillo/plugins/enhancer/services/gtfs.py +++ b/amarillo/plugins/enhancer/services/gtfs.py @@ -1,6 +1,6 @@ import amarillo.services.gtfsrt.gtfs_realtime_pb2 as gtfs_realtime_pb2 import amarillo.services.gtfsrt.realtime_extension_pb2 as mfdzrte -from amarillo.services.gtfs_constants import * +from amarillo.plugins.enhancer.services.gtfs_constants import * from google.protobuf.json_format import MessageToDict from google.protobuf.json_format import ParseDict from datetime import datetime, timedelta diff --git a/amarillo/plugins/enhancer/services/gtfs_export.py b/amarillo/plugins/enhancer/services/gtfs_export.py index 50bef25..cad4588 100644 --- a/amarillo/plugins/enhancer/services/gtfs_export.py +++ b/amarillo/plugins/enhancer/services/gtfs_export.py @@ -10,7 +10,7 @@ import re from amarillo.utils.utils import assert_folder_exists from amarillo.models.gtfs import GtfsTimeDelta, GtfsFeedInfo, GtfsAgency, GtfsRoute, GtfsStop, GtfsTrip, GtfsCalendar, GtfsCalendarDate, GtfsShape, GtfsDriver, GtfsAdditionalRidesharingInfo from amarillo.models.Carpool import Driver, RidesharingInfo -from amarillo.services.stops import is_carpooling_stop +from amarillo.plugins.enhancer.services.stops import is_carpooling_stop from amarillo.plugins.enhancer.services.gtfs_constants import * from amarillo.utils.utils import geodesic_distance_in_m diff --git a/amarillo/plugins/enhancer/services/trips.py b/amarillo/plugins/enhancer/services/trips.py index 0a712b1..de2b4f0 100644 --- a/amarillo/plugins/enhancer/services/trips.py +++ b/amarillo/plugins/enhancer/services/trips.py @@ -2,7 +2,7 @@ from amarillo.models.gtfs import GtfsTimeDelta, GtfsStopTime from amarillo.models.Carpool import MAX_STOPS_PER_TRIP, Carpool, Weekday, StopTime, PickupDropoffType from amarillo.plugins.enhancer.services.gtfs_constants import * from amarillo.services.routing import RoutingService, RoutingException -from amarillo.services.stops import is_carpooling_stop +from amarillo.plugins.enhancer.services.stops import is_carpooling_stop from amarillo.utils.utils import assert_folder_exists, is_older_than_days, yesterday, geodesic_distance_in_m from amarillo.models.Carpool import Driver, RidesharingInfo from shapely.geometry import Point, LineString, box