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

Visualization of city roads.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-10-15 18:58:31 +03:00 • committed by Tatiana Yan
parent 984e0d4801
commit ff9fdf07b9
8 changed files with 109 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
map/framework.cpp
View file

@ -13,6 +13,7 @@
#include "defines.hpp"
#include "private.h"
#include "routing/city_roads.hpp"
#include "routing/index_router.hpp"
#include "routing/online_absent_fetcher.hpp"
#include "routing/route.hpp"
@ -3261,35 +3262,42 @@ void DrawLine(Box const & box, dp::Color const & color, df::DrapeApi & drapeApi,
drapeApi.AddLine(id, df::DrapeApiLineData(points, color).Width(3.0f).ShowPoints(true).ShowId());
}
void VisualizeFeatureInRect(m2::RectD const & rect, FeatureType & ft, df::DrapeApi & drapeApi,
size_t & counter)
{
bool allPointsOutside = true;
vector<m2::PointD> points;
ft.ForEachPoint([&points, &rect, &allPointsOutside](m2::PointD const & pt)
{
if (rect.IsPointInside(pt))
allPointsOutside = false;
points.push_back(pt);
}, scales::GetUpperScale());
if (!allPointsOutside)
{
size_t const colorIndex = counter % colorList.size();
// Note. The first param at DrapeApi::AddLine() should be unique. Other way last added line
// replaces the previous added line with the same name.
// As a consequence VisualizeFeatureInRect() should be applied to single mwm. Other way
// feature ids will be dubbed.
drapeApi.AddLine(
strings::to_string(ft.GetID().m_index),
df::DrapeApiLineData(points, colorList[colorIndex]).Width(3.0f).ShowPoints(true).ShowId());
counter++;
}
}
} // namespace
void Framework::VisualizeRoadsInRect(m2::RectD const & rect)
{
int constexpr kScale = scales::GetUpperScale();
size_t counter = 0;
m_model.ForEachFeature(rect, [this, &counter, &rect](FeatureType & ft)
{
if (routing::IsRoad(feature::TypesHolder(ft)))
{
bool allPointsOutside = true;
vector<m2::PointD> points;
ft.ForEachPoint([&points, &rect, &allPointsOutside](m2::PointD const & pt)
{
if (rect.IsPointInside(pt))
allPointsOutside = false;
points.push_back(pt);
}, kScale);
if (!allPointsOutside)
{
size_t const colorIndex = counter % colorList.size();
m_drapeApi.AddLine(strings::to_string(ft.GetID().m_index),
df::DrapeApiLineData(points, colorList[colorIndex])
.Width(3.0f).ShowPoints(true).ShowId());
counter++;
}
}
}, kScale);
VisualizeFeatureInRect(rect, ft, m_drapeApi, counter);
}, scales::GetUpperScale());
}
void Framework::VisualizeCityBoundariesInRect(m2::RectD const & rect)
@ -3330,6 +3338,31 @@ void Framework::VisualizeCityBoundariesInRect(m2::RectD const & rect)
}
}
void Framework::VisualizeCityRoadsInRect(m2::RectD const & rect)
{
map<MwmSet::MwmId, unique_ptr<CityRoads>> cityRoads;
size_t counter = 0;
GetDataSource().ForEachInRect(
[this, &rect, &cityRoads, &counter](FeatureType & ft) {
auto const & mwmId = ft.GetID().m_mwmId;
auto const it = cityRoads.find(mwmId);
if (it == cityRoads.cend())
{
MwmSet::MwmHandle handle = m_model.GetDataSource().GetMwmHandleById(mwmId);
if (!handle.IsAlive())
return;
cityRoads[mwmId] = LoadCityRoads(GetDataSource(), handle);
}
if (!cityRoads[mwmId]->IsCityRoad(ft.GetID().m_index))
return; // ft is not a city road.
VisualizeFeatureInRect(rect, ft, m_drapeApi, counter);
},
rect, scales::GetUpperScale());
}
ads::Engine const & Framework::GetAdsEngine() const
{
ASSERT(m_adsEngine, ());

1
map/framework.hpp
View file

@ -351,6 +351,7 @@ public:
// Utilities
void VisualizeRoadsInRect(m2::RectD const & rect);
void VisualizeCityBoundariesInRect(m2::RectD const & rect);
void VisualizeCityRoadsInRect(m2::RectD const & rect);
ads::Engine const & GetAdsEngine() const;
void DisableAdProvider(ads::Banner::Type const type, ads::Banner::Place const place);

30
qt/draw_widget.cpp
View file

@ -189,7 +189,8 @@ void DrawWidget::mousePressEvent(QMouseEvent * e)
{
SubmitBookmark(pt);
}
else if (!(m_selectionMode || m_cityBoundariesSelectionMode) || IsCommandModifier(e))
else if (!(m_selectionMode || m_cityBoundariesSelectionMode || m_cityRoadsSelectionMode) ||
IsCommandModifier(e))
{
ShowInfoPopup(e, pt);
}
@ -210,8 +211,8 @@ void DrawWidget::mouseMoveEvent(QMouseEvent * e)
if (IsLeftButton(e) && !IsAltModifier(e))
m_framework.TouchEvent(GetTouchEvent(e, df::TouchEvent::TOUCH_MOVE));
if ((m_selectionMode || m_cityBoundariesSelectionMode) && m_rubberBand != nullptr &&
m_rubberBand->isVisible())
if ((m_selectionMode || m_cityBoundariesSelectionMode || m_cityRoadsSelectionMode) &&
m_rubberBand != nullptr && m_rubberBand->isVisible())
{
m_rubberBand->setGeometry(QRect(m_rubberBandOrigin, e->pos()).normalized());
}
@ -224,8 +225,8 @@ void DrawWidget::mouseReleaseEvent(QMouseEvent * e)
{
m_framework.TouchEvent(GetTouchEvent(e, df::TouchEvent::TOUCH_UP));
}
else if ((m_selectionMode || m_cityBoundariesSelectionMode) && IsRightButton(e) &&
m_rubberBand != nullptr && m_rubberBand->isVisible())
else if ((m_selectionMode || m_cityBoundariesSelectionMode || m_cityRoadsSelectionMode) &&
IsRightButton(e) && m_rubberBand != nullptr && m_rubberBand->isVisible())
{
QPoint const lt = m_rubberBand->geometry().topLeft();
QPoint const rb = m_rubberBand->geometry().bottomRight();
@ -235,13 +236,21 @@ void DrawWidget::mouseReleaseEvent(QMouseEvent * e)
if (m_selectionMode)
{
CHECK(!m_cityBoundariesSelectionMode, ());
m_framework.VisualizeRoadsInRect(rect);
CHECK(!m_cityRoadsSelectionMode, ());
m_framework.VisualizeCityRoadsInRect(rect);
}
else
else if (m_cityBoundariesSelectionMode)
{
CHECK(m_cityBoundariesSelectionMode, ());
CHECK(!m_selectionMode, ());
CHECK(!m_cityRoadsSelectionMode, ());
m_framework.VisualizeCityBoundariesInRect(rect);
}
else // m_cityRoadsSelectionMode
{
CHECK(!m_selectionMode, ());
CHECK(!m_cityBoundariesSelectionMode, ());
m_framework.VisualizeCityRoadsInRect(rect);
}
m_rubberBand->hide();
}
@ -525,6 +534,11 @@ void DrawWidget::SetCityBoundariesSelectionMode(bool mode)
m_cityBoundariesSelectionMode = mode;
}
void DrawWidget::SetCityRoadsSelectionMode(bool mode)
{
m_cityRoadsSelectionMode = mode;
}
// static
void DrawWidget::SetDefaultSurfaceFormat(bool apiOpenGLES3)
{

2
qt/draw_widget.hpp
View file

@ -74,6 +74,7 @@ public:
void SetSelectionMode(bool mode);
void SetCityBoundariesSelectionMode(bool mode);
void SetCityRoadsSelectionMode(bool mode);
RouteMarkType GetRoutePointAddMode() const { return m_routePointAddMode; }
void SetRoutePointAddMode(RouteMarkType mode) { m_routePointAddMode = mode; }
@ -116,6 +117,7 @@ private:
bool m_selectionMode = false;
bool m_cityBoundariesSelectionMode = false;
bool m_cityRoadsSelectionMode = false;
RouteMarkType m_routePointAddMode = RouteMarkType::Finish;
};
} // namespace qt

