Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-13 11:29:53 +03:00
Code Wiki Activity

Merge pull request #2248 from Scavanger/Geozones-RC2-Fixes

Browse source 
Geozones RC2 fixes
This commit is contained in:
Marcelo Bezerra 2024-11-16 21:55:57 +01:00 • committed by GitHub
commit 3cfbcb6ce5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 57 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/msp/MSPHelper.js
View file

@ -1607,7 +1607,11 @@ var mspHelper = (function () {
break;
case MSPCodes.MSP2_INAV_GEOZONE:
var geozone = new Geozone(
if (data.buffer.byteLength == 0) {
break;
}
var geozone = new Geozone(
data.getUint8(1),
data.getUint8(2),
data.getInt32(3, true),

6
locale/en/messages.json
View file

@ -4832,6 +4832,12 @@
"geozoneInvalidzone": {
"message": "Invalid Geozone(s) detected:"
},
"geozoneInvalidLat": {
"message": "Invalid latitude"
},
"geozoneInvalidLon": {
"message": "Invalid longitude"
},
"gezoneInvalidReasonNotCC": {
"message": "Not counter clockwise"
},

2
tabs/advanced_tuning.html
View file

@ -513,7 +513,7 @@
-->
</div>
</div>
<div class="config-section gui_box grey">
<div id="geozoneSettings" class="config-section gui_box grey">
<div class="gui_box_titlebar">
<div class="spacer_box_title" data-i18n="GeozoneSettings"></div>
</div>

4
tabs/advanced_tuning.js
View file

@ -56,6 +56,10 @@ TABS.advanced_tuning.initialize = function (callback) {
$('.notFixedWingTuning').show();
}
if (!FC.isFeatureEnabled('GEOZONE')) {
$('#geozoneSettings').hide();
}
GUI.simpleBind();
i18n.localize();;

50
tabs/mission_control.js
View file

@ -892,11 +892,11 @@ TABS.mission_control.initialize = function (callback) {
width: 3,
})
})
]
],
});
vectorLayer.kind = "geozoneline";
vectorLayer.selection = false;
vectorLayer.kind = "geozonecircle";
vectorLayer.selection = true;
geozoneLines.push(vectorLayer);
map.addLayer(vectorLayer);
@ -1748,17 +1748,49 @@ TABS.mission_control.initialize = function (callback) {
<span class="vertexNumber"></span> \
</td> \
<td> \
<input type="number" class="vertexLat" readonly/> \
<input type="number" class="vertexLat"/> \
</td> \
<td> \
<input type="number" class="vertexLon" readonly/> \
<input type="number" class="vertexLon"/> \
</td> \
</tr> \
');
const $row = $verticesTable.find('tr:last');
$row.find('.vertexNumber').text(vertex.getNumber() + 1);
$row.find('.vertexLat').val((vertex.getLatMap()).toLocaleString(['en-US'], {minimumFractionDigits: 7}));
$row.find('.vertexLon').val((vertex.getLonMap()).toLocaleString(['en-US'], {minimumFractionDigits: 7}));
$row.find('.vertexLat')
.val((vertex.getLatMap())
.toLocaleString(['en-US'], {minimumFractionDigits: 7}))
.on('change', event => {
const lat = $(event.currentTarget).val();
if (isNaN(lat) || lat < -90 || lat > 90) {
GUI.alert(i18n.getMessage("geozoneInvalidLat"));
$(event.currentTarget).val(vertex.getLatMap());
return;
}
vertex.setLat(lat * 1e7);
renderGeozoneOptions();
renderGeozonesOnMap();
updateGeozoneInfo();
});
$row.find('.vertexLon')
.val((vertex.getLonMap())
.toLocaleString(['en-US'], {minimumFractionDigits: 7}))
.on('change', event => {
const lat = $(event.currentTarget).val();
if (isNaN(lat) || lat < -180 || lat > 180) {
GUI.alert(i18n.getMessage("geozoneInvalidLon"));
$(event.currentTarget).val(vertex.getLonMap());
return;
}
vertex.setLon(lat * 1e7);
renderGeozoneOptions();
renderGeozonesOnMap();
updateGeozoneInfo();
});
$row.find('#removeVertex').on('click', event => {
if (selectedGeozone.getVerticesCount() > 3) {
selectedGeozone.dropVertex(vertex.getNumber());
@ -2150,7 +2182,7 @@ TABS.mission_control.initialize = function (callback) {
*/
app.Drag.prototype.handleDragEvent = function (evt) {
if (tempMarker.kind == "safehomecircle") {
if (tempMarker.kind == "safehomecircle" || tempMarker.kind == "geozonecircle") {
return;
}
@ -2213,7 +2245,7 @@ TABS.mission_control.initialize = function (callback) {
renderGeozoneOptions();
renderGeozonesOnMap();
updateGeozoneInfo();
}
}
};
/**