Further mapbox-gl optimization