Strassenverwaltung plus: Teilen von Strassenzügen
This commit is contained in:
1 parent
d54a986c14
commit
3eb3b746ab
22 files changed
+17391
-158
No files matched your search
@@ -164,12 +164,34 @@ function registerServiceWorker() {
|
||||
|
||||
const swUrl = window.CMBNET_SW_URL || '/sw.js';
|
||||
window.addEventListener('load', () => {
|
||||
navigator.serviceWorker.register(swUrl).catch(error => {
|
||||
console.warn('Service Worker konnte nicht registriert werden.', error);
|
||||
});
|
||||
navigator.serviceWorker.register(swUrl)
|
||||
.then(cachePolylineScript)
|
||||
.catch(error => {
|
||||
console.warn('Service Worker konnte nicht registriert werden.', error);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function cachePolylineScript() {
|
||||
// Das Polyline-Skript ist mandantenabhängig (str2pl-<tenant>.js oder
|
||||
// str2pl.js) und kann deshalb nicht statisch im Service Worker
|
||||
// vorabgespeichert werden. Der Client meldet die tatsächlich geladene
|
||||
// Datei nach der Registrierung zum Caching an.
|
||||
const script = document.querySelector('script[src*="str2pl"]');
|
||||
if (!script || !script.src) return;
|
||||
|
||||
navigator.serviceWorker.ready
|
||||
.then(registration => {
|
||||
const worker = registration.active
|
||||
|| registration.waiting
|
||||
|| registration.installing;
|
||||
if (worker) {
|
||||
worker.postMessage({type: 'CACHE_URLS', urls: [script.src]});
|
||||
}
|
||||
})
|
||||
.catch(() => {});
|
||||
}
|
||||
|
||||
function initPwaInstall() {
|
||||
const button = document.getElementById('mobileInstallBtn');
|
||||
if (!button) return;
|
||||
@@ -740,7 +762,7 @@ async function loadGroupData(groupId) {
|
||||
if (state.streets.length) {
|
||||
const first = state.streets[0];
|
||||
state.currentStreetId = first.id;
|
||||
loadStreetPolyline(first.name);
|
||||
loadStreetPolyline(first);
|
||||
fitToPositionAndPolyline();
|
||||
updateWorkButton();
|
||||
} else {
|
||||
@@ -774,7 +796,7 @@ function buildStreetList() {
|
||||
btn.type = 'button';
|
||||
btn.className = 'mobile-street-item';
|
||||
if (state.currentStreetId == street.id) btn.classList.add('active');
|
||||
btn.textContent = `${street.name} (${street.state || 'unbearbeitet'})`;
|
||||
btn.textContent = `${mobileStreetDisplayName(street)} (${street.state || 'unbearbeitet'})`;
|
||||
btn.addEventListener('click', () => {
|
||||
selectStreet(street);
|
||||
closeMobileStreetSelect();
|
||||
@@ -790,24 +812,54 @@ function selectStreet(street) {
|
||||
map.removeLayer(state.currentPolyline);
|
||||
state.currentPolyline = null;
|
||||
}
|
||||
loadStreetPolyline(street.name);
|
||||
loadStreetPolyline(street);
|
||||
fitToPositionAndPolyline();
|
||||
updateWorkButton();
|
||||
buildStreetList();
|
||||
}
|
||||
|
||||
function mobileStreetDisplayName(street) {
|
||||
if (!street) return '';
|
||||
const zusatz = String(street.zusatz || '').trim();
|
||||
return zusatz ? `${street.name} ${zusatz}` : String(street.name || '');
|
||||
}
|
||||
|
||||
function getStreetFragments() {
|
||||
if (typeof STRASSE2POLYLINES !== 'undefined') return STRASSE2POLYLINES;
|
||||
if (typeof Strasse2Polylines !== 'undefined') return Strasse2Polylines;
|
||||
return window.STRASSE2POLYLINES || window.Strasse2Polylines || {};
|
||||
}
|
||||
|
||||
function loadStreetPolyline(name) {
|
||||
function findStreetSegments(fragments, street) {
|
||||
if (!street || !street.name) return null;
|
||||
|
||||
const name = String(street.name).trim();
|
||||
const zusatz = String(street.zusatz || '').trim();
|
||||
const keys = zusatz ? [`${name} ${zusatz}`, name] : [name];
|
||||
|
||||
for (const key of keys) {
|
||||
if (Array.isArray(fragments[key])) return fragments[key];
|
||||
|
||||
const lower = key.toLowerCase();
|
||||
const matchingKey = Object.keys(fragments).find(
|
||||
candidate => candidate.toLowerCase() === lower
|
||||
);
|
||||
if (matchingKey && Array.isArray(fragments[matchingKey])) {
|
||||
return fragments[matchingKey];
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
function loadStreetPolyline(street) {
|
||||
const currentStreet = street
|
||||
|| state.streetById.get(Number(state.currentStreetId));
|
||||
if (!currentStreet) return;
|
||||
|
||||
const fragments = getStreetFragments();
|
||||
const segments = fragments[name];
|
||||
const segments = findStreetSegments(fragments, currentStreet);
|
||||
if (!Array.isArray(segments)) return;
|
||||
const street = state.streetById.get(Number(state.currentStreetId));
|
||||
const color = STREET_COLORS[street?.state] || STREET_COLORS.unbearbeitet;
|
||||
const color = STREET_COLORS[currentStreet.state] || STREET_COLORS.unbearbeitet;
|
||||
const style = {
|
||||
color,
|
||||
opacity: state.settings.opacity,
|
||||
@@ -894,7 +946,7 @@ function openStreetStateDialog() {
|
||||
alert('Bitte erst eine Straße auswählen.');
|
||||
return;
|
||||
}
|
||||
document.getElementById('mobileStreetStateTitle').textContent = `Straße: ${street.name}`;
|
||||
document.getElementById('mobileStreetStateTitle').textContent = `Straße: ${mobileStreetDisplayName(street)}`;
|
||||
document.getElementById('mobileStreetStateSelect').value = street.state || 'unbearbeitet';
|
||||
fillMobileStreetGroupSelect(street.group_id);
|
||||
updateMobileStreetGroupVisibility();
|
||||
@@ -1502,7 +1554,7 @@ function applyMobileStreetUpdate(payload) {
|
||||
const dialog = document.getElementById('mobileStreetStateDialog');
|
||||
if (dialog && dialog.open) {
|
||||
document.getElementById('mobileStreetStateTitle').textContent =
|
||||
`Straße: ${street.name}`;
|
||||
`Straße: ${mobileStreetDisplayName(street)}`;
|
||||
document.getElementById('mobileStreetStateSelect').value =
|
||||
street.state || 'unbearbeitet';
|
||||
fillMobileStreetGroupSelect(street.group_id);
|
||||
|
||||
Reference in new issue
Block a user