Commit 5c7d7358 authored by Volker Krause's avatar Volker Krause
Browse files

Properly implement platform name preference selection

This fixes the remaining issue in the Leipzig test case.
parent 91e25d04
......@@ -43,11 +43,11 @@
mode: Rail
lines: RE 42
8a
position: 1413474179 1923830421
stop point: <null>
edge: <null>
position: 1413471901 1923827903
stop point: n2299420232
edge: w180182561
area: r9615740
track: []
track: w355578378
level: 10
mode: Rail
9
......@@ -194,14 +194,6 @@
level: 10
mode: Rail
lines: RE 6
34
position: 1413471901 1923827903
stop point: n2299420232
edge: n2299420232
area: n2299420232
track: w355578378
level: 10
mode: Rail
5
position: 1413453342 1923787656
stop point: n2590268924
......
......@@ -433,5 +433,12 @@ QString Platform::preferredName(const QString &lhs, const QString &rhs)
return lhs;
}
return lhs.size() < rhs.size() ? lhs: rhs;
if (isPlausibleName(lhs)) {
return lhs;
}
if (isPlausibleName(rhs)) {
return rhs;
}
return lhs.size() <= rhs.size() ? lhs: rhs;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment