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

[generator] Moved code for removing speed cameras in prohibited mwms to 'feature' stage.

Browse source
This commit is contained in:
Maksim Andrianov 2019-12-10 17:24:50 +03:00 • committed by mpimenov
parent 9c1ff607f9
commit b443c4f0bb
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
generator/feature_sorter.cpp
View file

@ -311,16 +311,8 @@ bool GenerateFinalFeatures(feature::GenerateInfo const & info, string const & na
// stores cellIds for middle points
CalculateMidPoints midPoints;
platform::CountryFile const country(name);
bool const speedCamerasProhibitedMwm = routing::AreSpeedCamerasProhibited(country);
uint32_t const speedCameraType = classif().GetTypeByPath({"highway", "speed_camera"});
ForEachFromDatRawFormat(srcFilePath, [&speedCamerasProhibitedMwm, &speedCameraType, &midPoints](
FeatureBuilder 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);
ForEachFromDatRawFormat(srcFilePath, [&midPoints](FeatureBuilder const & fb, uint64_t pos) {
midPoints(fb, pos);
});
// sort features by their middle point

12
generator/final_processor_intermediate_mwm.cpp
View file

@ -12,6 +12,8 @@
#include "generator/type_helper.hpp"
#include "generator/utils.hpp"
#include "routing/speed_camera_prohibition.hpp"
#include "indexer/classificator.hpp"
#include "indexer/feature_algo.hpp"
@ -469,9 +471,19 @@ void CountryFinalProcessor::Finish()
auto const fullPath = base::JoinPath(m_temporaryMwmPath, filename);
auto fbs = ReadAllDatRawFormat<MaxAccuracy>(fullPath);
Sort(fbs);
auto const isProhibited = routing::AreSpeedCamerasProhibited(platform::CountryFile(filename));
static auto const speedCameraType = classif().GetTypeByPath({"highway", "speed_camera"});
FeatureBuilderWriter<> collector(fullPath);
for (auto & fb : fbs)
{
// Removing point features with speed cameras type from geometry index for some countries.
if (isProhibited && fb.IsPoint() && fb.HasType(speedCameraType))
continue;
collector.Write(fb);
}
});
});
}