Skip to content

Commit 11562c3

Browse files
William Goodspeedgoodspeed34
William Goodspeed
authored and
goodspeed34
committed
Support customizing the tile server for online map
In some countries with Internet censorship, the default OpenStreetMap tile server may not be accessible. This commit adds an option to choose the preferred tile server from a predefined list or customize them as needed. By default, the online map retains the old behaviour which defaults to the user's system language and it also provides an option to choose the langugage for OSM. Signed-off-by: William Goodspeed <goodspeed@anche.no>
1 parent d744cb8 commit 11562c3

File tree

6 files changed

+250
-6
lines changed

6 files changed

+250
-6
lines changed

‎res/map/onlinemap.html‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
<div id="map"></div>
6868

6969
<script>
70-
7170
var grids_worked = []; //field of Grids used for rendering Worked Grids
7271
var grids_confirmed = []; //field of Grids used for rendering Confirmed Grids
7372
var mylocations = []; //field of My Locations
@@ -126,7 +125,6 @@
126125
popupAnchor: [1, -14]
127126
});
128127

129-
130128
var language = navigator.language || navigator.userLanguage;
131129
var mapUrl;
132130

@@ -139,9 +137,16 @@
139137
mapUrl = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
140138
}
141139

142-
L.tileLayer(mapUrl, {
143-
attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a>'
144-
}).addTo(map);
140+
if (!window.tileConfig) {
141+
window.tileConfig = {
142+
url: mapUrl,
143+
options: {
144+
attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a>',
145+
},
146+
};
147+
}
148+
149+
L.tileLayer(window.tileConfig.url, window.tileConfig.options).addTo(map);
145150

146151
var maidenheadConfWorked = L.maidenheadConfWorked({color : 'rgba(255, 0, 0, 0.5)'}).addTo(map);
147152
var grayline = L.terminator({fillOpacity: 0.2})

‎ui/OnlineMapWidget.cpp‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
#include <QVector3D>
77
#include <QtMath>
88
#include <QFile>
9+
#include <QJsonDocument>
10+
#include <QWebEngineScript>
11+
#include <QWebEngineScriptCollection>
912
#include "OnlineMapWidget.h"
1013
#include "core/debug.h"
1114
#include "data/Gridsquare.h"
@@ -37,7 +40,7 @@ OnlineMapWidget::OnlineMapWidget(QWidget *parent):
3740
FCT_IDENTIFICATION;
3841

3942
main_page->setWebChannel(&channel);
40-
43+
injectTileConfig();
4144
setPage(main_page);
4245
main_page->load(QUrl(QLatin1String("qrc:/res/map/onlinemap.html")));
4346
connect(this, &OnlineMapWidget::loadFinished, this, &OnlineMapWidget::finishLoading);
@@ -56,6 +59,36 @@ OnlineMapWidget::OnlineMapWidget(QWidget *parent):
5659
connect(&webChannelHandler, &MapWebChannelHandler::IBPPressed, this, &OnlineMapWidget::IBPCallsignTrigger);
5760
}
5861

62+
void OnlineMapWidget::injectTileConfig()
63+
{
64+
if (!main_page)
65+
return;
66+
67+
QSettings settings;
68+
QString optionsStr = settings.value("tileServer/config", "{}").toString();
69+
70+
QJsonDocument doc = QJsonDocument::fromJson(optionsStr.toUtf8());
71+
72+
if (doc.isObject()) {
73+
QJsonObject obj = doc.object();
74+
if (!obj.contains("url") || !obj["url"].isString() ||
75+
!obj.contains("options") || !obj["options"].isObject()) {
76+
optionsStr = "undefined";
77+
}
78+
}
79+
80+
QString jsCode = QString("window.tileConfig = %1;").arg(optionsStr);
81+
82+
QWebEngineScript script;
83+
script.setName("InjectTileConfig");
84+
script.setSourceCode(jsCode);
85+
script.setInjectionPoint(QWebEngineScript::DocumentCreation);
86+
script.setWorldId(QWebEngineScript::MainWorld);
87+
script.setRunsOnSubFrames(false);
88+
89+
main_page->scripts().insert(script);
90+
}
91+
5992
void OnlineMapWidget::setTarget(double lat, double lon)
6093
{
6194
FCT_IDENTIFICATION;

‎ui/OnlineMapWidget.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ protected slots:
6363
double lastSeenAzimuth, lastSeenElevation;
6464
bool isRotConnected;
6565

66+
void injectTileConfig(void);
6667
void runJavaScript(const QString &);
6768
};
6869

‎ui/SettingsDialog.cpp‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,32 @@ SettingsDialog::SettingsDialog(MainWindow *parent) :
293293
ui->cwKeyModeSelect->addItem(tr("Ultimate"), CWKey::ULTIMATE);
294294
ui->cwKeyModeSelect->setCurrentIndex(ui->cwKeyModeSelect->findData(CWKey::IAMBIC_B));
295295

