1 files changed, 95 insertions, 46 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java
index 0eaccfef0c..6e9e45cfaa 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java
@@ -1,13 +1,14 @@
 package com.mapbox.mapboxsdk.testapp.activity.style;
 
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.support.v7.app.AppCompatActivity;
 import android.graphics.Color;
 import android.graphics.PointF;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-
+import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -32,7 +33,7 @@ import com.mapbox.services.commons.geojson.custom.PositionDeserializer;
 import com.mapbox.services.commons.models.Position;
 
 import java.io.IOException;
-
+import java.util.HashMap;
 import java.util.List;
 
 import timber.log.Timber;
@@ -64,49 +65,10 @@ public class SymbolGeneratorActivity extends AppCompatActivity implements OnMapR
   }
 
   @Override
-  public void onMapReady(MapboxMap map) {
+  public void onMapReady(final MapboxMap map) {
     mapboxMap = map;
-    try {
-      // read local geojson from raw folder
-      String tinyCountriesJson = ResourceUtils.readRawResource(this, R.raw.tiny_countries);
-
-      // convert geojson to a model
-      FeatureCollection featureCollection = new GsonBuilder()
-        .registerTypeAdapter(Geometry.class, new GeometryDeserializer())
-        .registerTypeAdapter(Position.class, new PositionDeserializer())
-        .create().fromJson(tinyCountriesJson, FeatureCollection.class);
-
-      // add a geojson to the map
-      Source source = new GeoJsonSource(SOURCE_ID, featureCollection);
-      mapboxMap.addSource(source);
-
-      // for each feature add a symbolLayer
-      for (Feature feature : featureCollection.getFeatures()) {
-        String countryName = feature.getStringProperty(FEATURE_ID);
-
-        // create View
-        TextView textView = new TextView(this);
-        textView.setBackgroundColor(getResources().getColor(R.color.blueAccent));
-        textView.setPadding(10, 5, 10, 5);
-        textView.setTextColor(Color.WHITE);
-        textView.setText(countryName);
-
-        // create bitmap from view
-        mapboxMap.addImage(countryName, SymbolGenerator.generate(textView));
-      }
-
-      // create layer use
-      mapboxMap.addLayer(new SymbolLayer(LAYER_ID, SOURCE_ID)
-        .withProperties(
-          iconImage("{" + FEATURE_ID + "}"), // { } is a token notation
-          iconAllowOverlap(false)
-        )
-      );
-
-      addSymbolClickListener();
-    } catch (IOException exception) {
-      Timber.e(exception);
-    }
+    addSymbolClickListener();
+    new LoadDataTask(map, SymbolGeneratorActivity.this).execute();
   }
 
   private void addSymbolClickListener() {
@@ -213,4 +175,91 @@ public class SymbolGeneratorActivity extends AppCompatActivity implements OnMapR
       return bitmap;
     }
   }
-}
+
+  private static class LoadDataTask extends AsyncTask<Void, Void, FeatureCollection> {
+
+    private final MapboxMap mapboxMap;
+    private final Context context;
+
+    LoadDataTask(MapboxMap mapboxMap, Context context) {
+      this.mapboxMap = mapboxMap;
+      this.context = context;
+    }
+
+    @Override
+    protected FeatureCollection doInBackground(Void... params) {
+      try {
+        // read local geojson from raw folder
+        String tinyCountriesJson = ResourceUtils.readRawResource(context, R.raw.tiny_countries);
+
+        // convert geojson to a model
+        FeatureCollection featureCollection = new GsonBuilder()
+          .registerTypeAdapter(Geometry.class, new GeometryDeserializer())
+          .registerTypeAdapter(Position.class, new PositionDeserializer())
+          .create().fromJson(tinyCountriesJson, FeatureCollection.class);
+
+        return featureCollection;
+      } catch (IOException exception) {
+        return null;
+      }
+    }
+
+
+    @Override
+    protected void onPostExecute(FeatureCollection featureCollection) {
+      super.onPostExecute(featureCollection);
+      if (featureCollection == null) {
+        return;
+      }
+
+      // add a geojson to the map
+      Source source = new GeoJsonSource(SOURCE_ID, featureCollection);
+      mapboxMap.addSource(source);
+
+      // create layer use
+      mapboxMap.addLayer(new SymbolLayer(LAYER_ID, SOURCE_ID)
+        .withProperties(
+          iconImage("{" + FEATURE_ID + "}"), // { } is a token notation
+          iconAllowOverlap(false)
+        )
+      );
+
+      new GenerateSymbolTask(mapboxMap, context).execute(featureCollection);
+    }
+  }
+
+  private static class GenerateSymbolTask extends AsyncTask<FeatureCollection, Void, HashMap<String, Bitmap>> {
+
+    private MapboxMap mapboxMap;
+    private Context context;
+
+    GenerateSymbolTask(MapboxMap mapboxMap, Context context) {
+      this.mapboxMap = mapboxMap;
+      this.context = context;
+    }
+
+    @SuppressWarnings("WrongThread")
+    @Override
+    protected HashMap<String, Bitmap> doInBackground(FeatureCollection... params) {
+      FeatureCollection featureCollection = params[0];
+
+      HashMap<String, Bitmap> imagesMap = new HashMap<>();
+      for (Feature feature : featureCollection.getFeatures()) {
+        String countryName = feature.getStringProperty(FEATURE_ID);
+        TextView textView = new TextView(context);
+        textView.setBackgroundColor(context.getResources().getColor(R.color.blueAccent));
+        textView.setPadding(10, 5, 10, 5);
+        textView.setTextColor(Color.WHITE);
+        textView.setText(countryName);
+        imagesMap.put(countryName, SymbolGenerator.generate(textView));
+      }
+      return imagesMap;
+    }
+
+    @Override
+    protected void onPostExecute(HashMap<String, Bitmap> bitmapHashMap) {
+      super.onPostExecute(bitmapHashMap);
+      mapboxMap.addImages(bitmapHashMap);
+    }
+  }
+}
\ No newline at end of file