Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b54cce1 authored by Fynn Godau's avatar Fynn Godau
Browse files

Constantize metadata field keys

parent 30369062

play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Styles.kt

+5 −4
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ import java.lang.NumberFormatException 
import kotlin.math.pow



const val TAG = "GmsMapStyles"



const val KEY_METADATA_FEATURE_TYPE = "microg:gms-type-feature"

const val KEY_METADATA_ELEMENT_TYPE = "microg:gms-type-element"



fun getStyle(context: MapContext, storedMapType: Int, styleOptions: MapStyleOptions?): Style.Builder {
@@ -57,10 +58,10 @@ fun MapStyleOptions.apply(style: JSONObject) { 
                    // Test if layer has required fields (metadata and paint)

                    val layer = layerArray.getJSONObject(i)

                    if (layer.has("paint") && layer.has("metadata") && layer.getJSONObject("metadata")

                            .let { it.has("microg:gms-type-feature") && it.has("microg:gms-type-element") }

                            .let { it.has(KEY_METADATA_FEATURE_TYPE) && it.has(KEY_METADATA_ELEMENT_TYPE) }

                    ) {

                        val layerFeatureType = layer.getJSONObject("metadata").getString("microg:gms-type-feature")

                        val layerElementType = layer.getJSONObject("metadata").getString("microg:gms-type-element")

                        val layerFeatureType = layer.getJSONObject("metadata").getString(KEY_METADATA_FEATURE_TYPE)

                        val layerElementType = layer.getJSONObject("metadata").getString(KEY_METADATA_ELEMENT_TYPE)



                        if (operation.featureType.startsWith("administrative")

                            && operation.elementType.startsWith("geometry")