Skip to content
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

Add feature: Local map overlays for mission planner #2164

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
+300 −4
Open

Add feature: Local map overlays for mission planner #2164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
9f8eb23
Added ability to drag and drop KML files onto map
paulwrath1223 Jul 23, 2024
383040b
changed alert to log for adding map overlay
paulwrath1223 Jul 23, 2024
a22570f
stopped waypoints from showing up in info box for mission planner
paulwrath1223 Jul 23, 2024
6f4b0e6
stopped info overflowing in info box for mission planner
paulwrath1223 Jul 23, 2024
1fed656
stopped map from zooming out when adding overlays
paulwrath1223 Jul 23, 2024
f9c5404
fixed issue where panning would not work
paulwrath1223 Jul 24, 2024
e844741
fixed info box in mission planner from displaying info on features th…
paulwrath1223 Jul 24, 2024
d77d7b6
added documentation to changes in this PR related to mission planner map
paulwrath1223 Jul 24, 2024
22e2881
removed unintentional import/require
paulwrath1223 Jul 24, 2024
4324d3b
Saving progress
paulwrath1223 Jul 24, 2024
0704134
Saving progress
paulwrath1223 Jul 24, 2024
a249357
fixed checkbox updating correctly
paulwrath1223 Jul 24, 2024
3b2eb95
added switchery switch
paulwrath1223 Jul 24, 2024
11c21a3
added beginning of save mechanism
paulwrath1223 Jul 25, 2024
937be13
Added proper save and delete for layers
paulwrath1223 Jul 25, 2024
670150b
temporary push to save work
paulwrath1223 Jul 25, 2024
09b4fe1
fixed rogue semicolon
paulwrath1223 Jul 28, 2024
75e64cb
added `remove_layer_from_disk(layer_name)`
paulwrath1223 Jul 28, 2024
8c09c62
added working(?) save layer feature
paulwrath1223 Aug 6, 2024
76de0df
added working(?) save layer feature {Confirmed] (no styles0
paulwrath1223 Aug 6, 2024
a58ab8c
optimize one var to let
paulwrath1223 Aug 6, 2024
7b8dc04
fixed delete from disk
paulwrath1223 Aug 7, 2024
79039ec
removed layer from map when deleting from disk
paulwrath1223 Aug 7, 2024
a6cb3b6
initialize custom layer list for fresh installs
paulwrath1223 Aug 7, 2024
d594b4b
update layer list when adding a layer
paulwrath1223 Aug 7, 2024
0ac5012
added HR to layer list visibility window
paulwrath1223 Aug 7, 2024
7861563
fixed HTML stuff
paulwrath1223 Aug 7, 2024
3d0c602
working on fixing info display
paulwrath1223 Aug 7, 2024
d67cb62
fixed info display for features
paulwrath1223 Aug 7, 2024
9f55d34
cleaning
paulwrath1223 Aug 8, 2024
5792d16
cleaning
paulwrath1223 Aug 8, 2024
78f383b
cleaning and commenting
paulwrath1223 Aug 8, 2024
81a9b31
Merge branch 'iNavFlight:master' into master
paulwrath1223 Aug 8, 2024
c92e518
undid debugging stuff
paulwrath1223 Aug 8, 2024
342d065
Merge remote-tracking branch 'origin/master'
paulwrath1223 Aug 8, 2024
ce80398
cleaning and commenting
paulwrath1223 Aug 8, 2024
35e4f42
undid accidental change
paulwrath1223 Aug 8, 2024
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
15 changes: 15 additions & 0 deletions locale/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5935,5 +5935,20 @@
},
"gpsAssistnowLoadDataError": {
"message": "Error loading AssistNow data."
},
"layerVisibilitySelectBoxTitle": {
"message": "Layer Visibility"
},
"layerVisibilitySelectCancel": {
"message": "Cancel"
},
"layerVisibilitySelectHide": {
"message": "Hide"
},
"layerVisibilityWindowLayerSave": {
"message": "Save"
},
"layerVisibilityWindowLayerDelete": {
"message": "Delete"
}
}
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/css/tabs/mission_planer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,11 @@
float: left;
}
*/
.layer-vis-select {
top: 160px;
left: .5em;
}

.mission-control-settings {
top: 65px;
left: .5em;
Expand Down
17 changes: 17 additions & 0 deletions tabs/mission_control.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,22 @@
</div>
</div>

<div id="layerVisibilitySelect" class="config-section gui_box grey" style="display: none">
<div class="gui_box_titlebar">
<div class="spacer_box_title" data-i18n="layerVisibilitySelectBoxTitle"></div>
<div class="btnMenu btnMenuIcon save_btn">
<div id="showHideVisibilityButton">
<a class="ic_hide" href="#" i18n_title="layerVisibilitySelectHide"></a>
</div>
<a id="cancelVisibility" class="ic_cancel" href="#" i18n_title="layerVisibilitySelectCancel"></a>
</div>
</div>
<div class="spacer_box" id="layerSelectContent">


</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 @@ -469,6 +485,7 @@
</div>
</div>
<div class="cf_column threefourth_left" style="height: 100%;">
<div id="geo_info" style="display: block; text-overflow: ellipsis; white-space: nowrap; overflow: hidden;">&nbsp;</div>
<div id="missionMap"></div>
<div id="missionPlannerElevation" class="gui_box grey" style="display: none">
<div class="gui_box_titlebar">
Expand Down
Loading
Loading