Added vector styles support. Added POI searching. Added turn by turn…

CedarMapsSDK/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'signing'
 apply plugin: 'com.github.dcendents.android-maven'
 
 group = "com.cedarmaps"
-version = "3.0.0"
+version = "3.1.0"
 def siteUrl = 'http://cedarmaps.com'
 def gitUrl = 'http://cedarmaps.com/git'
 
@@ -17,9 +17,9 @@ android {
 }
 
 dependencies {
-    api 'com.cedarmaps:mapbox-android-sdk:6.0.1'
-    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
-    implementation 'com.google.code.gson:gson:2.8.2'
+    api 'com.cedarmaps:mapbox-android-sdk:6.3.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.11.0'
+    implementation 'com.google.code.gson:gson:2.8.5'
 }
 
 // From https://raw.github.com/mcxiaoke/gradle-mvn-push/master/gradle-mvn-push.gradle

CedarMapsSDK/src/main/AndroidManifest.xml

@@ -2,7 +2,6 @@
     package="com.cedarstudios.cedarmapssdk">
 
     <application android:allowBackup="true">
-
     </application>
 
 </manifest>

CedarMapsSDK/src/main/java/com/cedarstudios/cedarmapssdk/AuthenticationManager.java

@@ -68,12 +68,16 @@ final class AuthenticationManager {
     }
 
     void setClientID(@NonNull String clientID) {
+        if (!clientID.equals(mClientID)) {
             mClientID = clientID;
         }
+    }
 
     void setClientSecret(@NonNull String clientSecret) {
+        if (!clientSecret.equals(mClientSecret)) {
             mClientSecret = clientSecret;
         }
+    }
 
     void getAccessToken(final @Nullable AccessTokenListener completionHandler) {
 
@@ -123,11 +127,13 @@ final class AuthenticationManager {
     }
 
     void setContext(@NonNull Context context) {
+        if (mContext == null) {
             mContext = context.getApplicationContext();
             LocalBroadcastManager.getInstance(mContext)
                     .registerReceiver(instance.mapViewError401BroadcastReceiver,
                             new IntentFilter(INTENT_FILTER_TILE_HTTP_CODE_401));
         }
+    }
 
     Context getContext() {
         return mContext;
@@ -184,7 +190,7 @@ final class AuthenticationManager {
     }
 
     @Nullable
-    private String getSavedAccessToken() throws CedarMapsException {
+    String getSavedAccessToken() throws CedarMapsException {
         if (mContext == null) {
             throw new CedarMapsException("Context is not set. Please call 'setContext' method on CedarMaps.getInstance()");
         }

CedarMapsSDK/src/main/java/com/cedarstudios/cedarmapssdk/CedarMaps.java

@@ -79,7 +79,12 @@ public class CedarMaps {
     String getMapID() {
         return mMapID;
     }
-    void setMapID(String mapID) {
+
+    /**
+     * This method specifies the result types when using Geocoding APIs. Possible values are "cedarmaps.streets" and "cedarmaps.mix"
+     * @param mapID The map ID
+     */
+    public void setMapID(String mapID) {
         this.mMapID = mapID;
     }
 
@@ -131,6 +136,9 @@ public class CedarMaps {
     }
     //endregion
 
+    public String getSavedAccessToken() throws CedarMapsException {
+        return AuthenticationManager.getInstance().getSavedAccessToken();
+    }
 
     /**
      * Forward Geocoding. You can use this method to obtain address info about the entered query.
@@ -260,14 +268,24 @@ public class CedarMaps {
 
         getResponseBodyFromURL(url, new NetworkResponseBodyCompletionHandler() {
             @Override
-            public void onSuccess(ResponseBody responseBody) {
-                ForwardGeocodeResponse forwardGeocodeResponse = ForwardGeocodeResponse.parseJSON(responseBody.charStream());
+            public void onSuccess(final ResponseBody responseBody) {
+                runOnBackgroundThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        final ForwardGeocodeResponse forwardGeocodeResponse = ForwardGeocodeResponse.parseJSON(responseBody.charStream());
+                        runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
                                 if (forwardGeocodeResponse.results == null) {
                                     completionHandler.onFailure(forwardGeocodeResponse.status);
                                 } else {
                                     completionHandler.onSuccess(forwardGeocodeResponse.results);
                                 }
                             }
+                        });
+                    }
+                });
+            }
 
             @Override
             public void onFailure(String errorMessage) {
@@ -292,14 +310,24 @@ public class CedarMaps {
 
         getResponseBodyFromURL(url, new NetworkResponseBodyCompletionHandler() {
             @Override
-            public void onSuccess(ResponseBody responseBody) {
-                ReverseGeocodeResponse reverseGeocodeResponse = ReverseGeocodeResponse.parseJSON(responseBody.charStream());
+            public void onSuccess(final ResponseBody responseBody) {
+                runOnBackgroundThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        final ReverseGeocodeResponse reverseGeocodeResponse = ReverseGeocodeResponse.parseJSON(responseBody.charStream());
+                        runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
                                 if (reverseGeocodeResponse.result == null) {
                                     completionHandler.onFailure(reverseGeocodeResponse.status);
                                 } else {
                                     completionHandler.onSuccess(reverseGeocodeResponse.result);
                                 }
                             }
+                        });
+                    }
+                });
+            }
 
             @Override
             public void onFailure(String errorMessage) {
@@ -325,14 +353,24 @@ public class CedarMaps {
 
         getResponseBodyFromURL(url, new NetworkResponseBodyCompletionHandler() {
             @Override
-            public void onSuccess(ResponseBody responseBody) {
-                GeoRoutingResponse geoRoutingResponse = GeoRoutingResponse.parseJSON(responseBody.charStream());
+            public void onSuccess(final ResponseBody responseBody) {
+                runOnBackgroundThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        final GeoRoutingResponse geoRoutingResponse = GeoRoutingResponse.parseJSON(responseBody.charStream());
+                        runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
                                 if (geoRoutingResponse.result == null) {
                                     completionHandler.onFailure(geoRoutingResponse.status);
                                 } else {
                                     completionHandler.onSuccess(geoRoutingResponse.result);
                                 }
                             }
+                        });
+                    }
+                });
+            }
 
             @Override
             public void onFailure(String errorMessage) {
@@ -365,14 +403,24 @@ public class CedarMaps {
 
         getResponseBodyFromURL(url, new NetworkResponseBodyCompletionHandler() {
             @Override
-            public void onSuccess(ResponseBody responseBody) {
-                GeoRoutingResponse geoRoutingResponse = GeoRoutingResponse.parseJSON(responseBody.charStream());
+            public void onSuccess(final ResponseBody responseBody) {
+                runOnBackgroundThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        final GeoRoutingResponse geoRoutingResponse = GeoRoutingResponse.parseJSON(responseBody.charStream());
+                        runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
                                 if (geoRoutingResponse.result == null) {
                                     completionHandler.onFailure(geoRoutingResponse.status);
                                 } else {
                                     completionHandler.onSuccess(geoRoutingResponse.result);
                                 }
                             }
+                        });
+                    }
+                });
+            }
 
             @Override
             public void onFailure(String errorMessage) {
@@ -391,27 +439,27 @@ public class CedarMaps {
      */
     public void direction(LatLng start, LatLng end, final GeoRoutingResultListener completionHandler) {
 
-        String url = String.format(Locale.ENGLISH,
-                AuthenticationManager.getInstance().getAPIBaseURL() + "direction/%1$s/%2$s,%3$s;%4$s,%5$s",
-                mDirectionID,
-                start.getLatitude(), start.getLongitude(), end.getLatitude(), end.getLongitude());
+        ArrayList<Pair<LatLng, LatLng>> points = new ArrayList<>();
+        points.add(new Pair<>(start, end));
 
-        getResponseBodyFromURL(url, new NetworkResponseBodyCompletionHandler() {
-            @Override
-            public void onSuccess(ResponseBody responseBody) {
-                GeoRoutingResponse geoRoutingResponse = GeoRoutingResponse.parseJSON(responseBody.charStream());
-                if (geoRoutingResponse.result == null) {
-                    completionHandler.onFailure(geoRoutingResponse.status);
-                } else {
-                    completionHandler.onSuccess(geoRoutingResponse.result);
-                }
+        direction(points, false, new Locale("fa"), completionHandler);
     }
 
-            @Override
-            public void onFailure(String errorMessage) {
-                completionHandler.onFailure(errorMessage);
-            }
-        });
+    /**
+     * This method calculates the detailed coordinates of the route between two points with textual instructions.
+     *
+     * @param start Starting coordinate
+     * @param end Ending coordinate
+     * @param locale Identifier for language. Currently Locale("fa") and Locale("en") are supported.
+     * @param completionHandler The handler to notify when Geo Routing results are ready with success or error.
+     *                          The handler methods are called on UIThread.
+     */
+    public void directionWithInstructions(LatLng start, LatLng end, Locale locale, final GeoRoutingResultListener completionHandler) {
+
+        ArrayList<Pair<LatLng, LatLng>> points = new ArrayList<>();
+        points.add(new Pair<>(start, end));
+
+        direction(points, true, locale, completionHandler);
     }
 
     /**
@@ -421,38 +469,69 @@ public class CedarMaps {
      * @param completionHandler The handler to notify when Geo Routing results are ready with success or error.
      *                          The handler methods are called on UIThread.
      */
-    public void direction(Pair<LatLng, LatLng>[] coordinatePairs, final GeoRoutingResultListener completionHandler) {
+    public void direction(ArrayList<Pair<LatLng, LatLng>> coordinatePairs, final GeoRoutingResultListener completionHandler) {
+        direction(coordinatePairs, false, new Locale("fa"), completionHandler);
+    }
 
-        String pairs = "";
+
+    /**
+     * This method calculates the detailed coordinates of the route between two consecutive points with textual instructions. It can be called with up to 50 pairs
+     *
+     * @param coordinatePairs Set up to 50 pairs of (Start, End).
+     * @param locale Identifier for language. Currently Locale("fa") and Locale("en") are supported.
+     * @param completionHandler The handler to notify when Geo Routing results are ready with success or error.
+     *                          The handler methods are called on UIThread.
+     */
+    public void directionWithInstructions(ArrayList<Pair<LatLng, LatLng>> coordinatePairs, Locale locale, final GeoRoutingResultListener completionHandler) {
+        direction(coordinatePairs, true, locale, completionHandler);
+    }
+
+    private void direction(ArrayList<Pair<LatLng, LatLng>> coordinatePairs, Boolean shouldShowInstructions, Locale locale, final GeoRoutingResultListener completionHandler) {
+
+        StringBuilder pairs = new StringBuilder();
         String delimiter = "";
         for (Pair<LatLng, LatLng> locationPair : coordinatePairs) {
-            pairs += delimiter + String.format(Locale.ENGLISH, "%1$s,%2$s;%3$s,%4$s", locationPair.first.getLatitude(),
-                    locationPair.first.getLongitude(), locationPair.second.getLatitude(), locationPair.second.getLatitude());
+            pairs.append(delimiter).append(String.format(Locale.ENGLISH, "%1$s,%2$s;%3$s,%4$s", locationPair.first.getLatitude(),
+                    locationPair.first.getLongitude(), locationPair.second.getLatitude(), locationPair.second.getLongitude()));
             delimiter = "/";
         }
 
         String url = String.format(Locale.ENGLISH,
-                AuthenticationManager.getInstance().getAPIBaseURL() + "direction/%1$s/%2$s",
-                mDirectionID, pairs);
+                AuthenticationManager.getInstance().getAPIBaseURL() + "direction/%1$s/%2$s?instructions=%3$s&locale=%4$s",
+                mDirectionID,
+                pairs.toString(),
+                shouldShowInstructions ? "true" : "false",
+                locale.getLanguage().contains("fa") ? "fa" : "en"
+        );
 
         getResponseBodyFromURL(url, new NetworkResponseBodyCompletionHandler() {
             @Override
-            public void onSuccess(ResponseBody responseBody) {
-                GeoRoutingResponse geoRoutingResponse = GeoRoutingResponse.parseJSON(responseBody.charStream());
+            public void onSuccess(final ResponseBody responseBody) {
+                runOnBackgroundThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        final GeoRoutingResponse geoRoutingResponse = GeoRoutingResponse.parseJSON(responseBody.charStream());
+                        runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
                                 if (geoRoutingResponse.result == null) {
                                     completionHandler.onFailure(geoRoutingResponse.status);
                                 } else {
                                     completionHandler.onSuccess(geoRoutingResponse.result);
                                 }
                             }
+                        });
+                    }
+                });
+            }
 
             @Override
             public void onFailure(String errorMessage) {
                 completionHandler.onFailure(errorMessage);
             }
         });
-    }
 
+    }
 
     /**
      * This method creates a static image of map for the entered location.
@@ -494,13 +573,11 @@ public class CedarMaps {
         getResponseBodyFromURL(url, new NetworkResponseBodyCompletionHandler() {
             @Override
             public void onSuccess(final ResponseBody responseBody) {
-                final Handler mainHandler = new Handler(Looper.getMainLooper());
-
-                AsyncTask.execute(new Runnable() {
+                runOnBackgroundThread(new Runnable() {
                     @Override
                     public void run() {
                         final Bitmap bitmap = BitmapFactory.decodeStream(responseBody.byteStream());
-                        mainHandler.post(new Runnable() {
+                        runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
                                 if (bitmap == null) {
@@ -550,8 +627,6 @@ public class CedarMaps {
 
     private void getResponseBodyFromURL(final String url, final NetworkResponseBodyCompletionHandler completionHandler) {
 
-        final Handler handler = new Handler(Looper.getMainLooper());
-
         AuthenticationManager.getInstance().getAccessToken(new AccessTokenListener() {
             @Override
             public void onSuccess(@NonNull String accessToken) {
@@ -565,7 +640,7 @@ public class CedarMaps {
                 client.newCall(request).enqueue(new Callback() {
                     @Override
                     public void onResponse(Call call, final Response response) throws IOException {
-                        handler.post(new Runnable() {
+                        runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
                                 if (response.code() == 400) {
@@ -589,7 +664,7 @@ public class CedarMaps {
 
                     @Override
                     public void onFailure(final Call call, final IOException e) {
-                        handler.post(new Runnable() {
+                        runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
                                 completionHandler.onFailure(new CedarMapsException(call.toString(), e).getMessage());
@@ -601,7 +676,7 @@ public class CedarMaps {
 
             @Override
             public void onFailure(final @NonNull String error) {
-                handler.post(new Runnable() {
+                runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
                         completionHandler.onFailure(error);
@@ -610,4 +685,12 @@ public class CedarMaps {
             }
         });
     }
+
+    private void runOnUiThread(Runnable task) {
+        new Handler(Looper.getMainLooper()).post(task);
+    }
+
+    private void runOnBackgroundThread(Runnable task) {
+        AsyncTask.execute(task);
+    }
 }

CedarMapsSDK/src/main/java/com/cedarstudios/cedarmapssdk/MapView.java

@@ -9,37 +9,40 @@ import android.support.annotation.Nullable;
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.AttributeSet;
 
+import com.cedarstudios.cedarmapssdk.listeners.AccessTokenListener;
 import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
 
 import java.util.Locale;
+import java.util.Map;
 
 public class MapView extends com.mapbox.mapboxsdk.maps.MapView {
 
     private BroadcastReceiver mBroadcastReceiver = null;
+    private String currentStyle;
 
     public MapView(@NonNull Context context) {
         super(context);
         setupBroadcastReceiver();
-        setupStyleURL();
+        setDefaultStyleURL();
     }
 
     public MapView(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
         setupBroadcastReceiver();
-        setupStyleURL();
+        setDefaultStyleURL();
     }
 
     public MapView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         setupBroadcastReceiver();
-        setupStyleURL();
+        setDefaultStyleURL();
     }
 
     public MapView(@NonNull Context context, @Nullable MapboxMapOptions options) {
         super(context, options);
         setupBroadcastReceiver();
-        setupStyleURL();
+        setDefaultStyleURL();
     }
 
     private void setupBroadcastReceiver() {
@@ -47,7 +50,11 @@ public class MapView extends com.mapbox.mapboxsdk.maps.MapView {
             mBroadcastReceiver = new BroadcastReceiver() {
                 @Override
                 public void onReceive(Context context, Intent intent) {
-                    setupStyleURL();
+                    if (currentStyle == null) {
+                        setDefaultStyleURL();
+                    } else {
+                        setStyleUrl(currentStyle);
+                    }
                 }
             };
 
@@ -56,12 +63,46 @@ public class MapView extends com.mapbox.mapboxsdk.maps.MapView {
         }
     }
 
-    private void setupStyleURL() {
+    @Override
+    public void setStyleUrl(@NonNull final String url) {
+        if (currentStyle != null && currentStyle.equals(url)) {
+            return;
+        }
+        currentStyle = url;
+        if (url.contains("access_token")) {
+            super.setStyleUrl(url);
+        } else {
+            AuthenticationManager.getInstance().getAccessToken(new AccessTokenListener() {
+                @Override
+                public void onSuccess(@NonNull String accessToken) {
+                    String urlWithToken = String.format(Locale.ENGLISH,"%s?access_token=%s", url, accessToken);
+                    MapView.super.setStyleUrl(urlWithToken);
+                }
+
+                @Override
+                public void onFailure(@NonNull String errorMessage) {
+
+                }
+            });
+        }
+    }
+
+    private void setDefaultStyleURL() {
+        AuthenticationManager.getInstance().getAccessToken(new AccessTokenListener() {
+            @Override
+            public void onSuccess(@NonNull String accessToken) {
                 String url = String.format(Locale.ENGLISH,
                         AuthenticationManager.getInstance().getAPIBaseURL()
-                + "tiles/light.json?access_token=%s",
-                Mapbox.getAccessToken());
-        this.setStyleUrl(url);
+                                + "styles/cedarmaps.light.json?access_token=%s",
+                        accessToken);
+                setStyleUrl(url);
+            }
+
+            @Override
+            public void onFailure(@NonNull String errorMessage) {
+
+            }
+        });
     }
 
     @Override

CedarMapsSDK/src/main/java/com/cedarstudios/cedarmapssdk/model/geocoder/forward/ForwardGeocode.java

@@ -46,17 +46,21 @@ public class ForwardGeocode implements Serializable
     @Expose
     private String name;
 
-    @SerializedName("alternate_name")
+    @SerializedName("name_en")
+    @Expose
+    private String nameEn;
+
+    @SerializedName("alt_name")
     @Expose
     private String alternateName;
 
-    @SerializedName("full_name")
+    @SerializedName("alt_name_en")
     @Expose
-    private String fullName;
+    private String alternateNameEn;
 
-    @SerializedName("name_en")
+    @SerializedName("category")
     @Expose
-    private String nameEn;
+    private String category = null;
 
     @SerializedName("type")
     @Expose
@@ -84,7 +88,11 @@ public class ForwardGeocode implements Serializable
 
     @SerializedName("components")
     @Expose
-    private Component components;
+    private Component components = null;
+
+    @SerializedName("slug")
+    @Expose
+    private String slug = null;
 
     /**
      *
@@ -106,7 +114,7 @@ public class ForwardGeocode implements Serializable
 
     /**
      *
-     * @return Alternate name of the result. e.g. Niayesh, Hashemi Rafsanjani
+     * @return Alternate name of the result. e.g. نیایش, هاشمی رفسنجانی
      */
     @Nullable
     public String getAlternateName() {
@@ -115,11 +123,11 @@ public class ForwardGeocode implements Serializable
 
     /**
      *
-     * @return Full name of the result. e.g. Hakim, Ayatollah Hakim
+     * @return English alternate name of the result. e.g. Niayesh, Hashemi Rafsanjani
      */
     @Nullable
-    public String getFullName() {
-        return fullName;
+    public String getEnglishlternateName() {
+        return alternateNameEn;
     }
 
     /**
@@ -133,6 +141,15 @@ public class ForwardGeocode implements Serializable
 
     /**
      *
+     * @return Category name of the result if type="poi".
+     */
+    @Nullable
+    public String getCategory() {
+        return category;
+    }
+
+    /**
+     *
      * @return Type of the result. e.g. street, locality, place, etc.
      */
     @NonNull
@@ -163,8 +180,17 @@ public class ForwardGeocode implements Serializable
      *
      * @return Detailed address components for the result.
      */
-    @NonNull
+    @Nullable
     public Component getComponents() {
         return components;
     }
+
+    /**
+     *
+     * @return Kikojas slug of the result if type="poi".
+     */
+    @Nullable
+    public String getSlug() {
+        return slug;
+    }
 }

CedarMapsSDK/src/main/java/com/cedarstudios/cedarmapssdk/model/routing/Instruction.java

+package com.cedarstudios.cedarmapssdk.model.routing;
+
+import android.support.annotation.Nullable;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Instruction implements Serializable {
+
+    public static final class Sign {
+        public static final int TURN_SHARP_LEFT = -3;
+        public static final int TURN_LEFT = -2;
+        public static final int TURN_SLIGHT_LEFT = -1;
+        public static final int CONTINUE = 0;
+        public static final int TURN_SLIHGT_RIGHT = 1;
+        public static final int TURN_RIGHT = 2;
+        public static final int TURN_SHARP_RIGHT = 3;
+        public static final int FINISH = 4;
+        public static final int REACHABLE_VIA = 5;
+        public static final int USE_ROUNDABOUT = 6;
+        public static final int KEEP_RIGHT = 7;
+    }
+
+    @SerializedName("distance")
+    @Expose
+    private Double distance;
+
+    @SerializedName("sign")
+    @Expose
+    private int sign;
+
+    @SerializedName("interval")
+    @Expose
+    private List<Integer> interval;
+
+    @SerializedName("text")
+    @Expose
+    private String text;
+
+    @SerializedName("time")
+    @Expose
+    private Integer time;
+
+    @SerializedName("street_name")
+    @Expose
+    private String streetName;
+
+
+    /**
+     *
+     * @return Distance of route section in the instruction in meters
+     */
+    @Nullable
+    public Double getDistance() {
+        return distance;
+    }
+
+    /**
+     *
+     * @return Traffic sign of route section in the instruction. Use Sign class for constants.
+     */
+    public int getSign() {
+        return sign;
+    }
+
+    /**
+     *
+     * @return An array of indices; these indices can be looked up in Route `geometry` property. It shows locations included in this section.
+     */
+    public List<Integer> getInterval() {
+        return interval;
+    }
+
+    /**
+     *
+     * @return Textual instruction of route section.
+     */
+    @Nullable
+    public String getText() {
+        return text;
+    }
+
+    /**
+     *
+     * @return Time duration of route section in the instruction in seconds
+     */
+    @Nullable
+    public Integer getTime() {
+        return time;
+    }
+
+    /**
+     *
+     * @return Main street name in the route section.
+     */
+    @Nullable
+    public String getStreetName() {
+        return streetName;
+    }
+}

CedarMapsSDK/src/main/java/com/cedarstudios/cedarmapssdk/model/routing/Route.java

@@ -28,7 +28,9 @@ public class Route implements Serializable
     @SerializedName("time")
     @Expose
     private Integer time;
-
+    @SerializedName("instructions")
+    @Expose
+    private List<Instruction> instructions = null;
     /**
      *
      * @return Boundary for a route.
@@ -72,4 +74,14 @@ public class Route implements Serializable
     public Integer getTime() {
         return time;
     }
+
+
+    /**
+     *
+     * @return Turn by turn instructions for a route
+     */
+    @Nullable
+    public List<Instruction> getInstructions() {
+        return instructions;
+    }
 }

CedarMapsSampleApp/build.gradle

@@ -7,15 +7,12 @@ android {
         applicationId "com.cedarmaps.sdksampleapp"
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 97022520
-        versionName "1.1.1"
+        versionCode 97050910
+        versionName "1.2.0"
 
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
-        debug {
-            applicationIdSuffix ".debug"
-        }
         release {
             minifyEnabled true
             shrinkResources true
@@ -27,11 +24,16 @@ android {
         abortOnError false
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     splits {
         abi {
             enable true
             reset()
-            include "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+//            include "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
             universalApk true
         }
     }
@@ -49,7 +51,7 @@ android {
             buildConfigField STRING, MARKET, GOOGLE_PLAY
             dimension "dimension"
             ndk {
-                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+                abiFilters "armeabi-v7a","arm64-v8a","x86","x86_64"
             }
         }
 
@@ -57,19 +59,13 @@ android {
             buildConfigField STRING, MARKET, CAFE_BAZAAR
             dimension "dimension"
             ndk {
-                abiFilters "armeabi-v7a", "arm64-v8a"
+                abiFilters "armeabi-v7a","arm64-v8a"
             }
         }
     }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
 }
 
 ext.abiCodes = ['armeabi-v7a':1, 'arm64-v8a':2, 'x86':3, 'x86_64':4]
-import com.android.build.OutputFile
 android.applicationVariants.all { variant ->
     variant.outputs.each { output ->
         def baseAbiVersionCode =
@@ -82,7 +78,7 @@ android.applicationVariants.all { variant ->
 
 dependencies {
     implementation (project(':CedarMapsSDK'))
-    implementation("com.mapbox.mapboxsdk:mapbox-android-plugin-locationlayer:0.5.0") {
+    implementation("com.mapbox.mapboxsdk:mapbox-android-plugin-locationlayer:0.7.1") {
         exclude group: 'com.mapbox.mapboxsdk'
     }
 

CedarMapsSampleApp/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.cedarmaps.sdksampleapp">
 
+    <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
     <application
@@ -10,12 +11,13 @@
         android:appCategory="maps"
         android:fullBackupContent="true"
         android:allowBackup="true"
+        android:name=".SampleApp"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:ignore="UnusedAttribute">
+        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"

CedarMapsSampleApp/src/main/java/com/cedarmaps/sdksampleapp/Constants.java

@@ -6,8 +6,8 @@ public class Constants {
 
     public static final int PERMISSION_LOCATION_REQUEST_CODE = 100;
 
-    static final String CLIENT_ID = "YOUR_CLIENT_ID";
-    static final String CLIENT_SECRET = "YOUR_CLIENT_SECRET";
+    static final String CLIENT_ID = "CLIENT_ID";
+    static final String CLIENT_SECRET = "CLIENT_SECRET";
 
     public static final LatLng VANAK_SQUARE = new LatLng(35.7572, 51.4099);
 }

CedarMapsSampleApp/src/main/java/com/cedarmaps/sdksampleapp/MainActivity.java

@@ -61,11 +61,6 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        CedarMaps.getInstance()
-                .setClientID(Constants.CLIENT_ID)
-                .setClientSecret(Constants.CLIENT_SECRET)
-                .setContext(this);
-
         CedarMaps.getInstance().prepareTiles(new OnTilesConfigured() {
             @Override
             public void onSuccess() {

CedarMapsSampleApp/src/main/java/com/cedarmaps/sdksampleapp/SampleApp.java

+package com.cedarmaps.sdksampleapp;
+
+import android.app.Application;
+
+import com.cedarstudios.cedarmapssdk.CedarMaps;
+
+public class SampleApp extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        CedarMaps.getInstance()
+                .setClientID(Constants.CLIENT_ID)
+                .setClientSecret(Constants.CLIENT_SECRET)
+                .setContext(this)
+                .setMapID("cedarmaps.mix");
+    }
+}

CedarMapsSampleApp/src/main/java/com/cedarmaps/sdksampleapp/fragments/ForwardGeocodeFragment.java

@@ -84,6 +84,7 @@ public class ForwardGeocodeFragment extends Fragment {
         super.onViewCreated(view, savedInstanceState);
 
         mMapView = view.findViewById(R.id.mapView);
+        mMapView.setStyleUrl("https://api.cedarmaps.com/v1/tiles/light.json");
         mMapView.onCreate(savedInstanceState);
         mMapView.getMapAsync(mapboxMap -> {
             mMapboxMap = mapboxMap;

CedarMapsSampleApp/src/main/java/com/cedarmaps/sdksampleapp/fragments/ReverseGeocodeFragment.java

@@ -50,6 +50,8 @@ public class ReverseGeocodeFragment extends Fragment {
 
         mMapView.onCreate(savedInstanceState);
 
+        mMapView.setStyleUrl("https://api.cedarmaps.com/v1/styles/cedarmaps.dark.json");
+
         mMapView.getMapAsync(mapboxMap -> {
             mMapboxMap = mapboxMap;
 

CedarMapsSampleApp/src/main/res/drawable/ic_launcher_foreground.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="266.21622"
+        android:viewportHeight="266.21622">
+    <group android:translateX="34.60811"
+            android:translateY="35.60811">
+      <path
+          android:pathData="M196.5,51.34L196.5,32.92C196.5,14.33 182.09,-0.5 163.5,-0.5L125.22,-0.5 154.77,71.34 196.5,51.34ZM196.5,51.34"
+          android:fillColor="#F9B718"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M1.32,162.92C2.05,178.63 13.64,191.63 28.71,194.53L57.29,136.61 1.32,162.92ZM1.32,162.92"
+          android:fillColor="#7764AA"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M0.5,96.71L0.5,143.49 52.12,119.22 0.5,96.71ZM0.5,96.71"
+          android:fillColor="#AB519D"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M134.67,135.67L196.86,162.96C196.88,162.43 196.5,161.89 196.5,161.35L196.5,70.79 152.96,91.45 134.67,135.67ZM134.67,135.67"
+          android:fillColor="#59A646"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M139.22,78.83L106.15,-0.5 72.91,-0.5 76.77,108.28 139.22,78.83ZM139.22,78.83"
+          android:fillColor="#F26D4A"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M79.72,130.6L48.04,194.5 90.44,194.5 111.69,144.37 79.72,130.6ZM79.72,130.6"
+          android:fillColor="#2F4858"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M118.54,128.64L129.51,102.65 95.55,118.62 118.54,128.64ZM118.54,128.64"
+          android:fillColor="#000000"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M55.3,-0.5L35.07,-0.5C16.49,-0.5 0.5,14.33 0.5,32.92L0.5,77.51 58.58,102.85 55.3,-0.5ZM55.3,-0.5"
+          android:fillColor="#EB298B"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M109.55,194.5L163.5,194.5C175.3,194.5 185.73,188.69 191.78,179.46L127.82,151.41 109.55,194.5ZM109.55,194.5"
+          android:fillColor="#016CAB"
+          android:strokeColor="#00000000"/>
+    </group>
+</vector>

CedarMapsSampleApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file

CedarMapsSampleApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file

CedarMapsSampleApp/src/main/res/values/ic_launcher_background.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file

README.md

@@ -2,7 +2,7 @@
 
 This guide will take you through the process of integrating CedarMaps into your Android application.
 
-All the mentioned methods and tools in this document are tested on Android Studio v3.1.
+All the mentioned methods and tools in this document are tested on Android Studio v3.1.3.
 
 ## Table of Contents
 - [Installation](#installation)
@@ -28,7 +28,7 @@ To install the current stable version, first add the address of CedarMaps maven
 ```groovy
 repositories {
     maven {
-        url "http://repo.cedarmaps.com/android/"
+        url "https://repo.cedarmaps.com/android/"
     }
 }
 ```
@@ -37,13 +37,18 @@ Then, add this to the `build.gradle` of your **app** module:
 
 ```groovy
 dependencies {
-    implementation 'com.cedarmaps:CedarMapsSDK:3.0.0'
+    implementation 'com.cedarmaps:CedarMapsSDK:3.1.0'
 }
 ```
 
 ### Required Permissions
 
-If your App needs to access location services, add the following to `AndroidManifest.xml`:
+Make sure your app can access internet by adding this to `AndroidManifest.xml`:
+```xml
+<uses-permission android:name="android.permission.INTERNET"/>
+```
+
+If your App needs to access location services, add the following as well:
 
 ```xml
 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -73,7 +78,7 @@ CedarMaps.getInstance()
 
 ### Mapbox
 
-CedarMaps SDK is based on [Mapbox GL Android SDK v6.0.1](https://github.com/mapbox/mapbox-gl-native) and provides extra API methods over Mapbox. 
+CedarMaps SDK is based on [Mapbox GL Android SDK v6.3.0](https://github.com/mapbox/mapbox-gl-native) and provides extra API methods over Mapbox. 
 For more information about how to use MapView and other components such as **Adding Markers**, **Showing Current Location**, etc., please see [Mapbox Getting Started](https://www.mapbox.com/help/first-steps-android-sdk/).
 
 #### MapView
@@ -137,6 +142,19 @@ mMapView.getMapAsync(new OnMapReadyCallback() {
 });
 ```
 
+##### Changing Map Style
+
+You can set various style URLs to instances of `MapView`:
+
+```java
+mMapView.setStyleUrl("STYLE_URL");
+
+// Light Vector (Default): "https://api.cedarmaps.com/v1/styles/cedarmaps.light.json"
+// Dark Vector: "https://api.cedarmaps.com/v1/styles/cedarmaps.dark.json"
+// Raster: "https://api.cedarmaps.com/v1/tiles/light.json"
+```
+Make sure to use your base URL if you have one.
+
 #### Plugins
 
 Mapbox uses [Plugins](https://github.com/mapbox/mapbox-plugins-android) to add extra functionality to the base SDK.

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

 GROUP=com.cedarmaps
-VERSION_NAME=2.0.0
+VERSION_NAME=3.1.0
 
 # Project-wide Gradle settings.
 

gradle/wrapper/gradle-wrapper.properties

-#Sun Apr 22 17:11:36 IRDT 2018
+#Tue Jul 31 16:50:23 IRDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip