Skip to content

Commit dcb32e5

Browse files
pjleonard37actions-userzmiao
authored andcommitted
[Backport release/v0.17] MAPSSDK-932 fix generation of GeoJSONSource.minzoom property (#8382) (#8520)
We previously added the `GeoJSONSource.minZoom` property for iOS and Android. This PR updates that generation to align with `maxzoom` and other GeoJSONOptions properties. Specifically: - Getting `minzoom` is currently disabled at the native level. This PR updates geojson_options to enable getting `minzoom`. - Like other GeoJSONOptions properties, `minzoom` can only be set when the source is created. This PR updates the generator to reflect this and removes separate set methods. (cherry picked from commit 35b4df8c0b881d90bd3e65b656b2b13dee3f09cb) cc @mapbox/maps-ios cc @mapbox/gl-native cc @mapbox/maps-android cc @mapbox/sdk-ci --------- Co-authored-by: Changelog autocreator bot <[email protected]> Co-authored-by: zmiao <[email protected]> GitOrigin-RevId: 708f3fda96a882c4ccd9e64140e5c5f64230ce5b
1 parent b7972d9 commit dcb32e5

File tree

3 files changed

+24
-8
lines changed

3 files changed

+24
-8
lines changed

Sources/MapboxMaps/Style/Generated/Sources/GeoJSONSource.swift

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tests/MapboxMapsTests/Style/Generated/Sources/GeoJSONSourceTests.swift

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/api-compatibility-check/breakage_allowlist.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2216,3 +2216,27 @@ Func MapboxMap.loadStyle(_:transition:completion:) has parameter 2 type change f
22162216
// Allow MapboxCommon's location provider to be used in MapView, Heading is moved to MapboxCommon
22172217
Constructor MapInitOptions.init(mapOptions:cameraOptions:styleURI:styleJSON:antialiasingSampleCount:) has been removed
22182218
Struct Heading has been removed
2219+
2220+
// Remove lineCutoutWidth API in favor of using lineWidth for cutout
2221+
Func LineLayer.lineCutoutWidth(_:) has been removed
2222+
Func LineLayer.lineCutoutWidthTransition(_:) has been removed
2223+
Func PolylineAnnotationGroup.lineCutoutWidth(_:) has been removed
2224+
Func PolylineAnnotationGroup.lineCutoutWidthTransition(_:) has been removed
2225+
Var LineLayer.lineCutoutWidth has been removed
2226+
Var LineLayer.lineCutoutWidthTransition has been removed
2227+
Var PolylineAnnotationManager.lineCutoutWidth has been removed
2228+
Var PolylineAnnotationManager.lineCutoutWidthTransition has been removed
2229+
2230+
// Add new Standard style color and 3D configuration parameters
2231+
Func MapStyle.standard(theme:lightPreset:font:showPointOfInterestLabels:showTransitLabels:showPlaceLabels:showRoadLabels:showPedestrianRoads:show3dObjects:backgroundPointOfInterestLabels:colorAdminBoundaries:colorBuildingHighlight:colorBuildingSelect:colorGreenspace:colorModePointOfInterestLabels:colorMotorways:colorPlaceLabelHighlight:colorPlaceLabels:colorPlaceLabelSelect:colorPointOfInterestLabels:colorRoadLabels:colorRoads:colorTrunks:colorWater:densityPointOfInterestLabels:fuelingStationModePointOfInterestLabels:roadsBrightness:showAdminBoundaries:showLandmarkIconLabels:showLandmarkIcons:themeData:) has been renamed to Func standard(theme:lightPreset:font:showPointOfInterestLabels:showTransitLabels:showPlaceLabels:showRoadLabels:showPedestrianRoads:show3dObjects:backgroundPointOfInterestLabels:colorAdminBoundaries:colorBuildingHighlight:colorBuildings:colorBuildingSelect:colorCommercial:colorEducation:colorGreenspace:colorIndustrial:colorLand:colorMedical:colorModePointOfInterestLabels:colorMotorways:colorPlaceLabelHighlight:colorPlaceLabels:colorPlaceLabelSelect:colorPointOfInterestLabels:colorRoadLabels:colorRoads:colorSnow:colorTrunks:colorWater:densityPointOfInterestLabels:fuelingStationModePointOfInterestLabels:roadsBrightness:show3dBuildings:show3dFacades:show3dLandmarks:show3dTrees:showAdminBoundaries:showLandmarkIconLabels:showLandmarkIcons:themeData:)
2232+
2233+
Func MapStyle.standard(theme:lightPreset:font:showPointOfInterestLabels:showTransitLabels:showPlaceLabels:showRoadLabels:showPedestrianRoads:show3dObjects:backgroundPointOfInterestLabels:colorAdminBoundaries:colorBuildingHighlight:colorBuildingSelect:colorGreenspace:colorModePointOfInterestLabels:colorMotorways:colorPlaceLabelHighlight:colorPlaceLabels:colorPlaceLabelSelect:colorPointOfInterestLabels:colorRoadLabels:colorRoads:colorTrunks:colorWater:densityPointOfInterestLabels:fuelingStationModePointOfInterestLabels:roadsBrightness:showAdminBoundaries:showLandmarkIconLabels:showLandmarkIcons:themeData:) has parameter 14 type change from MapboxMaps.StandardColorModePointOfInterestLabels? to MapboxMaps.StyleColor?
2234+
Func MapStyle.standard(theme:lightPreset:font:showPointOfInterestLabels:showTransitLabels:showPlaceLabels:showRoadLabels:showPedestrianRoads:show3dObjects:backgroundPointOfInterestLabels:colorAdminBoundaries:colorBuildingHighlight:colorBuildingSelect:colorGreenspace:colorModePointOfInterestLabels:colorMotorways:colorPlaceLabelHighlight:colorPlaceLabels:colorPlaceLabelSelect:colorPointOfInterestLabels:colorRoadLabels:colorRoads:colorTrunks:colorWater:densityPointOfInterestLabels:fuelingStationModePointOfInterestLabels:roadsBrightness:showAdminBoundaries:showLandmarkIconLabels:showLandmarkIcons:themeData:) has parameter 20 type change from MapboxMaps.StyleColor? to MapboxMaps.StandardColorModePointOfInterestLabels?
2235+
Func MapStyle.standard(theme:lightPreset:font:showPointOfInterestLabels:showTransitLabels:showPlaceLabels:showRoadLabels:showPedestrianRoads:show3dObjects:backgroundPointOfInterestLabels:colorAdminBoundaries:colorBuildingHighlight:colorBuildingSelect:colorGreenspace:colorModePointOfInterestLabels:colorMotorways:colorPlaceLabelHighlight:colorPlaceLabels:colorPlaceLabelSelect:colorPointOfInterestLabels:colorRoadLabels:colorRoads:colorTrunks:colorWater:densityPointOfInterestLabels:fuelingStationModePointOfInterestLabels:roadsBrightness:showAdminBoundaries:showLandmarkIconLabels:showLandmarkIcons:themeData:) has parameter 24 type change from Swift.Double? to MapboxMaps.StyleColor?
2236+
Func MapStyle.standard(theme:lightPreset:font:showPointOfInterestLabels:showTransitLabels:showPlaceLabels:showRoadLabels:showPedestrianRoads:show3dObjects:backgroundPointOfInterestLabels:colorAdminBoundaries:colorBuildingHighlight:colorBuildingSelect:colorGreenspace:colorModePointOfInterestLabels:colorMotorways:colorPlaceLabelHighlight:colorPlaceLabels:colorPlaceLabelSelect:colorPointOfInterestLabels:colorRoadLabels:colorRoads:colorTrunks:colorWater:densityPointOfInterestLabels:fuelingStationModePointOfInterestLabels:roadsBrightness:showAdminBoundaries:showLandmarkIconLabels:showLandmarkIcons:themeData:) has parameter 25 type change from MapboxMaps.StandardFuelingStationModePointOfInterestLabels? to MapboxMaps.StyleColor?
2237+
Func MapStyle.standard(theme:lightPreset:font:showPointOfInterestLabels:showTransitLabels:showPlaceLabels:showRoadLabels:showPedestrianRoads:show3dObjects:backgroundPointOfInterestLabels:colorAdminBoundaries:colorBuildingHighlight:colorBuildingSelect:colorGreenspace:colorModePointOfInterestLabels:colorMotorways:colorPlaceLabelHighlight:colorPlaceLabels:colorPlaceLabelSelect:colorPointOfInterestLabels:colorRoadLabels:colorRoads:colorTrunks:colorWater:densityPointOfInterestLabels:fuelingStationModePointOfInterestLabels:roadsBrightness:showAdminBoundaries:showLandmarkIconLabels:showLandmarkIcons:themeData:) has parameter 26 type change from Swift.Double? to MapboxMaps.StyleColor?
2238+
Func MapStyle.standard(theme:lightPreset:font:showPointOfInterestLabels:showTransitLabels:showPlaceLabels:showRoadLabels:showPedestrianRoads:show3dObjects:backgroundPointOfInterestLabels:colorAdminBoundaries:colorBuildingHighlight:colorBuildingSelect:colorGreenspace:colorModePointOfInterestLabels:colorMotorways:colorPlaceLabelHighlight:colorPlaceLabels:colorPlaceLabelSelect:colorPointOfInterestLabels:colorRoadLabels:colorRoads:colorTrunks:colorWater:densityPointOfInterestLabels:fuelingStationModePointOfInterestLabels:roadsBrightness:showAdminBoundaries:showLandmarkIconLabels:showLandmarkIcons:themeData:) has parameter 27 type change from Swift.Bool? to MapboxMaps.StyleColor?
2239+
Func MapStyle.standard(theme:lightPreset:font:showPointOfInterestLabels:showTransitLabels:showPlaceLabels:showRoadLabels:showPedestrianRoads:show3dObjects:backgroundPointOfInterestLabels:colorAdminBoundaries:colorBuildingHighlight:colorBuildingSelect:colorGreenspace:colorModePointOfInterestLabels:colorMotorways:colorPlaceLabelHighlight:colorPlaceLabels:colorPlaceLabelSelect:colorPointOfInterestLabels:colorRoadLabels:colorRoads:colorTrunks:colorWater:densityPointOfInterestLabels:fuelingStationModePointOfInterestLabels:roadsBrightness:showAdminBoundaries:showLandmarkIconLabels:showLandmarkIcons:themeData:) has parameter 28 type change from Swift.Bool? to MapboxMaps.StyleColor?
2240+
Func MapStyle.standard(theme:lightPreset:font:showPointOfInterestLabels:showTransitLabels:showPlaceLabels:showRoadLabels:showPedestrianRoads:show3dObjects:backgroundPointOfInterestLabels:colorAdminBoundaries:colorBuildingHighlight:colorBuildingSelect:colorGreenspace:colorModePointOfInterestLabels:colorMotorways:colorPlaceLabelHighlight:colorPlaceLabels:colorPlaceLabelSelect:colorPointOfInterestLabels:colorRoadLabels:colorRoads:colorTrunks:colorWater:densityPointOfInterestLabels:fuelingStationModePointOfInterestLabels:roadsBrightness:showAdminBoundaries:showLandmarkIconLabels:showLandmarkIcons:themeData:) has parameter 29 type change from Swift.Bool? to MapboxMaps.StyleColor?
2241+
Func MapStyle.standard(theme:lightPreset:font:showPointOfInterestLabels:showTransitLabels:showPlaceLabels:showRoadLabels:showPedestrianRoads:show3dObjects:backgroundPointOfInterestLabels:colorAdminBoundaries:colorBuildingHighlight:colorBuildingSelect:colorGreenspace:colorModePointOfInterestLabels:colorMotorways:colorPlaceLabelHighlight:colorPlaceLabels:colorPlaceLabelSelect:colorPointOfInterestLabels:colorRoadLabels:colorRoads:colorTrunks:colorWater:densityPointOfInterestLabels:fuelingStationModePointOfInterestLabels:roadsBrightness:showAdminBoundaries:showLandmarkIconLabels:showLandmarkIcons:themeData:) has parameter 30 type change from Swift.String? to MapboxMaps.StyleColor?
2242+
Func GeoJSONSource.minzoom(_:) has been removed

0 commit comments

Comments
 (0)