Skip to content

Update map endpoint, add default map and ability to select a different map style #566

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

Merged
NexInfinite merged 1 commit into from
Apr 19, 2025
Merged

Update map endpoint, add default map and ability to select a different map style #566

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
72 changes: 37 additions & 35 deletions gcs/data/default_settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,41 @@
{
"General": {
"maptilerAPIKey": {
"default": "",
"type": "string",
"display": "Maptiler API Key",
"hidden": true
},
"port": {
"default": "4237",
"type": "number",
"range": [
0,
65535
],
"display": "Backend Port"
},
"interfaceLanguage": {
"default": "English",
"type": "option",
"options": ["English"],
"display": "Interface Language"
},
"autoCheckForUpdates": {
"default": true,
"type": "boolean",
"display": "Automatically Check for Updates"
},
"syncMapViews": {
"default": false,
"type": "boolean",
"display": "Sync Dashboard and Missions Map Viewstate"
}
"General": {
"maptilerAPIKey": {
"default": "",
"type": "string",
"display": "Maptiler API Key",
"hidden": true
},
"Params": {},
"Config": {},
"FGCS": {
"mapStyle": {
"default": "hybrid",
"type": "option",
"options": ["satellite", "hybrid", "streets", "outdoor"],
"display": "Map Style"
},
"port": {
"default": "4237",
"type": "number",
"range": [0, 65535],
"display": "Backend Port"
},
"interfaceLanguage": {
"default": "English",
"type": "option",
"options": ["English"],
"display": "Interface Language"
},
"autoCheckForUpdates": {
"default": true,
"type": "boolean",
"display": "Automatically Check for Updates"
},
"syncMapViews": {
"default": false,
"type": "boolean",
"display": "Sync Dashboard and Missions Map Viewstate"
}
},
"Params": {},
"Config": {},
"FGCS": {}
}
2 changes: 1 addition & 1 deletion gcs/src/components/dashboard/map.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ function MapSectionNonMemo({
<div className="w-initial h-full" id="map">
<Map
initialViewState={initialViewState}
mapStyle={`https://api.maptiler.com/maps/8ff50749-c346-42f6-be2b-39d85c9c330d/style.json?key=${getSetting("General.maptilerAPIKey") || import.meta.env.VITE_MAPTILER_API_KEY}`}
mapStyle={`https://api.maptiler.com/maps/${getSetting("General.mapStyle") || "hybrid"}/style.json?key=${getSetting("General.maptilerAPIKey") || import.meta.env.VITE_MAPTILER_API_KEY}`}
ref={passedRef}
attributionControl={false}
dragRotate={false}
Expand Down
2 changes: 1 addition & 1 deletion gcs/src/components/missions/missionsMap.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ function MapSectionNonMemo({
<div className="w-initial h-full" id="map">
<Map
initialViewState={initialViewState}
mapStyle={`https://api.maptiler.com/maps/8ff50749-c346-42f6-be2b-39d85c9c330d/style.json?key=${getSetting("General.maptilerAPIKey") || import.meta.env.VITE_MAPTILER_API_KEY}`}
mapStyle={`https://api.maptiler.com/maps/${getSetting("General.mapStyle") || "hybrid"}/style.json?key=${getSetting("General.maptilerAPIKey") || import.meta.env.VITE_MAPTILER_API_KEY}`}
ref={passedRef}
attributionControl={false}
dragRotate={false}
Expand Down
Loading