diff --git a/generator/camera_info_collector.cpp b/generator/camera_info_collector.cpp index add2eb4799..16cb427de2 100644 --- a/generator/camera_info_collector.cpp +++ b/generator/camera_info_collector.cpp @@ -30,7 +30,7 @@ CamerasInfoCollector::CamerasInfoCollector(std::string const & dataFilePath, std::string const & osmIdsToFeatureIdsPath) { std::map osmIdToFeatureId; - if (!routing::ParseOsmIdToFeatureIdMapping(osmIdsToFeatureIdsPath, osmIdToFeatureId)) + if (!routing::ParseRoadsOsmIdToFeatureIdMapping(osmIdsToFeatureIdsPath, osmIdToFeatureId)) { LOG(LCRITICAL, ("An error happened while parsing feature id to osm ids mapping from file:", osmIdsToFeatureIdsPath)); diff --git a/generator/descriptions_section_builder.cpp b/generator/descriptions_section_builder.cpp index c1b1b84cfa..68f74e93a2 100644 --- a/generator/descriptions_section_builder.cpp +++ b/generator/descriptions_section_builder.cpp @@ -35,7 +35,7 @@ WikidataHelper::WikidataHelper(std::string const & mwmPath, std::string const & , m_idToWikidataPath(idToWikidataPath) { std::string const osmIdsToFeatureIdsPath = m_mwmPath + OSM2FEATURE_FILE_EXTENSION; - if (!routing::ParseFeatureIdToOsmIdMapping(osmIdsToFeatureIdsPath, m_featureIdToOsmId)) + if (!routing::ParseRoadsFeatureIdToOsmIdMapping(osmIdsToFeatureIdsPath, m_featureIdToOsmId)) LOG(LCRITICAL, ("Error parse OsmIdToFeatureId mapping.")); std::ifstream stream; diff --git a/generator/maxspeeds_builder.cpp b/generator/maxspeeds_builder.cpp index 58cac582e8..0f65898909 100644 --- a/generator/maxspeeds_builder.cpp +++ b/generator/maxspeeds_builder.cpp @@ -185,7 +185,7 @@ void BuildMaxspeedsSection(string const & dataPath, string const & osmToFeatureP LOG(LINFO, ("BuildMaxspeedsSection(", dataPath, ",", osmToFeaturePath, ",", maxspeedsFilename, ")")); map featureIdToOsmId; - CHECK(ParseFeatureIdToOsmIdMapping(osmToFeaturePath, featureIdToOsmId), ()); + CHECK(ParseRoadsFeatureIdToOsmIdMapping(osmToFeaturePath, featureIdToOsmId), ()); BuildMaxspeedsSection(dataPath, featureIdToOsmId, maxspeedsFilename); } } // namespace routing diff --git a/generator/metalines_builder.cpp b/generator/metalines_builder.cpp index 4a7a263925..db14339937 100644 --- a/generator/metalines_builder.cpp +++ b/generator/metalines_builder.cpp @@ -202,7 +202,7 @@ bool WriteMetalinesSection(std::string const & mwmPath, std::string const & meta std::string const & osmIdsToFeatureIdsPath) { std::map osmIdToFeatureId; - if (!routing::ParseOsmIdToFeatureIdMapping(osmIdsToFeatureIdsPath, osmIdToFeatureId)) + if (!routing::ParseRoadsOsmIdToFeatureIdMapping(osmIdsToFeatureIdsPath, osmIdToFeatureId)) return false; FileReader reader(metalinesPath); diff --git a/generator/restriction_collector.cpp b/generator/restriction_collector.cpp index aeb0ffa73f..27a02570a8 100644 --- a/generator/restriction_collector.cpp +++ b/generator/restriction_collector.cpp @@ -41,7 +41,7 @@ RestrictionCollector::RestrictionCollector(std::string const & restrictionPath, m_restrictions.clear(); }); - if (!ParseOsmIdToFeatureIdMapping(osmIdsToFeatureIdPath, m_osmIdToFeatureId)) + if (!ParseRoadsOsmIdToFeatureIdMapping(osmIdsToFeatureIdPath, m_osmIdToFeatureId)) { LOG(LWARNING, ("An error happened while parsing feature id to osm ids mapping from file:", osmIdsToFeatureIdPath)); diff --git a/generator/road_access_generator.cpp b/generator/road_access_generator.cpp index 03e389a094..1defec8ac4 100644 --- a/generator/road_access_generator.cpp +++ b/generator/road_access_generator.cpp @@ -351,7 +351,7 @@ RoadAccessCollector::RoadAccessCollector(string const & dataFilePath, string con string const & osmIdsToFeatureIdsPath) { map osmIdToFeatureId; - if (!ParseOsmIdToFeatureIdMapping(osmIdsToFeatureIdsPath, osmIdToFeatureId)) + if (!ParseRoadsOsmIdToFeatureIdMapping(osmIdsToFeatureIdsPath, osmIdToFeatureId)) { LOG(LWARNING, ("An error happened while parsing feature id to osm ids mapping from file:", osmIdsToFeatureIdsPath)); diff --git a/generator/routing_helpers.cpp b/generator/routing_helpers.cpp index 1d7b076112..ba306ca0ee 100644 --- a/generator/routing_helpers.cpp +++ b/generator/routing_helpers.cpp @@ -33,8 +33,8 @@ void AddFeatureId(base::GeoObjectId osmId, uint32_t featureId, osmIdToFeatureId.emplace(osmId, featureId); } -bool ParseOsmIdToFeatureIdMapping(string const & osmIdsToFeatureIdPath, - map & osmIdToFeatureId) +bool ParseRoadsOsmIdToFeatureIdMapping(string const & osmIdsToFeatureIdPath, + map & osmIdToFeatureId) { return ForEachRoadFromFile(osmIdsToFeatureIdPath, [&](uint32_t featureId, base::GeoObjectId osmId) { @@ -42,8 +42,8 @@ bool ParseOsmIdToFeatureIdMapping(string const & osmIdsToFeatureIdPath, }); } -bool ParseFeatureIdToOsmIdMapping(string const & osmIdsToFeatureIdPath, - map & featureIdToOsmId) +bool ParseRoadsFeatureIdToOsmIdMapping(string const & osmIdsToFeatureIdPath, + map & featureIdToOsmId) { featureIdToOsmId.clear(); bool idsAreOk = true; diff --git a/generator/routing_helpers.hpp b/generator/routing_helpers.hpp index 54fd988ee7..313556233e 100644 --- a/generator/routing_helpers.hpp +++ b/generator/routing_helpers.hpp @@ -28,8 +28,8 @@ void AddFeatureId(base::GeoObjectId osmId, uint32_t featureId, // 137999, 5170186, // 138000, 5170209, 5143342, // 138001, 5170228, -bool ParseOsmIdToFeatureIdMapping(std::string const & osmIdsToFeatureIdPath, - std::map & osmIdToFeatureId); -bool ParseFeatureIdToOsmIdMapping(std::string const & osmIdsToFeatureIdPath, - std::map & featureIdToOsmId); +bool ParseRoadsOsmIdToFeatureIdMapping(std::string const & osmIdsToFeatureIdPath, + std::map & osmIdToFeatureId); +bool ParseRoadsFeatureIdToOsmIdMapping(std::string const & osmIdsToFeatureIdPath, + std::map & featureIdToOsmId); } // namespace routing diff --git a/generator/routing_index_generator.cpp b/generator/routing_index_generator.cpp index 117bc128d2..66d3c29753 100644 --- a/generator/routing_index_generator.cpp +++ b/generator/routing_index_generator.cpp @@ -267,7 +267,7 @@ void CalcCrossMwmTransitions( { VehicleMaskBuilder const maskMaker(country, countryParentNameGetterFn); map featureIdToOsmId; - CHECK(ParseFeatureIdToOsmIdMapping(mappingFile, featureIdToOsmId), + CHECK(ParseRoadsFeatureIdToOsmIdMapping(mappingFile, featureIdToOsmId), ("Can't parse feature id to osm id mapping. File:", mappingFile)); ForEachFromDat(mwmFile, [&](FeatureType & f, uint32_t featureId) {