From 7bf18c191e1eb11c8a54b36eb0aecd7c59bff04c Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Tue, 16 Oct 2018 11:59:09 +0300 Subject: Review fixes. --- map/framework.cpp | 4 ++++ qt/draw_widget.cpp | 2 +- qt/mainwindow.cpp | 33 ++++++++++++--------------------- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/map/framework.cpp b/map/framework.cpp index 0ba5ae56bf..6f6058b8b8 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -101,6 +101,7 @@ #include "std/algorithm.hpp" #include "std/bind.hpp" +#include "std/map.hpp" #include "std/target_os.hpp" #include "api/internal/c/api-client-internals.h" @@ -3344,6 +3345,9 @@ void Framework::VisualizeCityRoadsInRect(m2::RectD const & rect) size_t counter = 0; GetDataSource().ForEachInRect( [this, &rect, &cityRoads, &counter](FeatureType & ft) { + if (ft.GetFeatureType() != feature::GEOM_LINE) + return; + auto const & mwmId = ft.GetID().m_mwmId; auto const it = cityRoads.find(mwmId); if (it == cityRoads.cend()) diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index 242763b07c..06f944a31b 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -237,7 +237,7 @@ void DrawWidget::mouseReleaseEvent(QMouseEvent * e) { CHECK(!m_cityBoundariesSelectionMode, ()); CHECK(!m_cityRoadsSelectionMode, ()); - m_framework.VisualizeCityRoadsInRect(rect); + m_framework.VisualizeRoadsInRect(rect); } else if (m_cityBoundariesSelectionMode) { diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp index f70cae886d..58b342029b 100644 --- a/qt/mainwindow.cpp +++ b/qt/mainwindow.cpp @@ -563,42 +563,33 @@ void MainWindow::OnCreateFeatureClicked() void MainWindow::OnSwitchSelectionMode() { - if (m_selectionCityBoundariesMode->isChecked() || m_selectionCityRoadsMode->isChecked()) - { - m_selectionCityBoundariesMode->setChecked(false); - m_pDrawWidget->SetCityBoundariesSelectionMode(false); + m_selectionCityBoundariesMode->setChecked(false); + m_pDrawWidget->SetCityBoundariesSelectionMode(false); - m_selectionCityRoadsMode->setChecked(false); - m_pDrawWidget->SetCityRoadsSelectionMode(false); - } + m_selectionCityRoadsMode->setChecked(false); + m_pDrawWidget->SetCityRoadsSelectionMode(false); m_pDrawWidget->SetSelectionMode(m_selectionMode->isChecked()); } void MainWindow::OnSwitchCityBoundariesSelectionMode() { - if (m_selectionMode->isChecked() || m_selectionCityRoadsMode->isChecked()) - { - m_selectionMode->setChecked(false); - m_pDrawWidget->SetSelectionMode(false); + m_selectionMode->setChecked(false); + m_pDrawWidget->SetSelectionMode(false); - m_selectionCityRoadsMode->setChecked(false); - m_pDrawWidget->SetCityRoadsSelectionMode(false); - } + m_selectionCityRoadsMode->setChecked(false); + m_pDrawWidget->SetCityRoadsSelectionMode(false); m_pDrawWidget->SetCityBoundariesSelectionMode(m_selectionCityBoundariesMode->isChecked()); } void MainWindow::OnSwitchCityRoadsSelectionMode() { - if (m_selectionMode->isChecked() || m_selectionCityBoundariesMode->isChecked()) - { - m_selectionMode->setChecked(false); - m_pDrawWidget->SetSelectionMode(false); + m_selectionMode->setChecked(false); + m_pDrawWidget->SetSelectionMode(false); - m_selectionCityBoundariesMode->setChecked(false); - m_pDrawWidget->SetCityBoundariesSelectionMode(false); - } + m_selectionCityBoundariesMode->setChecked(false); + m_pDrawWidget->SetCityBoundariesSelectionMode(false); m_pDrawWidget->SetCityRoadsSelectionMode(m_selectionCityRoadsMode->isChecked()); } -- cgit v1.2.3