mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-09-30 19:33:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update mapd to v2

Browse Source
This commit is contained in:
James
2026-01-06 17:12:51 -07:00
parent dc9a91e201
commit 5758e61a6d
17 changed files with 281 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frogpilot/ui/qt/widgets/navigation_functions.cc
+22 -21
View File
@@ -1,7 +1,3 @@
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
#include "frogpilot/ui/qt/widgets/navigation_functions.h"
MapSelectionControl::MapSelectionControl(const QMap<QString, QString> &map, bool isCountry) : selectionType(isCountry ? "nations" : "states") {
@@ -28,11 +24,15 @@ MapSelectionControl::MapSelectionControl(const QMap<QString, QString> &map, bool
}
void MapSelectionControl::loadSelectedMaps() {
QJsonObject existingMaps = QJsonDocument::fromJson(QByteArray::fromStdString(params.get("MapsSelected"))).object();
QString mapsSelected = QString::fromStdString(params.get("MapsSelected"));
QStringList mapList = mapsSelected.split(",", QString::SkipEmptyParts);
QString prefix = (selectionType == "nations") ? "nation." : "us_state.";
QSet<QString> selectedMaps;
for (const QJsonValue &value : existingMaps.value(selectionType).toArray()) {
selectedMaps.insert(value.toString());
for (const QString &map : mapList) {
if (map.startsWith(prefix)) {
selectedMaps.insert(map.mid(prefix.length()));
}
}
for (QAbstractButton *button : mapButtons->buttons()) {
@@ -41,22 +41,23 @@ void MapSelectionControl::loadSelectedMaps() {
}
void MapSelectionControl::updateSelectedMaps() {
QJsonObject existingMaps = QJsonDocument::fromJson(QByteArray::fromStdString(params.get("MapsSelected"))).object();
QString mapsSelected = QString::fromStdString(params.get("MapsSelected"));
QStringList mapList = mapsSelected.split(",", QString::SkipEmptyParts);
QString prefix = (selectionType == "nations") ? "nation." : "us_state.";
QSet<QString> selectedMaps;
for (const QJsonValue &value : existingMaps.value(selectionType).toArray()) {
selectedMaps.insert(value.toString());
}
for (QAbstractButton *button : mapButtons->buttons()) {
QString mapKey = button->property("mapKey").toString();
if (button->isChecked()) {
selectedMaps.insert(mapKey);
} else {
selectedMaps.remove(mapKey);
QStringList newMapList;
for (const QString &map : mapList) {
if (!map.startsWith(prefix)) {
newMapList.append(map);
}
}
existingMaps[selectionType] = QJsonArray::fromStringList(selectedMaps.values());
params.putNonBlocking("MapsSelected", QJsonDocument(existingMaps).toJson(QJsonDocument::Compact).toStdString());
for (QAbstractButton *button : mapButtons->buttons()) {
if (button->isChecked()) {
newMapList.append(prefix + button->property("mapKey").toString());
}
}
newMapList.sort();
params.putNonBlocking("MapsSelected", newMapList.join(",").toStdString());
}