blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 17:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add map copyrights and map provider to map context

Browse source
This commit is contained in:
Dan Paulat 2024-03-02 23:29:44 -06:00
parent 6b00c55bac
commit 5c7c7e6a19
5 changed files with 73 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scwx-qt/source/scwx/qt/util/maplibre.cpp
View file

@ -88,10 +88,11 @@ glm::vec2 LatLongToScreenCoordinate(const QMapLibre::Coordinate& coordinate)
return screen;
}
void SetMapStyleUrl(const std::shared_ptr<QMapLibre::Map>& map,
map::MapProvider mapProvider,
const std::string& url)
void SetMapStyleUrl(const std::shared_ptr<map::MapContext>& mapContext,
const std::string& url)
{
const auto mapProvider = mapContext->map_provider();
QString qUrl = QString::fromStdString(url);
if (mapProvider == map::MapProvider::MapTiler)
@ -100,7 +101,11 @@ void SetMapStyleUrl(const std::shared_ptr<QMapLibre::Map>& map,
qUrl.append(map::GetMapProviderApiKey(mapProvider));
}
map->setStyleUrl(qUrl);
auto map = mapContext->map().lock();
if (map != nullptr)
{
map->setStyleUrl(qUrl);
}
}
} // namespace maplibre

7
scwx-qt/source/scwx/qt/util/maplibre.hpp
View file

@ -1,6 +1,6 @@
#pragma once
#include <scwx/qt/map/map_provider.hpp>
#include <scwx/qt/map/map_context.hpp>
#include <QMapLibre/Map>
#include <QMapLibre/Types>
@ -34,9 +34,8 @@ bool IsPointInPolygon(const std::vector<glm::vec2>& vertices,
glm::vec2 LatLongToScreenCoordinate(const QMapLibre::Coordinate& coordinate);
void SetMapStyleUrl(const std::shared_ptr<QMapLibre::Map>& map,
map::MapProvider mapProvider,
const std::string& url);
void SetMapStyleUrl(const std::shared_ptr<map::MapContext>& mapContext,
const std::string& url);
} // namespace maplibre
} // namespace util