32
qt/mainwindow.cpp
View file

@ -331,7 +331,11 @@ void MainWindow::CreateNavigationBar()
pToolBar->addAction(QIcon(":/navig64/city_boundaries.png"), tr("City boundaries selection mode"),
this, SLOT(OnSwitchCityBoundariesSelectionMode()));
m_selectionCityBoundariesMode->setCheckable(true);
m_selectionCityBoundariesMode->setChecked(m_pDrawWidget->GetFramework().LoadTrafficEnabled());
m_selectionCityRoadsMode =
pToolBar->addAction(QIcon(":/navig64/city_roads.png"), tr("City roads selection mode"),
this, SLOT(OnSwitchCityRoadsSelectionMode()));
m_selectionCityRoadsMode->setCheckable(true);
m_clearSelection = pToolBar->addAction(QIcon(":/navig64/clear.png"), tr("Clear selection"),
this, SLOT(OnClearSelection()));
@ -559,11 +563,13 @@ void MainWindow::OnCreateFeatureClicked()
void MainWindow::OnSwitchSelectionMode()
{
if (m_selectionCityBoundariesMode->isChecked())
if (m_selectionCityBoundariesMode->isChecked() || m_selectionCityRoadsMode->isChecked())
{
// Unchecking selection city boundaries mode.
m_selectionCityBoundariesMode->setChecked(false);
m_pDrawWidget->SetCityBoundariesSelectionMode(false);
m_selectionCityRoadsMode->setChecked(false);
m_pDrawWidget->SetCityRoadsSelectionMode(false);
}
m_pDrawWidget->SetSelectionMode(m_selectionMode->isChecked());
@ -571,16 +577,32 @@ void MainWindow::OnSwitchSelectionMode()
void MainWindow::OnSwitchCityBoundariesSelectionMode()
{
if (m_selectionMode->isChecked())
if (m_selectionMode->isChecked() || m_selectionCityRoadsMode->isChecked())
{
// Unchecking selection mode.
m_selectionMode->setChecked(false);
m_pDrawWidget->SetSelectionMode(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_selectionCityBoundariesMode->setChecked(false);
m_pDrawWidget->SetCityBoundariesSelectionMode(false);
}
m_pDrawWidget->SetCityRoadsSelectionMode(m_selectionCityRoadsMode->isChecked());
}
void MainWindow::OnClearSelection()
{
m_pDrawWidget->GetFramework().GetDrapeApi().Clear();

2
qt/mainwindow.hpp
View file

@ -47,6 +47,7 @@ class MainWindow : public QMainWindow, location::LocationObserver
QAction * m_trafficEnableAction = nullptr;
QAction * m_bookmarksAction = nullptr;
QAction * m_selectionCityBoundariesMode = nullptr;
QAction * m_selectionCityRoadsMode = nullptr;
QToolButton * m_routePointsToolButton = nullptr;
QAction * m_selectStartRoutePoint = nullptr;
QAction * m_selectFinishRoutePoint = nullptr;
@ -108,6 +109,7 @@ protected Q_SLOTS:
void OnSwitchSelectionMode();
void OnSwitchCityBoundariesSelectionMode();
void OnSwitchCityRoadsSelectionMode();
void OnClearSelection();
void OnTrafficEnabled();

BIN
qt/res/city_roads.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

1
qt/res/resources.qrc
View file

@ -14,6 +14,7 @@
<file>clear.png</file>
<file>traffic.png</file>
<file>city_boundaries.png</file>
<file>city_roads.png</file>
<file>point-finish.png</file>
<file>point-intermediate.png</file>
<file>point-start.png</file>