From 288391cac236210a7042115c013dbc1cb1ac0743 Mon Sep 17 00:00:00 2001 From: Birk Skyum <74932975+birkskyum@users.noreply.github.com> Date: Wed, 7 Jun 2023 15:08:29 +0200 Subject: [PATCH] Update style spec references (#1150) --- ARCHITECTURE.md | 6 +- docs/mdbook/src/introduction.md | 2 +- include/mbgl/style/layer.hpp | 4 +- include/mbgl/style/source.hpp | 2 +- .../mapboxsdk/location/LocationComponent.java | 2 +- .../location/LocationIndicatorLayer.java | 2 +- .../location/LocationPropertyFactory.java | 2 +- .../mapbox/mapboxsdk/storage/Resource.java | 10 +- .../style/expressions/Expression.java | 326 +++++++++--------- .../style/layers/BackgroundLayer.java | 2 +- .../mapboxsdk/style/layers/CircleLayer.java | 2 +- .../style/layers/FillExtrusionLayer.java | 2 +- .../mapboxsdk/style/layers/FillLayer.java | 2 +- .../mapboxsdk/style/layers/HeatmapLayer.java | 2 +- .../style/layers/HillshadeLayer.java | 2 +- .../mapboxsdk/style/layers/LineLayer.java | 2 +- .../style/layers/PropertyFactory.java | 2 +- .../mapboxsdk/style/layers/RasterLayer.java | 2 +- .../mapboxsdk/style/layers/SymbolLayer.java | 2 +- .../style/layers/TransitionOptions.java | 2 +- .../mapboxsdk/style/layers/layer.java.ejs | 2 +- .../style/layers/property_factory.java.ejs | 2 +- .../mapbox/mapboxsdk/style/light/Light.java | 2 +- .../mapboxsdk/style/light/light.java.ejs | 2 +- .../mapboxsdk/style/sources/GeoJsonOptions.kt | 2 +- .../mapboxsdk/style/sources/GeoJsonSource.kt | 2 +- .../mapboxsdk/style/sources/ImageSource.kt | 2 +- .../style/sources/RasterDemSource.kt | 2 +- .../mapboxsdk/style/sources/RasterSource.kt | 2 +- .../mapboxsdk/style/sources/VectorSource.kt | 2 +- .../mapbox/mapboxsdk/style/types/Formatted.kt | 2 +- platform/darwin/src/local_glyph_rasterizer.mm | 2 +- .../docs/guides/For Style Authors.md.ejs | 6 +- .../docs/guides/Predicates and Expressions.md | 84 ++--- .../docs/guides/Tile URL Templates.md.ejs | 4 +- .../darwin/scripts/generate-style-code.js | 2 +- .../darwin/src/MLNComputedShapeSource.h | 4 +- platform/ios/platform/darwin/src/MLNFeature.h | 2 +- .../ios/platform/darwin/src/MLNImageSource.h | 2 +- .../ios/platform/darwin/src/MLNLight.h.ejs | 4 +- .../platform/darwin/src/MLNOfflineStorage.h | 10 +- .../platform/darwin/src/MLNRasterDEMSource.h | 2 +- .../platform/darwin/src/MLNRasterTileSource.h | 2 +- .../ios/platform/darwin/src/MLNShapeSource.h | 34 +- .../platform/darwin/src/MLNVectorStyleLayer.h | 2 +- .../platform/darwin/src/MLNVectorTileSource.h | 2 +- .../darwin/src/NSExpression+MLNAdditions.h | 44 +-- .../darwin/src/NSExpression+MLNAdditions.mm | 2 +- .../darwin/src/NSPredicate+MLNAdditions.h | 4 +- platform/ios/platform/ios/CHANGELOG.md | 2 +- .../ios/platform/ios/app/MBXViewController.m | 4 +- platform/ios/platform/ios/docs/pod-README.md | 2 +- .../ios/scripts/release-notes-jazzy.md.ejs | 2 +- platform/ios/platform/ios/src/MLNMapView.h | 2 +- platform/ios/platform/macos/README.md | 2 +- platform/ios/platform/macos/app/MapDocument.m | 2 +- .../ios/platform/macos/docs/doc-README.md | 2 +- .../macos/scripts/release-notes-jazzy.md.ejs | 2 +- platform/ios/platform/macos/src/MLNMapView.h | 2 +- .../macos/src/NSColor+MLNAdditions.mm | 6 +- platform/qt/src/map.cpp | 30 +- src/mbgl/text/language_tag.hpp | 2 +- 62 files changed, 336 insertions(+), 336 deletions(-) diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index 7d38e020b..b5742061a 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -28,7 +28,7 @@ Code and build scripts belonging to platform SDKs are contained in the `platform - iOS SDK runs benchmark test through a separate app named `BenchmarkApp`. - Android SDK does not have benchmark test. - `bin` contains the code for tools like `mbgl-cache`, `mbgl-offline`, and `mbgl-render`. -- `expression-test` contains tests for the expression feature in the map style (see more details about expression [here](https://maplibre.org/maplibre-gl-js-docs/style-spec/expressions/). +- `expression-test` contains tests for the expression feature in the map style (see more details about expression [here](https://maplibre.org/maplibre-style-spec/expressions/). - `metrics` contains test manifest files and ground truth for graphic comparison based render test. - `misc` contains protobuf for style, vector tile, and glyphs. It also icons and pictures used in documents. - `render-test` contains image diff based render tests. These tests verify if the rendering results match with expectations by capturing the rendering results and compare with the groundtruth images in the `metrics` directory. @@ -77,7 +77,7 @@ See the relevant platform-specific `README.md` / `INSTALL.md` for details. ## Map ## Style -The "Style" component of MapLibre Native contains an implementation of the [Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-style-spec/), defining what data to draw, the order to draw it in, and how to style the data when drawing it. +The "Style" component of MapLibre Native contains an implementation of the [MapLibre Style Spec](https://maplibre.org/maplibre-style-spec/), defining what data to draw, the order to draw it in, and how to style the data when drawing it. In addition to supporting styles loaded from a URL, MapLibre Native includes a runtime styling API, which allows users to dynamically modify the current style: add and remove layers, modify layer properties, and so on. As appropriate for a C++ API, the runtime styling API API is _strongly typed_: there are subclasses for each layer type, with correctly-typed accessors for each style property. This results in a large API surface area. Fortunately, this is automated, by generating the API – and the regular portion of the implementation – from the style specification. @@ -92,7 +92,7 @@ For each subclass of `Layer` or source, there's a corresponding `Impl` subclass. The `Layer::Impl` and `Source::Impl` reference held by `Layer` and `Source` base classes is _immutable_: it's a shared reference to a `const` (read only) pointer. Immutability permits the `Impl` objects to be shared safely between threads when needed -- for example, between the main thread and worker thread that performs computation in the background, or between the main thread and a dedicated renderer thread. See the "Threading" section below for further details on the threading model. -Immutability is an alternative to several other strategies for safe intra-thread communication. One alternative strategy is to insert locks whenever data is shared between threads and at least one thread may be modifying the data. This strategy is prone to problems such as race conditions (if you forget to use a lock), deadlocks (if locks are acquired in conflicting orders), and poor performance due to lock contention. Another strategy is to copy data whenever it's needed by another thread. For complex structures such as a Mapbox Style, copying can be an expensive operation. With immutability, the approach is to share data without copying, but ensure that any data so shared cannot be modified by any thread, and that the data is not destroyed until the last thread using it relinquishes its reference. +Immutability is an alternative to several other strategies for safe intra-thread communication. One alternative strategy is to insert locks whenever data is shared between threads and at least one thread may be modifying the data. This strategy is prone to problems such as race conditions (if you forget to use a lock), deadlocks (if locks are acquired in conflicting orders), and poor performance due to lock contention. Another strategy is to copy data whenever it's needed by another thread. For complex structures such as a MapLibre Style, copying can be an expensive operation. With immutability, the approach is to share data without copying, but ensure that any data so shared cannot be modified by any thread, and that the data is not destroyed until the last thread using it relinquishes its reference. Immutability is implemented by the `Immutable` template, which acts as a non-nullable shared reference to a `const T`. It has behavior similar to `std::shared_ptr`, but indicates its intent as an immutable reference that is safe to share between threads. diff --git a/docs/mdbook/src/introduction.md b/docs/mdbook/src/introduction.md index 1d723ffbd..e878f405f 100644 --- a/docs/mdbook/src/introduction.md +++ b/docs/mdbook/src/introduction.md @@ -2,4 +2,4 @@ *[MapLibre Native](https://github.com/maplibre/maplibre-native)* is a community led fork of *Mapbox GL Native*. It's a C++ library that powers vector maps in native applications on multiple platforms by taking stylesheets that conform to the *MapLibre Style Specification,* a fork of the -Mapbox Style Specification. Since it is derived from Mapbox's original work it also uses *Mapbox Vector Tile Specification* as its choice of vector tile format. +MapLibre Style Spec. Since it is derived from Mapbox's original work it also uses *Mapbox Vector Tile Specification* as its choice of vector tile format. diff --git a/include/mbgl/style/layer.hpp b/include/mbgl/style/layer.hpp index 3f842d590..cff9a68c0 100644 --- a/include/mbgl/style/layer.hpp +++ b/include/mbgl/style/layer.hpp @@ -88,8 +88,8 @@ struct LayerTypeInfo { }; /** - * The runtime representation of a [layer](https://www.mapbox.com/mapbox-gl-style-spec/#layers) - * from the Mapbox Style Specification. + * The runtime representation of a [layer](https://maplibre.org/maplibre-style-spec/#layers) + * from the MapLibre Style Spec. * * `Layer` is an abstract base class; concrete derived classes are provided for * each layer type. `Layer` contains functionality that is common to all layer types: diff --git a/include/mbgl/style/source.hpp b/include/mbgl/style/source.hpp index 93b8d2e33..db3b7063b 100644 --- a/include/mbgl/style/source.hpp +++ b/include/mbgl/style/source.hpp @@ -26,7 +26,7 @@ struct LayerTypeInfo; /** * The runtime representation of a - * [source](https://maplibre.org/maplibre-gl-js-docs/style-spec/sources/) from + * [source](https://maplibre.org/maplibre-style-spec/sources/) from * the MapLibre Style Specification. * * `Source` is an abstract base class; concrete derived classes are provided for diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java index cc654df57..41a629de6 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java @@ -158,7 +158,7 @@ public final class LocationComponent { /** * Indicates if Mapbox components are ready to be interacted with. This can differ from {@link #isComponentStarted} - * if the Mapbox style is being reloaded. + * if the MapLibre style is being reloaded. */ private boolean isLayerReady; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayer.java index 6c14d6c32..b36a538f4 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayer.java @@ -16,7 +16,7 @@ import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; /** * * - * @see The online documentation + * @see The online documentation */ @UiThread class LocationIndicatorLayer extends Layer { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationPropertyFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationPropertyFactory.java index 722f22d9e..5c804960f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationPropertyFactory.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationPropertyFactory.java @@ -15,7 +15,7 @@ import static com.mapbox.mapboxsdk.utils.ColorUtils.colorToRgbaString; /** * Constructs paint/layout properties for Layers * - * @see Layer style documentation + * @see Layer style documentation */ class LocationPropertyFactory { 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 869b3fc77..0e00a9164 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://maplibre.org/maplibre-gl-js-docs/style-spec/#root-sources + * TileJSON file as specified in https://maplibre.org/maplibre-style-spec/root/#sources */ public static final int SOURCE = 2; /** * A vector or raster tile as described in the style sheet at - * https://maplibre.org/maplibre-gl-js-docs/style-spec/#sources + * https://maplibre.org/maplibre-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://maplibre.org/maplibre-gl-js-docs/style-spec/#root-glyphs + * in https://maplibre.org/maplibre-style-spec/root/#glyphs */ public static final int GLYPHS = 4; /** * Image part of a sprite sheet. It is constructed of the prefix in - * https://maplibre.org/maplibre-gl-js-docs/style-spec/#root-sprite and a PNG file extension. + * https://maplibre.org/maplibre-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://maplibre.org/maplibre-gl-js-docs/style-spec/#root-sprite and a JSON file extension. + * https://maplibre.org/maplibre-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 4a815e4d2..048cb0af5 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 position in the array or string or -1 if not found. - * @see Style specification + * @see Style specification */ public static Expression indexOf(@NonNull Expression keyword, @NonNull Expression input) { return new Expression("index-of", keyword, input); @@ -1571,7 +1571,7 @@ public class Expression { * @param haystack the array or string expression * @param fromIndex the index to start searching from * @return position in the array or string or -1 if not found. - * @see Style specification + * @see Style specification */ public static Expression indexOf(@NonNull Expression keyword, @NonNull Expression input, @NonNull Expression fromIndex) { return new Expression("index-of", keyword, input, fromIndex); @@ -1583,7 +1583,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); @@ -1595,7 +1595,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); @@ -1612,7 +1612,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<>(); @@ -1647,7 +1647,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); @@ -1671,7 +1671,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)); @@ -1695,7 +1695,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); @@ -1719,7 +1719,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); @@ -1741,7 +1741,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); @@ -1763,7 +1763,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)); @@ -1786,7 +1786,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); @@ -1809,7 +1809,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); @@ -1820,7 +1820,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); @@ -1831,7 +1831,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)); @@ -1852,7 +1852,7 @@ public class Expression { * * * @return expression - * @see Style specification + * @see Style specification */ public static Expression ln2() { return new Expression("ln2"); @@ -1873,7 +1873,7 @@ public class Expression { * * * @return expression - * @see Style specification + * @see Style specification */ public static Expression pi() { return new Expression("pi"); @@ -1894,7 +1894,7 @@ public class Expression { * * * @return expression - * @see Style specification + * @see Style specification */ public static Expression e() { return new Expression("e"); @@ -1916,7 +1916,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); @@ -1938,7 +1938,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) { @@ -1965,7 +1965,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); @@ -1987,7 +1987,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) { @@ -2014,7 +2014,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); @@ -2036,7 +2036,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)); @@ -2059,7 +2059,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); @@ -2082,7 +2082,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)); @@ -2105,7 +2105,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); @@ -2128,7 +2128,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)); @@ -2151,7 +2151,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); @@ -2174,7 +2174,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)); @@ -2197,7 +2197,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); @@ -2220,7 +2220,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)); @@ -2242,7 +2242,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); @@ -2264,7 +2264,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)); @@ -2286,7 +2286,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); @@ -2308,7 +2308,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)); @@ -2330,7 +2330,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); @@ -2352,7 +2352,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)); @@ -2374,7 +2374,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); @@ -2396,7 +2396,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)); @@ -2418,7 +2418,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); @@ -2440,7 +2440,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)); @@ -2462,7 +2462,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); @@ -2484,7 +2484,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)); @@ -2506,7 +2506,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); @@ -2528,7 +2528,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)); @@ -2550,7 +2550,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); @@ -2572,7 +2572,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)); @@ -2594,7 +2594,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); @@ -2616,7 +2616,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)); @@ -2638,7 +2638,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); @@ -2660,7 +2660,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)); @@ -2682,7 +2682,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); @@ -2704,7 +2704,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) { @@ -2731,7 +2731,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); @@ -2753,7 +2753,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) { @@ -2782,7 +2782,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); @@ -2806,7 +2806,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)); @@ -2828,7 +2828,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); @@ -2850,7 +2850,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)); @@ -2872,7 +2872,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); @@ -2894,7 +2894,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)); @@ -2916,7 +2916,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); @@ -2938,7 +2938,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)); @@ -2965,7 +2965,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); @@ -2995,7 +2995,7 @@ public class Expression { * * @param expression the expression to evaluate * @return expression - * @see Style + * @see Style * specification */ public static Expression isSupportedScript(Expression expression) { @@ -3026,7 +3026,7 @@ public class Expression { * * @param string the string to evaluate * @return expression - * @see Style + * @see Style * specification */ public static Expression isSupportedScript(@NonNull String string) { @@ -3053,7 +3053,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); @@ -3079,7 +3079,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)); @@ -3105,7 +3105,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); @@ -3131,7 +3131,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)); @@ -3153,7 +3153,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); @@ -3175,7 +3175,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]; @@ -3192,7 +3192,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); @@ -3203,7 +3203,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); @@ -3217,7 +3217,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); @@ -3231,7 +3231,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); @@ -3279,7 +3279,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); @@ -3297,7 +3297,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<>(); @@ -3332,7 +3332,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<>(); @@ -3353,7 +3353,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<>(); @@ -3374,7 +3374,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<>(); @@ -3415,7 +3415,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 @@ -3552,7 +3552,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); @@ -3581,7 +3581,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); @@ -3608,7 +3608,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); @@ -3631,7 +3631,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); @@ -3655,7 +3655,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); @@ -3667,7 +3667,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); @@ -3678,7 +3678,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); @@ -3689,7 +3689,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)); @@ -3721,7 +3721,7 @@ public class Expression { * * * @return expression - * @see Style specification + * @see Style specification */ public static Expression zoom() { return new Expression("zoom"); @@ -3783,7 +3783,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); @@ -3815,7 +3815,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) { @@ -3848,7 +3848,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)); @@ -3880,7 +3880,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)); @@ -3912,7 +3912,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); @@ -3944,7 +3944,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); @@ -3976,7 +3976,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)); @@ -4008,7 +4008,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)); @@ -4042,7 +4042,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) { @@ -4077,7 +4077,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) { @@ -4106,7 +4106,7 @@ public class Expression { * * * @return expression - * @see Style specification + * @see Style specification */ public static Interpolator linear() { return new Interpolator("linear"); @@ -4138,7 +4138,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)); @@ -4170,7 +4170,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); @@ -4202,7 +4202,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) { @@ -4235,7 +4235,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) { @@ -4321,7 +4321,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); @@ -4876,7 +4876,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/BackgroundLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java index 6d27ed9d2..ea8924c92 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java @@ -12,7 +12,7 @@ import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; /** * The background color or pattern of the map. * - * @see The online documentation + * @see The online documentation */ @UiThread public class BackgroundLayer extends Layer { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java index 563fb15ca..15360ad1e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java @@ -16,7 +16,7 @@ import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; /** * A filled circle. * - * @see The online documentation + * @see The online documentation */ @UiThread public class CircleLayer extends Layer { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java index f42d94253..dffc4e37a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java @@ -16,7 +16,7 @@ import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; /** * An extruded (3D) polygon. * - * @see The online documentation + * @see The online documentation */ @UiThread public class FillExtrusionLayer extends Layer { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java index 172b5f447..6d94d17f0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java @@ -16,7 +16,7 @@ import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; /** * A filled polygon with an optional stroked border. * - * @see The online documentation + * @see The online documentation */ @UiThread public class FillLayer extends Layer { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java index bc22446dc..1d2c543cd 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java @@ -16,7 +16,7 @@ import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; /** * A heatmap. * - * @see The online documentation + * @see The online documentation */ @UiThread public class HeatmapLayer extends Layer { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java index 42b1f5f8b..2f31f2088 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java @@ -12,7 +12,7 @@ import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; /** * Client-side hillshading visualization based on DEM data. Currently, the implementation only supports Mapbox Terrain RGB and Mapzen Terrarium tiles. * - * @see The online documentation + * @see The online documentation */ @UiThread public class HillshadeLayer extends Layer { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java index 41ae07dcc..d2f0d9e48 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java @@ -16,7 +16,7 @@ import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; /** * A stroked line. * - * @see The online documentation + * @see The online documentation */ @UiThread public class LineLayer extends Layer { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java index fbb47b5da..447e0cc6f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java @@ -12,7 +12,7 @@ import static com.mapbox.mapboxsdk.utils.ColorUtils.colorToRgbaString; /** * Constructs paint/layout properties for Layers * - * @see Layer style documentation + * @see Layer style documentation */ public class PropertyFactory { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java index 5acf544ad..45ab14b6f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java @@ -9,7 +9,7 @@ import androidx.annotation.UiThread; /** * Raster map textures such as satellite imagery. * - * @see The online documentation + * @see The online documentation */ @UiThread public class RasterLayer extends Layer { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java index ee296a16d..767dd2cc9 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java @@ -17,7 +17,7 @@ import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; /** * An icon or a text label. * - * @see The online documentation + * @see The online documentation */ @UiThread public class SymbolLayer extends Layer { 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 45795410f..8ac99c0ad 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/layers/layer.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs index 987316768..9fc7dcc07 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs @@ -35,7 +35,7 @@ import com.mapbox.mapboxsdk.style.layers.PropertyValue; /** * <%- doc %> * - * @see The online documentation + * @see The online documentation */ @UiThread <% if (type === 'location-indicator') { -%> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs index 18bf39bcd..7d6b2a4af 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs @@ -26,7 +26,7 @@ import com.mapbox.mapboxsdk.style.layers.PropertyValue; /** * Constructs paint/layout properties for Layers * - * @see Layer style documentation + * @see Layer style documentation */ <% if (locationIndicator) { -%> class LocationPropertyFactory { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java index 75cd89128..0ca914d09 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java @@ -15,7 +15,7 @@ import com.mapbox.mapboxsdk.utils.ThreadUtils; /** * The global light source. * - * @see The online documentation + * @see The online documentation */ @UiThread public class Light { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs index 8074fa0df..771c72991 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs @@ -19,7 +19,7 @@ import com.mapbox.mapboxsdk.utils.ThreadUtils; /** * The global light source. * - * @see The online documentation + * @see The online documentation */ @UiThread public class Light { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.kt b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.kt index db61665bb..2c5d0a1d2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.kt +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.kt @@ -7,7 +7,7 @@ import com.mapbox.mapboxsdk.style.expressions.Expression.ExpressionLiteral * * @see GeoJsonSource * - * @see [The online documentation](https://www.mapbox.com/mapbox-gl-style-spec/.sources-geojson) + * @see [The online documentation](https://maplibre.org/maplibre-style-spec/.sources-geojson) */ class GeoJsonOptions : HashMap() { /** diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.kt b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.kt index 87b3972b6..44d1c4681 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.kt +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.kt @@ -13,7 +13,7 @@ import java.util.* /** * GeoJson source, allows using FeatureCollections from Json. * - * @see [the style specification](https://www.mapbox.com/mapbox-gl-style-spec/.sources-geojson) + * @see [the style specification](https://maplibre.org/maplibre-style-spec/.sources-geojson) */ @UiThread class GeoJsonSource : Source { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.kt b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.kt index 00551c51c..59eaf4f5d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.kt +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.kt @@ -18,7 +18,7 @@ import java.net.URL * The geographic location of the raster image content, supplied with `LatLngQuad`, * can be non-axis aligned. * - * * @see [the style specification](https://www.mapbox.com/mapbox-gl-style-spec/#sources-image) + * * @see [the style specification](https://maplibre.org/maplibre-style-spec/#sources-image) */ @UiThread class ImageSource : Source { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.kt b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.kt index fc50f2579..a7f9aa7e9 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.kt +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.kt @@ -8,7 +8,7 @@ import java.net.URL /** * A raster DEM source. * - * @see [The style specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/.sources-raster-dem) + * @see [The style specification](https://maplibre.org/maplibre-style-spec/.sources-raster-dem) */ @UiThread diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.kt b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.kt index a6a821574..f2dbb3a04 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.kt +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.kt @@ -7,7 +7,7 @@ import java.net.URL /** * Raster source, allows using raster tiles as source. * - * @see [The style specification](https://www.mapbox.com/mapbox-gl-style-spec/.sources-raster) + * @see [The style specification](https://maplibre.org/maplibre-style-spec/.sources-raster) */ class RasterSource : Source { /** diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.kt b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.kt index 8f9155eef..05d2eeca6 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.kt +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.kt @@ -13,7 +13,7 @@ import kotlin.collections.ArrayList /** * Vector source, allows the use of vector tiles. * - * @see [the style specification](https://www.mapbox.com/mapbox-gl-style-spec/.sources-vector) + * @see [the style specification](https://maplibre.org/maplibre-style-spec/.sources-vector) */ @UiThread class VectorSource : Source { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.kt b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.kt index 5263a1b88..d5d34fa1e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.kt +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.kt @@ -6,7 +6,7 @@ import java.util.* /** * Represents a string broken into sections annotated with separate formatting options. * - * @see [Style specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/.types-formatted) + * @see [Style specification](https://maplibre.org/maplibre-style-spec/.types-formatted) */ @Keep class Formatted(vararg formattedSections: FormattedSection) { diff --git a/platform/darwin/src/local_glyph_rasterizer.mm b/platform/darwin/src/local_glyph_rasterizer.mm index d6180c3f8..f5cded7c1 100644 --- a/platform/darwin/src/local_glyph_rasterizer.mm +++ b/platform/darwin/src/local_glyph_rasterizer.mm @@ -105,7 +105,7 @@ public: CTFontDescriptorRef createFontDescriptor(const FontStack& fontStack) { NSMutableArray *fontNames = [NSMutableArray arrayWithCapacity:fontStack.size() + fallbackFontNames.count]; for (auto& fontName : fontStack) { - // Per the Mapbox Style Specification, the text-font property comes + // Per the MapLibre Style Spec, the text-font property comes // with these last resort fonts by default, but they shouldn’t take // precedence over any application or system fallback font that may // be more appropriate to the current device. 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 9e899fd65..e4e3ea144 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 @@ -134,10 +134,10 @@ You set an `MLNMapView` object’s style either in code, by setting the `MLNMapView.styleURL` property, or in Interface Builder, by setting the “Style URL” inspectable. The URL must point to a local or remote style JSON file. The style JSON file format is defined by the -[Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-style-spec/). This +[MapLibre Style Spec](https://maplibre.org/maplibre-style-spec/). This SDK supports the functionality defined by version 8 of the specification unless otherwise noted in the -[style specification documentation](https://www.mapbox.com/mapbox-gl-style-spec/). +[style specification documentation](https://maplibre.org/maplibre-style-spec/). ## Manipulating the style at runtime @@ -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://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions), +[expressions in the MapLibre Style Spec](https://maplibre.org/maplibre-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 36308caf2..7cd4320b7 100644 --- a/platform/ios/platform/darwin/docs/guides/Predicates and Expressions.md +++ b/platform/ios/platform/darwin/docs/guides/Predicates and Expressions.md @@ -352,7 +352,7 @@ NSExpression(format: "MLN_LET(floorCount, 2, $floorCount + 1)") ## Mapbox-specific functions -For compatibility with the Mapbox Style Specification, the following functions +For compatibility with the MapLibre Style Spec, the following functions are defined by this SDK. When setting a style layer property, you can call these functions just like the predefined functions above, using either the `+[NSExpression expressionForFunction:arguments:]` method or a convenient format @@ -431,8 +431,8 @@ expression containing the strings to concatenate. Returns the arccosine of the number. This function corresponds to the -[`acos`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-acos) -operator in the Mapbox Style Specification. +[`acos`](https://maplibre.org/maplibre-style-spec/expressions/#acos) +operator in the MapLibre Style Spec. ### `mgl_asin:` @@ -446,8 +446,8 @@ operator in the Mapbox Style Specification. Returns the arcsine of the number. This function corresponds to the -[`asin`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-asin) -operator in the Mapbox Style Specification. +[`asin`](https://maplibre.org/maplibre-style-spec/expressions/#asin) +operator in the MapLibre Style Spec. ### `mgl_atan:` @@ -461,8 +461,8 @@ operator in the Mapbox Style Specification. Returns the arctangent of the number. This function corresponds to the -[`atan`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-atan) -operator in the Mapbox Style Specification. +[`atan`](https://maplibre.org/maplibre-style-spec/expressions/#atan) +operator in the MapLibre Style Spec. ### `mgl_cos:` @@ -476,8 +476,8 @@ operator in the Mapbox Style Specification. Returns the cosine of the number. This function corresponds to the -[`cos`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-cos) -operator in the Mapbox Style Specification. +[`cos`](https://maplibre.org/maplibre-style-spec/expressions/#cos) +operator in the MapLibre Style Spec. ### `mgl_log2:` @@ -491,8 +491,8 @@ operator in the Mapbox Style Specification. Returns the base-2 logarithm of the number. This function corresponds to the -[`log2`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-log2) -operator in the Mapbox Style Specification. +[`log2`](https://maplibre.org/maplibre-style-spec/expressions/#log2) +operator in the MapLibre Style Spec. ### `mgl_round:` @@ -507,8 +507,8 @@ 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://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-round) -operator in the Mapbox Style Specification. +[`round`](https://maplibre.org/maplibre-style-spec/expressions/#round) +operator in the MapLibre Style Spec. ### `mgl_sin:` @@ -522,8 +522,8 @@ operator in the Mapbox Style Specification. Returns the sine of the number. This function corresponds to the -[`sin`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-sin) -operator in the Mapbox Style Specification. +[`sin`](https://maplibre.org/maplibre-style-spec/expressions/#sin) +operator in the MapLibre Style Spec. ### `mgl_tan:` @@ -537,8 +537,8 @@ operator in the Mapbox Style Specification. Returns the tangent of the number. This function corresponds to the -[`tan`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-tan) -operator in the Mapbox Style Specification. +[`tan`](https://maplibre.org/maplibre-style-spec/expressions/#tan) +operator in the MapLibre Style Spec. ### `mgl_distanceFrom:` @@ -553,7 +553,7 @@ Returns the straight-line distance from the evaluated object to the given shape. This function corresponds to the [`distance`](https://docs.mapbox.com/mapbox-gl-js/style-spec/expressions/#distance) -operator in the Mapbox Style Specification. +operator in the MapLibre Style Spec. ### `mgl_coalesce:` @@ -567,8 +567,8 @@ operator in the Mapbox Style Specification. Returns the first non-`nil` value from an array of expressions. This function corresponds to the -[`coalesce`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-coalesce) -operator in the Mapbox Style Specification. +[`coalesce`](https://maplibre.org/maplibre-style-spec/expressions/#coalesce) +operator in the MapLibre Style Spec. ### `mgl_attributed:` @@ -591,8 +591,8 @@ with the `MLNSymbolStyleLayer.text` property. `MLNFontColorAttribute` | An `NSExpression` evaluating to an `UIColor` (iOS) or `NSColor` (macOS). This function corresponds to the -[`format`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-types-format) -operator in the Mapbox Style Specification. +[`format`](https://maplibre.org/maplibre-style-spec/expressions/#types-format) +operator in the MapLibre Style Spec. ### `MLN_LET` @@ -640,8 +640,8 @@ values. This function corresponds to the `+[NSExpression(MLNAdditions) mgl_expressionForMatchingExpression:inDictionary:defaultExpression:]` method and the -[`match`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-match) -operator in the Mapbox Style Specification. +[`match`](https://maplibre.org/maplibre-style-spec/expressions/#match) +operator in the MapLibre Style Spec. ### `MLN_IF` @@ -667,8 +667,8 @@ passed into this function must be wrapped in a constant expression. This function corresponds to the `+[NSExpression(MLNAdditions) mgl_expressionForConditional:trueExpression:falseExpresssion:]` method and the -[`case`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-case) -operator in the Mapbox Style Specification. +[`case`](https://maplibre.org/maplibre-style-spec/expressions/#case) +operator in the MapLibre Style Spec. ### `MLN_FUNCTION` @@ -684,7 +684,7 @@ operator in the Mapbox Style Specification. An expression exactly as defined by the -[Mapbox Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions). +[MapLibre Style Spec](https://maplibre.org/maplibre-style-spec/expressions/). ## Custom functions @@ -697,7 +697,7 @@ classes, but you should not call them directly outside the context of an expression, because the result may differ from the evaluated expression’s result or may result in undefined behavior. -The Mapbox Style Specification defines some operators for which no custom +The MapLibre Style Spec defines some operators for which no custom function is available. To use these operators in an `NSExpression`, call the [`MLN_FUNCTION()`](#code-mgl_function-code) function with the same arguments that the operator expects. @@ -745,8 +745,8 @@ otherwise TRUE. object has a value for the feature attribute. This function corresponds to the -[`has`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-has) -operator in the Mapbox Style Specification. See also the +[`has`](https://maplibre.org/maplibre-style-spec/expressions/#has) +operator in the MapLibre Style Spec. 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 attribute by comparing the key path to `NIL`, for example `cheeseburger != NIL` @@ -779,8 +779,8 @@ The target expression with variable subexpressions replaced with the values defined in the context dictionary. This function corresponds to the -[`let`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-let) -operator in the Mapbox Style Specification. See also the +[`let`](https://maplibre.org/maplibre-style-spec/expressions/#let) +operator in the MapLibre Style Spec. See also the [`MLN_LET`](#code-mgl_let-code) function, which is used on its own without the `FUNCTION()` operator. @@ -839,8 +839,8 @@ yellow, orange, and red as the values. This function corresponds to the `+[NSExpression(MLNAdditions) mgl_expressionForInterpolatingExpression:withCurveType:parameters:stops:]` method and the -[`interpolate`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-interpolate) -operator in the Mapbox Style Specification. See also the +[`interpolate`](https://maplibre.org/maplibre-style-spec/expressions/#interpolate) +operator in the MapLibre Style Spec. 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,8 +879,8 @@ A numeric representation of the target: first successful conversion is obtained. This function corresponds to the -[`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 +[`to-number`](https://maplibre.org/maplibre-style-spec/expressions/#types-to-number) +operator in the MapLibre Style Spec. You can also cast a value to a number by passing the value and the string `NSNumber` into the `CAST()` operator. @@ -923,8 +923,8 @@ yellow, orange, and red as the values. This function corresponds to the `+[NSExpression(MLNAdditions) mgl_expressionForSteppingExpression:fromExpression:stops:]` method and the -[`step`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-step) -operator in the Mapbox Style Specification. +[`step`](https://maplibre.org/maplibre-style-spec/expressions/#step) +operator in the MapLibre Style Spec. ### `stringByAppendingString:` @@ -944,8 +944,8 @@ The target string with each of the argument strings appended in order. This function corresponds to the `-[NSExpression(MLNAdditions) mgl_expressionByAppendingExpression:]` method and is similar to the -[`concat`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions-concat) -operator in the Mapbox Style Specification. See also the +[`concat`](https://maplibre.org/maplibre-style-spec/expressions/#concat) +operator in the MapLibre Style Spec. 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://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 +[`to-string`](https://maplibre.org/maplibre-style-spec/expressions/#types-to-string) +operator in the MapLibre Style Spec. 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 a8a194bc3..f5148c087 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://maplibre.org/maplibre-gl-js-docs/style-spec/#sources-raster-tiles) +[`raster`](https://maplibre.org/maplibre-style-spec/sources/#raster-tiles) and -[`vector`](https://maplibre.org/maplibre-gl-js-docs/style-spec/#sources-vector-tiles) +[`vector`](https://maplibre.org/maplibre-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/scripts/generate-style-code.js b/platform/ios/platform/darwin/scripts/generate-style-code.js index b3496071e..67b2a60d4 100755 --- a/platform/ios/platform/darwin/scripts/generate-style-code.js +++ b/platform/ios/platform/darwin/scripts/generate-style-code.js @@ -398,7 +398,7 @@ global.propertyDoc = function (propertyName, property, layerType, kind) { anchor = `paint-${property.original}`; break; } - doc += `\n\nThis attribute corresponds to the ${property.original} layout property in the Mapbox Style Specification.`; + doc += `\n\nThis attribute corresponds to the ${property.original} layout property in the MapLibre Style Spec.`; } doc += '\n\nYou can set this property to an expression containing any of the following:\n\n'; doc += `* Constant ${describeType(property)} values`; diff --git a/platform/ios/platform/darwin/src/MLNComputedShapeSource.h b/platform/ios/platform/darwin/src/MLNComputedShapeSource.h index 41d723ea1..c0ff97c34 100644 --- a/platform/ios/platform/darwin/src/MLNComputedShapeSource.h +++ b/platform/ios/platform/darwin/src/MLNComputedShapeSource.h @@ -89,7 +89,7 @@ MLN_EXPORT /** Returns a custom shape data source initialized with an identifier, and a dictionary of options for the source according to the - style + style specification. This class supports the following options: @@ -108,7 +108,7 @@ MLN_EXPORT /** Returns a custom shape data source initialized with an identifier, data source, and a dictionary of options for the source according to the - style + style specification. This class supports the following options: diff --git a/platform/ios/platform/darwin/src/MLNFeature.h b/platform/ios/platform/darwin/src/MLNFeature.h index 9ccc7074c..7fbd1a7ea 100644 --- a/platform/ios/platform/darwin/src/MLNFeature.h +++ b/platform/ios/platform/darwin/src/MLNFeature.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 `MLNShapeSource`. 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/MLNImageSource.h b/platform/ios/platform/darwin/src/MLNImageSource.h index 2e15218c7..3d45ab701 100644 --- a/platform/ios/platform/darwin/src/MLNImageSource.h +++ b/platform/ios/platform/darwin/src/MLNImageSource.h @@ -24,7 +24,7 @@ MLN_EXPORT appearance of content supplied by the image source. Each - image + image source defined by the style JSON file is represented at runtime by an `MLNImageSource` object that you can use to initialize new style layers. You can also add and remove sources dynamically using methods such as diff --git a/platform/ios/platform/darwin/src/MLNLight.h.ejs b/platform/ios/platform/darwin/src/MLNLight.h.ejs index e7d636759..73fd0afd8 100644 --- a/platform/ios/platform/darwin/src/MLNLight.h.ejs +++ b/platform/ios/platform/darwin/src/MLNLight.h.ejs @@ -74,8 +74,8 @@ MLN_EXPORT <%- propertyDoc(property.name, property, type, 'light').wrap(80, 1) %> This property corresponds to the <%- originalPropertyName(property) %> - light property in the Mapbox Style Specification. + href="https://maplibre.org/maplibre-style-spec/light/#<%- originalPropertyName(property) %>"><%- originalPropertyName(property) %> + light property in the MapLibre Style Spec. <% if (property.examples) { -%> #### Related examples diff --git a/platform/ios/platform/darwin/src/MLNOfflineStorage.h b/platform/ios/platform/darwin/src/MLNOfflineStorage.h index fbd257aec..f9fe7d9d3 100644 --- a/platform/ios/platform/darwin/src/MLNOfflineStorage.h +++ b/platform/ios/platform/darwin/src/MLNOfflineStorage.h @@ -159,19 +159,19 @@ typedef NS_ENUM(NSUInteger, MLNResourceKind) { MLNResourceKindUnknown, /** Style sheet JSON file */ MLNResourceKindStyle, - /** TileJSON file as specified in https://maplibre.org/maplibre-gl-js-docs/style-spec/#root-sources */ + /** TileJSON file as specified in https://maplibre.org/maplibre-style-spec/root/#sources */ MLNResourceKindSource, /** A vector or raster tile as described in the style sheet at - https://maplibre.org/maplibre-gl-js-docs/style-spec/#sources */ + https://maplibre.org/maplibre-style-spec/sources/ */ MLNResourceKindTile, /** Signed distance field glyphs for text rendering. These are the URLs specified in the style - in https://maplibre.org/maplibre-gl-js-docs/style-spec/#root-glyphs */ + in https://maplibre.org/maplibre-style-spec/root/#glyphs */ MLNResourceKindGlyphs, /** Image part of a sprite sheet. It is constructed of the prefix in - https://maplibre.org/maplibre-gl-js-docs/style-spec/#root-sprite and a PNG file extension. */ + https://maplibre.org/maplibre-style-spec/root/#sprite and a PNG file extension. */ MLNResourceKindSpriteImage, /** JSON part of a sprite sheet. It is constructed of the prefix in - https://maplibre.org/maplibre-gl-js-docs/style-spec/#root-sprite and a JSON file extension. */ + https://maplibre.org/maplibre-style-spec/root/#sprite and a JSON file extension. */ MLNResourceKindSpriteJSON, /** Image data for a georeferenced image source. **/ MLNResourceKindImage, diff --git a/platform/ios/platform/darwin/src/MLNRasterDEMSource.h b/platform/ios/platform/darwin/src/MLNRasterDEMSource.h index 7150d00e1..a8332f23f 100644 --- a/platform/ios/platform/darwin/src/MLNRasterDEMSource.h +++ b/platform/ios/platform/darwin/src/MLNRasterDEMSource.h @@ -27,7 +27,7 @@ FOUNDATION_EXTERN MLN_EXPORT const MLNTileSourceOption MLNTileSourceOptionDEMEnc appearance of content supplied by the raster DEM source. Each - raster-dem + raster-dem source defined by the style JSON file is represented at runtime by an `MLNRasterDEMSource` object that you can use to initialize new style layers. You can also add and remove sources dynamically using methods such as diff --git a/platform/ios/platform/darwin/src/MLNRasterTileSource.h b/platform/ios/platform/darwin/src/MLNRasterTileSource.h index de84c2a13..86c900906 100644 --- a/platform/ios/platform/darwin/src/MLNRasterTileSource.h +++ b/platform/ios/platform/darwin/src/MLNRasterTileSource.h @@ -33,7 +33,7 @@ FOUNDATION_EXTERN MLN_EXPORT const MLNTileSourceOption MLNTileSourceOptionTileSi appearance of content supplied by the raster tile source. Each - raster + raster source defined by the style JSON file is represented at runtime by an `MLNRasterTileSource` object that you can use to initialize new style layers. You can also add and remove sources dynamically using methods such as diff --git a/platform/ios/platform/darwin/src/MLNShapeSource.h b/platform/ios/platform/darwin/src/MLNShapeSource.h index c8798c6d9..b1bed4d8a 100644 --- a/platform/ios/platform/darwin/src/MLNShapeSource.h +++ b/platform/ios/platform/darwin/src/MLNShapeSource.h @@ -20,8 +20,8 @@ typedef NSString *MLNShapeSourceOption NS_STRING_ENUM; `YES` clusters the points by radius into groups. The default value is `NO`. This option corresponds to the - cluster - source property in the Mapbox Style Specification. + cluster + source property in the MapLibre Style Spec. This option only affects point features within an `MLNShapeSource` object; it is ignored when creating an `MLNComputedShapeSource` object. @@ -66,8 +66,8 @@ FOUNDATION_EXTERN MLN_EXPORT const MLNShapeSourceOption MLNShapeSourceOptionClus ``` This option corresponds to the - clusterProperties - source property in the Mapbox Style Specification. + clusterProperties + source property in the MapLibre Style Spec. This option only affects point features within an `MLNShapeSource` object; it is ignored when creating an `MLNComputedShapeSource` object. @@ -80,8 +80,8 @@ FOUNDATION_EXTERN MLN_EXPORT const MLNShapeSourceOption MLNShapeSourceOptionClus maximum zoom level, the shapes are not clustered. This option corresponds to the - clusterMaxZoom - source property in the Mapbox Style Specification. + clusterMaxZoom + source property in the MapLibre Style Spec. This option only affects point features within an `MLNShapeSource` object; it is ignored when creating an `MLNComputedShapeSource` object. @@ -93,8 +93,8 @@ FOUNDATION_EXTERN MLN_EXPORT const MLNShapeSourceOption MLNShapeSourceOptionMaxi which to create vector tiles. The default value is 0. This option corresponds to the - minzoom - source property in the Mapbox Style Specification. + minzoom + source property in the MapLibre Style Spec. */ FOUNDATION_EXTERN MLN_EXPORT const MLNShapeSourceOption MLNShapeSourceOptionMinimumZoomLevel; @@ -104,8 +104,8 @@ FOUNDATION_EXTERN MLN_EXPORT const MLNShapeSourceOption MLNShapeSourceOptionMini zoom levels. The default value is 18. This option corresponds to the - maxzoom - source property in the Mapbox Style Specification. + maxzoom + source property in the MapLibre Style Spec. */ FOUNDATION_EXTERN MLN_EXPORT const MLNShapeSourceOption MLNShapeSourceOptionMaximumZoomLevel; @@ -116,8 +116,8 @@ FOUNDATION_EXTERN MLN_EXPORT const MLNShapeSourceOption MLNShapeSourceOptionMaxi artifacts near tile edges and slower performance. The default value is 128. This option corresponds to the - buffer - source property in the Mapbox Style Specification. + buffer + source property in the MapLibre Style Spec. */ FOUNDATION_EXTERN MLN_EXPORT const MLNShapeSourceOption MLNShapeSourceOptionBuffer; @@ -127,8 +127,8 @@ FOUNDATION_EXTERN MLN_EXPORT const MLNShapeSourceOption MLNShapeSourceOptionBuff improves performance. The default value is 0.375. This option corresponds to the - tolerance - source property in the Mapbox Style Specification. + tolerance + source property in the MapLibre Style Spec. */ FOUNDATION_EXTERN MLN_EXPORT const MLNShapeSourceOption MLNShapeSourceOptionSimplificationTolerance; @@ -139,8 +139,8 @@ FOUNDATION_EXTERN MLN_EXPORT const MLNShapeSourceOption MLNShapeSourceOptionSimp The default value is `NO`. This option corresponds to the - lineMetrics - source property in the Mapbox Style Specification. + lineMetrics + source property in the MapLibre Style Spec. */ FOUNDATION_EXTERN MLN_EXPORT const MLNShapeSourceOption MLNShapeSourceOptionLineDistanceMetrics; @@ -158,7 +158,7 @@ FOUNDATION_EXTERN MLN_EXPORT const MLNShapeSourceOption MLNShapeSourceOptionLine use the `MLNComputedShapeSource` or `MLNVectorTileSource` class. Each - geojson + geojson source defined by the style JSON file is represented at runtime by an `MLNShapeSource` object that you can use to refine the map’s content and initialize new style layers. You can also add and remove sources dynamically diff --git a/platform/ios/platform/darwin/src/MLNVectorStyleLayer.h b/platform/ios/platform/darwin/src/MLNVectorStyleLayer.h index 920cdf8c3..dee127551 100644 --- a/platform/ios/platform/darwin/src/MLNVectorStyleLayer.h +++ b/platform/ios/platform/darwin/src/MLNVectorStyleLayer.h @@ -32,7 +32,7 @@ MLN_EXPORT Use the style layer’s predicate to include only the features in the source layer that satisfy a condition that you define. If the style layer initially comes from the style, its predicate corresponds to the - `filter` + `filter` property in the style JSON. See the “Predicates and Expressions” diff --git a/platform/ios/platform/darwin/src/MLNVectorTileSource.h b/platform/ios/platform/darwin/src/MLNVectorTileSource.h index c749a4215..30b1b3761 100644 --- a/platform/ios/platform/darwin/src/MLNVectorTileSource.h +++ b/platform/ios/platform/darwin/src/MLNVectorTileSource.h @@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN class may be a suitable alternative. Each - vector + vector source defined by the style JSON file is represented at runtime by an `MLNVectorTileSource` object that you can use to initialize new style layers. You can also add and remove sources dynamically using methods such as diff --git a/platform/ios/platform/darwin/src/NSExpression+MLNAdditions.h b/platform/ios/platform/darwin/src/NSExpression+MLNAdditions.h index 40b3865f7..fb906da91 100644 --- a/platform/ios/platform/darwin/src/NSExpression+MLNAdditions.h +++ b/platform/ios/platform/darwin/src/NSExpression+MLNAdditions.h @@ -17,8 +17,8 @@ typedef NSString *MLNExpressionInterpolationMode NS_TYPED_ENUM; An `NSString` identifying the `linear` interpolation type in an `NSExpression`. This attribute corresponds to the `linear` value in the - interpolate - expression operator in the Mapbox Style Specification. + interpolate + expression operator in the MapLibre Style Spec. */ FOUNDATION_EXTERN MLN_EXPORT const MLNExpressionInterpolationMode MLNExpressionInterpolationModeLinear; @@ -26,8 +26,8 @@ FOUNDATION_EXTERN MLN_EXPORT const MLNExpressionInterpolationMode MLNExpressionI An `NSString` identifying the `expotential` interpolation type in an `NSExpression`. This attribute corresponds to the `exponential` value in the - interpolate - expression operator in the Mapbox Style Specification. + interpolate + expression operator in the MapLibre Style Spec. */ FOUNDATION_EXTERN MLN_EXPORT const MLNExpressionInterpolationMode MLNExpressionInterpolationModeExponential; @@ -35,15 +35,15 @@ FOUNDATION_EXTERN MLN_EXPORT const MLNExpressionInterpolationMode MLNExpressionI An `NSString` identifying the `cubic-bezier` interpolation type in an `NSExpression`. This attribute corresponds to the `cubic-bezier` value in the - interpolate - expression operator in the Mapbox Style Specification. + interpolate + expression operator in the MapLibre Style Spec. */ FOUNDATION_EXTERN MLN_EXPORT const MLNExpressionInterpolationMode MLNExpressionInterpolationModeCubicBezier; /** Methods for creating expressions that use Mapbox-specific functionality and for converting to and from the JSON format defined in the - Mapbox Style Specification. + MapLibre Style Spec. */ @interface NSExpression (MLNAdditions) @@ -51,50 +51,50 @@ FOUNDATION_EXTERN MLN_EXPORT const MLNExpressionInterpolationMode MLNExpressionI /** `NSExpression` variable that corresponds to the - zoom - expression operator in the Mapbox Style Specification. + zoom + expression operator in the MapLibre Style Spec. */ @property (class, nonatomic, readonly) NSExpression *zoomLevelVariableExpression; /** `NSExpression` variable that corresponds to the - heatmap-density - expression operator in the Mapbox Style Specification. + heatmap-density + expression operator in the MapLibre Style Spec. */ @property (class, nonatomic, readonly) NSExpression *heatmapDensityVariableExpression; /** `NSExpression` variable that corresponds to the - line-progress - expression operator in the Mapbox Style Specification. + line-progress + expression operator in the MapLibre Style Spec. */ @property (class, nonatomic, readonly) NSExpression *lineProgressVariableExpression; /** `NSExpression` variable that corresponds to the - geometry-type - expression operator in the Mapbox Style Specification. + geometry-type + expression operator in the MapLibre Style Spec. */ @property (class, nonatomic, readonly) NSExpression *geometryTypeVariableExpression; /** `NSExpression` variable that corresponds to the - id - expression operator in the Mapbox Style Specification. + id + expression operator in the MapLibre Style Spec. */ @property (class, nonatomic, readonly) NSExpression *featureIdentifierVariableExpression; /** `NSExpression` variable that corresponds to the id - expression operator in the Mapbox Style Specification. + expression operator in the MapLibre Style Spec. */ @property (class, nonatomic, readonly) NSExpression *featureAccumulatedVariableExpression; /** `NSExpression` variable that corresponds to the - properties - expression operator in the Mapbox Style Specification. + properties + expression operator in the MapLibre Style Spec. */ @property (class, nonatomic, readonly) NSExpression *featureAttributesVariableExpression; @@ -186,7 +186,7 @@ FOUNDATION_EXTERN MLN_EXPORT const MLNExpressionInterpolationMode MLNExpressionI from JSON data. The Foundation object is interpreted according to the - [Mapbox Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions). + [MapLibre Style Spec](https://maplibre.org/maplibre-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 MLN_EXPORT const MLNExpressionInterpolationMode MLNExpressionI An equivalent Foundation object that can be serialized as JSON. The Foundation object conforms to the - [Mapbox Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions). + [MapLibre Style Spec](https://maplibre.org/maplibre-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/NSExpression+MLNAdditions.mm b/platform/ios/platform/darwin/src/NSExpression+MLNAdditions.mm index da4ddb43e..64c0a0b48 100644 --- a/platform/ios/platform/darwin/src/NSExpression+MLNAdditions.mm +++ b/platform/ios/platform/darwin/src/NSExpression+MLNAdditions.mm @@ -250,7 +250,7 @@ const MLNExpressionInterpolationMode MLNExpressionInterpolationModeCubicBezier = /** A placeholder for a catch-all method that evaluates an arbitrary number of - arguments as an expression according to the Mapbox Style Specification’s + arguments as an expression according to the MapLibre Style Spec’s expression language. */ - (id)MLN_FUNCTION:(id)firstArgument, ... { diff --git a/platform/ios/platform/darwin/src/NSPredicate+MLNAdditions.h b/platform/ios/platform/darwin/src/NSPredicate+MLNAdditions.h index fb3021a49..6bf639ea2 100644 --- a/platform/ios/platform/darwin/src/NSPredicate+MLNAdditions.h +++ b/platform/ios/platform/darwin/src/NSPredicate+MLNAdditions.h @@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN from JSON data. The Foundation object is interpreted according to the - [Mapbox Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions). + [MapLibre Style Spec](https://maplibre.org/maplibre-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://maplibre.org/maplibre-gl-js-docs/style-spec/#expressions). + [MapLibre Style Spec](https://maplibre.org/maplibre-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/CHANGELOG.md b/platform/ios/platform/ios/CHANGELOG.md index c7141dcb0..54d283bfd 100644 --- a/platform/ios/platform/ios/CHANGELOG.md +++ b/platform/ios/platform/ios/CHANGELOG.md @@ -1393,7 +1393,7 @@ This is the final scheduled version of the Mapbox iOS SDK that supports iOS 7. ( - A two-finger vertical swipe now tilts the map into perspective mode. ([#2116](https://github.com/mapbox/mapbox-gl-native/pull/2116)) - A new `MLNMapCamera` API allows you to transition multiple viewpoint properties, including rotation and pitch, simultaneously with an optional custom duration and timing function. ([#2193](https://github.com/mapbox/mapbox-gl-native/pull/2193)) - A new user tracking mode, `MLNUserTrackingModeFollowWithCourse`, has been added for indicating the current direction of travel. ([#2068](https://github.com/mapbox/mapbox-gl-native/pull/2068)) -- Version 8 (`v8`) of the [Mapbox GL style spec](https://www.mapbox.com/mapbox-gl-style-spec/) is now required. If you are using a custom `v7` style, it needs to be upgraded using [this migrator script](https://github.com/mapbox/mapbox-gl-style-spec/blob/mb-pages/migrations/v7.js). ([#2052](https://github.com/mapbox/mapbox-gl-native/pull/2052)) +- Version 8 (`v8`) of the [Mapbox GL style spec](https://maplibre.org/maplibre-style-spec/) is now required. If you are using a custom `v7` style, it needs to be upgraded using [this migrator script](https://github.com/mapbox/mapbox-gl-style-spec/blob/mb-pages/migrations/v7.js). ([#2052](https://github.com/mapbox/mapbox-gl-native/pull/2052)) - Applications built with Mapbox GL no longer crash when Location Services launches them in background mode. ([#1821](https://github.com/mapbox/mapbox-gl-native/pull/1821), [#1869](https://github.com/mapbox/mapbox-gl-native/pull/1869)) - Fixed a crash when adding annotations to an `MLNMapView` inside `-viewDidLoad`. ([#1874](https://github.com/mapbox/mapbox-gl-native/pull/1874)) - The user location annotation view now indicates the location reading’s accuracy and the device’s heading. ([#2010](https://github.com/mapbox/mapbox-gl-native/pull/2010)) diff --git a/platform/ios/platform/ios/app/MBXViewController.m b/platform/ios/platform/ios/app/MBXViewController.m index aaf863fbf..9d88620af 100644 --- a/platform/ios/platform/ios/app/MBXViewController.m +++ b/platform/ios/platform/ios/app/MBXViewController.m @@ -1909,7 +1909,7 @@ CLLocationCoordinate2D randomWorldCoordinate(void) { [self.styleNames addObject:@"MapLibre Basic"]; [self.styleURLs addObject:[NSURL URLWithString:@"https://demotiles.maplibre.org/style.json"]]; - /// Add Mapbox Styles if an `apiKey` exists + /// Add MapLibre Styles if an `apiKey` exists NSString* apiKey = [MLNSettings apiKey]; if (apiKey.length) { @@ -2189,7 +2189,7 @@ CLLocationCoordinate2D randomWorldCoordinate(void) { - (void)mapView:(MLNMapView *)mapView didFinishLoadingStyle:(MLNStyle *)style { - // Default Mapbox styles use {name_en} as their label language, which means + // Default MapLibre styles use {name_en} as their label language, which means // that a device with an English-language locale is already effectively // using locale-based country labels. _localizingLabels = [[self bestLanguageForUser] isEqualToString:@"en"]; diff --git a/platform/ios/platform/ios/docs/pod-README.md b/platform/ios/platform/ios/docs/pod-README.md index 93c202aad..c83742f66 100644 --- a/platform/ios/platform/ios/docs/pod-README.md +++ b/platform/ios/platform/ios/docs/pod-README.md @@ -1,6 +1,6 @@ # MapLibre Native for iOS -MapLibre Native for iOS is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa Touch applications on iOS 9.0 and above using Objective-C, Swift, or Interface Builder. It takes stylesheets that conform to the [MapLibre Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://docs.mapbox.com/data/tilesets/guides/vector-tiles-standards/), and renders them using OpenGL. +MapLibre Native for iOS is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa Touch applications on iOS 9.0 and above using Objective-C, Swift, or Interface Builder. It takes stylesheets that conform to the [MapLibre Style Specification](https://maplibre.org/maplibre-style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://docs.mapbox.com/data/tilesets/guides/vector-tiles-standards/), and renders them using OpenGL. For more information, check out the [MapLibre Native for iOS repository](https://github.com/maplibre/maplibre-native) and the [full changelog](https://github.com/maplibre/maplibre-native/blob/main/platform/ios/platform/ios/CHANGELOG.md) online. diff --git a/platform/ios/platform/ios/scripts/release-notes-jazzy.md.ejs b/platform/ios/platform/ios/scripts/release-notes-jazzy.md.ejs index ed865084c..ca647b8dc 100644 --- a/platform/ios/platform/ios/scripts/release-notes-jazzy.md.ejs +++ b/platform/ios/platform/ios/scripts/release-notes-jazzy.md.ejs @@ -1,6 +1,6 @@ # MapLibre Native for iOS -MapLibre Native for iOS is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa Touch applications on iOS 9.0 and above using Objective-C, Swift, or Interface Builder. It takes stylesheets that conform to the [MapLibre Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://docs.mapbox.com/data/tilesets/guides/vector-tiles-standards/), and renders them using OpenGL. +MapLibre Native for iOS is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa Touch applications on iOS 9.0 and above using Objective-C, Swift, or Interface Builder. It takes stylesheets that conform to the [MapLibre Style Specification](https://maplibre.org/maplibre-style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://docs.mapbox.com/data/tilesets/guides/vector-tiles-standards/), and renders them using OpenGL. ![MapLibre Native for iOS screenshots](img/screenshot.png) diff --git a/platform/ios/platform/ios/src/MLNMapView.h b/platform/ios/platform/ios/src/MLNMapView.h index 5e2f75c42..49d42a9c1 100644 --- a/platform/ios/platform/ios/src/MLNMapView.h +++ b/platform/ios/platform/ios/src/MLNMapView.h @@ -144,7 +144,7 @@ FOUNDATION_EXTERN MLN_EXPORT MLNExceptionName const MLNUserLocationAnnotationTyp The map view loads scalable vector tiles that conform to the Mapbox Vector Tile Specification. It styles them with a style that conforms to the - Mapbox Style Specification. + MapLibre Style Spec. Such styles can be designed in Mapbox Studio and hosted on mapbox.com. diff --git a/platform/ios/platform/macos/README.md b/platform/ios/platform/macos/README.md index a563d2afd..c9a38a461 100644 --- a/platform/ios/platform/macos/README.md +++ b/platform/ios/platform/macos/README.md @@ -19,7 +19,7 @@ MapLibre Native for macOS is compatible with macOS 10.10.0 and above for Cocoa a * [Build the MapLibre Native for macOS from source](INSTALL.md) * [Contribute to MapLibre Native for macOS](CONTRIBUTING.md) -* [Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-style-spec/) +* [MapLibre Style Spec](https://maplibre.org/maplibre-style-spec/) * [Mapbox Vector Tile Specification](https://www.mapbox.com/developers/vector-tiles/) The MapLibre Organization does not officially support the macOS to the same extent as iOS (see [project tiers](https://github.com/maplibre/maplibre/blob/main/PROJECT_TIERS.md)); however, bug reports and pull requests are certainly welcome. diff --git a/platform/ios/platform/macos/app/MapDocument.m b/platform/ios/platform/macos/app/MapDocument.m index 807f96bcc..e543287f6 100644 --- a/platform/ios/platform/macos/app/MapDocument.m +++ b/platform/ios/platform/macos/app/MapDocument.m @@ -330,7 +330,7 @@ NSArray> *MBXFlattenedShapes(NSArray> *sha - (IBAction)chooseCustomStyle:(id)sender { NSAlert *alert = [[NSAlert alloc] init]; alert.messageText = @"Apply custom style"; - alert.informativeText = @"Enter the URL to a JSON file that conforms to the Mapbox Style Specification, such as a style designed in Mapbox Studio:"; + alert.informativeText = @"Enter the URL to a JSON file that conforms to the MapLibre Style Spec, such as a style designed in Mapbox Studio:"; NSTextField *textField = [[NSTextField alloc] initWithFrame:NSZeroRect]; [textField sizeToFit]; NSRect textFieldFrame = textField.frame; diff --git a/platform/ios/platform/macos/docs/doc-README.md b/platform/ios/platform/macos/docs/doc-README.md index 758d67f85..2115ab4b9 100644 --- a/platform/ios/platform/macos/docs/doc-README.md +++ b/platform/ios/platform/macos/docs/doc-README.md @@ -1,6 +1,6 @@ # [Mapbox Maps SDK for macOS](https://github.com/mapbox/mapbox-gl-native-ios/tree/master/platform/macos/) -The Mapbox Maps SDK for macOS is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa applications on macOS 10.11.0 and above using Objective-C, Swift, Interface Builder, or AppleScript. The SDK takes stylesheets that conform to the [Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://www.mapbox.com/developers/vector-tiles/), and renders them using OpenGL. +The Mapbox Maps SDK for macOS is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa applications on macOS 10.11.0 and above using Objective-C, Swift, Interface Builder, or AppleScript. The SDK takes stylesheets that conform to the [MapLibre Style Spec](https://maplibre.org/maplibre-style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://www.mapbox.com/developers/vector-tiles/), and renders them using OpenGL. ![](img/screenshot.jpg) diff --git a/platform/ios/platform/macos/scripts/release-notes-jazzy.md.ejs b/platform/ios/platform/macos/scripts/release-notes-jazzy.md.ejs index fe81ab0c6..84e0ebeea 100644 --- a/platform/ios/platform/macos/scripts/release-notes-jazzy.md.ejs +++ b/platform/ios/platform/macos/scripts/release-notes-jazzy.md.ejs @@ -1,6 +1,6 @@ # [MapLibre Maps SDK for macos] -The MapLibre Maps SDK for macos is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa Touch applications on iOS 9.0 and above using Objective-C, Swift, or Interface Builder. It takes stylesheets that conform to the [Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://www.mapbox.com/developers/vector-tiles/), and renders them using OpenGL. +The MapLibre Maps SDK for macos is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa Touch applications on iOS 9.0 and above using Objective-C, Swift, or Interface Builder. It takes stylesheets that conform to the [MapLibre Style Spec](https://maplibre.org/maplibre-style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://www.mapbox.com/developers/vector-tiles/), and renders them using OpenGL. ## Changes in version <%-CURRENTVERSION%> diff --git a/platform/ios/platform/macos/src/MLNMapView.h b/platform/ios/platform/macos/src/MLNMapView.h index 05696fea8..b30c00555 100644 --- a/platform/ios/platform/macos/src/MLNMapView.h +++ b/platform/ios/platform/macos/src/MLNMapView.h @@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN The map view loads scalable vector tiles that conform to the Mapbox Vector Tile Specification. It styles them with a style that conforms to the - Mapbox Style Specification. + MapLibre Style Spec. Such styles can be designed in Mapbox Studio and hosted on mapbox.com. diff --git a/platform/ios/platform/macos/src/NSColor+MLNAdditions.mm b/platform/ios/platform/macos/src/NSColor+MLNAdditions.mm index 58b657135..3664a4f53 100644 --- a/platform/ios/platform/macos/src/NSColor+MLNAdditions.mm +++ b/platform/ios/platform/macos/src/NSColor+MLNAdditions.mm @@ -5,7 +5,7 @@ - (mbgl::Color)mgl_color { CGFloat r, g, b, a; - // The Mapbox Style Specification does not specify a color space, but it is + // The MapLibre Style Spec does not specify a color space, but it is // assumed to be sRGB for consistency with CSS. NSColor *srgbColor = self; if ([NSColor redColor].colorSpaceName == NSCalibratedRGBColorSpace) { @@ -24,7 +24,7 @@ - (mbgl::Color)mgl_colorForPremultipliedValue { CGFloat r, g, b, a; - // The Mapbox Style Specification does not specify a color space, but it is + // The MapLibre Style Spec does not specify a color space, but it is // assumed to be sRGB for consistency with CSS. NSColor *srgbColor = self; if ([NSColor redColor].colorSpaceName == NSCalibratedRGBColorSpace) { @@ -130,7 +130,7 @@ blue:components[2] alpha:components[3]]; } - // The Mapbox Style Specification does not specify a color space, but it is + // The MapLibre Style Spec does not specify a color space, but it is // assumed to be sRGB for consistency with CSS. return [NSColor colorWithColorSpace:[NSColorSpace sRGBColorSpace] components:&components[0] diff --git a/platform/qt/src/map.cpp b/platform/qt/src/map.cpp index 00952648b..231434f3e 100644 --- a/platform/qt/src/map.cpp +++ b/platform/qt/src/map.cpp @@ -329,8 +329,8 @@ Map::~Map() { \brief the map style JSON. Sets a new \a style from a JSON that must conform to the - \l {https://www.mapbox.com/mapbox-gl-style-spec/} - {Mapbox style specification}. + \l {https://maplibre.org/maplibre-style-spec/} + {MapLibre Style spec}. \note In case of a invalid style it will trigger a mapChanged signal with QMapLibreGL::Map::MapChangeDidFailLoadingMap as argument. @@ -633,7 +633,7 @@ void Map::removeAnnotation(AnnotationID id) { /*! Sets a layout \a property_ \a value to an existing \a layer. The \a property_ string can be any as defined by the \l - {https://www.mapbox.com/mapbox-gl-style-spec/} {Mapbox style specification} + {https://maplibre.org/maplibre-style-spec/} {MapLibre Style Spec} for layout properties. Returns true if the operation succeeds, and false otherwise. @@ -648,12 +648,12 @@ void Map::removeAnnotation(AnnotationID id) { \endcode This table describes the mapping between \l - {https://www.mapbox.com/mapbox-gl-style-spec/#types} {style types} and Qt + {https://maplibre.org/maplibre-style-spec/#types} {style types} and Qt types accepted by setLayoutProperty(): \table \header - \li Mapbox style type + \li MapLibre style type \li Qt type \row \li Enum @@ -679,7 +679,7 @@ bool Map::setLayoutProperty(const QString &layer, const QString &propertyName, c /*! Sets a paint \a property_ \a value to an existing \a layer. The \a property_ string can be any as defined by the \l - {https://www.mapbox.com/mapbox-gl-style-spec/} {Mapbox style specification} + {https://maplibre.org/maplibre-style-spec/} {MapLibre Style Spec} for paint properties. Returns true if the operation succeeds, and false otherwise. @@ -695,12 +695,12 @@ bool Map::setLayoutProperty(const QString &layer, const QString &propertyName, c \endcode This table describes the mapping between \l - {https://www.mapbox.com/mapbox-gl-style-spec/#types} {style types} and Qt + {https://maplibre.org/maplibre-style-spec/#types} {style types} and Qt types accepted by setPaintProperty(): \table \header - \li Mapbox style type + \li MapLibre style type \li Qt type \row \li Color @@ -878,8 +878,8 @@ QMargins Map::margins() const { /*! Adds a source \a id to the map as specified by the \l - {https://www.mapbox.com/mapbox-gl-style-spec/#root-sources}{Mapbox style - specification} with \a params. + {https://maplibre.org/maplibre-style-spec/#root-sources}{MapLibre Style + Specification} with \a params. This example reads a GeoJSON from the Qt resource system and adds it as source: @@ -1007,7 +1007,7 @@ void Map::addCustomLayer(const QString &id, std::unique_ptr