Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

added check for from-to units

Browse source
This commit is contained in:
afischerdev 2023-08-29 16:49:29 +02:00
parent e697734d64
commit e954d2174b
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java
View file

@ -573,8 +573,13 @@ public abstract class BExpressionContext implements IByteArrayUnifier {
value = value.replaceAll("’", "'");
value = value.replaceAll("”", "\"");
if (value.indexOf("-") == 0) value = value.substring(1);
if (value.contains("-")) { // replace eg. 1.4-1.6 m but also 1'-6"
value = value.substring(0, value.indexOf("-")); // + tmp;
if (value.contains("-")) {
// replace eg. 1.4-1.6 m to 1.4m
// but also 1'-6" to 1'
// keep the unit of measure
String tmp = value.substring(value.indexOf("-") + 1).replaceAll("[0-9.,-]", "");
value = value.substring(0, value.indexOf("-"));
if (value.matches("\\d+(\\.\\d+)?")) value += tmp;
}
value = value.toLowerCase(Locale.US);