diff --git a/tools/python/maps_generator/generator/env.py b/tools/python/maps_generator/generator/env.py index cf8d12dbb3..594a6d2b31 100644 --- a/tools/python/maps_generator/generator/env.py +++ b/tools/python/maps_generator/generator/env.py @@ -212,6 +212,12 @@ class PathProvider: def transit_path(self) -> AnyStr: return self.intermediate_data_path + @property + def transit_path_experimental(self) -> AnyStr: + return os.path.join( + self.intermediate_data_path, "transit_from_gtfs" + ) + @property def planet_osm_pbf(self) -> AnyStr: return os.path.join(self.build_path, f"{settings.PLANET}.osm.pbf") diff --git a/tools/python/maps_generator/generator/gen_tool.py b/tools/python/maps_generator/generator/gen_tool.py index ee41cd55d0..fb680b73c7 100644 --- a/tools/python/maps_generator/generator/gen_tool.py +++ b/tools/python/maps_generator/generator/gen_tool.py @@ -71,6 +71,7 @@ class GenTool: "regions_key_value": str, "srtm_path": str, "transit_path": str, + "transit_path_experimental": str, "ugc_data": str, "uk_postcodes_dataset": str, "us_postcodes_dataset": str, diff --git a/tools/python/maps_generator/generator/settings.py b/tools/python/maps_generator/generator/settings.py index 31bf0f4692..0ab2f54b06 100644 --- a/tools/python/maps_generator/generator/settings.py +++ b/tools/python/maps_generator/generator/settings.py @@ -106,6 +106,7 @@ PROMO_CATALOG_CITIES_URL = "" PROMO_CATALOG_COUNTRIES_URL = "" POPULARITY_URL = "" SUBWAY_URL = "" +TRANSIT_URL = "" FOOD_URL = "" FOOD_TRANSLATIONS_URL = "" UK_POSTCODES_URL = "" @@ -232,6 +233,7 @@ def init(default_settings_path: AnyStr): global PROMO_CATALOG_COUNTRIES_URL global POPULARITY_URL global SUBWAY_URL + global TRANSIT_URL global FOOD_URL global UK_POSTCODES_URL global US_POSTCODES_URL @@ -254,6 +256,7 @@ def init(default_settings_path: AnyStr): ) POPULARITY_URL = cfg.get_opt_path("External", "POPULARITY_URL", POPULARITY_URL) SUBWAY_URL = cfg.get_opt("External", "SUBWAY_URL", SUBWAY_URL) + TRANSIT_URL = cfg.get_opt("External", "TRANSIT_URL", TRANSIT_URL) FOOD_URL = cfg.get_opt("External", "FOOD_URL", FOOD_URL) UK_POSTCODES_URL = cfg.get_opt("External", "UK_POSTCODES_URL", UK_POSTCODES_URL) diff --git a/tools/python/maps_generator/generator/steps.py b/tools/python/maps_generator/generator/steps.py index 4b74a88dd0..4976cbb9d2 100644 --- a/tools/python/maps_generator/generator/steps.py +++ b/tools/python/maps_generator/generator/steps.py @@ -314,6 +314,7 @@ def step_routing_transit(env: Env, country: AnyStr, **kwargs): intermediate_data_path=env.paths.intermediate_data_path, user_resource_path=env.paths.user_resource_path, transit_path=env.paths.transit_path, + transit_path_experimental=env.paths.transit_path_experimental, make_transit_cross_mwm=True, output=country, **kwargs,