[deps] update gl-native to beta.15 and common to beta.11, adopt break… (

#120)

* [deps] update gl-native to beta.15 and common to beta.11, adopt breaking changes

* Fix breaking changes related to text-field and GeoJsonSource data property.

Co-authored-by: Peng Liu <[email protected]>

app/src/main/java/com/mapbox/maps/testapp/examples/RestrictBoundsActivity.kt

@@ -9,6 +9,7 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.FrameLayout
 import androidx.appcompat.app.AppCompatActivity
+import com.mapbox.geojson.FeatureCollection
 import com.mapbox.geojson.Point
 import com.mapbox.geojson.Polygon
 import com.mapbox.maps.BoundOptions
@@ -37,7 +38,7 @@ class RestrictBoundsActivity : AppCompatActivity() {
     mapboxMap.loadStyle(
       style(Style.SATELLITE_STREETS) {
         +geoJsonSource(BOUNDS_ID) {
-          data("")
+          featureCollection(FeatureCollection.fromFeatures(listOf()))
         }
         +fillLayer(BOUNDS_ID, BOUNDS_ID) {
           fillColor(Color.RED)

buildSrc/src/main/kotlin/Project.kt

@@ -66,8 +66,8 @@ object Versions {
   const val mapboxGestures = "0.7.0"
   const val mapboxJavaServices = "5.4.1"
   const val mapboxBase = "0.5.0"
-  const val mapboxGlNative = "10.0.0-beta.14"
-  const val mapboxCommon = "10.0.0-beta.9.1"
+  const val mapboxGlNative = "10.0.0-beta.15"
+  const val mapboxCommon = "10.0.0-beta.11"
   const val mapboxAndroidCore = "3.1.1"
   const val mapboxAndroidTelemetry = "6.2.2"
   const val androidxCore = "1.3.1"

extension-style-app/src/androidTest/java/com/mapbox/maps/testapp/style/BaseStyleTest.kt

@@ -48,7 +48,7 @@ abstract class BaseStyleTest {
 
         mapboxMap = mapView.getMapboxMap()
         mapboxMap.loadStyleUri(
-          Style.DARK
+          "mapbox://styles/mapbox/empty-v9"
         ) {
           this@BaseStyleTest.style = it
           latch.countDown()

extension-style/src/main/java/com/mapbox/maps/extension/style/types/Formatted.kt

@@ -51,35 +51,49 @@ class Formatted : ArrayList<FormattedSection>() {
    * Static variables and methods.
    */
   companion object {
+
     /**
-     * Construct a [Formatted] object from a HashMap (Returned from the Core SDK).
+     * Construct a [Formatted] object from a Formatted List (Returned from the Core).
      */
-    fun fromProperty(map: HashMap<*, *>): Formatted {
+    fun fromProperty(list: ArrayList<*>): Formatted {
       val formatted = Formatted()
-      val property = map["sections"] as List<*>
 
-      property.forEach { section ->
-        val sectionMap = section as HashMap<*, *>
-        val text = sectionMap["text"] as String
-        val formattedSection = FormattedSection(text)
-        sectionMap.keys.forEach { key ->
-          when (key) {
-            "textColor" -> {
-              val colorMap = sectionMap[key] as HashMap<String, Double>
-              formattedSection.textColor = ColorUtils.rgbaExpressionToColorString(
-                rgba {
-                  literal(colorMap["r"]!! * 255)
-                  literal(colorMap["g"]!! * 255)
-                  literal(colorMap["b"]!! * 255)
-                  literal(colorMap["a"]!!)
+      if (list.removeFirst() == "format") {
+        list.forEachIndexed { index, element ->
+          when (element) {
+            is String -> {
+              val formattedSection = FormattedSection(element)
+              val optionsMap = list[index + 1] as HashMap<*, *>
+              optionsMap.keys.forEach { key ->
+                when (key) {
+                  "text-color" -> {
+                    val colorExpressionList = optionsMap[key] as ArrayList<*>
+                    if (colorExpressionList.removeFirst() == "rgba") {
+                      formattedSection.textColor = ColorUtils.rgbaExpressionToColorString(
+                        rgba {
+                          literal(colorExpressionList[0] as Double)
+                          literal(colorExpressionList[1] as Double)
+                          literal(colorExpressionList[2] as Double)
+                          literal(colorExpressionList[3] as Double)
+                        }
+                      )
+                    }
+                  }
+                  "font-scale" -> formattedSection.fontScale = optionsMap[key] as Double
+                  "text-font" -> {
+                    val textFontExpressionList = optionsMap[key] as ArrayList<*>
+                    if (textFontExpressionList.removeFirst() == "literal") {
+                      formattedSection.fontStack =
+                        textFontExpressionList.last() as ArrayList<String>
+                    }
+                  }
                 }
-              )
+              }
+              formatted.add(formattedSection)
             }
-            "scale" -> formattedSection.fontScale = sectionMap[key] as Double
-            "fontStack" -> formattedSection.fontStack = (sectionMap[key] as String).split(',')
+            else -> Unit
           }
         }
-        formatted.add(formattedSection)
       }
       return formatted
     }