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

changed wording for foot/feet

Browse source
This commit is contained in:
afischerdev 2023-08-30 17:03:45 +02:00
parent 9d22709017
commit 8f793150b0
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -585,30 +585,30 @@ public abstract class BExpressionContext implements IByteArrayUnifier {
// do some value conversion // do some value conversion
if (value.contains("ft")) { if (value.contains("ft")) {
float foot = 0f; float feet = 0f;
int inch = 0; int inch = 0;
String[] sa = value.split("ft"); String[] sa = value.split("ft");
if (sa.length >= 1) foot = Float.parseFloat(sa[0]); if (sa.length >= 1) feet = Float.parseFloat(sa[0]);
if (sa.length == 2) { if (sa.length == 2) {
value = sa[1]; value = sa[1];
if (value.indexOf("in") > 0) value = value.substring(0, value.indexOf("in")); if (value.indexOf("in") > 0) value = value.substring(0, value.indexOf("in"));
inch = Integer.parseInt(value); inch = Integer.parseInt(value);
foot += inch / 12f; feet += inch / 12f;
} }
value = String.format(Locale.US, "%3.1f", foot * 0.3048f); value = String.format(Locale.US, "%3.1f", feet * 0.3048f);
} else if (value.contains("'")) { } else if (value.contains("'")) {
float foot = 0f; float feet = 0f;
int inch = 0; int inch = 0;
String[] sa = value.split("'"); String[] sa = value.split("'");
if (sa.length >= 1) foot = Float.parseFloat(sa[0]); if (sa.length >= 1) feet = Float.parseFloat(sa[0]);
if (sa.length == 2) { if (sa.length == 2) {
value = sa[1]; value = sa[1];
if (value.indexOf("''") > 0) value = value.substring(0, value.indexOf("''")); if (value.indexOf("''") > 0) value = value.substring(0, value.indexOf("''"));
if (value.indexOf("\"") > 0) value = value.substring(0, value.indexOf("\"")); if (value.indexOf("\"") > 0) value = value.substring(0, value.indexOf("\""));
inch = Integer.parseInt(value); inch = Integer.parseInt(value);
foot += inch / 12f; feet += inch / 12f;
} }
value = String.format(Locale.US, "%3.1f", foot * 0.3048f); value = String.format(Locale.US, "%3.1f", feet * 0.3048f);
} else if (value.contains("in") || value.contains("\"")) { } else if (value.contains("in") || value.contains("\"")) {
float inch = 0f; float inch = 0f;
if (value.indexOf("in") > 0) value = value.substring(0, value.indexOf("in")); if (value.indexOf("in") > 0) value = value.substring(0, value.indexOf("in"));