weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed error in mouse coordinates

Browse Source 
Will need refining
This commit is contained in:
Pax1601 2023-06-13 17:58:43 +02:00
parent feae9a4806
commit ca7c52ff67
5 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
client/package-lock.json generated
View File

@ -8,6 +8,7 @@
"name": "DCSOlympus",
"version": "v0.3.0-alpha",
"dependencies": {
"@types/formatcoords": "^1.1.0",
"@types/geojson": "^7946.0.10",
"@types/leaflet": "^1.9.0",
"@types/svg-injector": "^0.0.29",
@ -15,6 +16,7 @@
"debug": "~2.6.9",
"ejs": "^3.1.8",
"express": "~4.16.1",
"formatcoords": "^1.1.3",
"leaflet": "^1.9.3",
"leaflet-control-mini-map": "^0.4.0",
"leaflet.nauticscale": "^1.1.0",
@ -1835,6 +1837,11 @@
"tslib": "^2.5.0"
}
},
"node_modules/@types/formatcoords": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@types/formatcoords/-/formatcoords-1.1.0.tgz",
"integrity": "sha512-T20OHYACraNS/xCoBEmvtUYLc/eYjXaGGDpPFVAyuwarE9KHSGX8DVb3KNBKZ5RQz7fB7qXazZj13520eDSODw=="
},
"node_modules/@types/geojson": {
"version": "7946.0.10",
"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz",
@ -3395,6 +3402,11 @@
"is-callable": "^1.1.3"
}
},
"node_modules/formatcoords": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/formatcoords/-/formatcoords-1.1.3.tgz",
"integrity": "sha512-Ittg5/AsYFCOtcFGPLSmVpP56a8Ionmv4Ys69UmCAdvBnqVzvVVbkZMnjWEmXrZvnmoGQE8YI3RhnxbMQFdYSw=="
},
"node_modules/forwarded": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@ -6964,6 +6976,11 @@
"tslib": "^2.5.0"
}
},
"@types/formatcoords": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@types/formatcoords/-/formatcoords-1.1.0.tgz",
"integrity": "sha512-T20OHYACraNS/xCoBEmvtUYLc/eYjXaGGDpPFVAyuwarE9KHSGX8DVb3KNBKZ5RQz7fB7qXazZj13520eDSODw=="
},
"@types/geojson": {
"version": "7946.0.10",
"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz",
@ -8266,6 +8283,11 @@
"is-callable": "^1.1.3"
}
},
"formatcoords": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/formatcoords/-/formatcoords-1.1.3.tgz",
"integrity": "sha512-Ittg5/AsYFCOtcFGPLSmVpP56a8Ionmv4Ys69UmCAdvBnqVzvVVbkZMnjWEmXrZvnmoGQE8YI3RhnxbMQFdYSw=="
},
"forwarded": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",

2
client/package.json
View File

@ -10,6 +10,7 @@
"watch": "watchify .\\src\\index.ts --debug -o .\\public\\javascripts\\bundle.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ]"
},
"dependencies": {
"@types/formatcoords": "^1.1.0",
"@types/geojson": "^7946.0.10",
"@types/leaflet": "^1.9.0",
"@types/svg-injector": "^0.0.29",
@ -17,6 +18,7 @@
"debug": "~2.6.9",
"ejs": "^3.1.8",
"express": "~4.16.1",
"formatcoords": "^1.1.3",
"leaflet": "^1.9.3",
"leaflet-control-mini-map": "^0.4.0",
"leaflet.nauticscale": "^1.1.0",

2
client/public/stylesheets/panels/mouseinfo.css
View File

@ -99,7 +99,7 @@
}
.coordinates::after {
content: attr(data-dd) "\00b0 " attr(data-mm) "'" attr(data-ss) "." attr(data-sss) '"' attr(data-label);
content: attr(data-value);
font-weight: bold;
font-size: 13px;
overflow: hidden;

20
client/src/panels/mouseinfopanel.ts
View File

@ -3,6 +3,7 @@ import { getMap, getMissionData, getUnitsManager } from "..";
import { distance, bearing, zeroAppend, mToNm, nmToFt } from "../other/utils";
import { Unit } from "../units/unit";
import { Panel } from "./panel";
import formatcoords from "formatcoords";
export class MouseInfoPanel extends Panel {
#measureMarker: Marker;
@ -48,8 +49,10 @@ export class MouseInfoPanel extends Panel {
this.#drawMeasure(null, `bullseye-${idx}`, bullseyes[idx].getLatLng(), mousePosition);
/* Draw coordinates */
this.#drawCoordinates("ref-mouse-position-latitude", "mouse-position-latitude", mousePosition.lat, ["N", "S"]);
this.#drawCoordinates("ref-mouse-position-longitude", "mouse-position-longitude", mousePosition.lng, ["E", "W"]);
var coords = formatcoords(mousePosition.lat, mousePosition.lng);
var coordString = coords.format('XDDMMss', {decimalPlaces: 4});
this.#drawCoordinates("ref-mouse-position-latitude", "mouse-position-latitude", coordString.split(" ")[0]);
this.#drawCoordinates("ref-mouse-position-longitude", "mouse-position-longitude", coordString.split(" ")[1]);
}
#onMapClick(e: any) {
@ -153,19 +156,12 @@ export class MouseInfoPanel extends Panel {
}
}
#drawCoordinates(imgId: string, textId: string, value: number, prefixes: string[]) {
#drawCoordinates(imgId: string, textId: string, value: string) {
const el = this.getElement().querySelector(`#${textId}`) as HTMLElement;
const img = this.getElement().querySelector(`#${imgId}`) as HTMLElement;
if (img && el) {
let matches = String(value).match(/^\-?(\d+)\.(\d{2})(\d{2})(\d{2})/);
if (matches && matches.length) {
el.dataset.dd = matches[1];
el.dataset.mm = matches[2];
el.dataset.ss = matches[3];
el.dataset.sss = matches[4];
}
img.dataset.label = (value < 0) ? prefixes[1] : prefixes[0];
el.dataset.value = value.substring(1);
img.dataset.label = value[0];
}
}

3
client/tsconfig.json
View File

@ -34,7 +34,8 @@
"types": [
"leaflet",
"geojson",
"node"
"node",
"formatcoords"
], /* Specify type package names to be included without being referenced in a source file. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */