Skip to content

Fix string comparisons in LightCharacteristics Java port #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k-yle merged 1 commit into from
Aug 4, 2026
Merged

Fix string comparisons in LightCharacteristics Java port #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions data/planetiler/LightCharacteristics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,20 @@ private static String encodeLx(Map<String, Object> tags, String index, String ty
VALMXR = "";
}

if (CATLIT != "" && type == "fog_signal") {
if (!CATLIT.isEmpty() && "fog_signal".equals(type)) {
str += capitalize(CATLIT) + ": ";
}
if (CATLIT == "directional") {
if ("directional".equals(CATLIT)) {
str += "Dir";
}
if (CATLIT == "aero" || CATLIT == "air_obstruction") {
if ("aero".equals(CATLIT) || "air_obstruction".equals(CATLIT)) {
str += "Aero";
Comment on lines +72 to 79
}
if (MLTYLT != "") {
if (!MLTYLT.isEmpty()) {
str += MLTYLT;
}
if (LITCHR != "") {
if (SIGGRP != "") {
if (!LITCHR.isEmpty()) {
if (!SIGGRP.isEmpty()) {
if (LITCHR.contains("+")) {
// light charactertics with a plus are formatted differently
var prefixSuffix = LITCHR.split("\\+");
Expand All @@ -94,17 +94,17 @@ private static String encodeLx(Map<String, Object> tags, String index, String ty
// no group, simple case
str += LITCHR;
}
} else if (SIGGRP != "") {
} else if (!SIGGRP.isEmpty()) {
str += LITCHR + "(" + SIGGRP + ")";
}
Comment on lines +97 to 99

// if the last character is not a bracket, and the next token
// is going to be a colour, then add a dot
if (str != "" && str.charAt(str.length() - 1) != ')') {
if (!str.isEmpty() && str.charAt(str.length() - 1) != ')') {
str += ".";
}

if (COLOUR != "") {
if (!COLOUR.isEmpty()) {
for (var colour : COLOUR.split(";")) {
if (COLOUR_MAP.containsKey(colour)) {
str += COLOUR_MAP.get(colour);
Expand All @@ -113,43 +113,43 @@ private static String encodeLx(Map<String, Object> tags, String index, String ty
}

// add another dot, unless the previous group was empty
if (str != "" && str.charAt(str.length() - 1) != '.' && str.charAt(str.length() - 1) != ')'
&& !(str.length() > 2 && str.substring(str.length() - 2) == ": ")) {
if (!str.isEmpty() && str.charAt(str.length() - 1) != '.' && str.charAt(str.length() - 1) != ')'
&& !(str.length() > 2 && ": ".equals(str.substring(str.length() - 2)))) {
str += ".";
}

if (SIGPER != "") {
if (!SIGPER.isEmpty()) {
str += SIGPER + "s";
}
if (HEIGHT != "") {
if (!HEIGHT.isEmpty()) {
str += HEIGHT + "m";
}
if (VALMXR != "") {
if (!VALMXR.isEmpty()) {
str += VALMXR += "M";
}

// turns out we didn"t need that separator
var chars = Set.of('.', ':', ' ');
while (str != "" && chars.contains(str.charAt(str.length() - 1))) {
while (!str.isEmpty() && chars.contains(str.charAt(str.length() - 1))) {
str = str.substring(0, str.length() - 1);
}

if (CATLIT == "vertical") {
if ("vertical".equals(CATLIT)) {
str += "(vert)";
}
if (CATLIT == "horizontal") {
if ("horizontal".equals(CATLIT)) {
str += "(hor)";
}
if (CATLIT == "front") {
if ("front".equals(CATLIT)) {
str += "(Front)";
}
if (CATLIT == "rear") {
if ("rear".equals(CATLIT)) {
str += "(Rear)";
}
if (CATLIT == "upper") {
if ("upper".equals(CATLIT)) {
str += "(Upper)";
}
if (CATLIT == "lower") {
if ("lower".equals(CATLIT)) {
str += "(Lower)";
}

Expand Down
Loading