Skip to content

Commit 2dcda63

Browse files
natiginfokiryldz
andauthored
glNative 11.7.0-beta.2 + common bump + updated style spec (#2701)
* Bump glNative and common * Fix changelog after rebase * Update stylegen commit + generate code * Update api * Fix codegen * Update api for compose * Api-doc fix * Update mapbox-maps-android/CHANGELOG.md Co-authored-by: Kiryl Dzehtsiarenka <[email protected]> * Update mapbox-maps-android/CHANGELOG.md Co-authored-by: Kiryl Dzehtsiarenka <[email protected]> * Update mapbox-maps-android/CHANGELOG.md Co-authored-by: Kiryl Dzehtsiarenka <[email protected]> * Update mapbox-maps-android/CHANGELOG.md Co-authored-by: Kiryl Dzehtsiarenka <[email protected]> * Update mapbox-maps-android/CHANGELOG.md Co-authored-by: Kiryl Dzehtsiarenka <[email protected]> * Update CHANGELOG * autoMaxZoom to be read only + ignore getter test * Update Ignore description * use glNative 11.7.0-beta.2 * Update stylegen commit * Update mapbox-maps-android/CHANGELOG.md --------- Co-authored-by: Kiryl Dzehtsiarenka <[email protected]>
1 parent 41e0129 commit 2dcda63

File tree

38 files changed

+1599
-105
lines changed

38 files changed

+1599
-105
lines changed

CHANGELOG.md

+29
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ Mapbox welcomes participation and contributions from everyone.
99
* [compose] Expose data-driven properties on `AnnotationGroupState`s. Now it's possible to set data-driven properties globally on `AnnotationGroupState` and specify per-annotation overrides in `AnnotationState`. Setting global property value on `AnnotationGroupState` could introduce performance improvements when the amount of annotations is large.
1010
* [compose] Remove experimental `ModelLayerState.modelFrontCutoff`.
1111
* [compose] Introduce experimental `GeoJsonSourceState.autoMaxZoom` property to resolve rendering artifacts for features that use wide blur (e.g. fill extrusion ground flood light or circle layer).
12+
* [compose] Introduce experimental `ClipLayerState.clipLayerScope` API to remove data from certain style fragments only.
13+
* [compose] Introduce experimental `PointAnnotationState.symbolZOffset` property.
14+
* [compose] Introduce experimental `PointAnnotationGroupState.symbolElevationReference` property.
15+
* [compose] Introduce experimental `SymbolLayerState.symbolElevationReference` and `SymbolLayerState.symbolZOffset` properties.
16+
* [compose] Introduce experimental `SymbolLayerState.symbolZOffsetTransition` API.
1217
* Introduce experimental interactive feature elements and related APIs. Those APIs provide the convenient way to add the click / long click listener to layer / featureset / map itself with `MapboxMap.addInteraction`.
1318
* Expose `lineTrimColor` and `lineTrimFadeRange` on `LineLayer` which allow to set custom color for trimmed line and fade effect for trim. Update navigation example to use those properties.
1419
* Introduce `PointAnnotation.iconOcclusionOpacity`, `PointAnnotation.textOcclusionOpacity` to control occlusion opacity for individual point annotation.
@@ -17,11 +22,35 @@ Mapbox welcomes participation and contributions from everyone.
1722
* Expose data-driven properties on `AnnotationManager`s. Now it's possible to set data-driven properties globally on `AnnotationManager` and specify per-annotation overrides. Setting global property value on `AnnotationManager` could introduce performance improvements when the amount of annotations is large.
1823
* Remove experimental `ModelLayer.modelFrontCutoff`.
1924
* Introduce experimental `GeoJsonSource.autoMaxZoom` property to resolve rendering artifacts for features that use wide blur (e.g. fill extrusion ground flood light or circle layer).
25+
* Introduce static `HttpServiceFactory.setCancellationCallback` API.
26+
* Reduce style parsing time.
27+
* Enable multiple meta tiling schemes for composited sources.
28+
* Expose experimental `ClipLayer.clipLayerScope` API to remove data from certain style fragments only.
29+
* Expose experimental `PointAnnotation.symbolZOffset` property.
30+
* Expose experimental `PointAnnotationManager.symbolElevationReference` property.
31+
* Expose experimental `SymbolLayer.symbolElevationReference` and `SymbolLayer.symbolZOffset` properties.
32+
* Expose experimental `SymbolLayer.symbolZOffsetTransition` API.
2033

2134
## Bug fixes 🐞
2235
* [compose] Fix `UnsatisfiedLinkError` issue when rendering preview.
2336
* Fix annotation issues with click / long click callback ordering and dragging. Now the order of triggering the callbacks / dragging is determined: from top-level rendered annotation to bottom-level one.
2437
* Fix `OnAnnotationInteractionListener` not triggered if any `OnAnnotationClickListener.onAnnotationClick` returns true.
38+
* Fix incorrect layer updates when using `ClipLayer.clipLayerTypes` or `ClipLayerState.clipLayerTypes` in Compose.
39+
* Fix shadow rendering issues when using `FillExtrusionLayer.fillExtrusionCutoffFadeRange` or `FillExtrusionLayerState.fillExtrusionCutoffFadeRange`.
40+
* Significantly reduce the rate at which raster-particle trails cross each other.
41+
* Fix normal offset to improve shadow accuracy.
42+
* Fix data synchronization between renderer and the main threads on map resize.
43+
* Regenerate location indicator mipmap on image change.
44+
* Fix landmark visibility issues near tile borders.
45+
* Fix elevated line depth occlusion issue in 2D mode.
46+
* Fix Dynamic View Annotation position update for annotated geojson feature with `allowZElevate` to be true.
47+
* Fix race condition between `setFeatureState` and `removeFeatureState` / `resetFeatureStates` resulting in feature state not being applied or removed.
48+
49+
## Dependencies
50+
* Update gl-native to v11.7.0-beta.2 and common to v24.7.0-beta.2.
51+
52+
## Known issues
53+
* Experimental `GeoJsonSource.autoMaxZoom` and `GeoJsonSourceState.autoMaxZoom` will return `null` value even after it's set.
2554

2655
# 11.6.0 August 16, 2024
2756
## Breaking changes ⚠️

LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
444444

445445
===========================================================================
446446

447-
### MapboxCoreMaps,11.6.0,Mapbox ToS,Mapbox,https://www.mapbox.com/
447+
### MapboxCoreMaps,11.7.0-beta.2,Mapbox ToS,Mapbox,https://www.mapbox.com/
448448

449449
```
450450
Mapbox Core Maps version 10.0

app/src/androidTest/java/com/mapbox/maps/testapp/annotation/generated/PointAnnotationManagerAndroidTest.kt

+25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

extension-compose/api/Release/metalava.txt

+37
Original file line numberDiff line numberDiff line change
@@ -289,10 +289,12 @@ package com.mapbox.maps.extension.compose.annotation.generated {
289289
method public java.util.List<java.lang.Double>? getIconTranslate();
290290
method public com.mapbox.maps.extension.style.layers.properties.generated.IconTranslateAnchor? getIconTranslateAnchor();
291291
method public Boolean? getSymbolAvoidEdges();
292+
method public com.mapbox.maps.extension.style.layers.properties.generated.SymbolElevationReference? getSymbolElevationReference();
292293
method public com.mapbox.maps.extension.style.layers.properties.generated.SymbolPlacement? getSymbolPlacement();
293294
method public Double? getSymbolSortKey();
294295
method public Double? getSymbolSpacing();
295296
method public Boolean? getSymbolZElevate();
297+
method public Double? getSymbolZOffset();
296298
method public com.mapbox.maps.extension.style.layers.properties.generated.SymbolZOrder? getSymbolZOrder();
297299
method public Boolean? getTextAllowOverlap();
298300
method public com.mapbox.maps.extension.style.layers.properties.generated.TextAnchor? getTextAnchor();
@@ -351,10 +353,12 @@ package com.mapbox.maps.extension.compose.annotation.generated {
351353
method public void setIconTranslate(java.util.List<java.lang.Double>?);
352354
method public void setIconTranslateAnchor(com.mapbox.maps.extension.style.layers.properties.generated.IconTranslateAnchor?);
353355
method public void setSymbolAvoidEdges(Boolean?);
356+
method public void setSymbolElevationReference(com.mapbox.maps.extension.style.layers.properties.generated.SymbolElevationReference?);
354357
method public void setSymbolPlacement(com.mapbox.maps.extension.style.layers.properties.generated.SymbolPlacement?);
355358
method public void setSymbolSortKey(Double?);
356359
method public void setSymbolSpacing(Double?);
357360
method public void setSymbolZElevate(Boolean?);
361+
method public void setSymbolZOffset(Double?);
358362
method public void setSymbolZOrder(com.mapbox.maps.extension.style.layers.properties.generated.SymbolZOrder?);
359363
method public void setTextAllowOverlap(Boolean?);
360364
method public void setTextAnchor(com.mapbox.maps.extension.style.layers.properties.generated.TextAnchor?);
@@ -413,10 +417,12 @@ package com.mapbox.maps.extension.compose.annotation.generated {
413417
property public final java.util.List<java.lang.Double>? iconTranslate;
414418
property public final com.mapbox.maps.extension.style.layers.properties.generated.IconTranslateAnchor? iconTranslateAnchor;
415419
property public final Boolean? symbolAvoidEdges;
420+
property public final com.mapbox.maps.extension.style.layers.properties.generated.SymbolElevationReference? symbolElevationReference;
416421
property public final com.mapbox.maps.extension.style.layers.properties.generated.SymbolPlacement? symbolPlacement;
417422
property public final Double? symbolSortKey;
418423
property public final Double? symbolSpacing;
419424
property public final Boolean? symbolZElevate;
425+
property public final Double? symbolZOffset;
420426
property public final com.mapbox.maps.extension.style.layers.properties.generated.SymbolZOrder? symbolZOrder;
421427
property public final Boolean? textAllowOverlap;
422428
property public final com.mapbox.maps.extension.style.layers.properties.generated.TextAnchor? textAnchor;
@@ -482,6 +488,7 @@ package com.mapbox.maps.extension.compose.annotation.generated {
482488
method public Double? getIconSize();
483489
method public com.mapbox.maps.extension.style.layers.properties.generated.IconTextFit? getIconTextFit();
484490
method public java.util.List<java.lang.Double>? getIconTextFitPadding();
491+
method public Double? getSymbolZOffset();
485492
method public com.mapbox.maps.extension.style.layers.properties.generated.TextAnchor? getTextAnchor();
486493
method public androidx.compose.ui.graphics.Color? getTextColor();
487494
method public Double? getTextEmissiveStrength();
@@ -515,6 +522,7 @@ package com.mapbox.maps.extension.compose.annotation.generated {
515522
method public void setIconSize(Double?);
516523
method public void setIconTextFit(com.mapbox.maps.extension.style.layers.properties.generated.IconTextFit?);
517524
method public void setIconTextFitPadding(java.util.List<java.lang.Double>?);
525+
method public void setSymbolZOffset(Double?);
518526
method public void setTextAnchor(com.mapbox.maps.extension.style.layers.properties.generated.TextAnchor?);
519527
method public void setTextColor(androidx.compose.ui.graphics.Color?);
520528
method public void setTextEmissiveStrength(Double?);
@@ -548,6 +556,7 @@ package com.mapbox.maps.extension.compose.annotation.generated {
548556
property public final Double? iconSize;
549557
property public final com.mapbox.maps.extension.style.layers.properties.generated.IconTextFit? iconTextFit;
550558
property public final java.util.List<java.lang.Double>? iconTextFitPadding;
559+
property public final Double? symbolZOffset;
551560
property public final com.mapbox.maps.extension.style.layers.properties.generated.TextAnchor? textAnchor;
552561
property public final androidx.compose.ui.graphics.Color? textColor;
553562
property public final Double? textEmissiveStrength;
@@ -1466,18 +1475,21 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
14661475

14671476
@androidx.compose.runtime.Stable @com.mapbox.maps.MapboxExperimental public final class ClipLayerState {
14681477
ctor public ClipLayerState();
1478+
method public com.mapbox.maps.extension.compose.style.StringListValue getClipLayerScope();
14691479
method public com.mapbox.maps.extension.compose.style.layers.generated.ClipLayerTypesListValue getClipLayerTypes();
14701480
method public com.mapbox.maps.extension.compose.style.layers.Filter getFilter();
14711481
method public com.mapbox.maps.extension.compose.style.LongValue getMaxZoom();
14721482
method public com.mapbox.maps.extension.compose.style.LongValue getMinZoom();
14731483
method public com.mapbox.maps.extension.compose.style.StringValue getSourceLayer();
14741484
method public com.mapbox.maps.extension.compose.style.layers.generated.VisibilityValue getVisibility();
1485+
method public void setClipLayerScope(com.mapbox.maps.extension.compose.style.StringListValue);
14751486
method public void setClipLayerTypes(com.mapbox.maps.extension.compose.style.layers.generated.ClipLayerTypesListValue);
14761487
method public void setFilter(com.mapbox.maps.extension.compose.style.layers.Filter);
14771488
method public void setMaxZoom(com.mapbox.maps.extension.compose.style.LongValue);
14781489
method public void setMinZoom(com.mapbox.maps.extension.compose.style.LongValue);
14791490
method public void setSourceLayer(com.mapbox.maps.extension.compose.style.StringValue);
14801491
method public void setVisibility(com.mapbox.maps.extension.compose.style.layers.generated.VisibilityValue);
1492+
property public final com.mapbox.maps.extension.compose.style.StringListValue clipLayerScope;
14811493
property public final com.mapbox.maps.extension.compose.style.layers.generated.ClipLayerTypesListValue clipLayerTypes;
14821494
property public final com.mapbox.maps.extension.compose.style.layers.Filter filter;
14831495
property public final com.mapbox.maps.extension.compose.style.LongValue maxZoom;
@@ -2692,6 +2704,22 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
26922704
public static final class SkyTypeValue.Companion {
26932705
}
26942706

2707+
@androidx.compose.runtime.Immutable @com.mapbox.maps.MapboxExperimental public final class SymbolElevationReferenceValue {
2708+
ctor public SymbolElevationReferenceValue(com.mapbox.bindgen.Value value);
2709+
ctor public SymbolElevationReferenceValue(com.mapbox.maps.extension.style.expressions.generated.Expression expression);
2710+
method public com.mapbox.bindgen.Value component1();
2711+
method public com.mapbox.maps.extension.compose.style.layers.generated.SymbolElevationReferenceValue copy(com.mapbox.bindgen.Value value);
2712+
method public com.mapbox.bindgen.Value getValue();
2713+
property public final com.mapbox.bindgen.Value value;
2714+
field public static final com.mapbox.maps.extension.compose.style.layers.generated.SymbolElevationReferenceValue.Companion Companion;
2715+
field public static final com.mapbox.maps.extension.compose.style.layers.generated.SymbolElevationReferenceValue DEFAULT;
2716+
field public static final com.mapbox.maps.extension.compose.style.layers.generated.SymbolElevationReferenceValue GROUND;
2717+
field public static final com.mapbox.maps.extension.compose.style.layers.generated.SymbolElevationReferenceValue SEA;
2718+
}
2719+
2720+
public static final class SymbolElevationReferenceValue.Companion {
2721+
}
2722+
26952723
public final class SymbolLayerKt {
26962724
method @androidx.compose.runtime.Composable @com.mapbox.maps.extension.compose.MapboxMapComposable public static void SymbolLayer(com.mapbox.maps.extension.compose.style.sources.SourceState sourceState, String layerId = remember({
26972725
return generateRandomLayerId("symbol")
@@ -2745,10 +2773,13 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
27452773
method public com.mapbox.maps.extension.compose.style.LongValue getMinZoom();
27462774
method public com.mapbox.maps.extension.compose.style.StringValue getSourceLayer();
27472775
method public com.mapbox.maps.extension.compose.style.BooleanValue getSymbolAvoidEdges();
2776+
method public com.mapbox.maps.extension.compose.style.layers.generated.SymbolElevationReferenceValue getSymbolElevationReference();
27482777
method public com.mapbox.maps.extension.compose.style.layers.generated.SymbolPlacementValue getSymbolPlacement();
27492778
method public com.mapbox.maps.extension.compose.style.DoubleValue getSymbolSortKey();
27502779
method public com.mapbox.maps.extension.compose.style.DoubleValue getSymbolSpacing();
27512780
method public com.mapbox.maps.extension.compose.style.BooleanValue getSymbolZElevate();
2781+
method public com.mapbox.maps.extension.compose.style.DoubleValue getSymbolZOffset();
2782+
method public com.mapbox.maps.extension.compose.style.Transition getSymbolZOffsetTransition();
27522783
method public com.mapbox.maps.extension.compose.style.layers.generated.SymbolZOrderValue getSymbolZOrder();
27532784
method public com.mapbox.maps.extension.compose.style.BooleanValue getTextAllowOverlap();
27542785
method public com.mapbox.maps.extension.compose.style.layers.generated.TextAnchorValue getTextAnchor();
@@ -2830,10 +2861,13 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
28302861
method public void setMinZoom(com.mapbox.maps.extension.compose.style.LongValue);
28312862
method public void setSourceLayer(com.mapbox.maps.extension.compose.style.StringValue);
28322863
method public void setSymbolAvoidEdges(com.mapbox.maps.extension.compose.style.BooleanValue);
2864+
method public void setSymbolElevationReference(com.mapbox.maps.extension.compose.style.layers.generated.SymbolElevationReferenceValue);
28332865
method public void setSymbolPlacement(com.mapbox.maps.extension.compose.style.layers.generated.SymbolPlacementValue);
28342866
method public void setSymbolSortKey(com.mapbox.maps.extension.compose.style.DoubleValue);
28352867
method public void setSymbolSpacing(com.mapbox.maps.extension.compose.style.DoubleValue);
28362868
method public void setSymbolZElevate(com.mapbox.maps.extension.compose.style.BooleanValue);
2869+
method public void setSymbolZOffset(com.mapbox.maps.extension.compose.style.DoubleValue);
2870+
method public void setSymbolZOffsetTransition(com.mapbox.maps.extension.compose.style.Transition);
28372871
method public void setSymbolZOrder(com.mapbox.maps.extension.compose.style.layers.generated.SymbolZOrderValue);
28382872
method public void setTextAllowOverlap(com.mapbox.maps.extension.compose.style.BooleanValue);
28392873
method public void setTextAnchor(com.mapbox.maps.extension.compose.style.layers.generated.TextAnchorValue);
@@ -2915,10 +2949,13 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
29152949
property public final com.mapbox.maps.extension.compose.style.LongValue minZoom;
29162950
property public final com.mapbox.maps.extension.compose.style.StringValue sourceLayer;
29172951
property public final com.mapbox.maps.extension.compose.style.BooleanValue symbolAvoidEdges;
2952+
property public final com.mapbox.maps.extension.compose.style.layers.generated.SymbolElevationReferenceValue symbolElevationReference;
29182953
property public final com.mapbox.maps.extension.compose.style.layers.generated.SymbolPlacementValue symbolPlacement;
29192954
property public final com.mapbox.maps.extension.compose.style.DoubleValue symbolSortKey;
29202955
property public final com.mapbox.maps.extension.compose.style.DoubleValue symbolSpacing;
29212956
property public final com.mapbox.maps.extension.compose.style.BooleanValue symbolZElevate;
2957+
property public final com.mapbox.maps.extension.compose.style.DoubleValue symbolZOffset;
2958+
property public final com.mapbox.maps.extension.compose.style.Transition symbolZOffsetTransition;
29222959
property public final com.mapbox.maps.extension.compose.style.layers.generated.SymbolZOrderValue symbolZOrder;
29232960
property public final com.mapbox.maps.extension.compose.style.BooleanValue textAllowOverlap;
29242961
property public final com.mapbox.maps.extension.compose.style.layers.generated.TextAnchorValue textAnchor;

0 commit comments

Comments
 (0)