Suche nach Strassen und Hausnummern
This commit is contained in:
1 parent
a16f28b040
commit
518248ca00
12 files changed
+6346
-14
No files matched your search
@@ -11,7 +11,7 @@ from cmbnet.models.streets import StreetModel
|
||||
from cmbnet.services.groups_service import GroupsService
|
||||
from cmbnet.services.history_service import HistoryService
|
||||
from cmbnet.utils.helpers import log_transaction
|
||||
from cmbnet.utils.csv_utils import parse_streets_csv
|
||||
from cmbnet.utils.csv_utils import parse_streets_csv, parse_house_numbers_csv
|
||||
from cmbnet.ws import broker
|
||||
from cmbnet.ws.protocol import WSMessage
|
||||
import json
|
||||
@@ -368,3 +368,51 @@ def import_streets(**kwargs):
|
||||
|
||||
db.commit()
|
||||
return jsonify({'success': True, 'count': count})
|
||||
|
||||
|
||||
@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)}
|
||||
)
|
||||
return jsonify({'success': True, 'count': len(house_numbers)})
|
||||
@@ -21,4 +21,13 @@ def strassen(**kwargs):
|
||||
'SELECT * FROM groups WHERE tenant_id = ? ORDER BY id',
|
||||
(g.tenant_id,)
|
||||
).fetchall()
|
||||
return render_template('admin/strassen.html', strassen=strassen, gruppen=gruppen)
|
||||
house_number_count = db.execute(
|
||||
'SELECT COUNT(*) FROM street_house_numbers WHERE tenant_id = ?',
|
||||
(g.tenant_id,)
|
||||
).fetchone()[0]
|
||||
return render_template(
|
||||
'admin/strassen.html',
|
||||
strassen=strassen,
|
||||
gruppen=gruppen,
|
||||
house_number_count=house_number_count
|
||||
)
|
||||
@@ -1,8 +1,9 @@
|
||||
"""
|
||||
API Endpunkte für Initialdaten
|
||||
"""
|
||||
from flask import Blueprint, jsonify, g
|
||||
from flask import Blueprint, jsonify, g, request
|
||||
from cmbnet.auth import login_required
|
||||
from cmbnet.db import get_db
|
||||
from cmbnet.services.streets_service import StreetsService
|
||||
from cmbnet.services.groups_service import GroupsService
|
||||
|
||||
@@ -24,3 +25,37 @@ def init_groups(**kwargs):
|
||||
groups_dict = GroupsService.get_all(g.tenant_id)
|
||||
groups_list = list(groups_dict.values())
|
||||
return jsonify(groups_list)
|
||||
|
||||
|
||||
@api_init_bp.route('/init/hausnummern')
|
||||
@login_required
|
||||
def init_house_number(**kwargs):
|
||||
"""Liefert die Koordinate einer Hausnummer aus der importierten Tabelle."""
|
||||
street_name = (request.args.get('street') or '').strip()
|
||||
house_number = (
|
||||
request.args.get('house_number')
|
||||
or request.args.get('number')
|
||||
or ''
|
||||
).strip()
|
||||
|
||||
if not street_name or not house_number:
|
||||
return jsonify({'found': False})
|
||||
|
||||
row = get_db().execute(
|
||||
'''SELECT street_name, house_number, longitude, latitude
|
||||
FROM street_house_numbers
|
||||
WHERE tenant_id = ? AND street_name = ? AND house_number = ?
|
||||
LIMIT 1''',
|
||||
(g.tenant_id, street_name, house_number)
|
||||
).fetchone()
|
||||
|
||||
if not row:
|
||||
return jsonify({'found': False})
|
||||
|
||||
return jsonify({
|
||||
'found': True,
|
||||
'street_name': row['street_name'],
|
||||
'house_number': row['house_number'],
|
||||
'longitude': row['longitude'],
|
||||
'latitude': row['latitude']
|
||||
})
|
||||
@@ -13,6 +13,85 @@ def _normalize_header(name):
|
||||
return name.strip().lstrip('\ufeff').lstrip('#').strip()
|
||||
|
||||
|
||||
def _decode_csv(file_content):
|
||||
"""Dekodiert CSV-Inhalte tolerant gegenüber gängigen Kodierungen."""
|
||||
try:
|
||||
return file_content.decode('utf-8-sig')
|
||||
except UnicodeDecodeError:
|
||||
try:
|
||||
return file_content.decode('latin-1')
|
||||
except UnicodeDecodeError:
|
||||
return file_content.decode('cp1252')
|
||||
|
||||
|
||||
def _parse_coordinate(value, minimum, maximum):
|
||||
"""Wandelt eine Koordinate in eine Zahl um und prüft den Wertebereich."""
|
||||
if value is None:
|
||||
return None
|
||||
|
||||
text = str(value).strip()
|
||||
if not text:
|
||||
return None
|
||||
|
||||
# Deutsche CSV-Dateien verwenden häufig das Komma als Dezimaltrennzeichen.
|
||||
if ',' in text and '.' not in text:
|
||||
text = text.replace(',', '.')
|
||||
|
||||
try:
|
||||
number = float(text)
|
||||
except (TypeError, ValueError):
|
||||
return None
|
||||
|
||||
if not (minimum <= number <= maximum):
|
||||
return None
|
||||
return number
|
||||
|
||||
|
||||
def parse_house_numbers_csv(file_content):
|
||||
"""
|
||||
Parst den Hausnummern-Import mit Delimiter ';'.
|
||||
Erwartete Spalten: Straßenname, Hausnummer, Longitude, Latitude
|
||||
"""
|
||||
text = _decode_csv(file_content)
|
||||
reader = csv.DictReader(io.StringIO(text), delimiter=';')
|
||||
if reader.fieldnames:
|
||||
reader.fieldnames = [_normalize_header(name) for name in reader.fieldnames]
|
||||
|
||||
street_aliases = {'straßenname', 'strassenname', 'straße', 'strasse', 'street', 'street_name', 'name'}
|
||||
number_aliases = {'hausnummer', 'hn', 'house_number', 'number', 'nr'}
|
||||
longitude_aliases = {'longitude', 'lon', 'lng', 'long', 'längengrad', 'laengengrad'}
|
||||
latitude_aliases = {'latitude', 'lat', 'breitengrad'}
|
||||
|
||||
def row_value(row, aliases):
|
||||
for key, value in row.items():
|
||||
if key and _normalize_header(key).casefold() in aliases:
|
||||
return value
|
||||
return None
|
||||
|
||||
house_numbers = []
|
||||
for row in reader:
|
||||
street_name = row_value(row, street_aliases)
|
||||
house_number = row_value(row, number_aliases)
|
||||
longitude = _parse_coordinate(row_value(row, longitude_aliases), -180, 180)
|
||||
latitude = _parse_coordinate(row_value(row, latitude_aliases), -90, 90)
|
||||
|
||||
if not street_name or not str(street_name).strip():
|
||||
continue
|
||||
if not house_number or not str(house_number).strip():
|
||||
continue
|
||||
if longitude is None or latitude is None:
|
||||
continue
|
||||
|
||||
house_numbers.append({
|
||||
'street_name': str(street_name).strip(),
|
||||
'house_number': str(house_number).strip(),
|
||||
'longitude': longitude,
|
||||
'latitude': latitude
|
||||
})
|
||||
|
||||
return house_numbers
|
||||
|
||||
|
||||
def parse_streets_csv(file_content):
|
||||
"""
|
||||
Parst CSV mit Delimiter ';'
|
||||
|
||||
Reference in new issue
Block a user