Skip to content

feat(mission-control): add local geo layers to map #2519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erikbohnsack wants to merge 1 commit into
base: maintenance-9.x
Choose a base branch
from
Open

feat(mission-control): add local geo layers to map #2519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions locale/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6195,6 +6195,24 @@
"gpsAssistnowLoadDataError": {
"message": "Error loading AssistNow data."
},
"layerManagementTitle": {
"message": "Map Layer Management"
},
"layerLoadGeoFile": {
"message": "Load GEO File"
},
"layerDragDropHint": {
"message": "or drag & drop GEO files onto the map"
},
"layerConfirmDelete": {
"message": "Are you sure you want to delete this layer?"
},
"layerLoadError": {
"message": "Error loading GEO file. Please check the file format."
},
"layerParseError": {
"message": "Error parsing GEO file. Unsupported format or corrupted data."
},
"adsbVehicleTotalMessages": {
"message": "Vehicle msgs"
},
Expand Down
24 changes: 22 additions & 2 deletions src/css/tabs/mission_planer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,14 +317,22 @@
top: 140px;
}

.geozone-settings {
.mission-control-layers {
top: 165px;
left: .5em;
}
.ol-touch .geozone-settings {
.ol-touch .mission-control-layers {
top: 165px;
}

.geozone-settings {
top: 190px;
left: .5em;
}
.ol-touch .geozone-settings {
top: 190px;
}

.tab-mission-control .geozoneVerticesTable {
width: 100%;
text-align: center;
Expand Down Expand Up @@ -592,4 +600,16 @@
width: 90%;
height: 90%;
padding-bottom: 5px;
}

.tab-mission-control .layer-item {
transition: background-color 0.2s;
}

.tab-mission-control .layer-item:hover {
background-color: rgba(255, 255, 255, 0.05);
}

.tab-mission-control #geo_info {
transition: opacity 0.2s;
}
22 changes: 22 additions & 0 deletions tabs/mission_control.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,27 @@
</div>
</div>

<div id="missionPlannerLayers" class="gui_box grey" style="display: none">
<div class="gui_box_titlebar">
<div class="spacer_box_title" data-i18n="layerManagementTitle"></div>
<div class="btnMenu btnMenuIcon save_btn">
<a id="cancelLayers" class="ic_cancel" href="#" i18n_title="missionTitleCancel"></a>
</div>
</div>
<div class="spacer" id="layerContent">
<div class="btn save_btn" style="margin-bottom: 10px;">
<a id="loadGeoFileButton" class="btnicon ic_loadFromFile" href="#"
title="Load GEO File (KML, GeoJSON, GPX)"></a>
</div>
<hr>
<div id="layerListContainer" style="padding: 0 5px;"></div>
<hr>
<div style="text-align: center; color: #888; font-size: 0.9em; margin-top: 10px;">
<span data-i18n="layerDragDropHint"></span>
</div>
</div>
</div>

<div id="missionPlannerSettings" class="gui_box grey" style="display: none">
<div class="gui_box_titlebar">
<div class="spacer_box_title" data-i18n="missionDefaultSettingsHead"></div>
Expand Down Expand Up @@ -570,6 +591,7 @@
</div>
</div>
<div class="cf_column threefourth_left" style="height: 100%;">
<div id="geo_info" style="display: block; position: absolute; bottom: 10px; left: 50%; transform: translateX(-50%); background: rgba(0,0,0,0.7); color: white; padding: 5px 10px; border-radius: 4px; font-size: 0.9em; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; max-width: 80%; pointer-events: none; z-index: 1000;">&nbsp;</div>
<div id="missionMap"></div>
<div id="missionPlannerElevation" class="gui_box grey" style="display: none">
<div class="gui_box_titlebar">
Expand Down
Loading