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

Bugfix for Removing speed cameras from geometry index for Turkey, Switzerland, Macedonia and Cyprus.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2019-03-04 13:24:41 +03:00 • committed by Aleksandr Zatsepin
parent e5d303b5c4
commit e3383cc349
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
generator/feature_sorter.cpp
View file

@ -325,17 +325,18 @@ bool GenerateFinalFeatures(feature::GenerateInfo const & info, string const & na
// stores cellIds for middle points
CalculateMidPoints midPoints;
platform::CountryFile const country(name);
ForEachFromDatRawFormat(srcFilePath,
[&midPoints, &country](FeatureBuilder1 const & ft, uint64_t pos) {
// Removing speed cameras from geometry index for some countries.
if (routing::AreSpeedCamerasProhibited(country) && ft.IsPoint() &&
classif().GetTypeByPath({"highway", "speed_camera"}))
{
return;
}
bool const speedCamerasProhibitedMwm = routing::AreSpeedCamerasProhibited(country);
uint32_t const speedCameraType = classif().GetTypeByPath({"highway", "speed_camera"});
ForEachFromDatRawFormat(srcFilePath, [&speedCamerasProhibitedMwm, &speedCameraType, &midPoints](
FeatureBuilder1 const & ft, uint64_t pos) {
// Removing point features with speed cameras type from geometry index for some countries.
if (speedCamerasProhibitedMwm && ft.IsPoint() && ft.HasType(speedCameraType))
{
return;
}
midPoints(ft, pos);
});
midPoints(ft, pos);
});
// sort features by their middle point
midPoints.Sort();