trafficcue/planetiler-openmaptiles
1
0
Fork 0
mirror of https://github.com/cfpwastaken/planetiler-openmaptiles.git synced 2026-02-04 04:21:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support colon in field names (#56)

Browse Source 
Support colon in field name
This commit is contained in:
Frédéric Rodrigo
2022-12-31 19:02:57 +01:00
committed by GitHub
parent c662ef2d30
commit 614d9f34f9
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/openmaptiles/Generate.java
View File

@@ -269,7 +269,7 @@ public class Generate {
*/ */
""".stripTrailing().formatted(javadocDescription, """.stripTrailing().formatted(javadocDescription,
valuesForComment.stream().map(v -> "<li>" + v).collect(joining(LINE_SEPARATOR + " * "))), valuesForComment.stream().map(v -> "<li>" + v).collect(joining(LINE_SEPARATOR + " * "))),
name.toUpperCase(Locale.ROOT), name.toUpperCase(Locale.ROOT).replace(":", "__"),
Format.quote(name) Format.quote(name)
).indent(4)); ).indent(4));
@@ -280,12 +280,14 @@ public class Generate {
if (values.size() > 0) { if (values.size() > 0) {
fieldValues.append(values.stream() fieldValues.append(values.stream()
.map(v -> "public static final String %s = %s;" .map(v -> "public static final String %s = %s;"
.formatted(name.toUpperCase(Locale.ROOT) + "_" + v.toUpperCase(Locale.ROOT).replace('-', '_'), .formatted(
name.toUpperCase(Locale.ROOT).replace(":", "__") + "_" +
v.toUpperCase(Locale.ROOT).replace('-', '_').replace(":", "__"),
Format.quote(v))) Format.quote(v)))
.collect(joining(LINE_SEPARATOR)).indent(2).strip() .collect(joining(LINE_SEPARATOR)).indent(2).strip()
.indent(4)); .indent(4));
fieldValues.append("public static final Set<String> %s = Set.of(%s);".formatted( fieldValues.append("public static final Set<String> %s = Set.of(%s);".formatted(
name.toUpperCase(Locale.ROOT) + "_VALUES", name.toUpperCase(Locale.ROOT).replace(":", "__") + "_VALUES",
values.stream().map(Format::quote).collect(joining(", ")) values.stream().map(Format::quote).collect(joining(", "))
).indent(4)); ).indent(4));
} }
@@ -657,11 +659,11 @@ public class Generate {
} }
private static String lowerUnderscoreToLowerCamel(String name) { private static String lowerUnderscoreToLowerCamel(String name) {
return CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, name); return CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, name.replace(":", "__"));
} }
private static String lowerUnderscoreToUpperCamel(String name) { private static String lowerUnderscoreToUpperCamel(String name) {
return CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name); return CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name.replace(":", "__"));
} }
private static <T> List<T> iterToList(Iterator<T> iter) { private static <T> List<T> iterToList(Iterator<T> iter) {