296+
tileServers.append({"OpenStreetMap (Default, System Language)", QJsonObject{}});
297+
tileServers.append({"OpenStreetMap (English)", QJsonObject{
298+
{"url", "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"},
299+
{"options", QJsonObject{{"attribution", "&copy; OpenStreetMap"}}},
300+
}});
301+
tileServers.append({"OpenStreetMap (French)", QJsonObject{
302+
{"url", "https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png"},
303+
{"options", QJsonObject{{"attribution", "&copy; OpenStreetMap"}}},
304+
}});
305+
tileServers.append({"OpenStreetMap (German)", QJsonObject{
306+
{"url", "https://tile.openstreetmap.de/{z}/{x}/{y}.png"},
307+
{"options", QJsonObject{{"attribution", "&copy; OpenStreetMap"}}},
308+
}});
309+
310+
ui->tileServerComboBox->setEditable(true);
311+
for (const auto &pair : tileServers) {
312+
QString name = pair.first;
313+
QJsonObject info = pair.second;
314+
ui->tileServerComboBox->addItem(name);
315+
}
316+
ui->tileServerComboBox->addItem("Custom");
317+
318+
connect(ui->tileServerComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
319+
this, &SettingsDialog::onTileServerComboBoxChanged);
320+
onTileServerComboBoxChanged(ui->tileServerComboBox->currentIndex());
321+
296322
/* disable WSJTX Multicast by default */
297323
joinMulticastChanged(false);
298324

@@ -301,6 +327,47 @@ SettingsDialog::SettingsDialog(MainWindow *parent) :
301327
readSettings();
302328
}
303329

330+
void SettingsDialog::onTileServerComboBoxChanged(int index)
331+
{
332+
bool isCustom = index == (ui->tileServerComboBox->count() - 1);
333+
QString configStr = settings.value("tileServer/config", "{}").toString();
334+
335+
if (isCustom) {
336+
ui->tileOptionsTextEdit->setReadOnly(false);
337+
ui->tileMapUrlLineEdit->setReadOnly(false);
338+
339+
QJsonDocument info = QJsonDocument::fromJson(configStr.toUtf8());
340+
if (info.object().isEmpty() || settings.value("tileServer/index", 0).toInt()) {
341+
ui->tileMapUrlLineEdit->setText("");
342+
ui->tileOptionsTextEdit->setPlainText("");
343+
return;
344+
};
345+
346+
QJsonObject obj = info.object();
347+
ui->tileMapUrlLineEdit->setText(obj.contains("options") ? obj["url"].toString() : "");
348+
ui->tileOptionsTextEdit->setPlainText(obj.contains("options")
349+
? QJsonDocument(obj["options"].toObject()).toJson(QJsonDocument::Compact)
350+
: "");
351+
return;
352+
} else {
353+
ui->tileOptionsTextEdit->setReadOnly(true);
354+
ui->tileMapUrlLineEdit->setReadOnly(true);
355+
}
356+
357+
QJsonObject info = tileServers[index].second;
358+
if (info.isEmpty()) {
359+
ui->tileMapUrlLineEdit->setText("");
360+
ui->tileOptionsTextEdit->setPlainText("");
361+
return;
362+
};
363+
364+
ui->tileMapUrlLineEdit->setText(info.contains("options") ? info["url"].toString() : "");
365+
ui->tileOptionsTextEdit->setPlainText(info.contains("options")
366+
? QJsonDocument(info["options"].toObject()).toJson(QJsonDocument::Compact)
367+
: "");
368+
}
369+
370+
304371
void SettingsDialog::save() {
305372
FCT_IDENTIFICATION;
306373

@@ -2401,6 +2468,21 @@ void SettingsDialog::readSettings()
24012468
ui->dateFormatCustomRadioButton->setChecked(!dateSystemFormat);
24022469
ui->dateFormatStringEdit->setText(locale.getSettingDateFormat());
24032470

2471+
/**************/
2472+
/* Online Map */
2473+
/**************/
2474+
2475+
int index = settings.value("tileServer/index", 0).toInt();
2476+
QString configStr = settings.value("tileServer/config", "{}").toString();
2477+
2478+
if (index >= ui->tileServerComboBox->count()) index = 0;
2479+
if (index == 0 && !QJsonDocument::fromJson(configStr.toUtf8()).object().isEmpty()) {
2480+
/* For convenience, `default' and `custom' use the same index, but options was stored only for `custom'. */
2481+
ui->tileServerComboBox->setCurrentIndex(ui->tileServerComboBox->count() - 1);
2482+
} else {
2483+
ui->tileServerComboBox->setCurrentIndex(index);
2484+
}
2485+
24042486
/******************/
24052487
/* END OF Reading */
24062488
/******************/
@@ -2525,6 +2607,26 @@ void SettingsDialog::writeSettings()
25252607
locale.setSettingUseSystemDateFormat(systemDateChecked);
25262608
if ( !systemDateChecked )
25272609
locale.setSettingDateFormat(ui->dateFormatStringEdit->text());
2610+
2611+
/**************/
2612+
/* Online Map */
2613+
/**************/
2614+
int index = ui->tileServerComboBox->currentIndex();
2615+
bool isCustom = index == (ui->tileServerComboBox->count() - 1);
2616+
2617+
if (isCustom) {
2618+
settings.setValue("tileServer/index", 0);
2619+
QJsonObject info = QJsonObject{
2620+
{"url", ui->tileMapUrlLineEdit->text()},
2621+
{"options", QJsonDocument::fromJson(ui->tileOptionsTextEdit->toPlainText().toUtf8()).object()}
2622+
};
2623+
settings.setValue("tileServer/config", QJsonDocument(info).toJson(QJsonDocument::Compact));
2624+
return;
2625+
}
2626+
2627+
settings.setValue("tileServer/index", index);
2628+
QJsonObject info = tileServers[index].second;
2629+
settings.setValue("tileServer/config", QJsonDocument(info).toJson(QJsonDocument::Compact));
25282630
}
25292631

