Strassenverwaltung plus: Teilen von Strassenzügen

This commit is contained in:
concierge committed 2026-11-05 12:24:26 +01:00
1 parent d54a986c14
commit 3eb3b746ab
22 files changed
+17391 -158

No files matched your search

+148 -73
View File
@@ -1,7 +1,7 @@
"""
Admin API Endpunkte
"""
from flask import Blueprint, request, jsonify, g, session
from flask import Blueprint, request, jsonify, g, session, current_app
from cmbnet.auth import role_required
from cmbnet.db import get_db
from cmbnet.auth import hash_password
@@ -11,8 +11,10 @@ from cmbnet.models.streets import StreetModel
from cmbnet.services.groups_service import GroupsService
from cmbnet.services.history_service import HistoryService
from cmbnet.services.api_token_service import ApiTokenService
from cmbnet.services.streets_service import StreetsService
from cmbnet.services.str2pl_service import Str2PlService
from cmbnet.utils.helpers import log_transaction, notify_reload
from cmbnet.utils.csv_utils import parse_streets_csv, parse_house_numbers_csv
from cmbnet.utils.csv_utils import parse_house_numbers_csv
from cmbnet.ws import broker
from cmbnet.ws.protocol import WSMessage
import json
@@ -256,20 +258,23 @@ def create_street(**kwargs):
name = data.get('name', '').strip()
if not name:
return jsonify({'error': 'Name erforderlich'}), 400
zusatz = str(data.get('zusatz') or '').strip()
street_id = StreetModel.create(g.tenant_id, name,
hn_min=data.get('hn_min'),
hn_max=data.get('hn_max'),
bbox=data.get('bbox'),
state='unbearbeitet',
group_id=None)
group_id=None,
zusatz=zusatz)
db = get_db()
db.execute(
'INSERT INTO street_state_history (tenant_id, street_id, from_state, to_state, group_id, actor_account_id) VALUES (?, ?, ?, ?, ?, ?)',
(g.tenant_id, street_id, None, 'unbearbeitet', None, session['account_id'])
)
db.commit()
log_transaction('street.create', 'street', street_id, {'name': name})
notify_reload(f'Administration: Straße „{name}“ wurde erstellt.')
log_transaction('street.create', 'street', street_id, {'name': name, 'zusatz': zusatz})
display_name = f'{name} {zusatz}'.strip()
notify_reload(f'Administration: Straße „{display_name}“ wurde erstellt.')
return jsonify({'success': True, 'id': street_id})
@@ -283,10 +288,14 @@ def update_street(street_id, **kwargs):
return jsonify({'error': 'Straße nicht gefunden'}), 404
changes = {}
for key in ['name', 'hn_min', 'hn_max', 'bbox', 'group_id']:
for key in ['name', 'hn_min', 'hn_max', 'bbox', 'group_id', 'zusatz']:
if key in data:
if key == 'group_id' and (data[key] == '' or data[key] is None):
changes[key] = None
elif key == 'zusatz':
changes[key] = str(data[key] or '').strip()
elif key == 'name':
changes[key] = str(data[key] or '').strip()
elif key in ['hn_min', 'hn_max'] and data[key] != '' and data[key] is not None:
try:
changes[key] = int(data[key])
@@ -333,6 +342,87 @@ def delete_street(street_id, **kwargs):
return jsonify({'success': True})
@admin_api_bp.route('/strassen/bulk-delete', methods=['POST'])
@role_required('Administrator')
def bulk_delete_streets(**kwargs):
"""Löscht mehrere ausgewählte Straßen samt Hausnummern-Einträgen."""
data = request.get_json(silent=True)
if not isinstance(data, dict):
return jsonify({'error': 'JSON-Objekt erforderlich'}), 400
raw_ids = data.get('ids')
if not isinstance(raw_ids, list) or not raw_ids:
return jsonify({'error': 'Keine Straßen ausgewählt'}), 400
if len(raw_ids) > 10000:
return jsonify({'error': 'Zu viele Straßen auf einmal ausgewählt'}), 400
ids = []
for value in raw_ids:
if isinstance(value, bool):
return jsonify({'error': 'Ungültige Straßen-ID'}), 400
if isinstance(value, int):
street_id = value
elif isinstance(value, str) and value.strip().isdigit():
street_id = int(value.strip())
else:
return jsonify({'error': 'Ungültige Straßen-ID'}), 400
if street_id <= 0 or street_id > 9223372036854775807:
return jsonify({'error': 'Ungültige Straßen-ID'}), 400
if street_id not in ids:
ids.append(street_id)
result = StreetModel.delete_many(ids, g.tenant_id)
deleted_streets = result['streets']
if not deleted_streets:
return jsonify({'error': 'Keine passenden Straßen gefunden'}), 404
deleted_ids = [street['id'] for street in deleted_streets]
deleted_names = [street['name'] for street in deleted_streets]
log_transaction('street.bulk_delete', 'street', None, {
'ids': deleted_ids,
'names': deleted_names,
'house_numbers': result['house_numbers']
})
notify_reload(
f'Administration: {len(deleted_streets)} Straße(n) wurden gelöscht.'
)
return jsonify({
'success': True,
'deleted': len(deleted_streets),
'ids': deleted_ids,
'house_numbers_deleted': result['house_numbers']
})
@admin_api_bp.route('/strassen/str2pl', methods=['POST'])
@role_required('Administrator')
def generate_str2pl(**kwargs):
"""Erzeugt die mandantenspezifische Polyline-Datei neu.
Es werden immer alle Straßen des Mandanten aus der Datenbank
berücksichtigt; eine eventuelle Auswahl in der Oberfläche spielt keine
Rolle.
"""
try:
stats = Str2PlService.generate_for_tenant(g.tenant_id, g.tenant_code)
except FileNotFoundError as exc:
return jsonify({'error': str(exc)}), 400
except ValueError as exc:
return jsonify({'error': str(exc)}), 500
except OSError as exc:
current_app.logger.warning(
'Polyline-Datei konnte nicht geschrieben werden: %s', exc
)
return jsonify({'error': 'Polyline-Datei konnte nicht geschrieben werden'}), 500
log_transaction('street.str2pl_generate', 'street', None, stats)
notify_reload(
f'Administration: Polyline-Datei für Mandant {g.tenant_code} '
'wurde neu erzeugt.'
)
return jsonify({'success': True, **stats})
@admin_api_bp.route('/strassen/<int:street_id>/history')
@role_required('Administrator')
def street_history(street_id, **kwargs):
@@ -357,6 +447,7 @@ def revert_street_hist(street_id, hist_id, **kwargs):
@admin_api_bp.route('/strassen/import', methods=['POST'])
@role_required('Administrator')
def import_streets(**kwargs):
"""Importiert Straßen und Hausnummern aus einer gemeinsamen CSV-Datei."""
if 'file' not in request.files:
return jsonify({'error': 'Keine Datei'}), 400
file = request.files['file']
@@ -367,26 +458,59 @@ def import_streets(**kwargs):
if len(content) > 5_000_000:
return jsonify({'error': 'Datei zu groß'}), 400
streets_data = parse_streets_csv(content)
if not streets_data:
house_numbers = parse_house_numbers_csv(content)
if not house_numbers:
return jsonify({
'error': 'Keine gültigen Straßen in der CSV gefunden. '
'Erwartete Spalten: Name;Hausnummer minimal;Hausnummer maximal;Bounding Box'
'error': 'Keine gültigen Einträge in der CSV gefunden. '
'Erwartete Spalten: Straßenname;Hausnummer;Longitude;Latitude'
}), 400
db = get_db()
count = 0
for s in streets_data:
street_id = StreetModel.create(g.tenant_id, s['name'], s['hn_min'], s['hn_max'], s['bbox'], 'unbearbeitet', None)
db.execute(
'INSERT INTO street_state_history (tenant_id, street_id, from_state, to_state, group_id, actor_account_id) VALUES (?, ?, ?, ?, ?, ?)',
(g.tenant_id, street_id, None, 'unbearbeitet', None, session['account_id'])
)
log_transaction('street.import', 'street', street_id, {'name': s['name']})
count += 1
db.commit()
notify_reload(f'Administration: {count} Straßen wurden importiert.')
return jsonify({'success': True, 'count': count})
stats = StreetsService.import_from_house_numbers(
g.tenant_id, house_numbers, session['account_id']
)
log_transaction('street.import', 'street', None, stats)
notify_reload(
f'Administration: {stats["streets"]} Straßen und '
f'{stats["house_numbers"]} Hausnummern wurden importiert.'
)
return jsonify({
'success': True,
'count': stats['streets'],
'streets': stats['streets'],
'house_numbers': stats['house_numbers'],
})
@admin_api_bp.route('/strassen/<int:street_id>/split-options', methods=['GET'])
@role_required('Administrator')
def street_split_options(street_id, **kwargs):
"""Liefert die für eine Teilung wählbaren Hausnummern."""
options = StreetsService.get_split_options(street_id, g.tenant_id)
if options is None:
return jsonify({'error': 'Straße nicht gefunden'}), 404
return jsonify(options)
@admin_api_bp.route('/strassen/<int:street_id>/split', methods=['POST'])
@role_required('Administrator')
def split_street(street_id, **kwargs):
"""Teilt eine Straße an einer Hausnummer in zwei Abschnitte."""
data = request.get_json(silent=True) or {}
success, result = StreetsService.split_street(
street_id,
g.tenant_id,
data.get('house_number'),
session['account_id']
)
if not success:
return jsonify({'error': result}), 400
log_transaction('street.split', 'street', street_id, result)
notify_reload(
f'Administration: Straße „{result["lower"]["zusatz"]}“ / '
f'„{result["upper"]["zusatz"]}“ wurde geteilt.'
)
return jsonify({'success': True, **result})
@admin_api_bp.route('/broker/status')
@@ -411,52 +535,3 @@ def broker_status(**kwargs):
'group_alias': conn['group_alias']
})
return jsonify({'connections': result})
@admin_api_bp.route('/hausnummern/import', methods=['POST'])
@role_required('Administrator')
def import_house_numbers(**kwargs):
if 'file' not in request.files:
return jsonify({'error': 'Keine Datei'}), 400
file = request.files['file']
if file.filename == '':
return jsonify({'error': 'Keine Datei ausgewählt'}), 400
content = file.read()
if len(content) > 5_000_000:
return jsonify({'error': 'Datei zu groß'}), 400
house_numbers = parse_house_numbers_csv(content)
if not house_numbers:
return jsonify({
'error': 'Keine gültigen Hausnummern in der CSV gefunden. '
'Erwartete Spalten: Straßenname;Hausnummer;Longitude;Latitude'
}), 400
db = get_db()
for entry in house_numbers:
db.execute(
'''INSERT INTO street_house_numbers
(tenant_id, street_name, house_number, longitude, latitude)
VALUES (?, ?, ?, ?, ?)
ON CONFLICT(tenant_id, street_name, house_number)
DO UPDATE SET longitude = excluded.longitude,
latitude = excluded.latitude''',
(
g.tenant_id,
entry['street_name'],
entry['house_number'],
entry['longitude'],
entry['latitude']
)
)
db.commit()
log_transaction(
'house_number.import',
'street_house_number',
None,
{'count': len(house_numbers)}
)
notify_reload(f'Administration: {len(house_numbers)} Hausnummern wurden importiert.')
return jsonify({'success': True, 'count': len(house_numbers)})
+1 -1
View File
@@ -14,7 +14,7 @@ def strassen(**kwargs):
"""Straßenverwaltung"""
db = get_db()
strassen = db.execute(
'SELECT s.*, g.aliasname as group_name FROM streets s LEFT JOIN groups g ON s.group_id = g.id WHERE s.tenant_id = ? ORDER BY s.name',
'SELECT s.*, g.aliasname as group_name FROM streets s LEFT JOIN groups g ON s.group_id = g.id WHERE s.tenant_id = ? ORDER BY s.name, s.zusatz',
(g.tenant_id,)
).fetchall()
gruppen = db.execute(