RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Renaming mapping.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2017-10-25 15:09:43 +03:00 • committed by mpimenov
parent f8545f9871
commit 2299f4c5a4
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
generator/transit_generator.cpp
View file

@ -166,13 +166,13 @@ void CalculateEdgeWeight(vector<Stop> const & stops, vector<transit::Edge> & edg
}
}
void FillOsmIdToFeatureIdMap(string const & osmIdsToFeatureIdPath, OsmIdToFeatureIdsMap & map)
void FillOsmIdToFeatureIdsMap(string const & osmIdToFeatureIdsPath, OsmIdToFeatureIdsMap & map)
{
CHECK(ForEachOsmId2FeatureId(osmIdsToFeatureIdPath,
CHECK(ForEachOsmId2FeatureId(osmIdToFeatureIdsPath,
[&map](osm::Id const & osmId, uint32_t featureId) {
map[osmId].push_back(featureId);
}),
(osmIdsToFeatureIdPath));
(osmIdToFeatureIdsPath));
}
} // namespace
@ -221,7 +221,7 @@ void DeserializerFromJson::operator()(StopIdRanges & rs, char const * name)
}
void BuildTransit(string const & mwmDir, string const & countryId,
string const & osmIdsToFeatureIdPath, string const & transitDir)
string const & osmIdToFeatureIdsPath, string const & transitDir)
{
LOG(LERROR, ("This method is under construction and should not be used for building production mwm "
"sections."));
@ -258,7 +258,7 @@ void BuildTransit(string const & mwmDir, string const & countryId,
CHECK(root.get() != nullptr, ("Cannot parse the json file:", graphFullPath));
OsmIdToFeatureIdsMap mapping;
FillOsmIdToFeatureIdMap(osmIdsToFeatureIdPath, mapping);
FillOsmIdToFeatureIdsMap(osmIdToFeatureIdsPath, mapping);
// Note. |gates| has to be deserialized from json before starting writing transit section to mwm since
// the mwm is used to filled |gates|.

4
generator/transit_generator.hpp
View file

@ -110,12 +110,12 @@ private:
/// \brief Builds the transit section in the mwm.
/// \param mwmDir relative or full path to a directory where mwm is located.
/// \param countryId is an mwm name without extension of the processed mwm.
/// \param osmIdsToFeatureIdPath is a path to a file with osm ids to feature id mapping.
/// \param osmIdToFeatureIdsPath is a path to a file with osm id to feature ids mapping.
/// \param transitDir a path to directory with json files with transit graphs.
/// \note An mwm pointed by |mwmPath| should contain:
/// * feature geometry
/// * index graph (ROUTING_FILE_TAG)
void BuildTransit(string const & mwmDir, string const & countryId,
string const & osmIdsToFeatureIdPath, string const & transitDir);
string const & osmIdToFeatureIdsPath, string const & transitDir);
} // namespace transit
} // namespace routing