Merge pull request #273 from mapbox/rl/fix_layer_typecasting

evil159 · web-flow · commit 7753b5e4ffcb · 2023-10-17T10:54:51.000+03:00
Fix typecasting errors when decoding layer properties
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -96,6 +96,15 @@ jobs:
       - inject-netrc-credentials
       - add-mapbox-submodules-key
       - macos/install-rosetta
+      - run:
+          name: Use activesupport 7.0.8 so that Cocoapods works
+          command: |
+            # activesupport was pinned because of Cocoapods being incompatible with active support 7.0.10,
+            # more details here - https://github.com/CocoaPods/CocoaPods/issues/12081
+            # allegedly, this issue is resolved in https://github.com/CocoaPods/CocoaPods/pull/12082,
+            # pinning can be removed after the above fix is released
+            gem uninstall activesupport --version '>= 7.0.8' --ignore-dependencies
+            gem install activesupport --version '7.0.8'
       - flutter/install_sdk_and_pub:
           version: 3.13.6
           app-dir: example
diff --git a/example/integration_test/location_test.dart b/example/integration_test/location_test.dart
@@ -65,7 +65,8 @@ void main() {
     expect(updatedSettings.puckBearingSource, settings.puckBearingSource);
     expect(updatedSettings.showAccuracyRing, settings.showAccuracyRing);
     // FIXME bitmaps are decoded incorrectly for some reason
-    expect(updatedSettings.accuracyRingBorderColor, settings.accuracyRingBorderColor);
+    expect(updatedSettings.accuracyRingBorderColor,
+        settings.accuracyRingBorderColor);
     expect(updatedSettings.accuracyRingColor, settings.accuracyRingColor);
     // expect(updatedSettings.locationPuck?.locationPuck2D?.bearingImage,
     //     settings.locationPuck?.locationPuck2D?.bearingImage);
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -2,7 +2,7 @@ PODS:
   - Flutter (1.0.0)
   - integration_test (0.0.1):
     - Flutter
-  - mapbox_maps_flutter (0.4.4):
+  - mapbox_maps_flutter (0.4.5):
     - Flutter
     - MapboxMaps (~> 10.13.1)
   - MapboxCommon (23.5.0)
@@ -45,7 +45,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   integration_test: 13825b8a9334a850581300559b8839134b124670
-  mapbox_maps_flutter: b7750303639682268cc7f487bfc6f474a456acab
+  mapbox_maps_flutter: d86eb8d532ae2f7e5d389fff3aa197b743d3c747
   MapboxCommon: fdf7fd31c90b7b607cd9c63e37797f023c01d860
   MapboxCoreMaps: 24270c7c6b8cb71819fc2f3c549db9620ee4d019
   MapboxMaps: cb76511b98d3b95c74b0771ed105bc69f30ace6b
@@ -55,4 +55,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 04c8a50f0eb98e8e64bc4237a0712e89ba6c14b8
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.13.0
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -144,7 +144,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.4.4"
+    version: "0.4.5"
   matcher:
     dependency: transitive
     description:
diff --git a/example/test_driver/integration_test.dart b/example/test_driver/integration_test.dart
@@ -1,3 +1,3 @@
 import 'package:integration_test/integration_test_driver.dart';
 
-Future<void> main() => integrationDriver();
+Future<void> main() => integrationDriver();
diff --git a/ios/Classes/StyleController.swift b/ios/Classes/StyleController.swift
@@ -129,7 +129,7 @@ class StyleController: NSObject, FLTStyleManager {
         do {
             var mappedValue = value
             if let stringValue = value as? String {
-                if (stringValue.hasPrefix("[") || stringValue.hasPrefix("{")) {
+                if stringValue.hasPrefix("[") || stringValue.hasPrefix("{") {
                     if let expressionData = stringValue.data(using: .utf8) {
                         let expJSONObject = try JSONSerialization.jsonObject(with: expressionData, options: [])
                         mappedValue = expJSONObject
diff --git a/lib/src/style/layer/background_layer.dart b/lib/src/style/layer/background_layer.dart
@@ -83,7 +83,9 @@ class BackgroundLayer extends Layer {
       backgroundOpacity: map["paint"]["background-opacity"] is num?
           ? (map["paint"]["background-opacity"] as num?)?.toDouble()
           : null,
-      backgroundPattern: map["paint"]["background-pattern"],
+      backgroundPattern: map["paint"]["background-pattern"] is String?
+          ? map["paint"]["background-pattern"] as String?
+          : null,
     );
   }
 }
diff --git a/lib/src/style/layer/fill_extrusion_layer.dart b/lib/src/style/layer/fill_extrusion_layer.dart
@@ -143,7 +143,9 @@ class FillExtrusionLayer extends Layer {
       fillExtrusionOpacity: map["paint"]["fill-extrusion-opacity"] is num?
           ? (map["paint"]["fill-extrusion-opacity"] as num?)?.toDouble()
           : null,
-      fillExtrusionPattern: map["paint"]["fill-extrusion-pattern"],
+      fillExtrusionPattern: map["paint"]["fill-extrusion-pattern"] is String?
+          ? map["paint"]["fill-extrusion-pattern"] as String?
+          : null,
       fillExtrusionTranslate:
           (map["paint"]["fill-extrusion-translate"] as List?)
               ?.map<double?>((e) => e.toDouble())
@@ -157,8 +159,10 @@ class FillExtrusionLayer extends Layer {
                   .last
                   .toLowerCase()
                   .contains(map["paint"]["fill-extrusion-translate-anchor"])),
-      fillExtrusionVerticalGradient: map["paint"]
-          ["fill-extrusion-vertical-gradient"],
+      fillExtrusionVerticalGradient:
+          map["paint"]["fill-extrusion-vertical-gradient"] is bool?
+              ? map["paint"]["fill-extrusion-vertical-gradient"] as bool?
+              : null,
     );
   }
 }
diff --git a/lib/src/style/layer/fill_layer.dart b/lib/src/style/layer/fill_layer.dart
@@ -132,14 +132,18 @@ class FillLayer extends Layer {
       fillSortKey: map["layout"]["fill-sort-key"] is num?
           ? (map["layout"]["fill-sort-key"] as num?)?.toDouble()
           : null,
-      fillAntialias: map["paint"]["fill-antialias"],
+      fillAntialias: map["paint"]["fill-antialias"] is bool?
+          ? map["paint"]["fill-antialias"] as bool?
+          : null,
       fillColor: (map["paint"]["fill-color"] as List?)?.toRGBAInt(),
       fillOpacity: map["paint"]["fill-opacity"] is num?
           ? (map["paint"]["fill-opacity"] as num?)?.toDouble()
           : null,
       fillOutlineColor:
           (map["paint"]["fill-outline-color"] as List?)?.toRGBAInt(),
-      fillPattern: map["paint"]["fill-pattern"],
+      fillPattern: map["paint"]["fill-pattern"] is String?
+          ? map["paint"]["fill-pattern"] as String?
+          : null,
       fillTranslate: (map["paint"]["fill-translate"] as List?)
           ?.map<double?>((e) => e.toDouble())
           .toList(),
diff --git a/lib/src/style/layer/line_layer.dart b/lib/src/style/layer/line_layer.dart
@@ -234,7 +234,9 @@ class LineLayer extends Layer {
       lineOpacity: map["paint"]["line-opacity"] is num?
           ? (map["paint"]["line-opacity"] as num?)?.toDouble()
           : null,
-      linePattern: map["paint"]["line-pattern"],
+      linePattern: map["paint"]["line-pattern"] is String?
+          ? map["paint"]["line-pattern"] as String?
+          : null,
       lineTranslate: (map["paint"]["line-translate"] as List?)
           ?.map<double?>((e) => e.toDouble())
           .toList(),
diff --git a/lib/src/style/layer/location_indicator_layer.dart b/lib/src/style/layer/location_indicator_layer.dart
@@ -164,9 +164,15 @@ class LocationIndicatorLayer extends Layer {
               .last
               .toLowerCase()
               .contains(map["layout"]["visibility"])),
-      bearingImage: map["layout"]["bearing-image"],
-      shadowImage: map["layout"]["shadow-image"],
-      topImage: map["layout"]["top-image"],
+      bearingImage: map["layout"]["bearing-image"] is String?
+          ? map["layout"]["bearing-image"] as String?
+          : null,
+      shadowImage: map["layout"]["shadow-image"] is String?
+          ? map["layout"]["shadow-image"] as String?
+          : null,
+      topImage: map["layout"]["top-image"] is String?
+          ? map["layout"]["top-image"] as String?
+          : null,
       accuracyRadius: map["paint"]["accuracy-radius"] is num?
           ? (map["paint"]["accuracy-radius"] as num?)?.toDouble()
           : null,
diff --git a/lib/src/style/layer/symbol_layer.dart b/lib/src/style/layer/symbol_layer.dart
@@ -463,7 +463,9 @@ class SymbolLayer extends Layer {
               .last
               .toLowerCase()
               .contains(map["layout"]["visibility"])),
-      iconAllowOverlap: map["layout"]["icon-allow-overlap"],
+      iconAllowOverlap: map["layout"]["icon-allow-overlap"] is bool?
+          ? map["layout"]["icon-allow-overlap"] as bool?
+          : null,
       iconAnchor: map["layout"]["icon-anchor"] == null
           ? null
           : IconAnchor.values.firstWhere((e) => e
@@ -472,13 +474,21 @@ class SymbolLayer extends Layer {
               .last
               .toLowerCase()
               .contains(map["layout"]["icon-anchor"])),
-      iconIgnorePlacement: map["layout"]["icon-ignore-placement"],
-      iconImage: map["layout"]["icon-image"],
-      iconKeepUpright: map["layout"]["icon-keep-upright"],
+      iconIgnorePlacement: map["layout"]["icon-ignore-placement"] is bool?
+          ? map["layout"]["icon-ignore-placement"] as bool?
+          : null,
+      iconImage: map["layout"]["icon-image"] is String?
+          ? map["layout"]["icon-image"] as String?
+          : null,
+      iconKeepUpright: map["layout"]["icon-keep-upright"] is bool?
+          ? map["layout"]["icon-keep-upright"] as bool?
+          : null,
       iconOffset: (map["layout"]["icon-offset"] as List?)
           ?.map<double?>((e) => e.toDouble())
           .toList(),
-      iconOptional: map["layout"]["icon-optional"],
+      iconOptional: map["layout"]["icon-optional"] is bool?
+          ? map["layout"]["icon-optional"] as bool?
+          : null,
       iconPadding: map["layout"]["icon-padding"] is num?
           ? (map["layout"]["icon-padding"] as num?)?.toDouble()
           : null,
@@ -515,7 +525,9 @@ class SymbolLayer extends Layer {
       iconTextFitPadding: (map["layout"]["icon-text-fit-padding"] as List?)
           ?.map<double?>((e) => e.toDouble())
           .toList(),
-      symbolAvoidEdges: map["layout"]["symbol-avoid-edges"],
+      symbolAvoidEdges: map["layout"]["symbol-avoid-edges"] is bool?
+          ? map["layout"]["symbol-avoid-edges"] as bool?
+          : null,
       symbolPlacement: map["layout"]["symbol-placement"] == null
           ? null
           : SymbolPlacement.values.firstWhere((e) => e
@@ -538,7 +550,9 @@ class SymbolLayer extends Layer {
               .last
               .toLowerCase()
               .contains(map["layout"]["symbol-z-order"])),
-      textAllowOverlap: map["layout"]["text-allow-overlap"],
+      textAllowOverlap: map["layout"]["text-allow-overlap"] is bool?
+          ? map["layout"]["text-allow-overlap"] as bool?
+          : null,
       textAnchor: map["layout"]["text-anchor"] == null
           ? null
           : TextAnchor.values.firstWhere((e) => e
@@ -550,7 +564,9 @@ class SymbolLayer extends Layer {
       textFont: (map["layout"]["text-font"] as List?)
           ?.map<String?>((e) => e.toString())
           .toList(),
-      textIgnorePlacement: map["layout"]["text-ignore-placement"],
+      textIgnorePlacement: map["layout"]["text-ignore-placement"] is bool?
+          ? map["layout"]["text-ignore-placement"] as bool?
+          : null,
       textJustify: map["layout"]["text-justify"] == null
           ? null
           : TextJustify.values.firstWhere((e) => e
@@ -559,7 +575,9 @@ class SymbolLayer extends Layer {
               .last
               .toLowerCase()
               .contains(map["layout"]["text-justify"])),
-      textKeepUpright: map["layout"]["text-keep-upright"],
+      textKeepUpright: map["layout"]["text-keep-upright"] is bool?
+          ? map["layout"]["text-keep-upright"] as bool?
+          : null,
       textLetterSpacing: map["layout"]["text-letter-spacing"] is num?
           ? (map["layout"]["text-letter-spacing"] as num?)?.toDouble()
           : null,
@@ -575,7 +593,9 @@ class SymbolLayer extends Layer {
       textOffset: (map["layout"]["text-offset"] as List?)
           ?.map<double?>((e) => e.toDouble())
           .toList(),
-      textOptional: map["layout"]["text-optional"],
+      textOptional: map["layout"]["text-optional"] is bool?
+          ? map["layout"]["text-optional"] as bool?
+          : null,
       textPadding: map["layout"]["text-padding"] is num?
           ? (map["layout"]["text-padding"] as num?)?.toDouble()
           : null,

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`import 'package:integration_test/integration_test_driver.dart';`
`2`	`2`
`3`		`-Future<void> main() => integrationDriver();`
	`3`	`+Future<void> main() => integrationDriver();`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,9 @@ class BackgroundLayer extends Layer {`
`83`	`83`	`backgroundOpacity: map["paint"]["background-opacity"] is num?`
`84`	`84`	`? (map["paint"]["background-opacity"] as num?)?.toDouble()`
`85`	`85`	`: null,`
`86`		`- backgroundPattern: map["paint"]["background-pattern"],`
	`86`	`+ backgroundPattern: map["paint"]["background-pattern"] is String?`
	`87`	`+ ? map["paint"]["background-pattern"] as String?`
	`88`	`+ : null,`
`87`	`89`	`);`
`88`	`90`	`}`
`89`	`91`	`}`