gitea-enwelo-jba
/
bwsamern-ohne_standortplaner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Critical stability fix: handled null status values in database, fixed layer order (DB layer on top), and cleaned up redundant initialization logic
Deploy Bürgerwind / deploy (push) Successful in 16s Details

This commit is contained in:
Johannes Baumeister 2026-05-01 10:29:34 +02:00
parent f4403b055f
commit dd6e875e2c
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app.js
View File

@ -1280,8 +1280,8 @@ document.addEventListener('DOMContentLoaded', async () => {
if (!rawStatus) rawStatus = props.status || ''; if (!rawStatus) rawStatus = props.status || '';
// Translate legacy values // Translate legacy values safely
const status = LEGACY_STATUS_MAP[rawStatus.toLowerCase()] || rawStatus; const status = (rawStatus && LEGACY_STATUS_MAP[rawStatus.toLowerCase()]) ? LEGACY_STATUS_MAP[rawStatus.toLowerCase()] : (rawStatus || 'none');
let fillColor = 'transparent'; let fillColor = 'transparent';
let opacity = 0.1; let opacity = 0.1;
@ -1317,7 +1317,7 @@ document.addEventListener('DOMContentLoaded', async () => {
} }
} }
const status = LEGACY_STATUS_MAP[rawStatus.toLowerCase()] || rawStatus; const status = (rawStatus && LEGACY_STATUS_MAP[rawStatus.toLowerCase()]) ? LEGACY_STATUS_MAP[rawStatus.toLowerCase()] : (rawStatus || 'Kein Status');
let popup = `<b>${layerName}</b><br><hr style="margin: 5px 0; border: 0; border-top: 1px solid #444;">`; let popup = `<b>${layerName}</b><br><hr style="margin: 5px 0; border: 0; border-top: 1px solid #444;">`;
popup += `<b>Eigentümer:</b> ${firstName} ${lastName}<br>`; popup += `<b>Eigentümer:</b> ${firstName} ${lastName}<br>`;
@ -1337,7 +1337,7 @@ document.addEventListener('DOMContentLoaded', async () => {
overlays[layerName] = layer; overlays[layerName] = layer;
state.map.addLayer(layer); state.map.addLayer(layer);
layerControl.addOverlay(layer, layerName); layerControl.addOverlay(layer, layerName);
layer.bringToBack(); layer.bringToFront(); // Ensure it's on top of local shapefiles
} }
// Manual Import & Bundling // Manual Import & Bundling
@ -1691,27 +1691,32 @@ document.addEventListener('DOMContentLoaded', async () => {
} }
} }
// Initialize Dynamic Layers and then load data
initDynamicLayers().then(async () => { initDynamicLayers().then(async () => {
// Erst Status laden, dann WEAs // Erst Status laden
await loadOwnerStatusesFromDB(); await loadOwnerStatusesFromDB();
// Nach dem Laden der Status: Prüfen ob wir den Layer automatisch mappen können // Dann WEAs laden
await loadTurbinesFromDB();
// Automatisches Mapping für den Eigentümer-Layer prüfen
const ownerLayerName = Object.keys(overlays).find(k => k.toLowerCase().includes('eigentümer')); const ownerLayerName = Object.keys(overlays).find(k => k.toLowerCase().includes('eigentümer'));
if (ownerLayerName && overlays[ownerLayerName]) { if (ownerLayerName && overlays[ownerLayerName]) {
const layer = overlays[ownerLayerName]; const layer = overlays[ownerLayerName];
const firstFeature = layer.getLayers()[0]?.feature; const layers = layer.getLayers();
if (firstFeature && firstFeature.properties) { if (layers.length > 0) {
const props = firstFeature.properties; const firstFeature = layers[0].feature;
const vna = Object.keys(props).find(k => k.toUpperCase() === 'VNA'); if (firstFeature && firstFeature.properties) {
const gna = Object.keys(props).find(k => k.toUpperCase() === 'GNA' || k.toUpperCase() === 'NBA'); const props = firstFeature.properties;
if (vna && gna) { const vna = Object.keys(props).find(k => k.toUpperCase() === 'VNA');
state.ownerMapping = { firstName: vna, lastName: gna }; const gna = Object.keys(props).find(k => k.toUpperCase() === 'GNA' || k.toUpperCase() === 'NBA');
refreshOwnerLayerStyle(); // Jetzt werden die Farben sichtbar! if (vna && gna) {
state.ownerMapping = { firstName: vna, lastName: gna };
refreshOwnerLayerStyle();
}
} }
} }
} }
loadTurbinesFromDB();
}); });
// Project Persistence // Project Persistence
@ -1834,11 +1839,6 @@ document.addEventListener('DOMContentLoaded', async () => {
} }
} }
// Load from DB after layers are initialized
initDynamicLayers().then(() => {
loadTurbinesFromDB();
});
btnLoad.addEventListener('click', () => projectInput.click()); btnLoad.addEventListener('click', () => projectInput.click());
projectInput.addEventListener('change', (e) => { projectInput.addEventListener('change', (e) => {