From 4fb9972e4379bdc9738e72f547fec8ad503051be Mon Sep 17 00:00:00 2001 From: Tobrun Date: Tue, 30 Jan 2018 15:35:23 +0100 Subject: [android] - update javadoc with links to style specification --- .../mapboxsdk/style/expressions/Expression.java | 139 ++++++++++++++++++++- 1 file changed, 138 insertions(+), 1 deletion(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java index 7b841a2580..0f76f590c2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java @@ -246,7 +246,7 @@ public class Expression { } /** - * Create a literal object expression + * Create a literal object expression. * * @param object the object * @return the expression @@ -280,6 +280,7 @@ public class Expression { * @param green green color expression * @param blue blue color expression * @return expression + * @see Style specification */ public static Expression rgb(@NonNull Expression red, @NonNull Expression green, @NonNull Expression blue) { @@ -297,6 +298,7 @@ public class Expression { * @param green green color value * @param blue blue color value * @return expression + * @see Style specification */ public static Expression rgb(@NonNull Number red, @NonNull Number green, @NonNull Number blue) { return rgb(literal(red), literal(green), literal(blue)); @@ -314,6 +316,7 @@ public class Expression { * @param blue blue color value * @param alpha alpha color value * @return expression + * @see Style specification */ public static Expression rgba(@NonNull Expression red, @NonNull Expression green, @NonNull Expression blue, @NonNull Expression alpha) { @@ -332,6 +335,7 @@ public class Expression { * @param blue blue color value * @param alpha alpha color value * @return expression + * @see Style specification */ public static Expression rgba(@NonNull Number red, @NonNull Number green, @NonNull Number blue, @NonNull Number alpha) { return rgba(literal(red), literal(green), literal(blue), literal(alpha)); @@ -342,6 +346,7 @@ public class Expression { * * @param expression an expression to convert to a color * @return expression + * @see Style specification */ public static Expression toRgba(@NonNull Expression expression) { return new Expression<>("to-rgba", expression); @@ -358,6 +363,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second expression * @return expression + * @see Style specification */ public static Expression eq(@NonNull Expression compareOne, @NonNull Expression compareTwo) { return new Expression<>("==", compareOne, compareTwo); @@ -369,6 +375,7 @@ public class Expression { * @param compareOne the first boolean * @param compareTwo the second boolean * @return expression + * @see Style specification */ public static Expression eq(boolean compareOne, boolean compareTwo) { return eq(literal(compareOne), literal(compareTwo)); @@ -380,6 +387,7 @@ public class Expression { * @param compareOne the first number * @param compareTwo the second number * @return expression + * @see Style specification */ public static Expression eq(@NonNull String compareOne, @NonNull String compareTwo) { return eq(literal(compareOne), literal(compareTwo)); @@ -391,6 +399,7 @@ public class Expression { * @param compareOne the first number * @param compareTwo the second number * @return expression + * @see Style specification */ public static Expression eq(@NonNull Number compareOne, @NonNull Number compareTwo) { return eq(literal(compareOne), literal(compareTwo)); @@ -403,6 +412,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second expression * @return expression + * @see Style specification */ public static Expression neq(@NonNull Expression compareOne, @NonNull Expression compareTwo) { return new Expression<>("!=", compareOne, compareTwo); @@ -414,6 +424,7 @@ public class Expression { * @param compareOne the first boolean * @param compareTwo the second boolean * @return expression + * @see Style specification */ public static Expression neq(boolean compareOne, boolean compareTwo) { return new Expression<>("!=", literal(compareOne), literal(compareTwo)); @@ -425,6 +436,7 @@ public class Expression { * @param compareOne the first string * @param compareTwo the second string * @return expression + * @see Style specification */ public static Expression neq(@NonNull String compareOne, @NonNull String compareTwo) { return new Expression<>("!=", literal(compareOne), literal(compareTwo)); @@ -436,6 +448,7 @@ public class Expression { * @param compareOne the first number * @param compareTwo the second number * @return expression + * @see Style specification */ public static Expression neq(@NonNull Number compareOne, @NonNull Number compareTwo) { return new Expression<>("!=", literal(compareOne), literal(compareTwo)); @@ -448,6 +461,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second expression * @return expression + * @see Style specification */ public static Expression gt(@NonNull Expression compareOne, @NonNull Expression compareTwo) { return new Expression<>(">", compareOne, compareTwo); @@ -459,6 +473,7 @@ public class Expression { * @param compareOne the first number * @param compareTwo the second number * @return expression + * @see Style specification */ public static Expression gt(@NonNull Number compareOne, @NonNull Number compareTwo) { return new Expression<>(">", literal(compareOne), literal(compareTwo)); @@ -470,6 +485,7 @@ public class Expression { * @param compareOne the first string * @param compareTwo the second string * @return expression + * @see Style specification */ public static Expression gt(@NonNull String compareOne, @NonNull String compareTwo) { return new Expression<>(">", literal(compareOne), literal(compareTwo)); @@ -482,6 +498,7 @@ public class Expression { * @param compareOne the first number * @param compareTwo the second number * @return expression + * @see Style specification */ public static Expression lt(@NonNull Expression compareOne, @NonNull Expression compareTwo) { return new Expression<>("<", compareOne, compareTwo); @@ -493,6 +510,7 @@ public class Expression { * @param compareOne the first number * @param compareTwo the second number * @return expression + * @see Style specification */ public static Expression lt(@NonNull Number compareOne, @NonNull Number compareTwo) { return new Expression<>("<", literal(compareOne), literal(compareTwo)); @@ -504,6 +522,7 @@ public class Expression { * @param compareOne the first string * @param compareTwo the second string * @return expression + * @see Style specification */ public static Expression lt(@NonNull String compareOne, @NonNull String compareTwo) { return new Expression<>("<", literal(compareOne), literal(compareTwo)); @@ -516,6 +535,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second expression * @return expression + * @see Style specification */ public static Expression gte(@NonNull Expression compareOne, @NonNull Expression compareTwo) { return new Expression<>(">=", compareOne, compareTwo); @@ -527,6 +547,7 @@ public class Expression { * @param compareOne the first number * @param compareTwo the second number * @return expression + * @see Style specification */ public static Expression gte(@NonNull Number compareOne, @NonNull Number compareTwo) { return new Expression<>(">=", literal(compareOne), literal(compareTwo)); @@ -538,6 +559,7 @@ public class Expression { * @param compareOne the first string * @param compareTwo the second string * @return expression + * @see Style specification */ public static Expression gte(@NonNull String compareOne, @NonNull String compareTwo) { return new Expression<>(">=", literal(compareOne), literal(compareTwo)); @@ -550,6 +572,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second expression * @return expression + * @see Style specification */ public static Expression lte(@NonNull Expression compareOne, @NonNull Expression compareTwo) { return new Expression<>("<=", compareOne, compareTwo); @@ -561,6 +584,7 @@ public class Expression { * @param compareOne the first number * @param compareTwo the second number * @return expression + * @see Style specification */ public static Expression lte(@NonNull Number compareOne, @NonNull Number compareTwo) { return new Expression<>("<=", literal(compareOne), literal(compareTwo)); @@ -572,6 +596,7 @@ public class Expression { * @param compareOne the first string * @param compareTwo the second string * @return expression + * @see Style specification */ public static Expression lte(@NonNull String compareOne, @NonNull String compareTwo) { return new Expression<>("<=", literal(compareOne), literal(compareTwo)); @@ -587,6 +612,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ @SafeVarargs public static Expression all(@NonNull Expression... input) { @@ -603,6 +629,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ @SafeVarargs public static Expression any(@NonNull Expression... input) { @@ -614,6 +641,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ public static Expression not(@NonNull Expression input) { return new Expression<>("!", input); @@ -624,6 +652,7 @@ public class Expression { * * @param input boolean input * @return expression + * @see Style specification */ public static Expression not(boolean input) { return not(literal(input)); @@ -631,9 +660,14 @@ public class Expression { /** * Selects the first output whose corresponding test condition evaluates to true. + *

+ * For each case a condition and an output should be provided. + * The last parameter should provide the default output. + *

* * @param input expression input * @return expression + * @see Style specification */ @SafeVarargs public static Expression switchCase(@NonNull @Size(min = 1) Expression... input) { @@ -647,6 +681,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ public static Expression match(@NonNull @Size(min = 2) Expression... input) { return new Expression("match", input); @@ -659,6 +694,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ public static Expression match(@NonNull Expression input, @NonNull Stop... stops) { Expression[] expressions = new Expression[stops.length * 2]; @@ -674,6 +710,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ public static Expression coalesce(@NonNull Expression... input) { return new Expression("coalesce", input); @@ -690,6 +727,7 @@ public class Expression { *

* * @return expression + * @see Style specification */ public static Expression properties() { return new Expression<>("properties"); @@ -699,6 +737,7 @@ public class Expression { * Gets the feature's geometry type: Point, MultiPoint, LineString, MultiLineString, Polygon, MultiPolygon. * * @return expression + * @see Style specification */ public static Expression geometryType() { return new Expression<>("geometry-type"); @@ -708,6 +747,7 @@ public class Expression { * Gets the feature's id, if it has one. * * @return expression + * @see Style specification */ public static Expression id() { return new Expression<>("id"); @@ -723,6 +763,7 @@ public class Expression { * Can only be used in the `heatmap-color` property. * * @return expression + * @see Style specification */ public static Expression heatmapDensity() { return new Expression<>("heatmap-density"); @@ -738,6 +779,7 @@ public class Expression { * @param number the index expression * @param expression the array expression * @return expression + * @see Style specification */ public static Expression at(@NonNull Expression number, @NonNull Expression expression) { return new Expression<>("at", number, expression); @@ -749,6 +791,7 @@ public class Expression { * @param number the index expression * @param expression the array expression * @return expression + * @see Style specification */ public static Expression at(@NonNull Number number, @NonNull Expression expression) { return at(literal(number), expression); @@ -761,6 +804,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ public static Expression get(@NonNull Expression input) { return new Expression<>("get", input); @@ -773,6 +817,7 @@ public class Expression { * * @param input string input * @return expression + * @see Style specification */ public static Expression get(@NonNull String input) { return get(literal(input)); @@ -785,6 +830,7 @@ public class Expression { * @param key a property value key * @param object an expression object * @return expression + * @see Style specification */ public static Expression get(@NonNull Expression key, @NonNull Expression object) { return new Expression<>("get", key, object); @@ -797,6 +843,7 @@ public class Expression { * @param key a property value key * @param object an expression object * @return expression + * @see Style specification */ public static Expression get(@NonNull String key, @NonNull Expression object) { return get(literal(key), object); @@ -807,6 +854,7 @@ public class Expression { * * @param key the expression property value key * @return expression + * @see Style specification */ public static Expression has(@NonNull Expression key) { return new Expression<>("has", key); @@ -817,6 +865,7 @@ public class Expression { * * @param key the property value key * @return expression + * @see Style specification */ public static Expression has(@NonNull String key) { return has(literal(key)); @@ -828,6 +877,7 @@ public class Expression { * @param key the expression property value key * @param object an expression object * @return expression + * @see Style specification */ public static Expression has(@NonNull Expression key, @NonNull Expression object) { return new Expression<>("has", key, object); @@ -839,6 +889,7 @@ public class Expression { * @param key the property value key * @param object an expression object * @return expression + * @see Style specification */ public static Expression has(@NonNull String key, @NonNull Expression object) { return has(literal(key), object); @@ -849,6 +900,7 @@ public class Expression { * * @param expression an expression object or expression string * @return expression + * @see Style specification */ public static Expression length(@NonNull Expression expression) { return new Expression<>("length", expression); @@ -859,6 +911,7 @@ public class Expression { * * @param input a string * @return expression + * @see Style specification */ public static Expression length(@NonNull String input) { return length(literal(input)); @@ -872,6 +925,7 @@ public class Expression { * Returns mathematical constant ln(2). * * @return expression + * @see Style specification */ public static Expression ln2() { return new Expression<>("ln2"); @@ -881,6 +935,7 @@ public class Expression { * Returns the mathematical constant pi. * * @return expression + * @see Style specification */ public static Expression pi() { return new Expression<>("pi"); @@ -890,6 +945,7 @@ public class Expression { * Returns the mathematical constant e. * * @return expression + * @see Style specification */ public static Expression e() { return new Expression<>("e"); @@ -900,6 +956,7 @@ public class Expression { * * @param numbers the numbers to calculate the sum for * @return expression + * @see Style specification */ @SafeVarargs public static Expression sum(@Size(min = 2) Expression... numbers) { @@ -911,6 +968,7 @@ public class Expression { * * @param numbers the numbers to calculate the sum for * @return expression + * @see Style specification */ @SuppressWarnings("unchecked") public static Expression sum(@Size(min = 2) Number... numbers) { @@ -926,6 +984,7 @@ public class Expression { * * @param numbers the numbers to calculate the product for * @return expression + * @see Style specification */ @SafeVarargs public static Expression product(@Size(min = 2) Expression... numbers) { @@ -937,6 +996,7 @@ public class Expression { * * @param numbers the numbers to calculate the product for * @return expression + * @see Style specification */ @SuppressWarnings("unchecked") public static Expression product(@Size(min = 2) Number... numbers) { @@ -952,6 +1012,7 @@ public class Expression { * * @param number the number subtract from 0 * @return expression + * @see Style specification */ public static Expression subtract(@NonNull Expression number) { return new Expression<>("-", number); @@ -962,6 +1023,7 @@ public class Expression { * * @param number the number subtract from 0 * @return expression + * @see Style specification */ public static Expression subtract(@NonNull Number number) { return subtract(literal(number)); @@ -973,6 +1035,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression + * @see Style specification */ public static Expression subtract(@NonNull Expression first, @NonNull Expression second) { return new Expression<>("-", first, second); @@ -984,6 +1047,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression + * @see Style specification */ public static Expression subtract(@NonNull Number first, @NonNull Number second) { return subtract(literal(first), literal(second)); @@ -995,6 +1059,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression + * @see Style specification */ @SuppressWarnings("unchecked") public static Expression division(@NonNull Expression first, @NonNull Expression second) { @@ -1007,6 +1072,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression + * @see Style specification */ @SuppressWarnings("unchecked") public static Expression division(@NonNull Number first, @NonNull Number second) { @@ -1019,6 +1085,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression + * @see Style specification */ public static Expression mod(@NonNull Expression first, @NonNull Expression second) { return new Expression<>("%", first, second); @@ -1030,6 +1097,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression + * @see Style specification */ public static Expression mod(@NonNull Number first, @NonNull Number second) { return mod(literal(first), literal(second)); @@ -1041,6 +1109,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression + * @see Style specification */ public static Expression pow(@NonNull Expression first, @NonNull Expression second) { return new Expression<>("^", first, second); @@ -1052,6 +1121,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression + * @see Style specification */ public static Expression pow(@NonNull Number first, @NonNull Number second) { return pow(literal(first), literal(second)); @@ -1062,6 +1132,7 @@ public class Expression { * * @param number the number to take the square root from * @return expression + * @see Style specification */ public static Expression sqrt(@NonNull Expression number) { return new Expression<>("sqrt", number); @@ -1072,6 +1143,7 @@ public class Expression { * * @param number the number to take the square root from * @return expression + * @see Style specification */ public static Expression sqrt(@NonNull Number number) { return sqrt(literal(number)); @@ -1082,6 +1154,7 @@ public class Expression { * * @param number the number to take base-ten logarithm from * @return expression + * @see Style specification */ public static Expression log10(@NonNull Expression number) { return new Expression<>("log10", number); @@ -1092,6 +1165,7 @@ public class Expression { * * @param number the number to take base-ten logarithm from * @return expression + * @see Style specification */ public static Expression log10(@NonNull Number number) { return log10(literal(number)); @@ -1102,6 +1176,7 @@ public class Expression { * * @param number the number to take natural logarithm from * @return expression + * @see Style specification */ public static Expression ln(Expression number) { return new Expression<>("ln", number); @@ -1112,6 +1187,7 @@ public class Expression { * * @param number the number to take natural logarithm from * @return expression + * @see Style specification */ public static Expression ln(Number number) { return ln(literal(number)); @@ -1122,6 +1198,7 @@ public class Expression { * * @param number the number to take base-two logarithm from * @return expression + * @see Style specification */ public static Expression log2(@NonNull Expression number) { return new Expression<>("log2", number); @@ -1132,6 +1209,7 @@ public class Expression { * * @param number the number to take base-two logarithm from * @return expression + * @see Style specification */ public static Expression log2(@NonNull Number number) { return log2(literal(number)); @@ -1142,6 +1220,7 @@ public class Expression { * * @param number the number to calculate the sine for * @return expression + * @see Style specification */ public static Expression sin(@NonNull Expression number) { return new Expression<>("sin", number); @@ -1152,6 +1231,7 @@ public class Expression { * * @param number the number to calculate the sine for * @return expression + * @see Style specification */ public static Expression sin(@NonNull Number number) { return sin(literal(number)); @@ -1162,6 +1242,7 @@ public class Expression { * * @param number the number to calculate the cosine for * @return expression + * @see Style specification */ public static Expression cos(@NonNull Expression number) { return new Expression<>("cos", number); @@ -1172,6 +1253,7 @@ public class Expression { * * @param number the number to calculate the cosine for * @return expression + * @see Style specification */ public static Expression cos(@NonNull Number number) { return new Expression<>("cos", literal(number)); @@ -1182,6 +1264,7 @@ public class Expression { * * @param number the number to calculate the tangent for * @return expression + * @see Style specification */ public static Expression tan(@NonNull Expression number) { return new Expression<>("tan", number); @@ -1192,6 +1275,7 @@ public class Expression { * * @param number the number to calculate the tangent for * @return expression + * @see Style specification */ public static Expression tan(@NonNull Number number) { return new Expression<>("tan", literal(number)); @@ -1202,6 +1286,7 @@ public class Expression { * * @param number the number to calculate the arcsine for * @return expression + * @see Style specification */ public static Expression asin(@NonNull Expression number) { return new Expression<>("asin", number); @@ -1212,6 +1297,7 @@ public class Expression { * * @param number the number to calculate the arcsine for * @return expression + * @see Style specification */ public static Expression asin(@NonNull Number number) { return asin(literal(number)); @@ -1222,6 +1308,7 @@ public class Expression { * * @param number the number to calculate the arccosine for * @return expression + * @see Style specification */ public static Expression acos(@NonNull Expression number) { return new Expression<>("acos", number); @@ -1232,6 +1319,7 @@ public class Expression { * * @param number the number to calculate the arccosine for * @return expression + * @see Style specification */ public static Expression acos(@NonNull Number number) { return acos(literal(number)); @@ -1242,6 +1330,7 @@ public class Expression { * * @param number the number to calculate the arctangent for * @return expression + * @see Style specification */ public static Expression atan(@NonNull Expression number) { return new Expression("atan", number); @@ -1252,6 +1341,7 @@ public class Expression { * * @param number the number to calculate the arctangent for * @return expression + * @see Style specification */ public static Expression atan(@NonNull Number number) { return atan(literal(number)); @@ -1262,6 +1352,7 @@ public class Expression { * * @param numbers varargs of numbers to get the minimum from * @return expression + * @see Style specification */ @SafeVarargs public static Expression min(@Size(min = 1) Expression... numbers) { @@ -1273,6 +1364,7 @@ public class Expression { * * @param numbers varargs of numbers to get the minimum from * @return expression + * @see Style specification */ @SuppressWarnings("unchecked") public static Expression min(@Size(min = 1) Number... numbers) { @@ -1288,6 +1380,7 @@ public class Expression { * * @param numbers varargs of numbers to get the maximum from * @return expression + * @see Style specification */ @SafeVarargs public static Expression max(@Size(min = 1) Expression... numbers) { @@ -1299,6 +1392,7 @@ public class Expression { * * @param numbers varargs of numbers to get the maximum from * @return expression + * @see Style specification */ @SuppressWarnings("unchecked") public static Expression max(@Size(min = 1) Number... numbers) { @@ -1322,6 +1416,7 @@ public class Expression { * * @param string the string to upcase * @return expression + * @see Style specification */ public static Expression upcase(@NonNull Expression string) { return new Expression<>("upcase", string); @@ -1336,6 +1431,7 @@ public class Expression { * * @param string string to upcase * @return expression + * @see Style specification */ public static Expression upcase(@NonNull String string) { return upcase(literal(string)); @@ -1350,6 +1446,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ public static Expression downcase(@NonNull Expression input) { return new Expression<>("downcase", input); @@ -1364,6 +1461,7 @@ public class Expression { * * @param input string to downcase * @return expression + * @see Style specification */ public static Expression downcase(@NonNull String input) { return downcase(literal(input)); @@ -1374,6 +1472,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ @SafeVarargs public static Expression concat(@NonNull Expression... input) { @@ -1385,6 +1484,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ @SuppressWarnings("unchecked") public static Expression concat(@NonNull String... input) { @@ -1406,6 +1506,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ public static Expression array(@NonNull Expression input) { return new Expression<>("array", input); @@ -1416,6 +1517,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ public static Expression typeOf(@NonNull Expression input) { return new Expression<>("typeof", input); @@ -1428,6 +1530,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ public static Expression string(@NonNull Expression input) { return new Expression<>("string", input); @@ -1440,6 +1543,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ public static Expression number(@NonNull Expression input) { return new Expression<>("number", input); @@ -1452,6 +1556,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ public static Expression bool(@NonNull Expression input) { return new Expression<>("boolean", input); @@ -1462,6 +1567,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ public static Expression object(@NonNull Expression input) { return new Expression<>("object", input); @@ -1479,6 +1585,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ public static Expression toString(@NonNull Expression input) { return new Expression<>("to-string", input); @@ -1494,6 +1601,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ public static Expression toNumber(@NonNull Expression input) { return new Expression<>("to-number", input); @@ -1505,6 +1613,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ public static Expression toBool(@NonNull Expression input) { return new Expression<>("to-boolean", input); @@ -1517,6 +1626,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ public static Expression toColor(@NonNull Expression input) { return new Expression<>("to-color", input); @@ -1532,6 +1642,7 @@ public class Expression { * * @param input expression input * @return expression + * @see Style specification */ @SafeVarargs public static Expression let(@Size(min = 1) Expression... input) { @@ -1543,6 +1654,7 @@ public class Expression { * * @param expression the variable naming expression that was bound with using let * @return expression + * @see Style specification */ public static Expression var(@NonNull Expression expression) { return new Expression<>("var", expression); @@ -1553,6 +1665,7 @@ public class Expression { * * @param variableName the variable naming that was bound with using let * @return expression + * @see Style specification */ public static Expression var(@NonNull String variableName) { return var(literal(variableName)); @@ -1570,6 +1683,7 @@ public class Expression { *

* * @return expression + * @see Style specification */ public static Expression zoom() { return new Expression<>("zoom"); @@ -1579,6 +1693,13 @@ public class Expression { // Ramps, scales, curves // + /** + * Produces a stop value to be used as part of the step expression. + * + * @param stop the stop input + * @param value the stop output + * @return the stop + */ public static Stop stop(@NonNull Object stop, @NonNull Object value) { return new Stop(stop, value); } @@ -1593,6 +1714,7 @@ public class Expression { * @param input the input value * @param stops pair of input and output values * @return expression + * @see Style specification */ @SafeVarargs public static Expression step(@NonNull Number input, @NonNull Expression expression, Expression... stops) { @@ -1609,6 +1731,7 @@ public class Expression { * @param expression the input expression * @param stops pair of input and output values * @return expression + * @see Style specification */ @SafeVarargs public static Expression step(@NonNull Expression input, @NonNull Expression expression, Expression... stops) { @@ -1625,6 +1748,7 @@ public class Expression { * @param input the input value * @param stops pair of input and output values * @return expression + * @see Style specification */ @SafeVarargs public static Expression step(@NonNull Number input, @NonNull Expression expression, Stop... stops) { @@ -1646,6 +1770,7 @@ public class Expression { * @param input the input value * @param stops pair of input and output values * @return expression + * @see Style specification */ @SafeVarargs public static Expression step(@NonNull Expression input, @NonNull Expression expression, Stop... stops) { @@ -1667,6 +1792,7 @@ public class Expression { * @param number the input expression * @param stops pair of input and output values * @return expression + * @see Style specification */ @SafeVarargs public static Expression interpolate(@NonNull Expression interpolation, @@ -1684,6 +1810,7 @@ public class Expression { * @param number the input expression * @param stops pair of input and output values * @return expression + * @see Style specification */ @SafeVarargs public static Expression interpolate(@NonNull Expression interpolation, @@ -1700,6 +1827,7 @@ public class Expression { * interpolates linearly between the pair of stops just less than and just greater than the input. * * @return expression + * @see Style specification */ public static Expression linear() { return new Expression<>("linear"); @@ -1713,6 +1841,7 @@ public class Expression { * * @param base value controlling the route at which the output increases * @return expression + * @see Style specification */ public static Expression exponential(@NonNull Number base) { return exponential(literal(base)); @@ -1726,6 +1855,7 @@ public class Expression { * * @param expression base number expression * @return expression + * @see Style specification */ public static Expression exponential(@NonNull Expression expression) { return new Expression<>("exponential", expression); @@ -1739,6 +1869,7 @@ public class Expression { * @param x2 x value of the second point of a cubic bezier, ranges from 0 to 1 * @param y2 y value fo the second point of a cubic bezier, ranges from 0 to 1 * @return expression + * @see Style specification */ public static Expression cubicBezier(@NonNull Expression x1, @NonNull Expression y1, @NonNull Expression x2, @NonNull Expression y2) { @@ -1753,6 +1884,7 @@ public class Expression { * @param x2 x value of the second point of a cubic bezier, ranges from 0 to 1 * @param y2 y value fo the second point of a cubic bezier, ranges from 0 to 1 * @return expression + * @see Style specification */ public static Expression cubicBezier(@NonNull Number x1, @NonNull Number y1, @NonNull Number x2, @NonNull Number y2) { @@ -1777,6 +1909,11 @@ public class Expression { } + /** + * Returns a string representation of the object that matches the definition set in the style specification. + * + * @return a string representation of the object. + */ @Override public String toString() { StringBuilder builder = new StringBuilder(); -- cgit v1.2.1