16 changed files with 2283 additions and 76 deletions
+7 -7
View File
@@ -58,7 +58,7 @@ jobs:
shell: pwsh shell: pwsh
run: | run: |
New-Item -ItemType Directory -Force -Path dist | Out-Null New-Item -ItemType Directory -Force -Path dist | Out-Null
jpackage --type app-image --name praktiKST --input target/dist-libs --main-jar app.jar --main-class kst4contest.view.Kst4ContestApplication --module-path target/dist-libs --add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql --dest dist jpackage --type app-image --name praktiKST --input target/dist-libs --main-jar app.jar --main-class kst4contest.view.Kst4ContestApplication --module-path target/dist-libs --add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec --dest dist
- name: Create Windows ZIP - name: Create Windows ZIP
shell: pwsh shell: pwsh
@@ -113,7 +113,7 @@ jobs:
--main-jar app.jar \ --main-jar app.jar \
--main-class kst4contest.view.Kst4ContestApplication \ --main-class kst4contest.view.Kst4ContestApplication \
--module-path target/dist-libs \ --module-path target/dist-libs \
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql \ --add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
--dest dist --dest dist
- name: Create AppDir metadata - name: Create AppDir metadata
@@ -198,7 +198,7 @@ jobs:
--main-jar app.jar \ --main-jar app.jar \
--main-class kst4contest.view.Kst4ContestApplication \ --main-class kst4contest.view.Kst4ContestApplication \
--module-path target/dist-libs \ --module-path target/dist-libs \
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql \ --add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
--dest dist --dest dist
DEB="$(ls dist/*.deb | head -n 1)" DEB="$(ls dist/*.deb | head -n 1)"
if [ -z "$DEB" ]; then if [ -z "$DEB" ]; then
@@ -256,7 +256,7 @@ jobs:
--main-jar app.jar \ --main-jar app.jar \
--main-class kst4contest.view.Kst4ContestApplication \ --main-class kst4contest.view.Kst4ContestApplication \
--module-path target/dist-libs \ --module-path target/dist-libs \
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql \ --add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
--dest dist --dest dist
RPM="$(ls dist/*.rpm | head -n 1)" RPM="$(ls dist/*.rpm | head -n 1)"
if [ -z "$RPM" ]; then if [ -z "$RPM" ]; then
@@ -316,7 +316,7 @@ jobs:
--main-jar app.jar \ --main-jar app.jar \
--main-class kst4contest.view.Kst4ContestApplication \ --main-class kst4contest.view.Kst4ContestApplication \
--module-path target/dist-libs \ --module-path target/dist-libs \
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql \ --add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
--dest dist --dest dist
- name: Build Arch Linux package artifact - name: Build Arch Linux package artifact
@@ -413,7 +413,7 @@ jobs:
--main-jar app.jar \ --main-jar app.jar \
--main-class kst4contest.view.Kst4ContestApplication \ --main-class kst4contest.view.Kst4ContestApplication \
--module-path target/dist-libs \ --module-path target/dist-libs \
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql \ --add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
--dest target/flatpak-src --dest target/flatpak-src
- name: Create Flatpak manifest - name: Create Flatpak manifest
@@ -511,7 +511,7 @@ jobs:
--main-jar app.jar \ --main-jar app.jar \
--main-class kst4contest.view.Kst4ContestApplication \ --main-class kst4contest.view.Kst4ContestApplication \
--module-path target/dist-libs \ --module-path target/dist-libs \
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql \ --add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
--dest dist --dest dist
env: env:
+7 -7
View File
@@ -46,7 +46,7 @@ jobs:
shell: pwsh shell: pwsh
run: | run: |
New-Item -ItemType Directory -Force -Path dist | Out-Null New-Item -ItemType Directory -Force -Path dist | Out-Null
jpackage --type app-image --name praktiKST --input target/dist-libs --main-jar app.jar --main-class kst4contest.view.Kst4ContestApplication --module-path target/dist-libs --add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql --dest dist jpackage --type app-image --name praktiKST --input target/dist-libs --main-jar app.jar --main-class kst4contest.view.Kst4ContestApplication --module-path target/dist-libs --add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec --dest dist
- name: Create Windows ZIP - name: Create Windows ZIP
shell: pwsh shell: pwsh
@@ -94,7 +94,7 @@ jobs:
--main-jar app.jar \ --main-jar app.jar \
--main-class kst4contest.view.Kst4ContestApplication \ --main-class kst4contest.view.Kst4ContestApplication \
--module-path target/dist-libs \ --module-path target/dist-libs \
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql \ --add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
--dest dist --dest dist
- name: Create AppDir metadata - name: Create AppDir metadata
@@ -172,7 +172,7 @@ jobs:
--main-jar app.jar \ --main-jar app.jar \
--main-class kst4contest.view.Kst4ContestApplication \ --main-class kst4contest.view.Kst4ContestApplication \
--module-path target/dist-libs \ --module-path target/dist-libs \
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql \ --add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
--dest dist --dest dist
DEB="$(ls dist/*.deb | head -n 1)" DEB="$(ls dist/*.deb | head -n 1)"
if [ -z "$DEB" ]; then if [ -z "$DEB" ]; then
@@ -223,7 +223,7 @@ jobs:
--main-jar app.jar \ --main-jar app.jar \
--main-class kst4contest.view.Kst4ContestApplication \ --main-class kst4contest.view.Kst4ContestApplication \
--module-path target/dist-libs \ --module-path target/dist-libs \
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql \ --add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
--dest dist --dest dist
RPM="$(ls dist/*.rpm | head -n 1)" RPM="$(ls dist/*.rpm | head -n 1)"
if [ -z "$RPM" ]; then if [ -z "$RPM" ]; then
@@ -274,7 +274,7 @@ jobs:
--main-jar app.jar \ --main-jar app.jar \
--main-class kst4contest.view.Kst4ContestApplication \ --main-class kst4contest.view.Kst4ContestApplication \
--module-path target/dist-libs \ --module-path target/dist-libs \
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql \ --add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
--dest dist --dest dist
- name: Build Arch Linux package artifact - name: Build Arch Linux package artifact
@@ -362,7 +362,7 @@ jobs:
--main-jar app.jar \ --main-jar app.jar \
--main-class kst4contest.view.Kst4ContestApplication \ --main-class kst4contest.view.Kst4ContestApplication \
--module-path target/dist-libs \ --module-path target/dist-libs \
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql \ --add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
--dest target/flatpak-src --dest target/flatpak-src
- name: Create Flatpak manifest - name: Create Flatpak manifest
@@ -477,7 +477,7 @@ jobs:
--main-jar app.jar \ --main-jar app.jar \
--main-class kst4contest.view.Kst4ContestApplication \ --main-class kst4contest.view.Kst4ContestApplication \
--module-path target/dist-libs \ --module-path target/dist-libs \
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql \ --add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
--dest dist --dest dist
env: env:
+12
View File
@@ -8,6 +8,18 @@ Versionsverlauf von KST4Contest / PraktiKST.
letzter Changelog bitte aus GitHub entnehmen. Der bisherige Changelog letzter Changelog bitte aus GitHub entnehmen. Der bisherige Changelog
## v1.41
**Stationskarte, Performance, Reaktionsfähiges UI**
**Neu:**
- **Stationskarte**: Interaktive OpenStreetMap-Karte zeigt die geografische Position aller aktiven Chatmember. Enthält Stationsmarker, Antennen-Kegel, Verbindungslinie zur ausgewählten Station, Maidenhead-Raster-Overlay und ein Wegprofil-Diagramm mit Geländehöhen-Analyse (Fresnel-Zonen, Horizonterkennung). Geländedaten aus Copernicus GLO-30, Open-Meteo API oder Offline-DEM-Import. Aircraft-Scatter-Weganalyse integriert. Funktioniert in AppImage und Flatpak ohne externe CDN-Verbindung (lokaler Tile-Proxy, eingebettetes Leaflet.js).
**Geändert:**
- **Nachrichten-Tabellen-Limit auf 30.000 erhöht**: Chat- und Nachrichtentabellen sind auf 30.000 Einträge begrenzt. Ältere Nachrichten werden automatisch verworfen, was die Performance bei mehrtägigem Contest-Betrieb stabil hält.
- **Bildschirmgerechte Fenstergröße**: Beim Start wird das Hauptfenster auf den aktuellen Bildschirm angepasst. Wenn KST4Contest zuletzt auf einem größeren Monitor betrieben wurde, wird das Fenster automatisch verkleinert. Das UI-Layout ist kompakter und reaktionsfähiger auf kleineren Bildschirmen.
---
## v1.40 (2026-02-16) ## v1.40 (2026-02-16)
**Großes Feature-Release: Score-System, AP-Timeline, Win-Test, PSTRotator** **Großes Feature-Release: Score-System, AP-Timeline, Win-Test, PSTRotator**
+36
View File
@@ -235,3 +235,39 @@ Dateibasierte Log-Auswertung per Regex. Details: [Log-Synchronisation](Log-Synch
Ein separates Fenster zeigt den QSO-Fluss zwischen anderen Stationen. Besonders interessant in ruhigeren Nacht-Stunden während des Contests, wenn weniger Verkehr herrscht. Ein separates Fenster zeigt den QSO-Fluss zwischen anderen Stationen. Besonders interessant in ruhigeren Nacht-Stunden während des Contests, wenn weniger Verkehr herrscht.
Dieses Fenster kann miniaturisiert werden, wenn es nicht benötigt wird. Zukünftig geplant: Filterung auf Stationen im ausgewählten QTF. Dieses Fenster kann miniaturisiert werden, wenn es nicht benötigt wird. Zukünftig geplant: Filterung auf Stationen im ausgewählten QTF.
---
## Stationskarte (ab v1.41)
Eine interaktive OpenStreetMap-Karte zeigt die geografische Position aller aktiven Chatmember.
**Funktionen:**
- Stationsmarker mit Rufzeichen-Labels, farblich nach Aktivität und Sked-Status
- **Antennen-Kegel** für die eigene Station
- **Verbindungslinie** zur aktuell ausgewählten Station
- **Maidenhead-Raster** (QRA-Locator-Gitter als Overlay)
- **Wegprofil-Diagramm**: Geländehöhen-Querschnitt zwischen eigener und ausgewählter Station, inklusive Fresnel-Zonen-Analyse und Horizonterkennung
- Mehrere Terrainquellen: **Copernicus GLO-30** (hochauflösendes DEM), **Open-Meteo API**, synthetischer Fallback und **Offline-DEM-Import** für den Betrieb ohne Internetverbindung
- Aircraft-Scatter-Weganalyse verknüpft mit den Geländedaten
Die Karte funktioniert in gepackten Umgebungen (AppImage, Flatpak) ohne Zugriff auf externe CDNs: Die Kartenkacheln werden über einen lokalen Tile-Proxy abgerufen, die Leaflet.js-Bibliothek ist in der Anwendung eingebettet.
---
## Optimierte Nachrichtenverarbeitung / 30.000-Nachrichten-Limit (ab v1.41)
Die internen Chat- und Nachrichtentabellen sind auf **30.000 Einträge** begrenzt. Ältere Nachrichten werden automatisch verworfen, sobald das Limit erreicht wird. Damit bleiben Speicherverbrauch und Darstellungsperformance auch bei mehrtägigen Contest-Betrieb stabil.
---
## Bildschirmgerechte Fenstergröße (ab v1.41)
Beim Programmstart berechnet KST4Contest eine bildschirmgerechte Startgröße für das Hauptfenster:
- Die gespeicherte Fenstergröße aus der letzten Session wird verwendet aber **niemals größer als der aktuelle Bildschirm**.
- Wenn KST4Contest zuletzt auf einem größeren Monitor betrieben wurde, wird das Fenster automatisch auf die aktuelle Anzeige verkleinert.
- Das UI-Layout ist **kompakter und reaktionsfähiger auf kleineren Bildschirmen**.
Damit werden unbrauchbare, abgeschnittene Fenster beim Wechsel zwischen Geräten oder Monitoren verhindert.
+12
View File
@@ -8,6 +8,18 @@ Version history of KST4Contest / PraktiKST.
For the latest changelog, please refer to GitHub. The previous changelog is below. For the latest changelog, please refer to GitHub. The previous changelog is below.
## v1.41
**Station Map, Performance, Responsive UI**
**New:**
- **Station Map**: Interactive OpenStreetMap-based map showing the geographic position of all active chat members. Includes station markers, antenna beam cone, connection line to the selected station, Maidenhead grid overlay, and a path profile chart with terrain elevation analysis (Fresnel zones, horizon detection). Terrain data from Copernicus GLO-30, Open-Meteo API, or offline DEM import. Aircraft scatter path analysis integrated. Works in AppImage and Flatpak without external CDN access (local tile proxy, bundled Leaflet.js).
**Changed:**
- **Message table limit raised to 30,000**: Chat and message tables are capped at 30,000 entries. Older messages are automatically discarded, keeping performance stable during multi-day contest operations.
- **Screen-aware window sizing**: On startup, the main window is sized to fit the current screen. If KST4Contest was last used on a larger monitor, the window is automatically scaled down. The UI layout is more compact and responsive on smaller screens.
---
## v1.40 (2026-02-16) ## v1.40 (2026-02-16)
**Major Feature Release: Score System, AP Timeline, Win-Test, PSTRotator** **Major Feature Release: Score System, AP Timeline, Win-Test, PSTRotator**
+36
View File
@@ -233,3 +233,39 @@ File-based log evaluation using regex. Details: [Log Synchronisation](Log-Sync#m
## Cluster & QSO of Others ## Cluster & QSO of Others
A separate window showing the QSO flow between other stations. Particularly interesting during quieter night-time hours of a contest. This window can be minimised when not needed. Future plan: filtering to stations in your selected QTF. A separate window showing the QSO flow between other stations. Particularly interesting during quieter night-time hours of a contest. This window can be minimised when not needed. Future plan: filtering to stations in your selected QTF.
---
## Station Map (from v1.41)
An interactive OpenStreetMap-based map showing the geographic position of all active chat members.
**Features:**
- Station markers with callsign labels, coloured by activity and sked state
- Antenna **beam cone** visualisation for the own station
- **Connection line** to the currently selected station
- **Maidenhead grid** overlay (QRA locator grid)
- **Path profile chart**: Terrain elevation cross-section between own station and the selected station, including Fresnel zone analysis and obstruction/horizon detection
- Multiple terrain data sources: **Copernicus GLO-30** (high-resolution DEM), **Open-Meteo API**, synthetic fallback, and **offline DEM import** for air-gapped use
- Aircraft scatter path analysis integrated with the terrain data
The map works in packaged environments (AppImage, Flatpak) without internet access to external CDNs: map tiles are fetched via a local tile proxy, and the Leaflet.js library is bundled inside the application.
---
## Optimised Message Handling / 30,000 Message Limit (from v1.41)
The internal chat and message tables are capped at **30,000 entries**. Older messages are automatically discarded when the limit is reached. This keeps memory usage and rendering performance stable during multi-day contest operations.
---
## Screen-Aware Window Sizing (from v1.41)
On startup, KST4Contest calculates a screen-aware size for the main window:
- The stored window size from the previous session is used but **never larger than the current screen**.
- If KST4Contest was last used on a larger monitor, the window is automatically scaled down to fit the current display without clipping.
- The UI layout is more **compact and responsive on smaller screens**, showing the same information in less space.
This prevents unusable oversized windows when switching between machines or monitors.
+2
View File
@@ -437,6 +437,8 @@
<addmodule>javafx.fxml</addmodule> <addmodule>javafx.fxml</addmodule>
<addmodule>javafx.web</addmodule> <addmodule>javafx.web</addmodule>
<addmodule>java.sql</addmodule> <addmodule>java.sql</addmodule>
<addmodule>java.net.http</addmodule>
<addmodule>jdk.crypto.ec</addmodule>
</addmodules> </addmodules>
<mainclass>${main.class}</mainclass> <mainclass>${main.class}</mainclass>
<input>${project.build.directory}/modules</input> <input>${project.build.directory}/modules</input>
@@ -61,6 +61,8 @@ import kst4contest.model.*;
import javafx.scene.shape.Line; import javafx.scene.shape.Line;
import javafx.scene.shape.Polygon; import javafx.scene.shape.Polygon;
import javafx.stage.Screen;
import kst4contest.utils.ApplicationFileUtils; import kst4contest.utils.ApplicationFileUtils;
import kst4contest.view.map.StationMapBridge; import kst4contest.view.map.StationMapBridge;
import kst4contest.view.map.StationMapView; import kst4contest.view.map.StationMapView;
@@ -777,13 +779,14 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
}); });
selectedCallSignShowAsPathBtn.setGraphic(createArrow(selectedCallSignInfoStageChatMember.getQTFdirection())); selectedCallSignShowAsPathBtn.setGraphic(createArrow(selectedCallSignInfoStageChatMember.getQTFdirection()));
Button selectedCallSignShowOnMapBtn = new Button("Show on map"); Button selectedCallSignShowOnMapBtn = new Button("🧭 Show on map");
selectedCallSignShowOnMapBtn.setOnAction(new EventHandler<ActionEvent>() { selectedCallSignShowOnMapBtn.setOnAction(new EventHandler<ActionEvent>() {
@Override @Override
public void handle(ActionEvent actionEvent) { public void handle(ActionEvent actionEvent) {
showSelectedCallsignOnMap(); showSelectedCallsignOnMap();
} }
}); });
selectedCallSignShowOnMapBtn.setTooltip(new Tooltip("Show the selected station on the map"));
Button selectedCallSignTurnAntBtn = new Button("Turn ant1 to " + selectedCallSignInfoStageChatMember.getCallSignRaw()); Button selectedCallSignTurnAntBtn = new Button("Turn ant1 to " + selectedCallSignInfoStageChatMember.getCallSignRaw());
@@ -824,10 +827,43 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
selectedCallSignDownerSiteGridPane.add(selectedCallSignShowQRZCqprofile, 1,3,1,1); selectedCallSignDownerSiteGridPane.add(selectedCallSignShowQRZCqprofile, 1,3,1,1);
/*
* The old GridPane layout above is intentionally left in place because it
* creates all controls, bindings and event handlers in the established order.
* From here on we only change the presentation: clear the temporary GridPane
* and reassemble the same controls in a compact VBox/FlowPane layout.
*/
selectedCallSignDownerSiteGridPane.getChildren().clear();
VBox selectedCallSignCompactControlsPane = initSelectedCallSignCompactControlsPane(
selectedCallSignInfoStageChatMember,
selectedCallSignChatCategoryLabelDesc,
selectedCallSignInfoLblQTFInfo,
selectedCallSignInfoLblQRBInfo,
lblDetectedRxBands,
priorityRow,
skedRow,
selectedCallSignPathAndMapButtons,
selectedCallSignTurnAntBtn,
selectedCallSignShowQRZprofile,
selectedCallSignShowQRZCqprofile,
furtherInfoPnl_chkbx_notQRV144,
furtherInfoPnl_chkbx_notQRV432,
furtherInfoPnl_chkbx_notQRV23,
furtherInfoPnl_chkbx_notQRV13,
furtherInfoPnl_chkbx_notQRV9,
furtherInfoPnl_chkbx_notQRV6,
furtherInfoPnl_chkbx_notQRV3,
furtherInfoPnl_chkbx_notQRVall
);
selectedCallSignSplitPane.getItems().add(initFurtherInfoAbtCallsignMSGTable); selectedCallSignSplitPane.getItems().add(initFurtherInfoAbtCallsignMSGTable);
selectedCallSignSplitPane.getItems().add(selectedCallSignDownerSiteGridPane); selectedCallSignSplitPane.getItems().add(selectedCallSignCompactControlsPane);
// selectedCallSignSplitPane.getItems().add(initFurtherInfoAbtCallsignMSGTable);
// selectedCallSignSplitPane.getItems().add(selectedCallSignDownerSiteGridPane);
//first initialize how much divider positions we need... //first initialize how much divider positions we need...
// chatcontroller.getChatPreferences().setGUIselectedCallSignSplitPane_dividerposition(new double[selectedCallSignSplitPane.getDividers().size()]); // chatcontroller.getChatPreferences().setGUIselectedCallSignSplitPane_dividerposition(new double[selectedCallSignSplitPane.getDividers().size()]);
@@ -2060,6 +2096,166 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
/**
* Reassembles the selected-station controls into a compact, balanced layout.
*
* The selected-station message table stays immediately visible above this pane.
* This pane only contains the summary and controls below it:
* - compact station summary
* - action buttons such as Show path / Show on map / Turn antenna / lookups
* - score and sked controls
* - not-QRV tags
*
* Existing controls are passed in instead of recreated so all existing event
* handlers, bindings and comments in generateFurtherInfoAbtSelectedCallsignBP(...)
* remain intact.
*/
private VBox initSelectedCallSignCompactControlsPane(
ChatMember selectedCallSignInfoStageChatMember,
Label selectedCallSignChatCategoryLabelDesc,
Label selectedCallSignInfoLblQTFInfo,
Label selectedCallSignInfoLblQRBInfo,
Label lblDetectedRxBands,
HBox priorityRow,
HBox skedRow,
HBox selectedCallSignPathAndMapButtons,
Button selectedCallSignTurnAntBtn,
Button selectedCallSignShowQRZprofile,
Button selectedCallSignShowQRZCqprofile,
CheckBox furtherInfoPnl_chkbx_notQRV144,
CheckBox furtherInfoPnl_chkbx_notQRV432,
CheckBox furtherInfoPnl_chkbx_notQRV23,
CheckBox furtherInfoPnl_chkbx_notQRV13,
CheckBox furtherInfoPnl_chkbx_notQRV9,
CheckBox furtherInfoPnl_chkbx_notQRV6,
CheckBox furtherInfoPnl_chkbx_notQRV3,
CheckBox furtherInfoPnl_chkbx_notQRVall
) {
for (CheckBox cb : Arrays.asList(
furtherInfoPnl_chkbx_notQRV144,
furtherInfoPnl_chkbx_notQRV432,
furtherInfoPnl_chkbx_notQRV23,
furtherInfoPnl_chkbx_notQRV13,
furtherInfoPnl_chkbx_notQRV9,
furtherInfoPnl_chkbx_notQRV6,
furtherInfoPnl_chkbx_notQRV3,
furtherInfoPnl_chkbx_notQRVall
)) {
// Hidden band controls should not reserve space in the compact FlowPane.
cb.managedProperty().bind(cb.visibleProperty());
}
FlowPane stationSummaryFlow = new FlowPane();
stationSummaryFlow.setHgap(8);
stationSummaryFlow.setVgap(2);
stationSummaryFlow.setAlignment(Pos.CENTER_LEFT);
stationSummaryFlow.setStyle("-fx-padding: 3; -fx-border-color: lightgrey; -fx-border-width: 1;");
stationSummaryFlow.getChildren().addAll(
selectedCallSignChatCategoryLabelDesc,
new Label("|"),
selectedCallSignInfoLblQTFInfo,
selectedCallSignInfoLblQRBInfo,
new Label("Last activity: " + new Utils4KST().time_convertEpochToReadable(
selectedCallSignInfoStageChatMember.getActivityTimeLastInEpoch() + "")),
new Label("("
+ Utils4KST.time_getSecondsBetweenEpochAndNow(
selectedCallSignInfoStageChatMember.getActivityTimeLastInEpoch() + "") / 60 % 60
+ " min ago)"),
lblDetectedRxBands
);
FlowPane actionFlow = new FlowPane();
actionFlow.setHgap(5);
actionFlow.setVgap(3);
actionFlow.setAlignment(Pos.CENTER_LEFT);
actionFlow.setStyle("-fx-padding: 3; -fx-border-color: lightgrey; -fx-border-width: 1;");
actionFlow.getChildren().addAll(
selectedCallSignPathAndMapButtons,
selectedCallSignTurnAntBtn,
selectedCallSignShowQRZprofile,
selectedCallSignShowQRZCqprofile
);
FlowPane scoreAndSkedFlow = new FlowPane();
scoreAndSkedFlow.setHgap(5);
scoreAndSkedFlow.setVgap(3);
scoreAndSkedFlow.setAlignment(Pos.CENTER_LEFT);
scoreAndSkedFlow.setStyle("-fx-padding: 3; -fx-border-color: lightgrey; -fx-border-width: 1;");
scoreAndSkedFlow.getChildren().addAll(priorityRow, skedRow);
FlowPane notQrvFlow = new FlowPane();
notQrvFlow.setHgap(5);
notQrvFlow.setVgap(2);
notQrvFlow.setAlignment(Pos.CENTER_LEFT);
notQrvFlow.setStyle("-fx-padding: 3; -fx-border-color: lightgrey; -fx-border-width: 1;");
notQrvFlow.getChildren().addAll(
new Label("Not QRV:"),
furtherInfoPnl_chkbx_notQRV144,
furtherInfoPnl_chkbx_notQRV432,
furtherInfoPnl_chkbx_notQRV23,
furtherInfoPnl_chkbx_notQRV13,
furtherInfoPnl_chkbx_notQRV9,
furtherInfoPnl_chkbx_notQRV6,
furtherInfoPnl_chkbx_notQRV3,
furtherInfoPnl_chkbx_notQRVall
);
VBox selectedCallSignCompactControlsPane = new VBox(4);
selectedCallSignCompactControlsPane.setStyle("-fx-padding: 3;");
selectedCallSignCompactControlsPane.getChildren().addAll(
stationSummaryFlow,
actionFlow,
scoreAndSkedFlow,
notQrvFlow
);
return selectedCallSignCompactControlsPane;
}
/**
* Builds the lower global-message area.
*
* This TabPane is intentionally independent from the selected ChatMember.
* It contains global message streams only:
* - public/CQ messages
* - DXCluster messages
* - messages between other stations ("QSO of the other")
*
* The already initialized public-message table is passed in so its existing
* context menu and selection handling remain unchanged.
*
* DXCluster and QSO-of-the-other get their own TableViews on the same backing
* lists. This is important because the existing separate "Cluster & QSO of the other"
* window can keep using its own TableViews at the same time.
*/
private TabPane initBottomGlobalMessageTabPane(TableView<ChatMessage> tbl_generalMessageTable) {
TabPane bottomMessageTabs = new TabPane();
bottomMessageTabs.setTabClosingPolicy(TabPane.TabClosingPolicy.UNAVAILABLE);
bottomMessageTabs.setTabMinHeight(22);
bottomMessageTabs.setTabMaxHeight(24);
Tab publicMessagesTab = new Tab("Public messages");
publicMessagesTab.setTooltip(new Tooltip("Public/CQ messages from the chat."));
publicMessagesTab.setContent(tbl_generalMessageTable);
Tab dxClusterMessagesTab = new Tab("DXCluster messages");
dxClusterMessagesTab.setTooltip(new Tooltip("DXCluster spots."));
dxClusterMessagesTab.setContent(initDXClusterTable());
Tab qsoOfTheOtherTab = new Tab("QSO of the other");
qsoOfTheOtherTab.setTooltip(new Tooltip("Messages between other stations. This view is not tied to the selected ChatMember."));
qsoOfTheOtherTab.setContent(initChatToOtherMSGTable());
bottomMessageTabs.getTabs().addAll(publicMessagesTab, dxClusterMessagesTab, qsoOfTheOtherTab);
bottomMessageTabs.getSelectionModel().select(publicMessagesTab);
return bottomMessageTabs;
}
/** /**
* initializes the tableview in which the cq- and beacon-texts are shown * initializes the tableview in which the cq- and beacon-texts are shown
* *
@@ -3001,13 +3197,223 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
} // TODO: Textsnippets table } // TODO: Textsnippets table
// private BorderPane initTopPriorityListPane(TableView<ChatMember> tbl_chatMember, TextField txt_chatMessageUserInput) {
//
// BorderPane pane = new BorderPane();
// pane.setStyle("-fx-padding: 3;");
//
// Label header = new Label("Top priority candidates");
// header.getStyleClass().add("label");
//
// ListView<kst4contest.controller.ScoreService.TopCandidate> listView = new ListView<>();
// listView.setItems(chatcontroller.getScoreService().getTopCandidatesFx());
//
// listView.setCellFactory(lv -> new ListCell<>() {
// @Override
// protected void updateItem(kst4contest.controller.ScoreService.TopCandidate item, boolean empty) {
// super.updateItem(item, empty);
// if (empty || item == null) {
// setText(null);
// return;
// }
// // Keep it compact; score is mainly evaluated in FurtherInfo
// setText(item.getDisplayCallSign() + " | score " + String.format(java.util.Locale.US, "%.0f", item.getScore()));
// }
// });
//
// listView.setOnMouseClicked(evt -> {
// if (evt.getClickCount() < 1) return;
// kst4contest.controller.ScoreService.TopCandidate c = listView.getSelectionModel().getSelectedItem();
// if (c == null) return;
//
// ChatMember resolved = resolveChatMemberForTopCandidate(c);
// if (resolved == null) return;
//
// // Try to select in table (reuses existing selection logic)
// if (tbl_chatMember.getItems().contains(resolved)) {
// tbl_chatMember.getSelectionModel().select(resolved);
// tbl_chatMember.scrollTo(resolved);
// } else {
// // Fallback: if filtered out, still show FurtherInfo + prepare /cq
// selectedCallSignInfoStageChatMember = resolved;
// chatcontroller.getScoreService().setSelectedChatMember(selectedCallSignInfoStageChatMember);
//
// selectedCallSignFurtherInfoPane.getChildren().setAll(generateFurtherInfoAbtSelectedCallsignBP(resolved));
// txt_chatMessageUserInput.clear();
// txt_chatMessageUserInput.setText("/cq " + resolved.getCallSign() + " ");
// txt_chatMessageUserInput.requestFocus();
// txt_chatMessageUserInput.selectEnd();
//
// // Keep ScoreService selection in sync
// chatcontroller.getScoreService().setSelectedChatMember(resolved);
// }
// });
//
// pane.setTop(header);
// pane.setCenter(listView);
// return pane;
// }
/**
* Builds the compact priority candidate area for the right side of the main UI.
*
* The former implementation showed the complete priority list permanently.
* That used a lot of vertical space although normally only the first one or two
* candidates are relevant during live operation.
*
* New behaviour:
* - show only Top 1 and Top 2 directly in the main window
* - click Top 1/Top 2 to select that candidate immediately
* - use "more" to open the full priority list in a separate window
*/
private BorderPane initTopPriorityListPane(TableView<ChatMember> tbl_chatMember, TextField txt_chatMessageUserInput) { private BorderPane initTopPriorityListPane(TableView<ChatMember> tbl_chatMember, TextField txt_chatMessageUserInput) {
BorderPane pane = new BorderPane(); BorderPane pane = new BorderPane();
pane.setStyle("-fx-padding: 3;"); pane.setStyle("-fx-padding: 3; -fx-border-color: lightgrey; -fx-border-width: 1;");
Label header = new Label("Top priority candidates"); Label header = new Label("Priority:");
header.getStyleClass().add("label"); header.setMinWidth(48);
Button top1Button = new Button("1 -");
Button top2Button = new Button("2 -");
Button moreButton = new Button("more");
top1Button.setMaxWidth(Double.MAX_VALUE);
top2Button.setMaxWidth(Double.MAX_VALUE);
HBox.setHgrow(top1Button, Priority.ALWAYS);
HBox.setHgrow(top2Button, Priority.ALWAYS);
HBox row = new HBox(4, header, top1Button, top2Button, moreButton);
row.setAlignment(Pos.CENTER_LEFT);
Runnable refreshButtons = () -> {
ObservableList<kst4contest.controller.ScoreService.TopCandidate> items =
chatcontroller.getScoreService().getTopCandidatesFx();
updateTopCandidateButton(top1Button, items, 0);
updateTopCandidateButton(top2Button, items, 1);
};
chatcontroller.getScoreService().getTopCandidatesFx().addListener(
(ListChangeListener<kst4contest.controller.ScoreService.TopCandidate>) change -> refreshButtons.run()
);
refreshButtons.run();
top1Button.setOnAction(e -> selectTopCandidateAt(0, tbl_chatMember, txt_chatMessageUserInput));
top2Button.setOnAction(e -> selectTopCandidateAt(1, tbl_chatMember, txt_chatMessageUserInput));
moreButton.setOnAction(e -> showTopPriorityCandidatesWindow(tbl_chatMember, txt_chatMessageUserInput));
pane.setCenter(row);
pane.setMinHeight(38);
pane.setPrefHeight(42);
pane.setMaxHeight(58);
SplitPane.setResizableWithParent(pane, Boolean.FALSE);
return pane;
}
/**
* Updates one of the compact priority buttons from the current TopCandidate list.
* Disabled buttons indicate that not enough candidates are currently available.
*/
private void updateTopCandidateButton(
Button button,
ObservableList<kst4contest.controller.ScoreService.TopCandidate> items,
int index
) {
if (items == null || items.size() <= index || items.get(index) == null) {
button.setText((index + 1) + " -");
button.setDisable(true);
button.setTooltip(null);
return;
}
kst4contest.controller.ScoreService.TopCandidate candidate = items.get(index);
button.setText(String.format(
java.util.Locale.US,
"%d %s %.0f",
index + 1,
candidate.getDisplayCallSign(),
candidate.getScore()
));
button.setDisable(false);
button.setTooltip(new Tooltip("Select " + candidate.getDisplayCallSign() + " from priority candidates"));
}
/**
* Selects the TopCandidate at the given index, if available.
*/
private void selectTopCandidateAt(
int index,
TableView<ChatMember> tbl_chatMember,
TextField txt_chatMessageUserInput
) {
ObservableList<kst4contest.controller.ScoreService.TopCandidate> items =
chatcontroller.getScoreService().getTopCandidatesFx();
if (items == null || items.size() <= index) {
return;
}
selectTopCandidate(items.get(index), tbl_chatMember, txt_chatMessageUserInput);
}
/**
* Resolves and selects a priority candidate.
*
* If the station is currently visible in the member table, selecting it there is
* preferred because the existing table-selection listener then keeps the rest of
* the UI in sync. If the station is filtered out, we still show FurtherInfo and
* prepare the /cq text so the priority list remains useful with active filters.
*/
private void selectTopCandidate(
kst4contest.controller.ScoreService.TopCandidate candidate,
TableView<ChatMember> tbl_chatMember,
TextField txt_chatMessageUserInput
) {
if (candidate == null) {
return;
}
ChatMember resolved = resolveChatMemberForTopCandidate(candidate);
if (resolved == null) {
return;
}
if (tbl_chatMember.getItems().contains(resolved)) {
tbl_chatMember.getSelectionModel().select(resolved);
tbl_chatMember.scrollTo(resolved);
} else {
selectedCallSignInfoStageChatMember = resolved;
chatcontroller.getScoreService().setSelectedChatMember(selectedCallSignInfoStageChatMember);
selectedCallSignFurtherInfoPane.getChildren().setAll(generateFurtherInfoAbtSelectedCallsignBP(resolved));
txt_chatMessageUserInput.clear();
txt_chatMessageUserInput.setText("/cq " + resolved.getCallSign() + " ");
txt_chatMessageUserInput.requestFocus();
txt_chatMessageUserInput.selectEnd();
}
// Keep ScoreService selection in sync even if the visible table selection path was used.
chatcontroller.getScoreService().setSelectedChatMember(resolved);
}
/**
* Opens the complete priority candidate list in a separate window.
*
* This keeps the main UI compact while still making the full list available when
* the operator wants to inspect more than the first two candidates.
*/
private void showTopPriorityCandidatesWindow(
TableView<ChatMember> tbl_chatMember,
TextField txt_chatMessageUserInput
) {
Stage stage = new Stage();
stage.setTitle("Top priority candidates");
ListView<kst4contest.controller.ScoreService.TopCandidate> listView = new ListView<>(); ListView<kst4contest.controller.ScoreService.TopCandidate> listView = new ListView<>();
listView.setItems(chatcontroller.getScoreService().getTopCandidatesFx()); listView.setItems(chatcontroller.getScoreService().getTopCandidatesFx());
@@ -3016,48 +3422,44 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
@Override @Override
protected void updateItem(kst4contest.controller.ScoreService.TopCandidate item, boolean empty) { protected void updateItem(kst4contest.controller.ScoreService.TopCandidate item, boolean empty) {
super.updateItem(item, empty); super.updateItem(item, empty);
if (empty || item == null) { if (empty || item == null) {
setText(null); setText(null);
return; return;
} }
// Keep it compact; score is mainly evaluated in FurtherInfo
setText(item.getDisplayCallSign() + " | score " + String.format(java.util.Locale.US, "%.0f", item.getScore())); setText(item.getDisplayCallSign()
+ " | score "
+ String.format(java.util.Locale.US, "%.0f", item.getScore()));
} }
}); });
listView.setOnMouseClicked(evt -> { listView.setOnMouseClicked(evt -> {
if (evt.getClickCount() < 1) return; if (evt.getClickCount() < 2) {
kst4contest.controller.ScoreService.TopCandidate c = listView.getSelectionModel().getSelectedItem(); return;
if (c == null) return;
ChatMember resolved = resolveChatMemberForTopCandidate(c);
if (resolved == null) return;
// Try to select in table (reuses existing selection logic)
if (tbl_chatMember.getItems().contains(resolved)) {
tbl_chatMember.getSelectionModel().select(resolved);
tbl_chatMember.scrollTo(resolved);
} else {
// Fallback: if filtered out, still show FurtherInfo + prepare /cq
selectedCallSignInfoStageChatMember = resolved;
chatcontroller.getScoreService().setSelectedChatMember(selectedCallSignInfoStageChatMember);
selectedCallSignFurtherInfoPane.getChildren().setAll(generateFurtherInfoAbtSelectedCallsignBP(resolved));
txt_chatMessageUserInput.clear();
txt_chatMessageUserInput.setText("/cq " + resolved.getCallSign() + " ");
txt_chatMessageUserInput.requestFocus();
txt_chatMessageUserInput.selectEnd();
// Keep ScoreService selection in sync
chatcontroller.getScoreService().setSelectedChatMember(resolved);
} }
kst4contest.controller.ScoreService.TopCandidate selected =
listView.getSelectionModel().getSelectedItem();
if (selected == null) {
return;
}
selectTopCandidate(selected, tbl_chatMember, txt_chatMessageUserInput);
stage.close();
}); });
pane.setTop(header); BorderPane root = new BorderPane();
pane.setCenter(listView); root.setStyle("-fx-padding: 5;");
return pane; root.setCenter(listView);
root.setBottom(new Label("Double-click a candidate to select it."));
stage.setScene(new Scene(root, 360, 500));
stage.show();
} }
private ChatMember resolveChatMemberForTopCandidate(kst4contest.controller.ScoreService.TopCandidate c) { private ChatMember resolveChatMemberForTopCandidate(kst4contest.controller.ScoreService.TopCandidate c) {
String callRaw = c.getCallSignRaw(); String callRaw = c.getCallSignRaw();
@@ -4672,6 +5074,74 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
} }
/**
* Calculates a screen-aware startup size for the main chat window.
*
* Preferences store the main scene size as:
* - index 0 = height
* - index 1 = width
*
* The stored size is used unchanged as long as it fits into the currently
* available primary screen area. If the application was last used on a larger
* monitor and is now started on a smaller screen, the size is reduced so the
* main window remains usable immediately after startup.
*
* Screen.getVisualBounds() is used instead of Screen.getBounds() because the
* visual bounds exclude task bars, docks and similar OS UI areas.
*
* The returned array keeps the same H/W order as ChatPreferences:
* - index 0 = corrected height
* - index 1 = corrected width
*/
private double[] getScreenAwareMainSceneSizeHW(double[] storedSceneSizeHW) {
final double fallbackHeight = 768.0;
final double fallbackWidth = 1234.0;
/*
* Leave a little room for the native window decoration and screen edges.
* JavaFX Scene size does not include the full native Stage decoration.
*/
final double screenMargin = 40.0;
double storedHeight = fallbackHeight;
double storedWidth = fallbackWidth;
if (storedSceneSizeHW != null && storedSceneSizeHW.length >= 2) {
if (Double.isFinite(storedSceneSizeHW[0]) && storedSceneSizeHW[0] > 0) {
storedHeight = storedSceneSizeHW[0];
}
if (Double.isFinite(storedSceneSizeHW[1]) && storedSceneSizeHW[1] > 0) {
storedWidth = storedSceneSizeHW[1];
}
}
Rectangle2D visualBounds = Screen.getPrimary().getVisualBounds();
double availableWidth = Math.max(1.0, visualBounds.getWidth() - screenMargin);
double availableHeight = Math.max(1.0, visualBounds.getHeight() - screenMargin);
double correctedWidth = Math.min(storedWidth, availableWidth);
double correctedHeight = Math.min(storedHeight, availableHeight);
if (correctedWidth != storedWidth || correctedHeight != storedHeight) {
System.out.println("[Main.java, Info]: Main window startup size reduced to fit current screen. "
+ "storedWidth=" + storedWidth
+ ", storedHeight=" + storedHeight
+ ", availableWidth=" + availableWidth
+ ", availableHeight=" + availableHeight
+ ", correctedWidth=" + correctedWidth
+ ", correctedHeight=" + correctedHeight);
}
return new double[] {
correctedHeight,
correctedWidth
};
}
@Override @Override
public void start(Stage primaryStage) throws InterruptedException, IOException, URISyntaxException { public void start(Stage primaryStage) throws InterruptedException, IOException, URISyntaxException {
@@ -4818,9 +5288,25 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
BorderPane bPaneChatWindow = new BorderPane(); BorderPane bPaneChatWindow = new BorderPane();
scn_ChatwindowMainScene = new Scene(bPaneChatWindow, chatcontroller.getChatPreferences().getGUIscn_ChatwindowMainSceneSizeHW()[1], chatcontroller.getChatPreferences().getGUIscn_ChatwindowMainSceneSizeHW()[0]); /*
* Restore the main window size from preferences, but never start larger than
* the currently available screen area. This avoids unusable oversized windows
* when KST4Contest was last used on a larger monitor.
*/
double[] screenAwareMainSceneSizeHW = getScreenAwareMainSceneSizeHW(
chatcontroller.getChatPreferences().getGUIscn_ChatwindowMainSceneSizeHW()
);
scn_ChatwindowMainScene = new Scene(
bPaneChatWindow,
screenAwareMainSceneSizeHW[1],
screenAwareMainSceneSizeHW[0]
);
scn_ChatwindowMainScene.getStylesheets().add(ApplicationConstants.STYLECSSFILE_DEFAULT_DAYLIGHT); scn_ChatwindowMainScene.getStylesheets().add(ApplicationConstants.STYLECSSFILE_DEFAULT_DAYLIGHT);
//add listeners for size changes to restore after startup //add listeners for size changes to restore after startup
scn_ChatwindowMainScene.widthProperty().addListener(new ChangeListener<Number>() { scn_ChatwindowMainScene.widthProperty().addListener(new ChangeListener<Number>() {
@Override @Override
@@ -5413,8 +5899,19 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
messageSectionSplitpane.getItems().addAll(privateMessageTable, flwPane_textSnippets,pnl_inputAndSendButtons, textInputFlowPane, // messageSectionSplitpane.getItems().addAll(privateMessageTable, flwPane_textSnippets,pnl_inputAndSendButtons, textInputFlowPane,
tbl_generalMessageTable); // tbl_generalMessageTable);
TabPane bottomGlobalMessageTabPane = initBottomGlobalMessageTabPane(tbl_generalMessageTable);
messageSectionSplitpane.getItems().addAll(
privateMessageTable,
flwPane_textSnippets,
pnl_inputAndSendButtons,
textInputFlowPane,
bottomGlobalMessageTabPane
);
messageSectionSplitpane.setDividerPositions(chatcontroller.getChatPreferences().getGUImessageSectionSplitpane_dividerposition()); messageSectionSplitpane.setDividerPositions(chatcontroller.getChatPreferences().getGUImessageSectionSplitpane_dividerposition());
//first initialize how much divider positions we need... //first initialize how much divider positions we need...
@@ -6194,6 +6691,13 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
primaryStage.setScene(scn_ChatwindowMainScene); primaryStage.setScene(scn_ChatwindowMainScene);
/*
* Safety net after the Scene has been attached to the Stage.
* Some platforms add native window decoration after setScene(...), so this
* second check prevents the Stage from extending beyond the visible screen.
*/
ensureStageFitsPrimaryScreen(primaryStage);
primaryStage.show(); primaryStage.show();
} catch (Exception e) { } catch (Exception e) {
@@ -6876,7 +7380,7 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
grdPnlStation.add(new Label("DEM root directory:"), 0, 9); grdPnlStation.add(new Label("DEM root directory:"), 0, 9);
grdPnlStation.add(txtFldstn_pathAnalysisDemRootDirectory, 1, 9); grdPnlStation.add(txtFldstn_pathAnalysisDemRootDirectory, 1, 9);
grdPnlStation.add(hbxDemDirectoryActions, 2, 7, 2, 1); grdPnlStation.add(hbxDemDirectoryActions, 2, 9, 2, 1);
grdPnlStation.add(new Label("Default maximum QRB:"), 0, 10); grdPnlStation.add(new Label("Default maximum QRB:"), 0, 10);
grdPnlStation.add(txtFldstn_maxQRBDefault, 1, 10); grdPnlStation.add(txtFldstn_maxQRBDefault, 1, 10);
@@ -6896,8 +7400,8 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
grdPnlStation.add(new Label("DX OM ant. gain dBi:"), 0, 7); grdPnlStation.add(new Label("DX OM ant. gain dBi:"), 0, 7);
grdPnlStation.add(txtFldstn_pathAnalysisDefaultTargetAntennaGainDbi, 1, 7); grdPnlStation.add(txtFldstn_pathAnalysisDefaultTargetAntennaGainDbi, 1, 7);
grdPnlStation.add(lbl_station_pstRotatorEnabled, 0, 10); grdPnlStation.add(lbl_station_pstRotatorEnabled, 0, 12);
grdPnlStation.add(chkBx_station_pstRotatorEnabled, 1, 10); grdPnlStation.add(chkBx_station_pstRotatorEnabled, 1, 12);
@@ -9137,6 +9641,67 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
return textField; return textField;
} }
/**
* Ensures that the native Stage itself fits into the primary screen's visible
* area.
*
* This is a second safety net in addition to getScreenAwareMainSceneSizeHW(...).
* The first method corrects the JavaFX Scene size. This method corrects the
* actual Stage position and size, including platform-specific window behaviour.
*/
private void ensureStageFitsPrimaryScreen(Stage stage) {
if (stage == null) {
return;
}
Rectangle2D visualBounds = Screen.getPrimary().getVisualBounds();
double correctedX = stage.getX();
double correctedY = stage.getY();
double correctedWidth = stage.getWidth();
double correctedHeight = stage.getHeight();
if (!Double.isFinite(correctedWidth) || correctedWidth <= 0) {
correctedWidth = visualBounds.getWidth();
}
if (!Double.isFinite(correctedHeight) || correctedHeight <= 0) {
correctedHeight = visualBounds.getHeight();
}
correctedWidth = Math.min(correctedWidth, visualBounds.getWidth());
correctedHeight = Math.min(correctedHeight, visualBounds.getHeight());
if (!Double.isFinite(correctedX)) {
correctedX = visualBounds.getMinX();
}
if (!Double.isFinite(correctedY)) {
correctedY = visualBounds.getMinY();
}
if (correctedX < visualBounds.getMinX()) {
correctedX = visualBounds.getMinX();
}
if (correctedY < visualBounds.getMinY()) {
correctedY = visualBounds.getMinY();
}
if (correctedX + correctedWidth > visualBounds.getMaxX()) {
correctedX = visualBounds.getMaxX() - correctedWidth;
}
if (correctedY + correctedHeight > visualBounds.getMaxY()) {
correctedY = visualBounds.getMaxY() - correctedHeight;
}
stage.setX(correctedX);
stage.setY(correctedY);
stage.setWidth(correctedWidth);
stage.setHeight(correctedHeight);
}
} }
/** /**
@@ -9172,8 +9737,11 @@ class ActionButtonTableCell<S, T> extends TableCell<S, T> {
} }
} }
} }
/** /**
* This cell type is used to declare buttons which can be placed in the tableview * This cell type is used to declare buttons which can be placed in the tableview
* *
@@ -1,5 +1,10 @@
package kst4contest.view.map; package kst4contest.view.map;
import java.io.IOException;
import java.io.InputStream;
import java.io.UncheckedIOException;
import java.nio.charset.StandardCharsets;
/** /**
* HTML host for the JavaFX WebView map. * HTML host for the JavaFX WebView map.
* *
@@ -16,7 +21,21 @@ public final class MapHtmlResources {
private MapHtmlResources() { private MapHtmlResources() {
} }
public static String createStationMapHtml() { private static String readRequiredResource(String resourcePath) {
try (InputStream inputStream = MapHtmlResources.class.getResourceAsStream(resourcePath)) {
if (inputStream == null) {
throw new IllegalStateException("Missing map resource: " + resourcePath);
}
return new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
} catch (IOException exception) {
throw new UncheckedIOException("Could not read map resource: " + resourcePath, exception);
}
}
public static String createStationMapHtml(int tileProxyPort) {
String leafletCss = readRequiredResource("/web/leaflet/leaflet.css");
String leafletJs = readRequiredResource("/web/leaflet/leaflet.js");
return """ return """
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@@ -24,10 +43,9 @@ public final class MapHtmlResources {
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>KST4Contest Station Map</title> <title>KST4Contest Station Map</title>
<link rel="stylesheet" <style>
href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" """ + leafletCss + """
integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=" </style>
crossorigin="">
<style> <style>
:root { :root {
--map-background: #ede9df; --map-background: #ede9df;
@@ -196,9 +214,10 @@ public final class MapHtmlResources {
<body class="kst-theme-light"> <body class="kst-theme-light">
<div id="map"></div> <div id="map"></div>
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js" <script>
integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" """ + leafletJs + """
crossorigin=""></script> </script>
<script>window._kstTileProxyPort=__TILE_PROXY_PORT__;</script>
<script> <script>
@@ -336,7 +355,12 @@ public final class MapHtmlResources {
function init() { function init() {
if (map) { if (map) {
return; return true;
}
if (typeof L === 'undefined') {
jsError('Leaflet is not loaded. Station map cannot initialize.');
return false;
} }
applyThemeClass(); applyThemeClass();
@@ -347,10 +371,13 @@ public final class MapHtmlResources {
jsLog('Leaflet map initialized'); jsLog('Leaflet map initialized');
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { L.tileLayer(
maxZoom: 18, 'http://127.0.0.1:' + window._kstTileProxyPort + '/tiles/{s}/{z}/{x}/{y}.png',
attribution: '&copy; OpenStreetMap' {
}).addTo(map); maxZoom: 18,
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>'
}
).addTo(map);
map.createPane('beamPane'); map.createPane('beamPane');
map.getPane('beamPane').style.zIndex = 410; map.getPane('beamPane').style.zIndex = 410;
@@ -385,6 +412,7 @@ public final class MapHtmlResources {
notifyMapReady(); notifyMapReady();
notifyViewport(); notifyViewport();
return true;
} }
function invalidateSize() { function invalidateSize() {
@@ -468,13 +496,17 @@ public final class MapHtmlResources {
} }
function setHome(lat, lon, zoom) { function setHome(lat, lon, zoom) {
init(); if (!init()) {
return;
}
jsLog('setHome lat=' + lat + ' lon=' + lon + ' zoom=' + zoom); jsLog('setHome lat=' + lat + ' lon=' + lon + ' zoom=' + zoom);
map.setView([lat, lon], zoom); map.setView([lat, lon], zoom);
} }
function setStations(stationsJson) { function setStations(stationsJson) {
init(); if (!init()) {
return;
}
stationLayer.clearLayers(); stationLayer.clearLayers();
markersByCallsignRaw = {}; markersByCallsignRaw = {};
@@ -503,7 +535,9 @@ public final class MapHtmlResources {
} }
function setBeam(beamJson) { function setBeam(beamJson) {
init(); if (!init()) {
return;
}
beamLayer.clearLayers(); beamLayer.clearLayers();
if (!beamJson || beamJson === 'null') { if (!beamJson || beamJson === 'null') {
@@ -530,7 +564,9 @@ public final class MapHtmlResources {
} }
function setConnection(connectionJson) { function setConnection(connectionJson) {
init(); if (!init()) {
return;
}
connectionLayer.clearLayers(); connectionLayer.clearLayers();
if (!connectionJson || connectionJson === 'null') { if (!connectionJson || connectionJson === 'null') {
@@ -555,7 +591,9 @@ public final class MapHtmlResources {
} }
function setProfileHoverPoint(point) { function setProfileHoverPoint(point) {
init(); if (!init()) {
return;
}
if (profileHoverMarker) { if (profileHoverMarker) {
map.removeLayer(profileHoverMarker); map.removeLayer(profileHoverMarker);
@@ -584,7 +622,9 @@ public final class MapHtmlResources {
} }
function setGrid(gridJson) { function setGrid(gridJson) {
init(); if (!init()) {
return;
}
gridLayer.clearLayers(); gridLayer.clearLayers();
const cells = JSON.parse(gridJson); const cells = JSON.parse(gridJson);
@@ -670,6 +710,6 @@ public final class MapHtmlResources {
</script> </script>
</body> </body>
</html> </html>
"""; """.replace("__TILE_PROXY_PORT__", String.valueOf(tileProxyPort));
} }
} }
@@ -18,6 +18,7 @@ import kst4contest.ApplicationConstants;
import kst4contest.locatorUtils.Location; import kst4contest.locatorUtils.Location;
import kst4contest.model.ChatPreferences; import kst4contest.model.ChatPreferences;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@@ -48,6 +49,7 @@ public final class StationMapView {
private final Stage stage = new Stage(); private final Stage stage = new Stage();
private final WebView webView = new WebView(); private final WebView webView = new WebView();
private final WebEngine webEngine = webView.getEngine(); private final WebEngine webEngine = webView.getEngine();
private TileProxyServer tileProxyServer;
private Scene scene; private Scene scene;
private BorderPane rootPane; private BorderPane rootPane;
@@ -127,6 +129,11 @@ public final class StationMapView {
public StationMapView(ChatPreferences chatPreferences) { public StationMapView(ChatPreferences chatPreferences) {
this.chatPreferences = Objects.requireNonNull(chatPreferences, "chatPreferences"); this.chatPreferences = Objects.requireNonNull(chatPreferences, "chatPreferences");
try {
tileProxyServer = new TileProxyServer();
} catch (IOException e) {
System.err.println("[StationMap] tile proxy failed to start: " + e.getMessage());
}
initializeUi(); initializeUi();
initializeWebView(); initializeWebView();
} }
@@ -627,7 +634,8 @@ public final class StationMapView {
} }
}); });
webEngine.loadContent(MapHtmlResources.createStationMapHtml()); int proxyPort = tileProxyServer != null ? tileProxyServer.getPort() : 0;
webEngine.loadContent(MapHtmlResources.createStationMapHtml(proxyPort));
} }
private void requestMapInvalidateSize() { private void requestMapInvalidateSize() {
@@ -1093,6 +1101,7 @@ public final class StationMapView {
webEngine.executeScript(script); webEngine.executeScript(script);
} catch (Exception exception) { } catch (Exception exception) {
System.err.println("[StationMap] executeScript failed: " + exception.getMessage()); System.err.println("[StationMap] executeScript failed: " + exception.getMessage());
exception.printStackTrace();
} }
} }
@@ -0,0 +1,156 @@
package kst4contest.view.map;
import java.io.*;
import java.net.*;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.time.Duration;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
/**
* Minimal HTTP server that proxies OSM tile requests via Java's HttpClient,
* so JavaFX WebView only needs to connect to localhost (avoids WebKit SSL/sandbox
* issues in AppImage and Flatpak packaging). Uses only java.base + java.net.http.
*/
final class TileProxyServer {
private static final int CACHE_MAX = 512;
private static final String USER_AGENT = "kst4contest/1.0 amateur-radio-contest-tool";
private final ServerSocket serverSocket;
private final ExecutorService executor;
private final HttpClient httpClient;
private final Map<String, byte[]> cache;
TileProxyServer() throws IOException {
this.httpClient = HttpClient.newBuilder()
.connectTimeout(Duration.ofSeconds(10))
.build();
this.cache = Collections.synchronizedMap(new LinkedHashMap<>(CACHE_MAX, 0.75f, true) {
@Override
protected boolean removeEldestEntry(Map.Entry<String, byte[]> eldest) {
return size() > CACHE_MAX;
}
});
this.serverSocket = new ServerSocket(0, 16, InetAddress.getByName("127.0.0.1"));
this.executor = Executors.newFixedThreadPool(4, r -> {
Thread t = new Thread(r, "tile-proxy");
t.setDaemon(true);
return t;
});
executor.submit(this::acceptLoop);
}
int getPort() {
return serverSocket.getLocalPort();
}
void stop() {
try { serverSocket.close(); } catch (IOException ignored) {}
executor.shutdownNow();
}
private void acceptLoop() {
while (!serverSocket.isClosed()) {
try {
Socket client = serverSocket.accept();
executor.submit(() -> handleClient(client));
} catch (IOException e) {
if (!serverSocket.isClosed()) {
System.err.println("[TileProxy] accept error: " + e.getMessage());
}
}
}
}
private void handleClient(Socket client) {
try (client;
BufferedReader in = new BufferedReader(new InputStreamReader(client.getInputStream()));
OutputStream out = client.getOutputStream()) {
String requestLine = in.readLine();
if (requestLine == null || !requestLine.startsWith("GET ")) {
sendError(out, 400, "Bad Request");
return;
}
// Drain headers
String line;
while ((line = in.readLine()) != null && !line.isEmpty()) { /* skip */ }
// Parse: GET /tiles/{s}/{z}/{x}/{y}.png HTTP/1.1
String[] parts = requestLine.split(" ");
if (parts.length < 2) { sendError(out, 400, "Bad Request"); return; }
String path = parts[1];
String[] segments = path.split("/");
// segments: ["", "tiles", s, z, x, "y.png"]
if (segments.length != 6
|| !segments[2].matches("[abc]")
|| !segments[3].matches("\\d{1,2}")
|| !segments[4].matches("\\d+")
|| !segments[5].matches("\\d+\\.png")) {
sendError(out, 404, "Not Found");
return;
}
String cacheKey = segments[2] + "/" + segments[3] + "/" + segments[4] + "/" + segments[5];
byte[] tileData = cache.get(cacheKey);
if (tileData == null) {
String tileUrl = "https://" + segments[2] + ".tile.openstreetmap.org/"
+ segments[3] + "/" + segments[4] + "/" + segments[5];
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(tileUrl))
.header("User-Agent", USER_AGENT)
.timeout(Duration.ofSeconds(15))
.GET()
.build();
HttpResponse<byte[]> response = httpClient.send(request, HttpResponse.BodyHandlers.ofByteArray());
if (response.statusCode() != 200) {
sendError(out, 502, "OSM returned " + response.statusCode());
return;
}
tileData = response.body();
cache.put(cacheKey, tileData);
}
String header = "HTTP/1.1 200 OK\r\n"
+ "Content-Type: image/png\r\n"
+ "Content-Length: " + tileData.length + "\r\n"
+ "Cache-Control: max-age=86400\r\n"
+ "Connection: close\r\n"
+ "\r\n";
out.write(header.getBytes());
out.write(tileData);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
} catch (Exception e) {
System.err.println("[TileProxy] error: " + e.getMessage());
}
}
private static void sendError(OutputStream out, int code, String message) throws IOException {
byte[] body = message.getBytes();
String response = "HTTP/1.1 " + code + " " + message + "\r\n"
+ "Content-Length: " + body.length + "\r\n"
+ "Connection: close\r\n"
+ "\r\n";
out.write(response.getBytes());
out.write(body);
}
}
+2
View File
@@ -8,11 +8,13 @@ module praktiKST {
requires jdk.jsobject; requires jdk.jsobject;
requires java.net.http; requires java.net.http;
requires java.desktop; requires java.desktop;
requires jdk.crypto.ec;
exports kst4contest.controller.interfaces; exports kst4contest.controller.interfaces;
exports kst4contest.controller; exports kst4contest.controller;
exports kst4contest.locatorUtils; exports kst4contest.locatorUtils;
exports kst4contest.model; exports kst4contest.model;
exports kst4contest.view; exports kst4contest.view;
opens kst4contest.view.map to javafx.web; opens kst4contest.view.map to javafx.web;
} }
+661
View File
@@ -0,0 +1,661 @@
/* required styles */
.leaflet-pane,
.leaflet-tile,
.leaflet-marker-icon,
.leaflet-marker-shadow,
.leaflet-tile-container,
.leaflet-pane > svg,
.leaflet-pane > canvas,
.leaflet-zoom-box,
.leaflet-image-layer,
.leaflet-layer {
position: absolute;
left: 0;
top: 0;
}
.leaflet-container {
overflow: hidden;
}
.leaflet-tile,
.leaflet-marker-icon,
.leaflet-marker-shadow {
-webkit-user-select: none;
-moz-user-select: none;
user-select: none;
-webkit-user-drag: none;
}
/* Prevents IE11 from highlighting tiles in blue */
.leaflet-tile::selection {
background: transparent;
}
/* Safari renders non-retina tile on retina better with this, but Chrome is worse */
.leaflet-safari .leaflet-tile {
image-rendering: -webkit-optimize-contrast;
}
/* hack that prevents hw layers "stretching" when loading new tiles */
.leaflet-safari .leaflet-tile-container {
width: 1600px;
height: 1600px;
-webkit-transform-origin: 0 0;
}
.leaflet-marker-icon,
.leaflet-marker-shadow {
display: block;
}
/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
.leaflet-container .leaflet-overlay-pane svg {
max-width: none !important;
max-height: none !important;
}
.leaflet-container .leaflet-marker-pane img,
.leaflet-container .leaflet-shadow-pane img,
.leaflet-container .leaflet-tile-pane img,
.leaflet-container img.leaflet-image-layer,
.leaflet-container .leaflet-tile {
max-width: none !important;
max-height: none !important;
width: auto;
padding: 0;
}
.leaflet-container img.leaflet-tile {
/* See: https://bugs.chromium.org/p/chromium/issues/detail?id=600120 */
mix-blend-mode: plus-lighter;
}
.leaflet-container.leaflet-touch-zoom {
-ms-touch-action: pan-x pan-y;
touch-action: pan-x pan-y;
}
.leaflet-container.leaflet-touch-drag {
-ms-touch-action: pinch-zoom;
/* Fallback for FF which doesn't support pinch-zoom */
touch-action: none;
touch-action: pinch-zoom;
}
.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom {
-ms-touch-action: none;
touch-action: none;
}
.leaflet-container {
-webkit-tap-highlight-color: transparent;
}
.leaflet-container a {
-webkit-tap-highlight-color: rgba(51, 181, 229, 0.4);
}
.leaflet-tile {
filter: inherit;
visibility: hidden;
}
.leaflet-tile-loaded {
visibility: inherit;
}
.leaflet-zoom-box {
width: 0;
height: 0;
-moz-box-sizing: border-box;
box-sizing: border-box;
z-index: 800;
}
/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
.leaflet-overlay-pane svg {
-moz-user-select: none;
}
.leaflet-pane { z-index: 400; }
.leaflet-tile-pane { z-index: 200; }
.leaflet-overlay-pane { z-index: 400; }
.leaflet-shadow-pane { z-index: 500; }
.leaflet-marker-pane { z-index: 600; }
.leaflet-tooltip-pane { z-index: 650; }
.leaflet-popup-pane { z-index: 700; }
.leaflet-map-pane canvas { z-index: 100; }
.leaflet-map-pane svg { z-index: 200; }
.leaflet-vml-shape {
width: 1px;
height: 1px;
}
.lvml {
behavior: url(#default#VML);
display: inline-block;
position: absolute;
}
/* control positioning */
.leaflet-control {
position: relative;
z-index: 800;
pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
pointer-events: auto;
}
.leaflet-top,
.leaflet-bottom {
position: absolute;
z-index: 1000;
pointer-events: none;
}
.leaflet-top {
top: 0;
}
.leaflet-right {
right: 0;
}
.leaflet-bottom {
bottom: 0;
}
.leaflet-left {
left: 0;
}
.leaflet-control {
float: left;
clear: both;
}
.leaflet-right .leaflet-control {
float: right;
}
.leaflet-top .leaflet-control {
margin-top: 10px;
}
.leaflet-bottom .leaflet-control {
margin-bottom: 10px;
}
.leaflet-left .leaflet-control {
margin-left: 10px;
}
.leaflet-right .leaflet-control {
margin-right: 10px;
}
/* zoom and fade animations */
.leaflet-fade-anim .leaflet-popup {
opacity: 0;
-webkit-transition: opacity 0.2s linear;
-moz-transition: opacity 0.2s linear;
transition: opacity 0.2s linear;
}
.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
opacity: 1;
}
.leaflet-zoom-animated {
-webkit-transform-origin: 0 0;
-ms-transform-origin: 0 0;
transform-origin: 0 0;
}
svg.leaflet-zoom-animated {
will-change: transform;
}
.leaflet-zoom-anim .leaflet-zoom-animated {
-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
-moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
transition: transform 0.25s cubic-bezier(0,0,0.25,1);
}
.leaflet-zoom-anim .leaflet-tile,
.leaflet-pan-anim .leaflet-tile {
-webkit-transition: none;
-moz-transition: none;
transition: none;
}
.leaflet-zoom-anim .leaflet-zoom-hide {
visibility: hidden;
}
/* cursors */
.leaflet-interactive {
cursor: pointer;
}
.leaflet-grab {
cursor: -webkit-grab;
cursor: -moz-grab;
cursor: grab;
}
.leaflet-crosshair,
.leaflet-crosshair .leaflet-interactive {
cursor: crosshair;
}
.leaflet-popup-pane,
.leaflet-control {
cursor: auto;
}
.leaflet-dragging .leaflet-grab,
.leaflet-dragging .leaflet-grab .leaflet-interactive,
.leaflet-dragging .leaflet-marker-draggable {
cursor: move;
cursor: -webkit-grabbing;
cursor: -moz-grabbing;
cursor: grabbing;
}
/* marker & overlays interactivity */
.leaflet-marker-icon,
.leaflet-marker-shadow,
.leaflet-image-layer,
.leaflet-pane > svg path,
.leaflet-tile-container {
pointer-events: none;
}
.leaflet-marker-icon.leaflet-interactive,
.leaflet-image-layer.leaflet-interactive,
.leaflet-pane > svg path.leaflet-interactive,
svg.leaflet-image-layer.leaflet-interactive path {
pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
pointer-events: auto;
}
/* visual tweaks */
.leaflet-container {
background: #ddd;
outline-offset: 1px;
}
.leaflet-container a {
color: #0078A8;
}
.leaflet-zoom-box {
border: 2px dotted #38f;
background: rgba(255,255,255,0.5);
}
/* general typography */
.leaflet-container {
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
font-size: 12px;
font-size: 0.75rem;
line-height: 1.5;
}
/* general toolbar styles */
.leaflet-bar {
box-shadow: 0 1px 5px rgba(0,0,0,0.65);
border-radius: 4px;
}
.leaflet-bar a {
background-color: #fff;
border-bottom: 1px solid #ccc;
width: 26px;
height: 26px;
line-height: 26px;
display: block;
text-align: center;
text-decoration: none;
color: black;
}
.leaflet-bar a,
.leaflet-control-layers-toggle {
background-position: 50% 50%;
background-repeat: no-repeat;
display: block;
}
.leaflet-bar a:hover,
.leaflet-bar a:focus {
background-color: #f4f4f4;
}
.leaflet-bar a:first-child {
border-top-left-radius: 4px;
border-top-right-radius: 4px;
}
.leaflet-bar a:last-child {
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
border-bottom: none;
}
.leaflet-bar a.leaflet-disabled {
cursor: default;
background-color: #f4f4f4;
color: #bbb;
}
.leaflet-touch .leaflet-bar a {
width: 30px;
height: 30px;
line-height: 30px;
}
.leaflet-touch .leaflet-bar a:first-child {
border-top-left-radius: 2px;
border-top-right-radius: 2px;
}
.leaflet-touch .leaflet-bar a:last-child {
border-bottom-left-radius: 2px;
border-bottom-right-radius: 2px;
}
/* zoom control */
.leaflet-control-zoom-in,
.leaflet-control-zoom-out {
font: bold 18px 'Lucida Console', Monaco, monospace;
text-indent: 1px;
}
.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out {
font-size: 22px;
}
/* layers control */
.leaflet-control-layers {
box-shadow: 0 1px 5px rgba(0,0,0,0.4);
background: #fff;
border-radius: 5px;
}
.leaflet-control-layers-toggle {
background-image: url(images/layers.png);
width: 36px;
height: 36px;
}
.leaflet-retina .leaflet-control-layers-toggle {
background-image: url(images/layers-2x.png);
background-size: 26px 26px;
}
.leaflet-touch .leaflet-control-layers-toggle {
width: 44px;
height: 44px;
}
.leaflet-control-layers .leaflet-control-layers-list,
.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
display: none;
}
.leaflet-control-layers-expanded .leaflet-control-layers-list {
display: block;
position: relative;
}
.leaflet-control-layers-expanded {
padding: 6px 10px 6px 6px;
color: #333;
background: #fff;
}
.leaflet-control-layers-scrollbar {
overflow-y: scroll;
overflow-x: hidden;
padding-right: 5px;
}
.leaflet-control-layers-selector {
margin-top: 2px;
position: relative;
top: 1px;
}
.leaflet-control-layers label {
display: block;
font-size: 13px;
font-size: 1.08333em;
}
.leaflet-control-layers-separator {
height: 0;
border-top: 1px solid #ddd;
margin: 5px -10px 5px -6px;
}
/* Default icon URLs */
.leaflet-default-icon-path { /* used only in path-guessing heuristic, see L.Icon.Default */
background-image: url(images/marker-icon.png);
}
/* attribution and scale controls */
.leaflet-container .leaflet-control-attribution {
background: #fff;
background: rgba(255, 255, 255, 0.8);
margin: 0;
}
.leaflet-control-attribution,
.leaflet-control-scale-line {
padding: 0 5px;
color: #333;
line-height: 1.4;
}
.leaflet-control-attribution a {
text-decoration: none;
}
.leaflet-control-attribution a:hover,
.leaflet-control-attribution a:focus {
text-decoration: underline;
}
.leaflet-attribution-flag {
display: inline !important;
vertical-align: baseline !important;
width: 1em;
height: 0.6669em;
}
.leaflet-left .leaflet-control-scale {
margin-left: 5px;
}
.leaflet-bottom .leaflet-control-scale {
margin-bottom: 5px;
}
.leaflet-control-scale-line {
border: 2px solid #777;
border-top: none;
line-height: 1.1;
padding: 2px 5px 1px;
white-space: nowrap;
-moz-box-sizing: border-box;
box-sizing: border-box;
background: rgba(255, 255, 255, 0.8);
text-shadow: 1px 1px #fff;
}
.leaflet-control-scale-line:not(:first-child) {
border-top: 2px solid #777;
border-bottom: none;
margin-top: -2px;
}
.leaflet-control-scale-line:not(:first-child):not(:last-child) {
border-bottom: 2px solid #777;
}
.leaflet-touch .leaflet-control-attribution,
.leaflet-touch .leaflet-control-layers,
.leaflet-touch .leaflet-bar {
box-shadow: none;
}
.leaflet-touch .leaflet-control-layers,
.leaflet-touch .leaflet-bar {
border: 2px solid rgba(0,0,0,0.2);
background-clip: padding-box;
}
/* popup */
.leaflet-popup {
position: absolute;
text-align: center;
margin-bottom: 20px;
}
.leaflet-popup-content-wrapper {
padding: 1px;
text-align: left;
border-radius: 12px;
}
.leaflet-popup-content {
margin: 13px 24px 13px 20px;
line-height: 1.3;
font-size: 13px;
font-size: 1.08333em;
min-height: 1px;
}
.leaflet-popup-content p {
margin: 17px 0;
margin: 1.3em 0;
}
.leaflet-popup-tip-container {
width: 40px;
height: 20px;
position: absolute;
left: 50%;
margin-top: -1px;
margin-left: -20px;
overflow: hidden;
pointer-events: none;
}
.leaflet-popup-tip {
width: 17px;
height: 17px;
padding: 1px;
margin: -10px auto 0;
pointer-events: auto;
-webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg);
-ms-transform: rotate(45deg);
transform: rotate(45deg);
}
.leaflet-popup-content-wrapper,
.leaflet-popup-tip {
background: white;
color: #333;
box-shadow: 0 3px 14px rgba(0,0,0,0.4);
}
.leaflet-container a.leaflet-popup-close-button {
position: absolute;
top: 0;
right: 0;
border: none;
text-align: center;
width: 24px;
height: 24px;
font: 16px/24px Tahoma, Verdana, sans-serif;
color: #757575;
text-decoration: none;
background: transparent;
}
.leaflet-container a.leaflet-popup-close-button:hover,
.leaflet-container a.leaflet-popup-close-button:focus {
color: #585858;
}
.leaflet-popup-scrolled {
overflow: auto;
}
.leaflet-oldie .leaflet-popup-content-wrapper {
-ms-zoom: 1;
}
.leaflet-oldie .leaflet-popup-tip {
width: 24px;
margin: 0 auto;
-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
}
.leaflet-oldie .leaflet-control-zoom,
.leaflet-oldie .leaflet-control-layers,
.leaflet-oldie .leaflet-popup-content-wrapper,
.leaflet-oldie .leaflet-popup-tip {
border: 1px solid #999;
}
/* div icon */
.leaflet-div-icon {
background: #fff;
border: 1px solid #666;
}
/* Tooltip */
/* Base styles for the element that has a tooltip */
.leaflet-tooltip {
position: absolute;
padding: 6px;
background-color: #fff;
border: 1px solid #fff;
border-radius: 3px;
color: #222;
white-space: nowrap;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
pointer-events: none;
box-shadow: 0 1px 3px rgba(0,0,0,0.4);
}
.leaflet-tooltip.leaflet-interactive {
cursor: pointer;
pointer-events: auto;
}
.leaflet-tooltip-top:before,
.leaflet-tooltip-bottom:before,
.leaflet-tooltip-left:before,
.leaflet-tooltip-right:before {
position: absolute;
pointer-events: none;
border: 6px solid transparent;
background: transparent;
content: "";
}
/* Directions */
.leaflet-tooltip-bottom {
margin-top: 6px;
}
.leaflet-tooltip-top {
margin-top: -6px;
}
.leaflet-tooltip-bottom:before,
.leaflet-tooltip-top:before {
left: 50%;
margin-left: -6px;
}
.leaflet-tooltip-top:before {
bottom: 0;
margin-bottom: -12px;
border-top-color: #fff;
}
.leaflet-tooltip-bottom:before {
top: 0;
margin-top: -12px;
margin-left: -6px;
border-bottom-color: #fff;
}
.leaflet-tooltip-left {
margin-left: -6px;
}
.leaflet-tooltip-right {
margin-left: 6px;
}
.leaflet-tooltip-left:before,
.leaflet-tooltip-right:before {
top: 50%;
margin-top: -6px;
}
.leaflet-tooltip-left:before {
right: 0;
margin-right: -12px;
border-left-color: #fff;
}
.leaflet-tooltip-right:before {
left: 0;
margin-left: -12px;
border-right-color: #fff;
}
/* Printing */
@media print {
/* Prevent printers from removing background-images of controls. */
.leaflet-control {
-webkit-print-color-adjust: exact;
print-color-adjust: exact;
}
}
File diff suppressed because one or more lines are too long
+661
View File
@@ -0,0 +1,661 @@
/* required styles */
.leaflet-pane,
.leaflet-tile,
.leaflet-marker-icon,
.leaflet-marker-shadow,
.leaflet-tile-container,
.leaflet-pane > svg,
.leaflet-pane > canvas,
.leaflet-zoom-box,
.leaflet-image-layer,
.leaflet-layer {
position: absolute;
left: 0;
top: 0;
}
.leaflet-container {
overflow: hidden;
}
.leaflet-tile,
.leaflet-marker-icon,
.leaflet-marker-shadow {
-webkit-user-select: none;
-moz-user-select: none;
user-select: none;
-webkit-user-drag: none;
}
/* Prevents IE11 from highlighting tiles in blue */
.leaflet-tile::selection {
background: transparent;
}
/* Safari renders non-retina tile on retina better with this, but Chrome is worse */
.leaflet-safari .leaflet-tile {
image-rendering: -webkit-optimize-contrast;
}
/* hack that prevents hw layers "stretching" when loading new tiles */
.leaflet-safari .leaflet-tile-container {
width: 1600px;
height: 1600px;
-webkit-transform-origin: 0 0;
}
.leaflet-marker-icon,
.leaflet-marker-shadow {
display: block;
}
/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
.leaflet-container .leaflet-overlay-pane svg {
max-width: none !important;
max-height: none !important;
}
.leaflet-container .leaflet-marker-pane img,
.leaflet-container .leaflet-shadow-pane img,
.leaflet-container .leaflet-tile-pane img,
.leaflet-container img.leaflet-image-layer,
.leaflet-container .leaflet-tile {
max-width: none !important;
max-height: none !important;
width: auto;
padding: 0;
}
.leaflet-container img.leaflet-tile {
/* See: https://bugs.chromium.org/p/chromium/issues/detail?id=600120 */
mix-blend-mode: plus-lighter;
}
.leaflet-container.leaflet-touch-zoom {
-ms-touch-action: pan-x pan-y;
touch-action: pan-x pan-y;
}
.leaflet-container.leaflet-touch-drag {
-ms-touch-action: pinch-zoom;
/* Fallback for FF which doesn't support pinch-zoom */
touch-action: none;
touch-action: pinch-zoom;
}
.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom {
-ms-touch-action: none;
touch-action: none;
}
.leaflet-container {
-webkit-tap-highlight-color: transparent;
}
.leaflet-container a {
-webkit-tap-highlight-color: rgba(51, 181, 229, 0.4);
}
.leaflet-tile {
filter: inherit;
visibility: hidden;
}
.leaflet-tile-loaded {
visibility: inherit;
}
.leaflet-zoom-box {
width: 0;
height: 0;
-moz-box-sizing: border-box;
box-sizing: border-box;
z-index: 800;
}
/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
.leaflet-overlay-pane svg {
-moz-user-select: none;
}
.leaflet-pane { z-index: 400; }
.leaflet-tile-pane { z-index: 200; }
.leaflet-overlay-pane { z-index: 400; }
.leaflet-shadow-pane { z-index: 500; }
.leaflet-marker-pane { z-index: 600; }
.leaflet-tooltip-pane { z-index: 650; }
.leaflet-popup-pane { z-index: 700; }
.leaflet-map-pane canvas { z-index: 100; }
.leaflet-map-pane svg { z-index: 200; }
.leaflet-vml-shape {
width: 1px;
height: 1px;
}
.lvml {
behavior: url(#default#VML);
display: inline-block;
position: absolute;
}
/* control positioning */
.leaflet-control {
position: relative;
z-index: 800;
pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
pointer-events: auto;
}
.leaflet-top,
.leaflet-bottom {
position: absolute;
z-index: 1000;
pointer-events: none;
}
.leaflet-top {
top: 0;
}
.leaflet-right {
right: 0;
}
.leaflet-bottom {
bottom: 0;
}
.leaflet-left {
left: 0;
}
.leaflet-control {
float: left;
clear: both;
}
.leaflet-right .leaflet-control {
float: right;
}
.leaflet-top .leaflet-control {
margin-top: 10px;
}
.leaflet-bottom .leaflet-control {
margin-bottom: 10px;
}
.leaflet-left .leaflet-control {
margin-left: 10px;
}
.leaflet-right .leaflet-control {
margin-right: 10px;
}
/* zoom and fade animations */
.leaflet-fade-anim .leaflet-popup {
opacity: 0;
-webkit-transition: opacity 0.2s linear;
-moz-transition: opacity 0.2s linear;
transition: opacity 0.2s linear;
}
.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
opacity: 1;
}
.leaflet-zoom-animated {
-webkit-transform-origin: 0 0;
-ms-transform-origin: 0 0;
transform-origin: 0 0;
}
svg.leaflet-zoom-animated {
will-change: transform;
}
.leaflet-zoom-anim .leaflet-zoom-animated {
-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
-moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
transition: transform 0.25s cubic-bezier(0,0,0.25,1);
}
.leaflet-zoom-anim .leaflet-tile,
.leaflet-pan-anim .leaflet-tile {
-webkit-transition: none;
-moz-transition: none;
transition: none;
}
.leaflet-zoom-anim .leaflet-zoom-hide {
visibility: hidden;
}
/* cursors */
.leaflet-interactive {
cursor: pointer;
}
.leaflet-grab {
cursor: -webkit-grab;
cursor: -moz-grab;
cursor: grab;
}
.leaflet-crosshair,
.leaflet-crosshair .leaflet-interactive {
cursor: crosshair;
}
.leaflet-popup-pane,
.leaflet-control {
cursor: auto;
}
.leaflet-dragging .leaflet-grab,
.leaflet-dragging .leaflet-grab .leaflet-interactive,
.leaflet-dragging .leaflet-marker-draggable {
cursor: move;
cursor: -webkit-grabbing;
cursor: -moz-grabbing;
cursor: grabbing;
}
/* marker & overlays interactivity */
.leaflet-marker-icon,
.leaflet-marker-shadow,
.leaflet-image-layer,
.leaflet-pane > svg path,
.leaflet-tile-container {
pointer-events: none;
}
.leaflet-marker-icon.leaflet-interactive,
.leaflet-image-layer.leaflet-interactive,
.leaflet-pane > svg path.leaflet-interactive,
svg.leaflet-image-layer.leaflet-interactive path {
pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
pointer-events: auto;
}
/* visual tweaks */
.leaflet-container {
background: #ddd;
outline-offset: 1px;
}
.leaflet-container a {
color: #0078A8;
}
.leaflet-zoom-box {
border: 2px dotted #38f;
background: rgba(255,255,255,0.5);
}
/* general typography */
.leaflet-container {
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
font-size: 12px;
font-size: 0.75rem;
line-height: 1.5;
}
/* general toolbar styles */
.leaflet-bar {
box-shadow: 0 1px 5px rgba(0,0,0,0.65);
border-radius: 4px;
}
.leaflet-bar a {
background-color: #fff;
border-bottom: 1px solid #ccc;
width: 26px;
height: 26px;
line-height: 26px;
display: block;
text-align: center;
text-decoration: none;
color: black;
}
.leaflet-bar a,
.leaflet-control-layers-toggle {
background-position: 50% 50%;
background-repeat: no-repeat;
display: block;
}
.leaflet-bar a:hover,
.leaflet-bar a:focus {
background-color: #f4f4f4;
}
.leaflet-bar a:first-child {
border-top-left-radius: 4px;
border-top-right-radius: 4px;
}
.leaflet-bar a:last-child {
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
border-bottom: none;
}
.leaflet-bar a.leaflet-disabled {
cursor: default;
background-color: #f4f4f4;
color: #bbb;
}
.leaflet-touch .leaflet-bar a {
width: 30px;
height: 30px;
line-height: 30px;
}
.leaflet-touch .leaflet-bar a:first-child {
border-top-left-radius: 2px;
border-top-right-radius: 2px;
}
.leaflet-touch .leaflet-bar a:last-child {
border-bottom-left-radius: 2px;
border-bottom-right-radius: 2px;
}
/* zoom control */
.leaflet-control-zoom-in,
.leaflet-control-zoom-out {
font: bold 18px 'Lucida Console', Monaco, monospace;
text-indent: 1px;
}
.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out {
font-size: 22px;
}
/* layers control */
.leaflet-control-layers {
box-shadow: 0 1px 5px rgba(0,0,0,0.4);
background: #fff;
border-radius: 5px;
}
.leaflet-control-layers-toggle {
background-image: url(images/layers.png);
width: 36px;
height: 36px;
}
.leaflet-retina .leaflet-control-layers-toggle {
background-image: url(images/layers-2x.png);
background-size: 26px 26px;
}
.leaflet-touch .leaflet-control-layers-toggle {
width: 44px;
height: 44px;
}
.leaflet-control-layers .leaflet-control-layers-list,
.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
display: none;
}
.leaflet-control-layers-expanded .leaflet-control-layers-list {
display: block;
position: relative;
}
.leaflet-control-layers-expanded {
padding: 6px 10px 6px 6px;
color: #333;
background: #fff;
}
.leaflet-control-layers-scrollbar {
overflow-y: scroll;
overflow-x: hidden;
padding-right: 5px;
}
.leaflet-control-layers-selector {
margin-top: 2px;
position: relative;
top: 1px;
}
.leaflet-control-layers label {
display: block;
font-size: 13px;
font-size: 1.08333em;
}
.leaflet-control-layers-separator {
height: 0;
border-top: 1px solid #ddd;
margin: 5px -10px 5px -6px;
}
/* Default icon URLs */
.leaflet-default-icon-path { /* used only in path-guessing heuristic, see L.Icon.Default */
background-image: url(images/marker-icon.png);
}
/* attribution and scale controls */
.leaflet-container .leaflet-control-attribution {
background: #fff;
background: rgba(255, 255, 255, 0.8);
margin: 0;
}
.leaflet-control-attribution,
.leaflet-control-scale-line {
padding: 0 5px;
color: #333;
line-height: 1.4;
}
.leaflet-control-attribution a {
text-decoration: none;
}
.leaflet-control-attribution a:hover,
.leaflet-control-attribution a:focus {
text-decoration: underline;
}
.leaflet-attribution-flag {
display: inline !important;
vertical-align: baseline !important;
width: 1em;
height: 0.6669em;
}
.leaflet-left .leaflet-control-scale {
margin-left: 5px;
}
.leaflet-bottom .leaflet-control-scale {
margin-bottom: 5px;
}
.leaflet-control-scale-line {
border: 2px solid #777;
border-top: none;
line-height: 1.1;
padding: 2px 5px 1px;
white-space: nowrap;
-moz-box-sizing: border-box;
box-sizing: border-box;
background: rgba(255, 255, 255, 0.8);
text-shadow: 1px 1px #fff;
}
.leaflet-control-scale-line:not(:first-child) {
border-top: 2px solid #777;
border-bottom: none;
margin-top: -2px;
}
.leaflet-control-scale-line:not(:first-child):not(:last-child) {
border-bottom: 2px solid #777;
}
.leaflet-touch .leaflet-control-attribution,
.leaflet-touch .leaflet-control-layers,
.leaflet-touch .leaflet-bar {
box-shadow: none;
}
.leaflet-touch .leaflet-control-layers,
.leaflet-touch .leaflet-bar {
border: 2px solid rgba(0,0,0,0.2);
background-clip: padding-box;
}
/* popup */
.leaflet-popup {
position: absolute;
text-align: center;
margin-bottom: 20px;
}
.leaflet-popup-content-wrapper {
padding: 1px;
text-align: left;
border-radius: 12px;
}
.leaflet-popup-content {
margin: 13px 24px 13px 20px;
line-height: 1.3;
font-size: 13px;
font-size: 1.08333em;
min-height: 1px;
}
.leaflet-popup-content p {
margin: 17px 0;
margin: 1.3em 0;
}
.leaflet-popup-tip-container {
width: 40px;
height: 20px;
position: absolute;
left: 50%;
margin-top: -1px;
margin-left: -20px;
overflow: hidden;
pointer-events: none;
}
.leaflet-popup-tip {
width: 17px;
height: 17px;
padding: 1px;
margin: -10px auto 0;
pointer-events: auto;
-webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg);
-ms-transform: rotate(45deg);
transform: rotate(45deg);
}
.leaflet-popup-content-wrapper,
.leaflet-popup-tip {
background: white;
color: #333;
box-shadow: 0 3px 14px rgba(0,0,0,0.4);
}
.leaflet-container a.leaflet-popup-close-button {
position: absolute;
top: 0;
right: 0;
border: none;
text-align: center;
width: 24px;
height: 24px;
font: 16px/24px Tahoma, Verdana, sans-serif;
color: #757575;
text-decoration: none;
background: transparent;
}
.leaflet-container a.leaflet-popup-close-button:hover,
.leaflet-container a.leaflet-popup-close-button:focus {
color: #585858;
}
.leaflet-popup-scrolled {
overflow: auto;
}
.leaflet-oldie .leaflet-popup-content-wrapper {
-ms-zoom: 1;
}
.leaflet-oldie .leaflet-popup-tip {
width: 24px;
margin: 0 auto;
-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
}
.leaflet-oldie .leaflet-control-zoom,
.leaflet-oldie .leaflet-control-layers,
.leaflet-oldie .leaflet-popup-content-wrapper,
.leaflet-oldie .leaflet-popup-tip {
border: 1px solid #999;
}
/* div icon */
.leaflet-div-icon {
background: #fff;
border: 1px solid #666;
}
/* Tooltip */
/* Base styles for the element that has a tooltip */
.leaflet-tooltip {
position: absolute;
padding: 6px;
background-color: #fff;
border: 1px solid #fff;
border-radius: 3px;
color: #222;
white-space: nowrap;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
pointer-events: none;
box-shadow: 0 1px 3px rgba(0,0,0,0.4);
}
.leaflet-tooltip.leaflet-interactive {
cursor: pointer;
pointer-events: auto;
}
.leaflet-tooltip-top:before,
.leaflet-tooltip-bottom:before,
.leaflet-tooltip-left:before,
.leaflet-tooltip-right:before {
position: absolute;
pointer-events: none;
border: 6px solid transparent;
background: transparent;
content: "";
}
/* Directions */
.leaflet-tooltip-bottom {
margin-top: 6px;
}
.leaflet-tooltip-top {
margin-top: -6px;
}
.leaflet-tooltip-bottom:before,
.leaflet-tooltip-top:before {
left: 50%;
margin-left: -6px;
}
.leaflet-tooltip-top:before {
bottom: 0;
margin-bottom: -12px;
border-top-color: #fff;
}
.leaflet-tooltip-bottom:before {
top: 0;
margin-top: -12px;
margin-left: -6px;
border-bottom-color: #fff;
}
.leaflet-tooltip-left {
margin-left: -6px;
}
.leaflet-tooltip-right {
margin-left: 6px;
}
.leaflet-tooltip-left:before,
.leaflet-tooltip-right:before {
top: 50%;
margin-top: -6px;
}
.leaflet-tooltip-left:before {
right: 0;
margin-right: -12px;
border-left-color: #fff;
}
.leaflet-tooltip-right:before {
left: 0;
margin-left: -12px;
border-right-color: #fff;
}
/* Printing */
@media print {
/* Prevent printers from removing background-images of controls. */
.leaflet-control {
-webkit-print-color-adjust: exact;
print-color-adjust: exact;
}
}
File diff suppressed because one or more lines are too long