bug fix beim Anlegen/Import von Strassen
This commit is contained in:
1 parent
7e498ebc3f
commit
12453c7d5f
9 files changed
+686
-831
No files matched your search
@@ -350,6 +350,11 @@ def import_streets(**kwargs):
|
||||
return jsonify({'error': 'Datei zu groß'}), 400
|
||||
|
||||
streets_data = parse_streets_csv(content)
|
||||
if not streets_data:
|
||||
return jsonify({
|
||||
'error': 'Keine gültigen Straßen in der CSV gefunden. '
|
||||
'Erwartete Spalten: Name;Hausnummer minimal;Hausnummer maximal;Bounding Box'
|
||||
}), 400
|
||||
db = get_db()
|
||||
count = 0
|
||||
for s in streets_data:
|
||||
|
||||
@@ -6,15 +6,22 @@ import io
|
||||
import json
|
||||
|
||||
|
||||
def _normalize_header(name):
|
||||
"""Entfernt BOM, Kommentarzeichen und umgebende Leerzeichen aus Spaltennamen."""
|
||||
if name is None:
|
||||
return ''
|
||||
return name.strip().lstrip('\ufeff').lstrip('#').strip()
|
||||
|
||||
|
||||
def parse_streets_csv(file_content):
|
||||
"""
|
||||
Parst CSV mit Delimiter ';'
|
||||
Erwartete Spalten: Name, Hausnummer minimal, Hausnummer maximal, Bounding Box
|
||||
"""
|
||||
streets = []
|
||||
# Versuche mit verschiedenen Encodings
|
||||
# Versuche mit verschiedenen Encodings (utf-8-sig entfernt ein evtl. BOM)
|
||||
try:
|
||||
text = file_content.decode('utf-8')
|
||||
text = file_content.decode('utf-8-sig')
|
||||
except:
|
||||
try:
|
||||
text = file_content.decode('latin-1')
|
||||
@@ -23,6 +30,9 @@ def parse_streets_csv(file_content):
|
||||
|
||||
f = io.StringIO(text)
|
||||
reader = csv.DictReader(f, delimiter=';')
|
||||
# Kopfzeilen wie "#Name;..." oder mit BOM/Leerzeichen tolerant behandeln.
|
||||
if reader.fieldnames:
|
||||
reader.fieldnames = [_normalize_header(name) for name in reader.fieldnames]
|
||||
|
||||
for row in reader:
|
||||
name = row.get('Name') or row.get('name') or row.get('Strasse') or row.get('Straße')
|
||||
|
||||
@@ -47,7 +47,7 @@ function editStrasse(streetId) {
|
||||
document.getElementById('strasseName').value = row.cells[1].innerText;
|
||||
document.getElementById('strasseHnMin').value = row.cells[4].innerText === '-' ? '' : row.cells[4].innerText;
|
||||
document.getElementById('strasseHnMax').value = row.cells[5].innerText === '-' ? '' : row.cells[5].innerText;
|
||||
document.getElementById('strasseBbox').value = row.cells[6].innerText === '-' ? '' : row.cells[6].innerText;
|
||||
document.getElementById('strasseBbox').value = row.dataset.bbox || '';
|
||||
document.getElementById('strasseState').value = row.cells[2].querySelector('select').value;
|
||||
document.getElementById('strasseState').disabled = false;
|
||||
document.getElementById('strasseGroup').value = row.cells[3].querySelector('select').value;
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for strasse in strassen %}
|
||||
<tr data-id="{{ strasse.id }}">
|
||||
<tr data-id="{{ strasse.id }}" data-bbox="{{ strasse.bbox or '' }}">
|
||||
<td>{{ strasse.id }}</td>
|
||||
<td>{{ strasse.name }}</td>
|
||||
<td>
|
||||
@@ -41,7 +41,7 @@
|
||||
</td>
|
||||
<td>{{ strasse.hn_min or '-' }}</td>
|
||||
<td>{{ strasse.hn_max or '-' }}</td>
|
||||
<td>{{ strasse.bbox[:20] if strasse.bbox else '-' }}</td>
|
||||
<td style="word-break: break-all;">{{ strasse.bbox or '-' }}</td>
|
||||
<td>
|
||||
<button onclick="editStrasse({{ strasse.id }})">✎</button>
|
||||
<button onclick="showStreetHistory({{ strasse.id }})">Historie</button>
|
||||
|
||||
Reference in new issue
Block a user