From eaf16da2654382efdb47ad2ad2dbac4ae52d9e52 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Fri, 1 Mar 2019 17:59:23 +0300 Subject: [PATCH] Review fixes. --- generator/feature_sorter.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/generator/feature_sorter.cpp b/generator/feature_sorter.cpp index 719062079c..cb854e420d 100644 --- a/generator/feature_sorter.cpp +++ b/generator/feature_sorter.cpp @@ -328,11 +328,13 @@ bool GenerateFinalFeatures(feature::GenerateInfo const & info, string const & na 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"})) + if (routing::AreSpeedCamerasProhibited(country) && ft.IsPoint() && + classif().GetTypeByPath({"highway", "speed_camera"})) { - midPoints(ft, pos); + return; } + + midPoints(ft, pos); }); // sort features by their middle point