tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] - add quotes to toString representation of a String literal

Browse Source
This commit is contained in:
Tobrun
2018-08-29 18:10:10 +02:00
committed by Tobrun
parent e7642f28fe
commit 1099bb4920
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java
View File

@@ -2834,8 +2834,8 @@ public class Expression {
* CircleLayer circleLayer = new CircleLayer("layer-id", "source-id");
* circleLayer.setProperties(
* circleColor(switchCase(
eq(literal("it"), resolvedLocale(collator(true, true, "it"))), literal(ColorUtils.colorToRgbaString(Color.GREEN)),
literal(ColorUtils.colorToRgbaString(Color.RED))))
* eq(literal("it"), resolvedLocale(collator(true, true, "it"))), literal(ColorUtils.colorToRgbaString(Color.GREEN)),
* literal(ColorUtils.colorToRgbaString(Color.RED))))
* );
* }
* </pre>
@@ -3921,13 +3921,10 @@ public class Expression {
// special case for handling unusual input like 'rgba(r, g, b, a)'
if (literalValue instanceof String) {
if (((String) literalValue).contains(",")) {
builder.append("\"").append(literalValue).append("\"");
continue;
}
builder.append("\"").append(literalValue).append("\"");
} else {
builder.append(literalValue);
}
builder.append(literalValue);
} else {
builder.append(argument.toString());
}

11
platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java
View File

@@ -1101,7 +1101,7 @@ public class ExpressionTest {
@Test
public void testExpressionConcatToString() throws Exception {
String expected = "[\"concat\", foo, bar]";
String expected = "[\"concat\", \"foo\", \"bar\"]";
String actual = concat(literal("foo"), literal("bar")).toString();
assertEquals("toString should match", expected, actual);
}
@@ -1116,7 +1116,7 @@ public class ExpressionTest {
@Test
public void testExpressionExponentialToString() throws Exception {
String expected = "[\"interpolate\", [\"cubic-bezier\", 1.0, 1.0, 1.0, 1.0],"
+ " [\"get\", x], 0.0, 100.0, 100.0, 200.0]";
+ " [\"get\", \"x\"], 0.0, 100.0, 100.0, 200.0]";
String actual = interpolate(cubicBezier(literal(1), literal(1), literal(1), literal(1)),
get(literal("x")), literal(0), literal(100), literal(100), literal(200)).toString();
assertEquals("toString should match", expected, actual);
@@ -1367,4 +1367,11 @@ public class ExpressionTest {
String actual = collator(literal(false), eq(literal(2), literal(1)), literal("it")).toString();
assertEquals("expression should match", expected, actual);
}
@Test
public void testStringReverseConversion() {
String expected = "[\"to-string\", [\"get\", \"name_en\"]]";
String actual = Expression.toString(get("name_en")).toString();
assertEquals("Reverse string conversion should match", expected, actual);
}
}