From 672f2d86556a10c7f086c1f2ab577969dfd511e4 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Sun, 31 Jan 2021 00:49:11 +0100 Subject: [PATCH] Fixing maplibre-gl-js version and updating generated style files. --- maplibre-gl-js | 2 +- platform/ios/platform/darwin/src/MGLCircleStyleLayer.h | 9 --------- .../platform/darwin/src/MGLFillExtrusionStyleLayer.h | 6 ------ platform/ios/platform/darwin/src/MGLFillStyleLayer.h | 5 ----- .../ios/platform/darwin/src/MGLHeatmapStyleLayer.h | 8 -------- .../ios/platform/darwin/src/MGLHillshadeStyleLayer.h | 5 ----- platform/ios/platform/darwin/src/MGLLight.h | 5 ----- platform/ios/platform/darwin/src/MGLLineStyleLayer.h | 9 --------- platform/ios/platform/darwin/src/MGLRasterStyleLayer.h | 3 --- platform/ios/platform/darwin/src/MGLSymbolStyleLayer.h | 10 ---------- 10 files changed, 1 insertion(+), 61 deletions(-) diff --git a/maplibre-gl-js b/maplibre-gl-js index fe03b706f..9489d7654 160000 --- a/maplibre-gl-js +++ b/maplibre-gl-js @@ -1 +1 @@ -Subproject commit fe03b706ff6fbda2ff4796bbf581aa667c6fbc7d +Subproject commit 9489d7654ef9bb36a44c9b98446b84eccb98628a diff --git a/platform/ios/platform/darwin/src/MGLCircleStyleLayer.h b/platform/ios/platform/darwin/src/MGLCircleStyleLayer.h index 540980176..d96ed5967 100644 --- a/platform/ios/platform/darwin/src/MGLCircleStyleLayer.h +++ b/platform/ios/platform/darwin/src/MGLCircleStyleLayer.h @@ -91,15 +91,6 @@ typedef NS_ENUM(NSUInteger, MGLCircleTranslationAnchor) { ### Example ```swift - let layer = MGLCircleStyleLayer(identifier: "circles", source: population) - layer.sourceLayerIdentifier = "population" - layer.circleColor = NSExpression(forConstantValue: UIColor.green) - layer.circleRadius = NSExpression(format: "mgl_interpolate:withCurveType:parameters:stops:($zoomLevel, 'exponential', 1.75, %@)", - [12: 2, - 22: 180]) - layer.circleOpacity = NSExpression(forConstantValue: 0.7) - layer.predicate = NSPredicate(format: "%K == %@", "marital-status", "married") - mapView.style?.addLayer(layer) ``` */ MGL_EXPORT diff --git a/platform/ios/platform/darwin/src/MGLFillExtrusionStyleLayer.h b/platform/ios/platform/darwin/src/MGLFillExtrusionStyleLayer.h index adb215c41..7a7c8f93c 100644 --- a/platform/ios/platform/darwin/src/MGLFillExtrusionStyleLayer.h +++ b/platform/ios/platform/darwin/src/MGLFillExtrusionStyleLayer.h @@ -47,12 +47,6 @@ typedef NS_ENUM(NSUInteger, MGLFillExtrusionTranslationAnchor) { ### Example ```swift - let layer = MGLFillExtrusionStyleLayer(identifier: "buildings", source: buildings) - layer.sourceLayerIdentifier = "building" - layer.fillExtrusionHeight = NSExpression(forKeyPath: "height") - layer.fillExtrusionBase = NSExpression(forKeyPath: "min_height") - layer.predicate = NSPredicate(format: "extrude == 'true'") - mapView.style?.addLayer(layer) ``` */ MGL_EXPORT diff --git a/platform/ios/platform/darwin/src/MGLFillStyleLayer.h b/platform/ios/platform/darwin/src/MGLFillStyleLayer.h index 931a0abdd..26dc31df9 100644 --- a/platform/ios/platform/darwin/src/MGLFillStyleLayer.h +++ b/platform/ios/platform/darwin/src/MGLFillStyleLayer.h @@ -51,11 +51,6 @@ typedef NS_ENUM(NSUInteger, MGLFillTranslationAnchor) { ### Example ```swift - let layer = MGLFillStyleLayer(identifier: "parks", source: parks) - layer.sourceLayerIdentifier = "parks" - layer.fillColor = NSExpression(forConstantValue: UIColor.green) - layer.predicate = NSPredicate(format: "type == %@", "national-park") - mapView.style?.addLayer(layer) ``` */ MGL_EXPORT diff --git a/platform/ios/platform/darwin/src/MGLHeatmapStyleLayer.h b/platform/ios/platform/darwin/src/MGLHeatmapStyleLayer.h index 3c6dfbc29..f73aea5d1 100644 --- a/platform/ios/platform/darwin/src/MGLHeatmapStyleLayer.h +++ b/platform/ios/platform/darwin/src/MGLHeatmapStyleLayer.h @@ -40,14 +40,6 @@ NS_ASSUME_NONNULL_BEGIN ### Example ```swift - let layer = MGLHeatmapStyleLayer(identifier: "earthquake-heat", source: earthquakes) - layer.heatmapWeight = NSExpression(format: "mgl_interpolate:withCurveType:parameters:stops:(magnitude, 'linear', nil, %@)", - [0: 0, - 6: 1]) - layer.heatmapIntensity = NSExpression(format: "mgl_interpolate:withCurveType:parameters:stops:($zoomLevel, 'linear', nil, %@)", - [0: 1, - 9: 3]) - mapView.style?.addLayer(layer) ``` */ MGL_EXPORT diff --git a/platform/ios/platform/darwin/src/MGLHillshadeStyleLayer.h b/platform/ios/platform/darwin/src/MGLHillshadeStyleLayer.h index 1cf379732..d426daa97 100644 --- a/platform/ios/platform/darwin/src/MGLHillshadeStyleLayer.h +++ b/platform/ios/platform/darwin/src/MGLHillshadeStyleLayer.h @@ -48,11 +48,6 @@ typedef NS_ENUM(NSUInteger, MGLHillshadeIlluminationAnchor) { ### Example ```swift - let layer = MGLHillshadeStyleLayer(identifier: "hills", source: source) - layer.hillshadeExaggeration = NSExpression(forConstantValue: 0.6) - if let canalShadowLayer = mapView.style?.layer(withIdentifier: "waterway-river-canal-shadow") { - mapView.style?.insertLayer(layer, below: canalShadowLayer) - } ``` */ MGL_EXPORT diff --git a/platform/ios/platform/darwin/src/MGLLight.h b/platform/ios/platform/darwin/src/MGLLight.h index 281fcc5c6..3491c126f 100644 --- a/platform/ios/platform/darwin/src/MGLLight.h +++ b/platform/ios/platform/darwin/src/MGLLight.h @@ -62,11 +62,6 @@ NS_INLINE MGLSphericalPosition MGLSphericalPositionMake(CGFloat radial, CLLocati ### Example ```swift - let light = MGLLight() - let position = MGLSphericalPosition(radial: 5, azimuthal: 180, polar: 80) - light.position = NSExpression(forConstantValue: NSValue(mglSphericalPosition: position)) - light.anchor = NSExpression(forConstantValue: "map") - mapView.style?.light = light ``` #### Related examples diff --git a/platform/ios/platform/darwin/src/MGLLineStyleLayer.h b/platform/ios/platform/darwin/src/MGLLineStyleLayer.h index 00856e9d2..99ce8754e 100644 --- a/platform/ios/platform/darwin/src/MGLLineStyleLayer.h +++ b/platform/ios/platform/darwin/src/MGLLineStyleLayer.h @@ -101,15 +101,6 @@ typedef NS_ENUM(NSUInteger, MGLLineTranslationAnchor) { ### Example ```swift - let layer = MGLLineStyleLayer(identifier: "trails-path", source: trails) - layer.sourceLayerIdentifier = "trails" - layer.lineWidth = NSExpression(format: "mgl_interpolate:withCurveType:parameters:stops:($zoomLevel, 'exponential', 1.5, %@)", - [14: 2, - 18: 20]) - layer.lineColor = NSExpression(forConstantValue: UIColor.brown) - layer.lineCap = NSExpression(forConstantValue: "round") - layer.predicate = NSPredicate(format: "%K == %@", "trail-type", "mountain-biking") - mapView.style?.addLayer(layer) ``` */ MGL_EXPORT diff --git a/platform/ios/platform/darwin/src/MGLRasterStyleLayer.h b/platform/ios/platform/darwin/src/MGLRasterStyleLayer.h index 87cf5be1b..5b8543007 100644 --- a/platform/ios/platform/darwin/src/MGLRasterStyleLayer.h +++ b/platform/ios/platform/darwin/src/MGLRasterStyleLayer.h @@ -61,9 +61,6 @@ typedef NS_ENUM(NSUInteger, MGLRasterResamplingMode) { ### Example ```swift - let layer = MGLRasterStyleLayer(identifier: "clouds", source: source) - layer.rasterOpacity = NSExpression(forConstantValue: 0.5) - mapView.style?.addLayer(layer) ``` */ MGL_EXPORT diff --git a/platform/ios/platform/darwin/src/MGLSymbolStyleLayer.h b/platform/ios/platform/darwin/src/MGLSymbolStyleLayer.h index d62518c49..520e1fe9e 100644 --- a/platform/ios/platform/darwin/src/MGLSymbolStyleLayer.h +++ b/platform/ios/platform/darwin/src/MGLSymbolStyleLayer.h @@ -402,16 +402,6 @@ typedef NS_ENUM(NSUInteger, MGLTextTranslationAnchor) { ### Example ```swift - let layer = MGLSymbolStyleLayer(identifier: "coffeeshops", source: pois) - layer.sourceLayerIdentifier = "pois" - layer.iconImageName = NSExpression(forConstantValue: "coffee") - layer.iconScale = NSExpression(forConstantValue: 0.5) - layer.text = NSExpression(forKeyPath: "name") - layer.textTranslation = NSExpression(forConstantValue: NSValue(cgVector: CGVector(dx: 10, dy: 0))) - layer.textJustification = NSExpression(forConstantValue: "left") - layer.textAnchor = NSExpression(forConstantValue: "left") - layer.predicate = NSPredicate(format: "%K == %@", "venue-type", "coffee") - mapView.style?.addLayer(layer) ``` */ MGL_EXPORT