Compare commits

...

2 commits

Author SHA1 Message Date
ThePetrovich
cd98f04622 Merge branch 'components' of https://git.intra.yksa.space/mikhailov.aa/leaflet_svelte into components 2025-04-04 23:42:35 +08:00
ThePetrovich
68aae97597 add bootstrap 2025-04-04 23:42:30 +08:00
6 changed files with 147 additions and 573 deletions

16
package-lock.json generated
View file

@ -8,6 +8,7 @@
"name": "app4", "name": "app4",
"version": "0.0.1", "version": "0.0.1",
"dependencies": { "dependencies": {
"bootstrap-icons": "^1.11.3",
"leaflet": "^1.9.4" "leaflet": "^1.9.4"
}, },
"devDependencies": { "devDependencies": {
@ -878,6 +879,21 @@
"node": ">= 0.4" "node": ">= 0.4"
} }
}, },
"node_modules/bootstrap-icons": {
"version": "1.11.3",
"resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.3.tgz",
"integrity": "sha512-+3lpHrCw/it2/7lBL15VR0HEumaBss0+f/Lb6ZvHISn1mlK83jjFpooTLsMWbIjJMDjDjOExMsTxnXSIT4k4ww==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/twbs"
},
{
"type": "opencollective",
"url": "https://opencollective.com/bootstrap"
}
]
},
"node_modules/chokidar": { "node_modules/chokidar": {
"version": "4.0.3", "version": "4.0.3",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",

View file

@ -21,6 +21,7 @@
"vite": "^6.2.5" "vite": "^6.2.5"
}, },
"dependencies": { "dependencies": {
"bootstrap-icons": "^1.11.3",
"leaflet": "^1.9.4" "leaflet": "^1.9.4"
} }
} }

View file

@ -3,6 +3,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="icon" href="%sveltekit.assets%/favicon.png" /> <link rel="icon" href="%sveltekit.assets%/favicon.png" />
<link rel="stylesheet" href="%sveltekit.assets%/css/bootstrap.min.css">
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
%sveltekit.head% %sveltekit.head%
</head> </head>

View file

