diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/Resource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/Resource.java index f278317d5..869b3fc77 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/Resource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/Resource.java @@ -30,31 +30,31 @@ public final class Resource { public static final int STYLE = 1; /** - * TileJSON file as specified in https://www.mapbox.com/mapbox-gl-js/style-spec/#root-sources + * TileJSON file as specified in https://maplibre.org/maplibre-gl-js-docs/style-spec/#root-sources */ public static final int SOURCE = 2; /** * A vector or raster tile as described in the style sheet at - * https://www.mapbox.com/mapbox-gl-js/style-spec/#sources + * https://maplibre.org/maplibre-gl-js-docs/style-spec/#sources */ public static final int TILE = 3; /** * Signed distance field glyphs for text rendering. These are the URLs specified in the style - * in https://www.mapbox.com/mapbox-gl-js/style-spec/#root-glyphs + * in https://maplibre.org/maplibre-gl-js-docs/style-spec/#root-glyphs */ public static final int GLYPHS = 4; /** * Image part of a sprite sheet. It is constructed of the prefix in - * https://www.mapbox.com/mapbox-gl-js/style-spec/#root-sprite and a PNG file extension. + * https://maplibre.org/maplibre-gl-js-docs/style-spec/#root-sprite and a PNG file extension. */ public static final int SPRITE_IMAGE = 5; /** * JSON part of a sprite sheet. It is constructed of the prefix in - * https://www.mapbox.com/mapbox-gl-js/style-spec/#root-sprite and a JSON file extension. + * https://maplibre.org/maplibre-gl-js-docs/style-spec/#root-sprite and a JSON file extension. */ public static final int SPRITE_JSON = 6; } 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 cc965a1fe..4218b1e67 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 @@ -259,7 +259,7 @@ public class Expression { * @param green green color expression * @param blue blue color expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression rgb(@NonNull Expression red, @NonNull Expression green, @NonNull Expression blue) { return new Expression("rgb", red, green, blue); @@ -289,7 +289,7 @@ public class Expression { * @param green green color value * @param blue blue color value * @return expression - * @see Style specification + * @see Style specification */ public static Expression rgb(@NonNull Number red, @NonNull Number green, @NonNull Number blue) { return rgb(literal(red), literal(green), literal(blue)); @@ -325,7 +325,7 @@ public class Expression { * @param blue blue color value * @param alpha alpha color value * @return expression - * @see Style specification + * @see Style specification */ public static Expression rgba(@NonNull Expression red, @NonNull Expression green, @NonNull Expression blue, @NonNull Expression alpha) { @@ -357,7 +357,7 @@ public class Expression { * @param blue blue color value * @param alpha alpha color value * @return expression - * @see Style specification + * @see Style specification */ public static Expression rgba(@NonNull Number red, @NonNull Number green, @NonNull Number blue, @NonNull Number alpha) { @@ -369,7 +369,7 @@ public class Expression { * * @param expression an expression to convert to a color * @return expression - * @see Style specification + * @see Style specification */ public static Expression toRgba(@NonNull Expression expression) { return new Expression("to-rgba", expression); @@ -393,7 +393,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression eq(@NonNull Expression compareOne, @NonNull Expression compareTwo) { return new Expression("==", compareOne, compareTwo); @@ -418,7 +418,7 @@ public class Expression { * @param compareTwo the second expression * @param collator the collator expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression eq(@NonNull Expression compareOne, @NonNull Expression compareTwo, @NonNull Expression collator) { @@ -442,7 +442,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second boolean * @return expression - * @see Style specification + * @see Style specification */ public static Expression eq(@NonNull Expression compareOne, boolean compareTwo) { return eq(compareOne, literal(compareTwo)); @@ -465,7 +465,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression eq(@NonNull Expression compareOne, @NonNull String compareTwo) { return eq(compareOne, literal(compareTwo)); @@ -490,7 +490,7 @@ public class Expression { * @param compareTwo the second String * @param collator the collator expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression eq(@NonNull Expression compareOne, @NonNull String compareTwo, @NonNull Expression collator) { @@ -514,7 +514,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression eq(@NonNull Expression compareOne, @NonNull Number compareTwo) { return eq(compareOne, literal(compareTwo)); @@ -538,7 +538,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression neq(@NonNull Expression compareOne, @NonNull Expression compareTwo) { return new Expression("!=", compareOne, compareTwo); @@ -563,7 +563,7 @@ public class Expression { * @param compareTwo the second expression * @param collator the collator expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression neq(@NonNull Expression compareOne, @NonNull Expression compareTwo, @NonNull Expression collator) { @@ -587,7 +587,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second boolean * @return expression - * @see Style specification + * @see Style specification */ public static Expression neq(Expression compareOne, boolean compareTwo) { return new Expression("!=", compareOne, literal(compareTwo)); @@ -610,7 +610,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second string * @return expression - * @see Style specification + * @see Style specification */ public static Expression neq(@NonNull Expression compareOne, @NonNull String compareTwo) { return new Expression("!=", compareOne, literal(compareTwo)); @@ -635,7 +635,7 @@ public class Expression { * @param compareTwo the second String * @param collator the collator expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression neq(@NonNull Expression compareOne, @NonNull String compareTwo, @NonNull Expression collator) { @@ -659,7 +659,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression neq(@NonNull Expression compareOne, @NonNull Number compareTwo) { return new Expression("!=", compareOne, literal(compareTwo)); @@ -683,7 +683,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression gt(@NonNull Expression compareOne, @NonNull Expression compareTwo) { return new Expression(">", compareOne, compareTwo); @@ -708,7 +708,7 @@ public class Expression { * @param compareTwo the second expression * @param collator the collator expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression gt(@NonNull Expression compareOne, @NonNull Expression compareTwo, @NonNull Expression collator) { @@ -732,7 +732,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression gt(@NonNull Expression compareOne, @NonNull Number compareTwo) { return new Expression(">", compareOne, literal(compareTwo)); @@ -755,7 +755,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second string * @return expression - * @see Style specification + * @see Style specification */ public static Expression gt(@NonNull Expression compareOne, @NonNull String compareTwo) { return new Expression(">", compareOne, literal(compareTwo)); @@ -780,7 +780,7 @@ public class Expression { * @param compareTwo the second String * @param collator the collator expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression gt(@NonNull Expression compareOne, @NonNull String compareTwo, @NonNull Expression collator) { @@ -805,7 +805,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression lt(@NonNull Expression compareOne, @NonNull Expression compareTwo) { return new Expression("<", compareOne, compareTwo); @@ -830,7 +830,7 @@ public class Expression { * @param compareTwo the second number * @param collator the collator expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression lt(@NonNull Expression compareOne, @NonNull Expression compareTwo, @NonNull Expression collator) { @@ -854,7 +854,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression lt(@NonNull Expression compareOne, @NonNull Number compareTwo) { return new Expression("<", compareOne, literal(compareTwo)); @@ -877,7 +877,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second string * @return expression - * @see Style specification + * @see Style specification */ public static Expression lt(@NonNull Expression compareOne, @NonNull String compareTwo) { return new Expression("<", compareOne, literal(compareTwo)); @@ -902,7 +902,7 @@ public class Expression { * @param compareTwo the second String * @param collator the collator expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression lt(@NonNull Expression compareOne, @NonNull String compareTwo, @NonNull Expression collator) { @@ -927,7 +927,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression gte(@NonNull Expression compareOne, @NonNull Expression compareTwo) { return new Expression(">=", compareOne, compareTwo); @@ -952,7 +952,7 @@ public class Expression { * @param compareTwo the second expression * @param collator the collator expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression gte(@NonNull Expression compareOne, @NonNull Expression compareTwo, @NonNull Expression collator) { @@ -976,7 +976,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression gte(@NonNull Expression compareOne, @NonNull Number compareTwo) { return new Expression(">=", compareOne, literal(compareTwo)); @@ -999,7 +999,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second string * @return expression - * @see Style specification + * @see Style specification */ public static Expression gte(@NonNull Expression compareOne, @NonNull String compareTwo) { return new Expression(">=", compareOne, literal(compareTwo)); @@ -1024,7 +1024,7 @@ public class Expression { * @param compareTwo the second String * @param collator the collator expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression gte(@NonNull Expression compareOne, @NonNull String compareTwo, @NonNull Expression collator) { @@ -1049,7 +1049,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression lte(@NonNull Expression compareOne, @NonNull Expression compareTwo) { return new Expression("<=", compareOne, compareTwo); @@ -1074,7 +1074,7 @@ public class Expression { * @param compareTwo the second expression * @param collator the collator expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression lte(@NonNull Expression compareOne, @NonNull Expression compareTwo, @NonNull Expression collator) { @@ -1098,7 +1098,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression lte(@NonNull Expression compareOne, @NonNull Number compareTwo) { return new Expression("<=", compareOne, literal(compareTwo)); @@ -1121,7 +1121,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second string * @return expression - * @see Style specification + * @see Style specification */ public static Expression lte(@NonNull Expression compareOne, @NonNull String compareTwo) { return new Expression("<=", compareOne, literal(compareTwo)); @@ -1146,7 +1146,7 @@ public class Expression { * @param compareTwo the second String * @param collator the collator expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression lte(@NonNull Expression compareOne, @NonNull String compareTwo, @NonNull Expression collator) { @@ -1174,7 +1174,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression all(@NonNull Expression... input) { return new Expression("all", input); @@ -1201,7 +1201,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression any(@NonNull Expression... input) { return new Expression("any", input); @@ -1223,7 +1223,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression not(@NonNull Expression input) { return new Expression("!", input); @@ -1245,7 +1245,7 @@ public class Expression { * * @param input boolean input * @return expression - * @see Style specification + * @see Style specification */ public static Expression not(boolean input) { return not(literal(input)); @@ -1277,7 +1277,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression switchCase(@NonNull @Size(min = 1) Expression... input) { return new Expression("case", input); @@ -1309,7 +1309,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression match(@NonNull @Size(min = 2) Expression... input) { return new Expression("match", input); @@ -1340,7 +1340,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression match(@NonNull Expression input, @NonNull Expression defaultOutput, @NonNull Stop... stops) { return match(join(join(new Expression[] {input}, Stop.toExpressionArray(stops)), new Expression[] {defaultOutput})); @@ -1367,7 +1367,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression coalesce(@NonNull Expression... input) { return new Expression("coalesce", input); @@ -1391,7 +1391,7 @@ public class Expression { * * * @return expression - * @see Style specification + * @see Style specification */ public static Expression properties() { return new Expression("properties"); @@ -1412,7 +1412,7 @@ public class Expression { * * * @return expression - * @see Style specification + * @see Style specification */ public static Expression geometryType() { return new Expression("geometry-type"); @@ -1433,7 +1433,7 @@ public class Expression { * * * @return expression - * @see Style specification + * @see Style specification */ public static Expression id() { return new Expression("id"); @@ -1454,7 +1454,7 @@ public class Expression { * * * @return expression - * @see Style specification + * @see Style specification */ public static Expression accumulated() { return new Expression("accumulated"); @@ -1484,7 +1484,7 @@ public class Expression { * * * @return expression - * @see Style specification + * @see Style specification */ public static Expression heatmapDensity() { return new Expression("heatmap-density"); @@ -1510,7 +1510,7 @@ public class Expression { * * * @return expression - * @see Style specification + * @see Style specification */ public static Expression lineProgress() { return new Expression("line-progress"); @@ -1522,7 +1522,7 @@ public class Expression { * @param number the index expression * @param expression the array expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression at(@NonNull Expression number, @NonNull Expression expression) { return new Expression("at", number, expression); @@ -1534,7 +1534,7 @@ public class Expression { * @param number the index expression * @param expression the array expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression at(@NonNull Number number, @NonNull Expression expression) { return at(literal(number), expression); @@ -1546,7 +1546,7 @@ public class Expression { * @param needle the item expression * @param haystack the array or string expression * @return true if exists. - * @see Style specification + * @see Style specification */ public static Expression in(@NonNull Expression needle, @NonNull Expression haystack) { return new Expression("in", needle, haystack); @@ -1558,7 +1558,7 @@ public class Expression { * @param needle the item expression * @param haystack the array or string expression * @return true if exists. - * @see Style specification + * @see Style specification */ public static Expression in(@NonNull Number needle, @NonNull Expression haystack) { return new Expression("in", literal(needle), haystack); @@ -1570,7 +1570,7 @@ public class Expression { * @param needle the item expression * @param haystack the array or string expression * @return true if exists. - * @see Style specification + * @see Style specification */ public static Expression in(@NonNull String needle, @NonNull Expression haystack) { return new Expression("in", literal(needle), haystack); @@ -1587,7 +1587,7 @@ public class Expression { * Currently supports `Point`, `MultiPoint`, `LineString`, `MultiLineString`, `Polygon`, `MultiPolygon` * geometry types * @return the distance in the unit "meters". - * @see Style specification + * @see Style specification */ public static Expression distance(@NonNull GeoJson geoJson) { Map map = new HashMap<>(); @@ -1622,7 +1622,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression get(@NonNull Expression input) { return new Expression("get", input); @@ -1646,7 +1646,7 @@ public class Expression { * * @param input string input * @return expression - * @see Style specification + * @see Style specification */ public static Expression get(@NonNull String input) { return get(literal(input)); @@ -1670,7 +1670,7 @@ public class Expression { * @param key a property value key * @param object an expression object * @return expression - * @see Style specification + * @see Style specification */ public static Expression get(@NonNull Expression key, @NonNull Expression object) { return new Expression("get", key, object); @@ -1694,7 +1694,7 @@ public class Expression { * @param key a property value key * @param object an expression object * @return expression - * @see Style specification + * @see Style specification */ public static Expression get(@NonNull String key, @NonNull Expression object) { return get(literal(key), object); @@ -1716,7 +1716,7 @@ public class Expression { * * @param key the expression property value key * @return expression - * @see Style specification + * @see Style specification */ public static Expression has(@NonNull Expression key) { return new Expression("has", key); @@ -1738,7 +1738,7 @@ public class Expression { * * @param key the property value key * @return expression - * @see Style specification + * @see Style specification */ public static Expression has(@NonNull String key) { return has(literal(key)); @@ -1761,7 +1761,7 @@ public class Expression { * @param key the expression property value key * @param object an expression object * @return expression - * @see Style specification + * @see Style specification */ public static Expression has(@NonNull Expression key, @NonNull Expression object) { return new Expression("has", key, object); @@ -1784,7 +1784,7 @@ public class Expression { * @param key the property value key * @param object an expression object * @return expression - * @see Style specification + * @see Style specification */ public static Expression has(@NonNull String key, @NonNull Expression object) { return has(literal(key), object); @@ -1795,7 +1795,7 @@ public class Expression { * * @param expression an expression object or expression string * @return expression - * @see Style specification + * @see Style specification */ public static Expression length(@NonNull Expression expression) { return new Expression("length", expression); @@ -1806,7 +1806,7 @@ public class Expression { * * @param input a string * @return expression - * @see Style specification + * @see Style specification */ public static Expression length(@NonNull String input) { return length(literal(input)); @@ -1827,7 +1827,7 @@ public class Expression { * * * @return expression - * @see Style specification + * @see Style specification */ public static Expression ln2() { return new Expression("ln2"); @@ -1848,7 +1848,7 @@ public class Expression { * * * @return expression - * @see Style specification + * @see Style specification */ public static Expression pi() { return new Expression("pi"); @@ -1869,7 +1869,7 @@ public class Expression { * * * @return expression - * @see Style specification + * @see Style specification */ public static Expression e() { return new Expression("e"); @@ -1891,7 +1891,7 @@ public class Expression { * * @param numbers the numbers to calculate the sum for * @return expression - * @see Style specification + * @see Style specification */ public static Expression sum(@Size(min = 2) Expression... numbers) { return new Expression("+", numbers); @@ -1913,7 +1913,7 @@ public class Expression { * * @param numbers the numbers to calculate the sum for * @return expression - * @see Style specification + * @see Style specification */ @SuppressLint("Range") public static Expression sum(@Size(min = 2) Number... numbers) { @@ -1940,7 +1940,7 @@ public class Expression { * * @param numbers the numbers to calculate the product for * @return expression - * @see Style specification + * @see Style specification */ public static Expression product(@Size(min = 2) Expression... numbers) { return new Expression("*", numbers); @@ -1962,7 +1962,7 @@ public class Expression { * * @param numbers the numbers to calculate the product for * @return expression - * @see Style specification + * @see Style specification */ @SuppressLint("Range") public static Expression product(@Size(min = 2) Number... numbers) { @@ -1989,7 +1989,7 @@ public class Expression { * * @param number the number subtract from 0 * @return expression - * @see Style specification + * @see Style specification */ public static Expression subtract(@NonNull Expression number) { return new Expression("-", number); @@ -2011,7 +2011,7 @@ public class Expression { * * @param number the number subtract from 0 * @return expression - * @see Style specification + * @see Style specification */ public static Expression subtract(@NonNull Number number) { return subtract(literal(number)); @@ -2034,7 +2034,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression subtract(@NonNull Expression first, @NonNull Expression second) { return new Expression("-", first, second); @@ -2057,7 +2057,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression subtract(@NonNull Number first, @NonNull Number second) { return subtract(literal(first), literal(second)); @@ -2080,7 +2080,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression division(@NonNull Expression first, @NonNull Expression second) { return new Expression("/", first, second); @@ -2103,7 +2103,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression division(@NonNull Number first, @NonNull Number second) { return division(literal(first), literal(second)); @@ -2126,7 +2126,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression mod(@NonNull Expression first, @NonNull Expression second) { return new Expression("%", first, second); @@ -2149,7 +2149,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression mod(@NonNull Number first, @NonNull Number second) { return mod(literal(first), literal(second)); @@ -2172,7 +2172,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression pow(@NonNull Expression first, @NonNull Expression second) { return new Expression("^", first, second); @@ -2195,7 +2195,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression pow(@NonNull Number first, @NonNull Number second) { return pow(literal(first), literal(second)); @@ -2217,7 +2217,7 @@ public class Expression { * * @param number the number to take the square root from * @return expression - * @see Style specification + * @see Style specification */ public static Expression sqrt(@NonNull Expression number) { return new Expression("sqrt", number); @@ -2239,7 +2239,7 @@ public class Expression { * * @param number the number to take the square root from * @return expression - * @see Style specification + * @see Style specification */ public static Expression sqrt(@NonNull Number number) { return sqrt(literal(number)); @@ -2261,7 +2261,7 @@ public class Expression { * * @param number the number to take base-ten logarithm from * @return expression - * @see Style specification + * @see Style specification */ public static Expression log10(@NonNull Expression number) { return new Expression("log10", number); @@ -2283,7 +2283,7 @@ public class Expression { * * @param number the number to take base-ten logarithm from * @return expression - * @see Style specification + * @see Style specification */ public static Expression log10(@NonNull Number number) { return log10(literal(number)); @@ -2305,7 +2305,7 @@ public class Expression { * * @param number the number to take natural logarithm from * @return expression - * @see Style specification + * @see Style specification */ public static Expression ln(Expression number) { return new Expression("ln", number); @@ -2327,7 +2327,7 @@ public class Expression { * * @param number the number to take natural logarithm from * @return expression - * @see Style specification + * @see Style specification */ public static Expression ln(@NonNull Number number) { return ln(literal(number)); @@ -2349,7 +2349,7 @@ public class Expression { * * @param number the number to take base-two logarithm from * @return expression - * @see Style specification + * @see Style specification */ public static Expression log2(@NonNull Expression number) { return new Expression("log2", number); @@ -2371,7 +2371,7 @@ public class Expression { * * @param number the number to take base-two logarithm from * @return expression - * @see Style specification + * @see Style specification */ public static Expression log2(@NonNull Number number) { return log2(literal(number)); @@ -2393,7 +2393,7 @@ public class Expression { * * @param number the number to calculate the sine for * @return expression - * @see Style specification + * @see Style specification */ public static Expression sin(@NonNull Expression number) { return new Expression("sin", number); @@ -2415,7 +2415,7 @@ public class Expression { * * @param number the number to calculate the sine for * @return expression - * @see Style specification + * @see Style specification */ public static Expression sin(@NonNull Number number) { return sin(literal(number)); @@ -2437,7 +2437,7 @@ public class Expression { * * @param number the number to calculate the cosine for * @return expression - * @see Style specification + * @see Style specification */ public static Expression cos(@NonNull Expression number) { return new Expression("cos", number); @@ -2459,7 +2459,7 @@ public class Expression { * * @param number the number to calculate the cosine for * @return expression - * @see Style specification + * @see Style specification */ public static Expression cos(@NonNull Number number) { return new Expression("cos", literal(number)); @@ -2481,7 +2481,7 @@ public class Expression { * * @param number the number to calculate the tangent for * @return expression - * @see Style specification + * @see Style specification */ public static Expression tan(@NonNull Expression number) { return new Expression("tan", number); @@ -2503,7 +2503,7 @@ public class Expression { * * @param number the number to calculate the tangent for * @return expression - * @see Style specification + * @see Style specification */ public static Expression tan(@NonNull Number number) { return new Expression("tan", literal(number)); @@ -2525,7 +2525,7 @@ public class Expression { * * @param number the number to calculate the arcsine for * @return expression - * @see Style specification + * @see Style specification */ public static Expression asin(@NonNull Expression number) { return new Expression("asin", number); @@ -2547,7 +2547,7 @@ public class Expression { * * @param number the number to calculate the arcsine for * @return expression - * @see Style specification + * @see Style specification */ public static Expression asin(@NonNull Number number) { return asin(literal(number)); @@ -2569,7 +2569,7 @@ public class Expression { * * @param number the number to calculate the arccosine for * @return expression - * @see Style specification + * @see Style specification */ public static Expression acos(@NonNull Expression number) { return new Expression("acos", number); @@ -2591,7 +2591,7 @@ public class Expression { * * @param number the number to calculate the arccosine for * @return expression - * @see Style specification + * @see Style specification */ public static Expression acos(@NonNull Number number) { return acos(literal(number)); @@ -2613,7 +2613,7 @@ public class Expression { * * @param number the number to calculate the arctangent for * @return expression - * @see Style specification + * @see Style specification */ public static Expression atan(@NonNull Expression number) { return new Expression("atan", number); @@ -2635,7 +2635,7 @@ public class Expression { * * @param number the number to calculate the arctangent for * @return expression - * @see Style specification + * @see Style specification */ public static Expression atan(@NonNull Number number) { return atan(literal(number)); @@ -2657,7 +2657,7 @@ public class Expression { * * @param numbers varargs of numbers to get the minimum from * @return expression - * @see Style specification + * @see Style specification */ public static Expression min(@Size(min = 1) Expression... numbers) { return new Expression("min", numbers); @@ -2679,7 +2679,7 @@ public class Expression { * * @param numbers varargs of numbers to get the minimum from * @return expression - * @see Style specification + * @see Style specification */ @SuppressLint("Range") public static Expression min(@Size(min = 1) Number... numbers) { @@ -2706,7 +2706,7 @@ public class Expression { * * @param numbers varargs of numbers to get the maximum from * @return expression - * @see Style specification + * @see Style specification */ public static Expression max(@Size(min = 1) Expression... numbers) { return new Expression("max", numbers); @@ -2728,7 +2728,7 @@ public class Expression { * * @param numbers varargs of numbers to get the maximum from * @return expression - * @see Style specification + * @see Style specification */ @SuppressLint("Range") public static Expression max(@Size(min = 1) Number... numbers) { @@ -2757,7 +2757,7 @@ public class Expression { * * @param expression number expression to round * @return expression - * @see Style specification + * @see Style specification */ public static Expression round(Expression expression) { return new Expression("round", expression); @@ -2781,7 +2781,7 @@ public class Expression { * * @param number number to round * @return expression - * @see Style specification + * @see Style specification */ public static Expression round(@NonNull Number number) { return round(literal(number)); @@ -2803,7 +2803,7 @@ public class Expression { * * @param expression number expression to get absolute value from * @return expression - * @see Style specification + * @see Style specification */ public static Expression abs(Expression expression) { return new Expression("abs", expression); @@ -2825,7 +2825,7 @@ public class Expression { * * @param number number to get absolute value from * @return expression - * @see Style specification + * @see Style specification */ public static Expression abs(@NonNull Number number) { return abs(literal(number)); @@ -2847,7 +2847,7 @@ public class Expression { * * @param expression number expression to get value from * @return expression - * @see Style specification + * @see Style specification */ public static Expression ceil(Expression expression) { return new Expression("ceil", expression); @@ -2869,7 +2869,7 @@ public class Expression { * * @param number number to get value from * @return expression - * @see Style specification + * @see Style specification */ public static Expression ceil(@NonNull Number number) { return ceil(literal(number)); @@ -2891,7 +2891,7 @@ public class Expression { * * @param expression number expression to get value from * @return expression - * @see Style specification + * @see Style specification */ public static Expression floor(Expression expression) { return new Expression("floor", expression); @@ -2913,7 +2913,7 @@ public class Expression { * * @param number number to get value from * @return expression - * @see Style specification + * @see Style specification */ public static Expression floor(@NonNull Number number) { return floor(literal(number)); @@ -2940,7 +2940,7 @@ public class Expression { * * @param collator the collator expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression resolvedLocale(Expression collator) { return new Expression("resolved-locale", collator); @@ -2970,7 +2970,7 @@ public class Expression { * * @param expression the expression to evaluate * @return expression - * @see Style + * @see Style * specification */ public static Expression isSupportedScript(Expression expression) { @@ -3001,7 +3001,7 @@ public class Expression { * * @param string the string to evaluate * @return expression - * @see Style + * @see Style * specification */ public static Expression isSupportedScript(@NonNull String string) { @@ -3028,7 +3028,7 @@ public class Expression { * * @param string the string to upcase * @return expression - * @see Style specification + * @see Style specification */ public static Expression upcase(@NonNull Expression string) { return new Expression("upcase", string); @@ -3054,7 +3054,7 @@ public class Expression { * * @param string string to upcase * @return expression - * @see Style specification + * @see Style specification */ public static Expression upcase(@NonNull String string) { return upcase(literal(string)); @@ -3080,7 +3080,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression downcase(@NonNull Expression input) { return new Expression("downcase", input); @@ -3106,7 +3106,7 @@ public class Expression { * * @param input string to downcase * @return expression - * @see Style specification + * @see Style specification */ public static Expression downcase(@NonNull String input) { return downcase(literal(input)); @@ -3128,7 +3128,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression concat(@NonNull Expression... input) { return new Expression("concat", input); @@ -3150,7 +3150,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression concat(@NonNull String... input) { Expression[] stringExpression = new Expression[input.length]; @@ -3167,7 +3167,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression array(@NonNull Expression input) { return new Expression("array", input); @@ -3178,7 +3178,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression typeOf(@NonNull Expression input) { return new Expression("typeof", input); @@ -3192,7 +3192,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression string(@NonNull Expression... input) { return new Expression("string", input); @@ -3206,7 +3206,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression number(@NonNull Expression... input) { return new Expression("number", input); @@ -3254,7 +3254,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression bool(@NonNull Expression... input) { return new Expression("boolean", input); @@ -3272,7 +3272,7 @@ public class Expression { * @param diacriticSensitive diacritic sensitive flag * @param locale locale * @return expression - * @see Style specification + * @see Style specification */ public static Expression collator(boolean caseSensitive, boolean diacriticSensitive, Locale locale) { Map map = new HashMap<>(); @@ -3307,7 +3307,7 @@ public class Expression { * @param caseSensitive case sensitive flag * @param diacriticSensitive diacritic sensitive flag * @return expression - * @see Style specification + * @see Style specification */ public static Expression collator(boolean caseSensitive, boolean diacriticSensitive) { Map map = new HashMap<>(); @@ -3328,7 +3328,7 @@ public class Expression { * @param diacriticSensitive diacritic sensitive flag * @param locale locale * @return expression - * @see Style specification + * @see Style specification */ public static Expression collator(Expression caseSensitive, Expression diacriticSensitive, Expression locale) { Map map = new HashMap<>(); @@ -3349,7 +3349,7 @@ public class Expression { * @param caseSensitive case sensitive flag * @param diacriticSensitive diacritic sensitive flag * @return expression - * @see Style specification + * @see Style specification */ public static Expression collator(Expression caseSensitive, Expression diacriticSensitive) { Map map = new HashMap<>(); @@ -3390,7 +3390,7 @@ public class Expression { * * @param formatEntries format entries * @return expression - * @see Style specification + * @see Style specification */ public static Expression format(@NonNull FormatEntry... formatEntries) { // for each entry we are going to build an input and parameters @@ -3527,7 +3527,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression object(@NonNull Expression input) { return new Expression("object", input); @@ -3556,7 +3556,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression toString(@NonNull Expression input) { return new Expression("to-string", input); @@ -3583,7 +3583,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression toNumber(@NonNull Expression input) { return new Expression("to-number", input); @@ -3606,7 +3606,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression toBool(@NonNull Expression input) { return new Expression("to-boolean", input); @@ -3630,7 +3630,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression toColor(@NonNull Expression input) { return new Expression("to-color", input); @@ -3642,7 +3642,7 @@ public class Expression { * * @param input expression input * @return expression - * @see Style specification + * @see Style specification */ public static Expression let(@Size(min = 1) Expression... input) { return new Expression("let", input); @@ -3653,7 +3653,7 @@ public class Expression { * * @param expression the variable naming expression that was bound with using let * @return expression - * @see Style specification + * @see Style specification */ public static Expression var(@NonNull Expression expression) { return new Expression("var", expression); @@ -3664,7 +3664,7 @@ public class Expression { * * @param variableName the variable naming that was bound with using let * @return expression - * @see Style specification + * @see Style specification */ public static Expression var(@NonNull String variableName) { return var(literal(variableName)); @@ -3696,7 +3696,7 @@ public class Expression { * * * @return expression - * @see Style specification + * @see Style specification */ public static Expression zoom() { return new Expression("zoom"); @@ -3758,7 +3758,7 @@ public class Expression { * @param defaultOutput the default output expression * @param stops pair of input and output values * @return expression - * @see Style specification + * @see Style specification */ public static Expression step(@NonNull Number input, @NonNull Expression defaultOutput, Expression... stops) { return step(literal(input), defaultOutput, stops); @@ -3790,7 +3790,7 @@ public class Expression { * @param defaultOutput the default output expression * @param stops pair of input and output values * @return expression - * @see Style specification + * @see Style specification */ public static Expression step(@NonNull Expression input, @NonNull Expression defaultOutput, @NonNull Expression... stops) { @@ -3823,7 +3823,7 @@ public class Expression { * @param defaultOutput the default output expression * @param stops pair of input and output values * @return expression - * @see Style specification + * @see Style specification */ public static Expression step(@NonNull Number input, @NonNull Expression defaultOutput, Stop... stops) { return step(literal(input), defaultOutput, Stop.toExpressionArray(stops)); @@ -3855,7 +3855,7 @@ public class Expression { * @param defaultOutput the default output expression * @param stops pair of input and output values * @return expression - * @see Style specification + * @see Style specification */ public static Expression step(@NonNull Expression input, @NonNull Expression defaultOutput, Stop... stops) { return step(input, defaultOutput, Stop.toExpressionArray(stops)); @@ -3887,7 +3887,7 @@ public class Expression { * @param defaultOutput the default output expression * @param stops pair of input and output values * @return expression - * @see Style specification + * @see Style specification */ public static Expression step(@NonNull Number input, @NonNull Number defaultOutput, Expression... stops) { return step(literal(input), defaultOutput, stops); @@ -3919,7 +3919,7 @@ public class Expression { * @param defaultOutput the default output expression * @param stops pair of input and output values * @return expression - * @see Style specification + * @see Style specification */ public static Expression step(@NonNull Expression input, @NonNull Number defaultOutput, Expression... stops) { return step(input, literal(defaultOutput), stops); @@ -3951,7 +3951,7 @@ public class Expression { * @param defaultOutput the default output expression * @param stops pair of input and output values * @return expression - * @see Style specification + * @see Style specification */ public static Expression step(@NonNull Number input, @NonNull Number defaultOutput, Stop... stops) { return step(literal(input), defaultOutput, Stop.toExpressionArray(stops)); @@ -3983,7 +3983,7 @@ public class Expression { * @param defaultOutput the default output expression * @param stops pair of input and output values * @return expression - * @see Style specification + * @see Style specification */ public static Expression step(@NonNull Expression input, @NonNull Number defaultOutput, Stop... stops) { return step(input, defaultOutput, Stop.toExpressionArray(stops)); @@ -4017,7 +4017,7 @@ public class Expression { * @param number the input expression * @param stops pair of input and output values * @return expression - * @see Style specification + * @see Style specification */ public static Expression interpolate(@NonNull Interpolator interpolation, @NonNull Expression number, @NonNull Expression... stops) { @@ -4052,7 +4052,7 @@ public class Expression { * @param number the input expression * @param stops pair of input and output values * @return expression - * @see Style specification + * @see Style specification */ public static Expression interpolate(@NonNull Interpolator interpolation, @NonNull Expression number, Stop... stops) { @@ -4081,7 +4081,7 @@ public class Expression { * * * @return expression - * @see Style specification + * @see Style specification */ public static Interpolator linear() { return new Interpolator("linear"); @@ -4113,7 +4113,7 @@ public class Expression { * * @param base value controlling the route at which the output increases * @return expression - * @see Style specification + * @see Style specification */ public static Interpolator exponential(@NonNull Number base) { return exponential(literal(base)); @@ -4145,7 +4145,7 @@ public class Expression { * * @param expression base number expression * @return expression - * @see Style specification + * @see Style specification */ public static Interpolator exponential(@NonNull Expression expression) { return new Interpolator("exponential", expression); @@ -4177,7 +4177,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 + * @see Style specification */ public static Interpolator cubicBezier(@NonNull Expression x1, @NonNull Expression y1, @NonNull Expression x2, @NonNull Expression y2) { @@ -4210,7 +4210,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 + * @see Style specification */ public static Interpolator cubicBezier(@NonNull Number x1, @NonNull Number y1, @NonNull Number x2, @NonNull Number y2) { @@ -4296,7 +4296,7 @@ public class Expression { * * @param rawExpression the raw expression * @return the resulting expression - * @see Style specification + * @see Style specification */ public static Expression raw(@NonNull String rawExpression) { return Converter.convert(rawExpression); @@ -4851,7 +4851,7 @@ public class Expression { * * @param rawExpression the raw expression to convert * @return the resulting expression - * @see Style specification + * @see Style specification */ public static Expression convert(@NonNull String rawExpression) { return convert(gson.fromJson(rawExpression, JsonArray.class)); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java index 98b8154bc..45795410f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java @@ -5,7 +5,7 @@ import androidx.annotation.Keep; /** * Resembles transition property from the style specification. * - * @see Transition documentation + * @see Transition documentation */ public class TransitionOptions { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java index abd2fa053..39cf4b327 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java @@ -11,7 +11,7 @@ import java.net.URL; /** * A raster DEM source. * - * @see The style specification + * @see The style specification */ @UiThread public class RasterDemSource extends Source { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.java index d877f4f3f..a8a5739e5 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.java @@ -8,7 +8,7 @@ import java.util.Arrays; /** * Represents a string broken into sections annotated with separate formatting options. * - * @see Style specification + * @see Style specification */ @Keep public class Formatted { diff --git a/platform/ios/platform/darwin/docs/guides/For Style Authors.md.ejs b/platform/ios/platform/darwin/docs/guides/For Style Authors.md.ejs index bdaa89753..ea487f7de 100644 --- a/platform/ios/platform/darwin/docs/guides/For Style Authors.md.ejs +++ b/platform/ios/platform/darwin/docs/guides/For Style Authors.md.ejs @@ -269,7 +269,7 @@ In style JSON | In Objective-C | In Swift Each property representing a layout or paint attribute is set to an `NSExpression` object. `NSExpression` objects play the same role as -[expressions in the Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions), +[expressions in the Mapbox Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions), but you create the former using a very different syntax. `NSExpression`’s format string syntax is reminiscent of a spreadsheet formula or an expression in a database query. See the diff --git a/platform/ios/platform/darwin/docs/guides/Predicates and Expressions.md b/platform/ios/platform/darwin/docs/guides/Predicates and Expressions.md index 2cb493d75..758eedd20 100644 --- a/platform/ios/platform/darwin/docs/guides/Predicates and Expressions.md +++ b/platform/ios/platform/darwin/docs/guides/Predicates and Expressions.md @@ -431,7 +431,7 @@ expression containing the strings to concatenate. Returns the arccosine of the number. This function corresponds to the -[`acos`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-acos) +[`acos`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-acos) operator in the Mapbox Style Specification. ### `mgl_asin:` @@ -446,7 +446,7 @@ operator in the Mapbox Style Specification. Returns the arcsine of the number. This function corresponds to the -[`asin`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-asin) +[`asin`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-asin) operator in the Mapbox Style Specification. ### `mgl_atan:` @@ -461,7 +461,7 @@ operator in the Mapbox Style Specification. Returns the arctangent of the number. This function corresponds to the -[`atan`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-atan) +[`atan`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-atan) operator in the Mapbox Style Specification. ### `mgl_cos:` @@ -476,7 +476,7 @@ operator in the Mapbox Style Specification. Returns the cosine of the number. This function corresponds to the -[`cos`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-cos) +[`cos`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-cos) operator in the Mapbox Style Specification. ### `mgl_log2:` @@ -491,7 +491,7 @@ operator in the Mapbox Style Specification. Returns the base-2 logarithm of the number. This function corresponds to the -[`log2`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-log2) +[`log2`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-log2) operator in the Mapbox Style Specification. ### `mgl_round:` @@ -507,7 +507,7 @@ Returns the number rounded to the nearest integer. If the number is halfway between two integers, this function rounds it away from zero. This function corresponds to the -[`round`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-round) +[`round`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-round) operator in the Mapbox Style Specification. ### `mgl_sin:` @@ -522,7 +522,7 @@ operator in the Mapbox Style Specification. Returns the sine of the number. This function corresponds to the -[`sin`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-sin) +[`sin`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-sin) operator in the Mapbox Style Specification. ### `mgl_tan:` @@ -537,7 +537,7 @@ operator in the Mapbox Style Specification. Returns the tangent of the number. This function corresponds to the -[`tan`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-tan) +[`tan`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-tan) operator in the Mapbox Style Specification. ### `mgl_distanceFrom:` @@ -567,7 +567,7 @@ operator in the Mapbox Style Specification. Returns the first non-`nil` value from an array of expressions. This function corresponds to the -[`coalesce`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-coalesce) +[`coalesce`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-coalesce) operator in the Mapbox Style Specification. ### `mgl_attributed:` @@ -591,7 +591,7 @@ with the `MGLSymbolStyleLayer.text` property. `MGLFontColorAttribute` | An `NSExpression` evaluating to an `UIColor` (iOS) or `NSColor` (macOS). This function corresponds to the -[`format`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-types-format) +[`format`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-types-format) operator in the Mapbox Style Specification. ### `MGL_LET` @@ -640,7 +640,7 @@ values. This function corresponds to the `+[NSExpression(MGLAdditions) mgl_expressionForMatchingExpression:inDictionary:defaultExpression:]` method and the -[`match`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-match) +[`match`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-match) operator in the Mapbox Style Specification. ### `MGL_IF` @@ -667,7 +667,7 @@ passed into this function must be wrapped in a constant expression. This function corresponds to the `+[NSExpression(MGLAdditions) mgl_expressionForConditional:trueExpression:falseExpresssion:]` method and the -[`case`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-case) +[`case`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-case) operator in the Mapbox Style Specification. ### `MGL_FUNCTION` @@ -684,7 +684,7 @@ operator in the Mapbox Style Specification. An expression exactly as defined by the -[Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions). +[Mapbox Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions). ## Custom functions @@ -745,7 +745,7 @@ otherwise TRUE. object has a value for the feature attribute. This function corresponds to the -[`has`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-has) +[`has`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-has) operator in the Mapbox Style Specification. See also the [`mgl_does:have:`](#code-mgl_does-have-code) function, which is used on its own without the `FUNCTION()` operator. You can also check whether an object has an @@ -779,7 +779,7 @@ The target expression with variable subexpressions replaced with the values defined in the context dictionary. This function corresponds to the -[`let`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-let) +[`let`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-let) operator in the Mapbox Style Specification. See also the [`MGL_LET`](#code-mgl_let-code) function, which is used on its own without the `FUNCTION()` operator. @@ -839,7 +839,7 @@ yellow, orange, and red as the values. This function corresponds to the `+[NSExpression(MGLAdditions) mgl_expressionForInterpolatingExpression:withCurveType:parameters:stops:]` method and the -[`interpolate`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-interpolate) +[`interpolate`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-interpolate) operator in the Mapbox Style Specification. See also the [`mgl_interpolate:withCurveType:parameters:stops:`](#code-mgl_interpolate-withcurvetype-parameters-stops-code) function, which is used on its own without the `FUNCTION()` operator. @@ -879,7 +879,7 @@ A numeric representation of the target: first successful conversion is obtained. This function corresponds to the -[`to-number`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-types-to-number) +[`to-number`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-types-to-number) operator in the Mapbox Style Specification. You can also cast a value to a number by passing the value and the string `NSNumber` into the `CAST()` operator. @@ -923,7 +923,7 @@ yellow, orange, and red as the values. This function corresponds to the `+[NSExpression(MGLAdditions) mgl_expressionForSteppingExpression:fromExpression:stops:]` method and the -[`step`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-step) +[`step`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-step) operator in the Mapbox Style Specification. ### `stringByAppendingString:` @@ -944,7 +944,7 @@ The target string with each of the argument strings appended in order. This function corresponds to the `-[NSExpression(MGLAdditions) mgl_expressionByAppendingExpression:]` method and is similar to the -[`concat`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-concat) +[`concat`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-concat) operator in the Mapbox Style Specification. See also the [`mgl_join:`](#code-mgl_join-code) function, which concatenates multiple expressions and is used on its own without the `FUNCTION()` operator. @@ -980,7 +980,7 @@ A string representation of the target: function of the ECMAScript Language Specification. This function corresponds to the -[`to-string`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-types-to-string) +[`to-string`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-types-to-string) operator in the Mapbox Style Specification. You can also cast a value to a string by passing the value and the string `NSString` into the `CAST()` operator. diff --git a/platform/ios/platform/darwin/docs/guides/Tile URL Templates.md.ejs b/platform/ios/platform/darwin/docs/guides/Tile URL Templates.md.ejs index 2b1de65b4..abfb9dc89 100644 --- a/platform/ios/platform/darwin/docs/guides/Tile URL Templates.md.ejs +++ b/platform/ios/platform/darwin/docs/guides/Tile URL Templates.md.ejs @@ -23,9 +23,9 @@ evaluates based on the tile it needs to load. For example: evaluated as `http://www.example.com/tiles/14/6/9@2x.png`. Tile URL templates are also used to define tilesets in TileJSON manifests or -[`raster`](https://www.mapbox.com/mapbox-gl-js/style-spec/#sources-raster-tiles) +[`raster`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#sources-raster-tiles) and -[`vector`](https://www.mapbox.com/mapbox-gl-js/style-spec/#sources-vector-tiles) +[`vector`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#sources-vector-tiles) sources in style JSON files. See the [TileJSON specification](https://github.com/mapbox/tilejson-spec/tree/master/2.2.0) for information about tile URL templates in the context of a TileJSON or style diff --git a/platform/ios/platform/darwin/src/MGLFeature.h b/platform/ios/platform/darwin/src/MGLFeature.h index 3f3526102..a208effba 100644 --- a/platform/ios/platform/darwin/src/MGLFeature.h +++ b/platform/ios/platform/darwin/src/MGLFeature.h @@ -138,7 +138,7 @@ NS_ASSUME_NONNULL_BEGIN listed above for each attribute value. In addition to the Foundation types, you may also set an attribute to an `NSColor` (macOS) or `UIColor` (iOS), which will be converted into its - CSS string representation + CSS string representation when the feature is added to an `MGLShapeSource`. This can be convenient when using the attribute to supply a value for a color-typed layout or paint attribute via a key path expression. diff --git a/platform/ios/platform/darwin/src/MGLLight.h b/platform/ios/platform/darwin/src/MGLLight.h index 281fcc5c6..a2bf021f2 100644 --- a/platform/ios/platform/darwin/src/MGLLight.h +++ b/platform/ios/platform/darwin/src/MGLLight.h @@ -102,7 +102,7 @@ MGL_EXPORT attributes. This property corresponds to the anchor + href="https://maplibre.org/maplibre-gl-js-docs/style-spec/#light-anchor">anchor light property in the Mapbox Style Specification. */ @property (nonatomic) NSExpression *anchor; @@ -132,7 +132,7 @@ MGL_EXPORT feature attributes. This property corresponds to the position + href="https://maplibre.org/maplibre-gl-js-docs/style-spec/#light-position">position light property in the Mapbox Style Specification. #### Related examples @@ -169,7 +169,7 @@ MGL_EXPORT feature attributes. This property corresponds to the color + href="https://maplibre.org/maplibre-gl-js-docs/style-spec/#light-color">color light property in the Mapbox Style Specification. */ @property (nonatomic) NSExpression *color; @@ -192,7 +192,7 @@ MGL_EXPORT feature attributes. This property corresponds to the color + href="https://maplibre.org/maplibre-gl-js-docs/style-spec/#light-color">color light property in the Mapbox Style Specification. */ @property (nonatomic) NSExpression *color; @@ -224,7 +224,7 @@ MGL_EXPORT feature attributes. This property corresponds to the intensity + href="https://maplibre.org/maplibre-gl-js-docs/style-spec/#light-intensity">intensity light property in the Mapbox Style Specification. */ @property (nonatomic) NSExpression *intensity; diff --git a/platform/ios/platform/darwin/src/MGLLight.h.ejs b/platform/ios/platform/darwin/src/MGLLight.h.ejs index 30efef793..716385f14 100644 --- a/platform/ios/platform/darwin/src/MGLLight.h.ejs +++ b/platform/ios/platform/darwin/src/MGLLight.h.ejs @@ -74,7 +74,7 @@ MGL_EXPORT <%- propertyDoc(property.name, property, type, 'light').wrap(80, 1) %> This property corresponds to the <%- originalPropertyName(property) %> + href="https://maplibre.org/maplibre-gl-js-docs/style-spec/#light-<%- originalPropertyName(property) %>"><%- originalPropertyName(property) %> light property in the Mapbox Style Specification. <% if (property.examples) { -%> diff --git a/platform/ios/platform/darwin/src/MGLOfflineStorage.h b/platform/ios/platform/darwin/src/MGLOfflineStorage.h index 87588324e..e6e8f6388 100644 --- a/platform/ios/platform/darwin/src/MGLOfflineStorage.h +++ b/platform/ios/platform/darwin/src/MGLOfflineStorage.h @@ -159,19 +159,19 @@ typedef NS_ENUM(NSUInteger, MGLResourceKind) { MGLResourceKindUnknown, /** Style sheet JSON file */ MGLResourceKindStyle, - /** TileJSON file as specified in https://www.mapbox.com/mapbox-gl-js/style-spec/#root-sources */ + /** TileJSON file as specified in https://maplibre.org/maplibre-gl-js-docs/style-spec/#root-sources */ MGLResourceKindSource, /** A vector or raster tile as described in the style sheet at - https://www.mapbox.com/mapbox-gl-js/style-spec/#sources */ + https://maplibre.org/maplibre-gl-js-docs/style-spec/#sources */ MGLResourceKindTile, /** Signed distance field glyphs for text rendering. These are the URLs specified in the style - in https://www.mapbox.com/mapbox-gl-js/style-spec/#root-glyphs */ + in https://maplibre.org/maplibre-gl-js-docs/style-spec/#root-glyphs */ MGLResourceKindGlyphs, /** Image part of a sprite sheet. It is constructed of the prefix in - https://www.mapbox.com/mapbox-gl-js/style-spec/#root-sprite and a PNG file extension. */ + https://maplibre.org/maplibre-gl-js-docs/style-spec/#root-sprite and a PNG file extension. */ MGLResourceKindSpriteImage, /** JSON part of a sprite sheet. It is constructed of the prefix in - https://www.mapbox.com/mapbox-gl-js/style-spec/#root-sprite and a JSON file extension. */ + https://maplibre.org/maplibre-gl-js-docs/style-spec/#root-sprite and a JSON file extension. */ MGLResourceKindSpriteJSON, /** Image data for a georeferenced image source. **/ MGLResourceKindImage, diff --git a/platform/ios/platform/darwin/src/MGLShapeSource.h b/platform/ios/platform/darwin/src/MGLShapeSource.h index 675c21930..5c08a1faf 100644 --- a/platform/ios/platform/darwin/src/MGLShapeSource.h +++ b/platform/ios/platform/darwin/src/MGLShapeSource.h @@ -139,7 +139,7 @@ FOUNDATION_EXTERN MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionSimp The default value is `NO`. This option corresponds to the - lineMetrics + lineMetrics source property in the Mapbox Style Specification. */ FOUNDATION_EXTERN MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionLineDistanceMetrics; diff --git a/platform/ios/platform/darwin/src/NSExpression+MGLAdditions.h b/platform/ios/platform/darwin/src/NSExpression+MGLAdditions.h index 2109310e6..38c7a4d03 100644 --- a/platform/ios/platform/darwin/src/NSExpression+MGLAdditions.h +++ b/platform/ios/platform/darwin/src/NSExpression+MGLAdditions.h @@ -17,7 +17,7 @@ typedef NSString *MGLExpressionInterpolationMode NS_TYPED_ENUM; An `NSString` identifying the `linear` interpolation type in an `NSExpression`. This attribute corresponds to the `linear` value in the - interpolate + interpolate expression operator in the Mapbox Style Specification. */ FOUNDATION_EXTERN MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionInterpolationModeLinear; @@ -26,7 +26,7 @@ FOUNDATION_EXTERN MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionI An `NSString` identifying the `expotential` interpolation type in an `NSExpression`. This attribute corresponds to the `exponential` value in the - interpolate + interpolate expression operator in the Mapbox Style Specification. */ FOUNDATION_EXTERN MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionInterpolationModeExponential; @@ -35,7 +35,7 @@ FOUNDATION_EXTERN MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionI An `NSString` identifying the `cubic-bezier` interpolation type in an `NSExpression`. This attribute corresponds to the `cubic-bezier` value in the - interpolate + interpolate expression operator in the Mapbox Style Specification. */ FOUNDATION_EXTERN MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionInterpolationModeCubicBezier; @@ -43,7 +43,7 @@ FOUNDATION_EXTERN MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionI /** Methods for creating expressions that use Mapbox-specific functionality and for converting to and from the JSON format defined in the - Mapbox Style Specification. + Mapbox Style Specification. */ @interface NSExpression (MGLAdditions) @@ -51,35 +51,35 @@ FOUNDATION_EXTERN MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionI /** `NSExpression` variable that corresponds to the - zoom + zoom expression operator in the Mapbox Style Specification. */ @property (class, nonatomic, readonly) NSExpression *zoomLevelVariableExpression; /** `NSExpression` variable that corresponds to the - heatmap-density + heatmap-density expression operator in the Mapbox Style Specification. */ @property (class, nonatomic, readonly) NSExpression *heatmapDensityVariableExpression; /** `NSExpression` variable that corresponds to the - line-progress + line-progress expression operator in the Mapbox Style Specification. */ @property (class, nonatomic, readonly) NSExpression *lineProgressVariableExpression; /** `NSExpression` variable that corresponds to the - geometry-type + geometry-type expression operator in the Mapbox Style Specification. */ @property (class, nonatomic, readonly) NSExpression *geometryTypeVariableExpression; /** `NSExpression` variable that corresponds to the - id + id expression operator in the Mapbox Style Specification. */ @property (class, nonatomic, readonly) NSExpression *featureIdentifierVariableExpression; @@ -93,7 +93,7 @@ FOUNDATION_EXTERN MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionI /** `NSExpression` variable that corresponds to the - properties + properties expression operator in the Mapbox Style Specification. */ @property (class, nonatomic, readonly) NSExpression *featureAttributesVariableExpression; @@ -186,7 +186,7 @@ FOUNDATION_EXTERN MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionI from JSON data. The Foundation object is interpreted according to the - [Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions). + [Mapbox Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions). See the “[Information for Style Authors](../for-style-authors.html#setting-attribute-values)” guide for a correspondence of operators and types between the style @@ -203,7 +203,7 @@ FOUNDATION_EXTERN MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionI An equivalent Foundation object that can be serialized as JSON. The Foundation object conforms to the - [Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions). + [Mapbox Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions). See the “[Information for Style Authors](../for-style-authors.html#setting-attribute-values)” guide for a correspondence of operators and types between the style diff --git a/platform/ios/platform/darwin/src/NSPredicate+MGLAdditions.h b/platform/ios/platform/darwin/src/NSPredicate+MGLAdditions.h index 6c4b878d3..f6717f356 100644 --- a/platform/ios/platform/darwin/src/NSPredicate+MGLAdditions.h +++ b/platform/ios/platform/darwin/src/NSPredicate+MGLAdditions.h @@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN from JSON data. The Foundation object is interpreted according to the - [Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions). + [Mapbox Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions). See the “[Predicates and Expressions](../predicates-and-expressions.html)” guide for a correspondence of operators and types between the style @@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN An equivalent Foundation object that can be serialized as JSON. The Foundation object conforms to the - [Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions). + [Mapbox Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions). See the “[Predicates and Expressions](../predicates-and-expressions.html)” guide for a correspondence of operators and types between the style diff --git a/platform/ios/platform/ios/docs/guides/For Style Authors.md b/platform/ios/platform/ios/docs/guides/For Style Authors.md index 0b8dc2c98..1f8928878 100644 --- a/platform/ios/platform/ios/docs/guides/For Style Authors.md +++ b/platform/ios/platform/ios/docs/guides/For Style Authors.md @@ -280,7 +280,7 @@ In style JSON | In Objective-C | In Swift Each property representing a layout or paint attribute is set to an `NSExpression` object. `NSExpression` objects play the same role as -[expressions in the Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions), +[expressions in the Mapbox Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions), but you create the former using a very different syntax. `NSExpression`’s format string syntax is reminiscent of a spreadsheet formula or an expression in a database query. See the diff --git a/platform/ios/platform/ios/docs/guides/Tile URL Templates.md b/platform/ios/platform/ios/docs/guides/Tile URL Templates.md index 4c8064f78..17fe5926f 100644 --- a/platform/ios/platform/ios/docs/guides/Tile URL Templates.md +++ b/platform/ios/platform/ios/docs/guides/Tile URL Templates.md @@ -17,9 +17,9 @@ evaluates based on the tile it needs to load. For example: evaluated as `http://www.example.com/tiles/14/6/9@2x.png`. Tile URL templates are also used to define tilesets in TileJSON manifests or -[`raster`](https://www.mapbox.com/mapbox-gl-js/style-spec/#sources-raster-tiles) +[`raster`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#sources-raster-tiles) and -[`vector`](https://www.mapbox.com/mapbox-gl-js/style-spec/#sources-vector-tiles) +[`vector`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#sources-vector-tiles) sources in style JSON files. See the [TileJSON specification](https://github.com/mapbox/tilejson-spec/tree/master/2.2.0) for information about tile URL templates in the context of a TileJSON or style diff --git a/platform/ios/platform/macos/docs/guides/For Style Authors.md b/platform/ios/platform/macos/docs/guides/For Style Authors.md index 2d72fe0c6..2c32bb50f 100644 --- a/platform/ios/platform/macos/docs/guides/For Style Authors.md +++ b/platform/ios/platform/macos/docs/guides/For Style Authors.md @@ -267,7 +267,7 @@ In style JSON | In Objective-C | In Swift Each property representing a layout or paint attribute is set to an `NSExpression` object. `NSExpression` objects play the same role as -[expressions in the Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions), +[expressions in the Mapbox Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions), but you create the former using a very different syntax. `NSExpression`’s format string syntax is reminiscent of a spreadsheet formula or an expression in a database query. See the diff --git a/platform/ios/platform/macos/docs/guides/Tile URL Templates.md b/platform/ios/platform/macos/docs/guides/Tile URL Templates.md index e71bcab0a..6e6a208cf 100644 --- a/platform/ios/platform/macos/docs/guides/Tile URL Templates.md +++ b/platform/ios/platform/macos/docs/guides/Tile URL Templates.md @@ -17,9 +17,9 @@ evaluates based on the tile it needs to load. For example: evaluated as `http://www.example.com/tiles/14/6/9@2x.png`. Tile URL templates are also used to define tilesets in TileJSON manifests or -[`raster`](https://www.mapbox.com/mapbox-gl-js/style-spec/#sources-raster-tiles) +[`raster`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#sources-raster-tiles) and -[`vector`](https://www.mapbox.com/mapbox-gl-js/style-spec/#sources-vector-tiles) +[`vector`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#sources-vector-tiles) sources in style JSON files. See the [TileJSON specification](https://github.com/mapbox/tilejson-spec/tree/master/2.2.0) for information about tile URL templates in the context of a TileJSON or style diff --git a/platform/qt/src/map.cpp b/platform/qt/src/map.cpp index 3672e5cc9..6be15823b 100644 --- a/platform/qt/src/map.cpp +++ b/platform/qt/src/map.cpp @@ -1132,7 +1132,7 @@ void Map::removeImage(const QString &id) /*! Adds a \a filter to a style \a layer using the format described in the \l - {https://www.mapbox.com/mapbox-gl-js/style-spec/#other-filter}{Mapbox style specification}. + {https://maplibre.org/maplibre-gl-js-docs/style-spec/#other-filter}{Mapbox style specification}. Given a layer \c marker from an arbitrary GeoJSON source containing features of type \b "Point" and \b "LineString", this example shows how to make sure the layer will only tag @@ -1209,7 +1209,7 @@ QVariant QVariantFromValue(const mbgl::Value &value) { Returns the current \a expression-based filter value applied to a style \layer, if any. - Filter value types are described in the {https://www.mapbox.com/mapbox-gl-js/style-spec/#types}{Mapbox style specification}. + Filter value types are described in the {https://maplibre.org/maplibre-gl-js-docs/style-spec/#types}{Mapbox style specification}. */ QVariant Map::getFilter(const QString &layer) const { using namespace mbgl::style;