25302632
/* this function is called when user modify rig progile

‎ui/SettingsDialog.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ public slots:
133133
void generateMembershipCheckboxes();
134134
void generateQRZAPICallsignTable();
135135
void saveQRZAPICallsignTable();
136+
void onTileServerComboBoxChanged(int index);
136137

137138
QSqlTableModel* modeTableModel;
138139
QSqlTableModel* bandTableModel;
@@ -151,6 +152,8 @@ public slots:
151152
QList<QCheckBox*> memberListCheckBoxes;
152153
Ui::SettingsDialog *ui;
153154
LogLocale locale;
155+
QVector<QPair<QString, QJsonObject>> tileServers;
156+
QSettings settings;
154157
bool sotaFallback;
155158
bool potaFallback;
156159
bool wwffFallback;

‎ui/SettingsDialog.ui‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4564,6 +4564,106 @@
45644564
</item>
45654565
</layout>
45664566
</widget>
4567+
<widget class="QWidget" name="onlineMapTab">
4568+
<attribute name="title">
4569+
<string>Online Map</string>
4570+
</attribute>
4571+
<layout class="QVBoxLayout" name="verticalLayout_20">
4572+
<item>
4573+
<layout class="QGridLayout" name="gridLayout">
4574+
<item row="1" column="1">
4575+
<widget class="QLineEdit" name="tileMapUrlLineEdit">
4576+
<property name="font">
4577+
<font>
4578+
<family>Monospace</family>
4579+
</font>
4580+
</property>
4581+
</widget>
4582+
</item>
4583+
<item row="2" column="1">
4584+
<widget class="QPlainTextEdit" name="tileOptionsTextEdit">
4585+
<property name="sizePolicy">
4586+
<sizepolicy hsizetype="Expanding" vsizetype="Minimum">
4587+
<horstretch>0</horstretch>
4588+
<verstretch>0</verstretch>
4589+
</sizepolicy>
4590+
</property>
4591+
<property name="font">
4592+
<font>
4593+
<family>Monospace</family>
4594+
</font>
4595+
</property>
4596+
<property name="readOnly">
4597+
<bool>true</bool>
4598+
</property>
4599+
</widget>
4600+
</item>
4601+
<item row="2" column="0">
4602+
<widget class="QLabel" name="label_6">
4603+
<property name="sizePolicy">
4604+
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
4605+
<horstretch>0</horstretch>
4606+
<verstretch>0</verstretch>
4607+
</sizepolicy>
4608+
</property>
4609+
<property name="text">
4610+
<string>Options (JSON): </string>
4611+
</property>
4612+
</widget>
4613+
</item>
4614+
<item row="0" column="1">
4615+
<widget class="QComboBox" name="tileServerComboBox">
4616+
<property name="sizePolicy">
4617+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
4618+
<horstretch>0</horstretch>
4619+
<verstretch>0</verstretch>
4620+
</sizepolicy>
4621+
</property>
4622+
</widget>
4623+
</item>
4624+
<item row="0" column="0">
4625+
<widget class="QLabel" name="label_4">
4626+
<property name="sizePolicy">
4627+
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
4628+
<horstretch>0</horstretch>
4629+
<verstretch>0</verstretch>
4630+
</sizepolicy>
4631+
</property>
4632+
<property name="text">
4633+
<string>Tile Server: </string>
4634+
</property>
4635+
</widget>
4636+
</item>
4637+
<item row="1" column="0">
4638+
<widget class="QLabel" name="label_9">
4639+
<property name="sizePolicy">
4640+
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
4641+
<horstretch>0</horstretch>
4642+
<verstretch>0</verstretch>
4643+
</sizepolicy>
4644+
</property>
4645+
<property name="text">
4646+
<string>Map Url:</string>
4647+
</property>
4648+
</widget>
4649+
</item>
4650+
</layout>
4651+
</item>
4652+
<item>
4653+
<spacer name="verticalSpacer_25">
4654+
<property name="orientation">
4655+
<enum>Qt::Orientation::Vertical</enum>
4656+
</property>
4657+
<property name="sizeHint" stdset="0">
4658+
<size>
4659+
<width>20</width>
4660+
<height>40</height>
4661+
</size>
4662+
</property>
4663+
</spacer>
4664+
</item>
4665+
</layout>
4666+
</widget>
45674667
</widget>
45684668
</item>
45694669
</layout>

0 commit comments

Comments
 (0)