@ -1,7 +1,11 @@
<script> <script>
import { createEventDispatcher } from 'svelte'; import { createEventDispatcher } from 'svelte';
const dispatch = createEventDispatcher(); const dispatch = createEventDispatcher();
let isCollapsed = false;
let mouseLat = 0;
let mouseLng = 0;
let startPoint = 'Custom'; let startPoint = 'Custom';
let startHeight = 0; let startHeight = 0;
@ -95,204 +99,124 @@
} }
</script> </script>
<div class="control-panel"> <div class="card shadow-lg position-absolute bottom-0 end-0 m-3" style="width: 22rem; max-height: 80vh; overflow-y: auto; z-index: 1000;">
<div class="control-header">Launch Point</div> <div class="card-header bg-primary text-white d-flex justify-content-between align-items-center">
<h6 class="card-title mb-0">Prediction Parameters</h6>
<div class="control-row"> <button class="btn btn-sm btn-primary" on:click={() => (isCollapsed = !isCollapsed)}>
<span>Start Point:</span> {#if isCollapsed}
<select bind:value={startPoint}> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-caret-left-fill" viewBox="0 0 16 16">
<option>Custom</option> <path d="m3.86 8.753 5.482 4.796c.646.566 1.658.106 1.658-.753V3.204a1 1 0 0 0-1.659-.753l-5.48 4.796a1 1 0 0 0 0 1.506z"/>
<option>Preset 1</option> </svg>
<option>Preset 2</option> {:else}
</select> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-caret-down" viewBox="0 0 16 16">
</div> <path d="M7.247 11.14 2.451 5.658C1.885 5.013 2.345 4 3.204 4h9.592a1 1 0 0 1 .753 1.659l-4.796 5.48a1 1 0 0 1-1.506 0z"/>
</svg>
<div class="control-row"> {/if}
<span>Latitude/Longitude:</span> </button>
<div class="coordinate-inputs">
<input type="text" bind:value={inputLat} placeholder="Latitude">
<p>/</p>
<input type="text" bind:value={inputLng} placeholder="Longitude">
<button on:click={handleUpdatePosition} class="update-button"></button>
</div>
</div> </div>
{#if !isCollapsed}
<div class="card-body">
<div class="mb-2">
<label class="form-label small">Start Point:</label>
<div class="input-group input-group-sm">
<select id="startPoint" class="form-select" bind:value={startPoint}>
<option>Custom</option>
<option>Preset 1</option>
<option>Preset 2</option>
</select>
<button class="btn btn-secondary" title="Edit Saved Locations" on:click={() => dispatch('openLocationsEditor')}>
<span>Edit</span>
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-journal-bookmark-fill" viewBox="0 0 16 16">
<path fill-rule="evenodd" d="M6 1h6v7a.5.5 0 0 1-.757.429L9 7.083 6.757 8.43A.5.5 0 0 1 6 8z"/>
<path d="M3 0h10a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2v-1h1v1a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1H3a1 1 0 0 0-1 1v1H1V2a2 2 0 0 1 2-2"/>
<path d="M1 5v-.5a.5.5 0 0 1 1 0V5h.5a.5.5 0 0 1 0 1h-2a.5.5 0 0 1 0-1zm0 3v-.5a.5.5 0 0 1 1 0V8h.5a.5.5 0 0 1 0 1h-2a.5.5 0 0 1 0-1zm0 3v-.5a.5.5 0 0 1 1 0v.5h.5a.5.5 0 0 1 0 1h-2a.5.5 0 0 1 0-1z"/>
</svg>
</button>
</div>
</div>
<div class="control-row"> <div class="mb-2">
<button class="map-button" on:click={() => { <label class="form-label small">Latitude/Longitude:</label>
inputLat = mouseLat; <div class="input-group input-group-sm">
inputLng = mouseLng; <input type="text" class="form-control" bind:value={inputLat} placeholder="Latitude">
updateMapPosition(); <span class="input-group-text">/</span>
}}>Specify on map (click location)</button> <input type="text" class="form-control" bind:value={inputLng} placeholder="Longitude">
</div> <button on:click={handleUpdatePosition} class="btn btn-success btn-sm"></button>
</div>
<div class="control-row"> </div>
<span>Launch Height (m):</span>
<input type="number" bind:value={startHeight}> <div class="mb-2">
</div> <button class="btn btn-outline-secondary btn-sm w-100" on:click={() => {
inputLat = mouseLat;
<div class="control-row"> inputLng = mouseLng;
<span>Launch Time (UTC):</span> updateMapPosition();
<input type="time" bind:value={startTime}> }}>Specify on map (click location)</button>
</div> </div>
<div class="control-row"> <div class="mb-2">
<span>Launch Date:</span> <label for="startHeight" class="form-label small">Launch Height (m):</label>
<input type="date" bind:value={startDate}> <input type="number" id="startHeight" class="form-control form-control-sm" bind:value={startHeight}>
</div> </div>
<div class="control-row"> <div class="mb-2 d-flex gap-2">
<span>Ascent Rate (m/s):</span> <div class="flex-fill">
<input type="number" bind:value={ascentRate}> <label for="startTime" class="form-label small">Launch Time (UTC):</label>
</div> <input type="time" id="startTime" class="form-control form-control-sm" bind:value={startTime}>
</div>
<div class="control-row"> <div class="flex-fill">
<span>Burst/Drift Altitude (m):</span> <label for="startDate" class="form-label small">Launch Date:</label>
<input type="number" bind:value={burstAltitude}> <input type="date" id="startDate" class="form-control form-control-sm" bind:value={startDate}>
</div> </div>
</div>
<div class="control-row">
<span>Flight Profile:</span> <div class="mb-2 d-flex gap-2">
<select bind:value={flightProfile}> <div class="flex-fill">
<option>Normal</option> <label for="ascentRate" class="form-label small">Ascent Rate (m/s):</label>
<option>Drift</option> <input type="number" id="ascentRate" class="form-control form-control-sm" bind:value={ascentRate}>
<option>Reversible (on the rise)</option> </div>
<option>Custom</option> <div class="flex-fill">
</select> <label for="descentRate" class="form-label small">Descent Rate (m/s):</label>
</div> <input type="number" id="descentRate" class="form-control form-control-sm" bind:value={descentRate}>
</div>
<div class="control-row buttons"> </div>
<button on:click={toggleBurstCalculator}>Open Burst Calculator</button>
<button>Set Custom Flight Profile</button> <div class="mb-2">
<button>Show Last Altitude Graph</button> <label for="burstAltitude" class="form-label small">Burst/Drift Altitude (m):</label>
</div> <input type="number" id="burstAltitude" class="form-control form-control-sm" bind:value={burstAltitude}>
</div>
<div class="control-row">
<span>Descent Rate (m/s):</span> <div class="mb-2">
<input type="number" bind:value={descentRate}> <label for="flightProfile" class="form-label small">Flight Profile:</label>
</div> <div class="input-group input-group-sm">
<select id="flightProfile" class="form-select" bind:value={flightProfile}>
<div class="control-row"> <option>Normal</option>
<span>Forecast Mode (help):</span> <option>Float</option>
<div class="radio-group"> <option>Reverse (ascent only)</option>
<label> <option>Custom</option>
<input type="radio" bind:group={forecastMode} value="Single"> Single </select>
</label> <button class="btn btn-secondary btn-sm" title="Edit profile" disabled={flightProfile !== 'Custom'}>
<label> <span>Edit</span>
<input type="radio" bind:group={forecastMode} value="Multiple"> Multiple <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" class="bi bi-gear-fill" viewBox="0 0 16 16">
</label> <path d="M9.405 1.05c-.413-1.4-2.397-1.4-2.81 0l-.1.34a1.464 1.464 0 0 1-2.105.872l-.31-.17c-1.283-.698-2.686.705-1.987 1.987l.169.311c.446.82.023 1.841-.872 2.105l-.34.1c-1.4.413-1.4 2.397 0 2.81l.34.1a1.464 1.464 0 0 1 .872 2.105l-.17.31c-.698 1.283.705 2.686 1.987 1.987l.311-.169a1.464 1.464 0 0 1 2.105.872l.1.34c.413 1.4 2.397 1.4 2.81 0l.1-.34a1.464 1.464 0 0 1 2.105-.872l.31.17c1.283.698 2.686-.705 1.987-1.987l-.169-.311a1.464 1.464 0 0 1 .872-2.105l.34-.1c1.4-.413 1.4-2.397 0-2.81l-.34-.1a1.464 1.464 0 0 1-.872-2.105l.17-.31c.698-1.283-.705-2.686-1.987-1.987l-.311.169a1.464 1.464 0 0 1-2.105-.872zM8 10.93a2.929 2.929 0 1 1 0-5.86 2.929 2.929 0 0 1 0 5.858z"/>
</svg>
</button>
</div>
</div>
<div class="mb-2 d-grid gap-1">
<button class="btn btn-outline-secondary btn-sm">Show Last Altitude Graph</button>
<button class="btn btn-secondary btn-sm">Save as Template</button>
<button class="btn btn-sm btn-primary" on:click={getForecast}>Run Prediction</button>
</div>
</div> </div>
</div> {/if}
<div class="control-row">
<button class="primary-button" on:click={getForecast}>Get Forecast</button>
<button>Save Point</button>
</div>
</div> </div>
<style> <style>
.control-panel { .card {
position: absolute; transition: all 0.3s ease;
bottom: 20px; }
right: 20px; .card-header {
background: rgba(255, 255, 255, 0.9); cursor: pointer;
padding: 15px; }
border-radius: 5px; </style>
font-family: Arial, sans-serif;
font-size: 14px;
z-index: 1000;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
width: 320px;
max-height: 80vh;
overflow-y: auto;
}
.control-header {
font-weight: bold;
margin-bottom: 10px;
font-size: 16px;
border-bottom: 1px solid #ddd;
padding-bottom: 5px;
}
.control-row {
margin-bottom: 8px;
display: flex;
align-items: center;
}
.control-row span {
width: 160px;
display: inline-block;
}
.control-row input[type="number"],
.control-row input[type="date"],
.control-row input[type="time"],
.control-row select {
width: 120px;
padding: 3px;
}
.coordinate-inputs {
display: flex;
align-items: center;
gap: 5px;
}
.coordinate-inputs input {
width: 70px !important;
padding: 3px;
}
.update-button {
padding: 3px 8px;
background: #4CAF50;
color: white;
border: none;
border-radius: 3px;
cursor: pointer;
margin-left: 5px;
}
.map-button {
width: 100%;
padding: 5px;
background: #f0f0f0;
border: 1px solid #ccc;
border-radius: 3px;
cursor: pointer;
}
.buttons {
flex-direction: column;
gap: 5px;
margin-top: 10px;
}
.buttons button {
width: 100%;
padding: 5px;
margin-bottom: 5px;
background: #f0f0f0;
border: 1px solid #ccc;
border-radius: 3px;
cursor: pointer;
}
.primary-button {
background: #4CAF50 !important;
color: white;
border: 1px solid #3e8e41 !important;
}
.radio-group {
display: flex;
gap: 10px;
}
.radio-group label {
display: flex;
align-items: center;
gap: 5px;
}
</style>

View file

@ -164,385 +164,10 @@
}; };
</script> </script>
<div class="map-container"> <div class="container-fluid position-relative h-100">
<div id="map"></div> <div id="map" class="w-100 h-100 position-absolute"></div>
<div class="coordinates-display"> <div class="position-absolute top-0 end-0 bg-light p-2 rounded shadow-sm">
Lat: {mouseLat}, Long: {mouseLng} Lat: {mouseLat}, Long: {mouseLng}
</div> </div>
<div class="control-panel">
<div class="control-header">Launch Point</div>
<div class="control-row">
<span>Start Point:</span>
<select bind:value={startPoint}>
<option>Custom</option>
<option>Preset 1</option>
<option>Preset 2</option>
</select>
</div>
<div class="control-row">
<span>Latitude/Longitude:</span>
<div class="coordinate-inputs">
<input type="text" bind:value={inputLat} placeholder="Latitude">
<p>/</p>
<input type="text" bind:value={inputLng} placeholder="Longitude">
<button on:click={updateMapPosition} class="update-button"></button>
</div>
</div>
<div class="control-row">
<button class="map-button" on:click={() => {
inputLat = mouseLat;
inputLng = mouseLng;
updateMapPosition();
}}>Specify on map (click location)</button>
</div>
<div class="control-row">
<span>Launch Height (m):</span>
<input type="number" bind:value={startHeight}>
</div>
<div class="control-row">
<span>Launch Time (UTC):</span>
<input type="time" bind:value={startTime}>
</div>
<div class="control-row">
<span>Launch Date:</span>
<input type="date" bind:value={startDate}>
</div>
<div class="control-row">
<span>Ascent Rate (m/s):</span>
<input type="number" bind:value={ascentRate}>
</div>
<div class="control-row">
<span>Burst/Drift Altitude (m):</span>
<input type="number" bind:value={burstAltitude}>
</div>
<div class="control-row">
<span>Flight Profile:</span>
<select bind:value={flightProfile}>
<option>Normal</option>
<option>Drift</option>
<option>Reversible (on the rise)</option>
<option>Custom</option>
</select>
</div>
<div class="control-row buttons">
<button on:click={toggleBurstCalculator}>Open Burst Calculator</button>
<button>Set Custom Flight Profile</button>
<button>Show Last Altitude Graph</button>
</div>
<div class="control-row">
<span>Descent Rate (m/s):</span>
<input type="number" bind:value={descentRate}>
</div>
<div class="control-row">
<span>Forecast Mode (help):</span>
<div class="radio-group">
<label>
<input type="radio" bind:group={forecastMode} value="Single"> Single
</label>
<label>
<input type="radio" bind:group={forecastMode} value="Multiple"> Multiple
</label>
</div>
</div>
<div class="control-row">
<button class="primary-button" on:click={getForecast}>Get Forecast</button>
<button>Save Point</button>
</div>
</div>
</div> </div>
<!-- Burst Calculator Modal -->
{#if showBurstCalculator}
<div class="modal-overlay" on:click|self={toggleBurstCalculator}>
<div class="modal-content">
<h2>Balloon Burst Calculation</h2>
<div class="calculator-grid">
<div class="input-group">
<label>Payload Mass (g)</label>
<input type="number" bind:value={payloadMass}>
</div>
<div class="input-group">
<label>Balloon Mass (g)</label>
<input type="number" bind:value={balloonMass}>
</div>
<div class="input-group">
<label>Desired Burst Altitude (m)</label>
<input type="number" bind:value={desiredBurstAltitude}>
</div>
<div class="input-group">
<label>Desired Ascent Rate (m/s)</label>
<input type="number" bind:value={desiredAscentRate} step="0.01">
</div>
</div>
<div class="results-section">
<h3>Results</h3>
<div class="result-row">
<span>Burst Altitude:</span>
<span>{burstAltitudeResult} m</span>
</div>
<div class="result-row">
<span>Time to Burst:</span>
<span>{timeToBurst} min</span>
</div>
<div class="result-row">
<span>Initial Volume:</span>
<span>{initialVolume}</span>
</div>
<div class="result-row">
<span>Ascent Rate:</span>
<span>{ascentRateResult} m/s</span>
</div>
<div class="result-row">
<span>Lift Force at Launch:</span>
<span>{liftForce} g</span>
</div>
<div class="result-row">
<span>Volume:</span>
<span>{volumeLiters} L ({volumeCubicFeet} ft³)</span>
</div>
</div>
<div class="modal-actions">
<button class="secondary-button">Additional Settings</button>
<button class="primary-button" on:click={calculateBurst}>Use Results</button>
<button on:click={toggleBurstCalculator}>Close</button>
</div>
</div>
</div>
{/if}
<style>
.map-container {
position: relative;
width: 100%;
height: 100vh;
}
#map {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
}
.coordinates-display {
position: absolute;
top: 10px;
right: 10px;
background: rgba(255, 255, 255, 0.8);
padding: 5px 10px;
border-radius: 3px;
font-family: Arial, sans-serif;
font-size: 14px;
z-index: 1000; /* Ensure it's above the map */
box-shadow: 0 0 5px rgba(0, 0, 0, 0.2);
}
.control-panel {
position: absolute;
bottom: 20px;
right: 20px;
background: rgba(255, 255, 255, 0.9);
padding: 15px;
border-radius: 5px;
font-family: Arial, sans-serif;
font-size: 14px;
z-index: 1000;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
width: 320px;
max-height: 80vh;
overflow-y: auto;
}
.control-header {
font-weight: bold;
margin-bottom: 10px;
font-size: 16px;
border-bottom: 1px solid #ddd;
padding-bottom: 5px;
}
.control-row {
margin-bottom: 8px;
display: flex;
align-items: center;
}
.control-row span {
width: 160px;
display: inline-block;
}
.control-row input[type="number"],
.control-row input[type="date"],
.control-row input[type="time"],
.control-row select {
width: 120px;
padding: 3px;
}
.coordinate-inputs {
display: flex;
align-items: center;
gap: 5px;
}
.coordinate-inputs input {
width: 70px !important;
padding: 3px;
}
.update-button {
padding: 3px 8px;
background: #4CAF50;
color: white;
border: none;
border-radius: 3px;
cursor: pointer;
margin-left: 5px;
}
.map-button {
width: 100%;
padding: 5px;
background: #f0f0f0;
border: 1px solid #ccc;
border-radius: 3px;
cursor: pointer;
}
.buttons {
flex-direction: column;
gap: 5px;
margin-top: 10px;
}
.buttons button {
width: 100%;
padding: 5px;
margin-bottom: 5px;
background: #f0f0f0;
border: 1px solid #ccc;
border-radius: 3px;
cursor: pointer;
}
.primary-button {
background: #4CAF50 !important;
color: white;
border: 1px solid #3e8e41 !important;
}
.radio-group {
display: flex;
gap: 10px;
}
.radio-group label {
display: flex;
align-items: center;
gap: 5px;
}
.modal-overlay {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
justify-content: center;
align-items: center;
z-index: 2000;
}
.modal-content {
background-color: white;
padding: 20px;
border-radius: 8px;
width: 500px;
max-width: 90%;
max-height: 90vh;
overflow-y: auto;
box-shadow: 0 4px 20px rgba(0, 0, 0, 0.2);
}
.calculator-grid {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 15px;
margin: 20px 0;
}
.input-group {
display: flex;
flex-direction: column;
}
.input-group label {
margin-bottom: 5px;
font-weight: bold;
font-size: 0.9em;
}
.input-group input {
padding: 8px;
border: 1px solid #ddd;
border-radius: 4px;
}
.results-section {
background-color: #f5f5f5;
padding: 15px;
border-radius: 5px;
margin: 15px 0;
}
.results-section h3 {
margin-top: 0;
border-bottom: 1px solid #ddd;
padding-bottom: 5px;
}
.result-row {
display: flex;
justify-content: space-between;
margin: 8px 0;
}
.result-row span:first-child {
font-weight: bold;
}
.modal-actions {
display: flex;
justify-content: flex-end;
gap: 10px;
margin-top: 20px;
}
.secondary-button {
background: #f0f0f0;
border: 1px solid #ccc;
}
</style>

7
static/css/bootstrap.min.css vendored Normal file

File diff suppressed because one or more lines are too long