change method namesupstream/set_fps_mapview

3 files changed, 14 insertions, 18 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index cef7242ff3..6f07f276e0 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -426,14 +426,14 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
   }
 
   /**
-   *  The preferred frame rate at which the map view is rendered,
+   *  The maximum frame rate at which the map view is rendered,
    *  but it can't excess the ability of device hardware.
    *
-   * @param preferredFramesPerSecond  Can be set to arbitrary integer values.
+   * @param maximumFps  Can be set to arbitrary integer values.
    */
-  public void setPreferredFramesPerSecond(int preferredFramesPerSecond) {
+  public void setMaximumFps(int maximumFps) {
     if (mapRenderer != null) {
-      mapRenderer.setPreferredFramesPerSecond(preferredFramesPerSecond);
+      mapRenderer.setMaximumFps(maximumFps);
     }
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java
index 449ba3b93e..a9bea97836 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java
@@ -5,7 +5,6 @@ import android.support.annotation.CallSuper;
 import android.support.annotation.Keep;
 
 import android.support.annotation.NonNull;
-
 import com.mapbox.mapboxsdk.log.Logger;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.storage.FileSource;
@@ -27,6 +26,7 @@ public abstract class MapRenderer implements MapRendererScheduler {
 
   // Holds the pointer to the native peer after initialisation
   private long nativePtr = 0;
+
   private double expectedRenderTime = 0;
   private MapboxMap.OnFpsChangedListener onFpsChangedListener;
 
@@ -87,7 +87,7 @@ public abstract class MapRenderer implements MapRendererScheduler {
       try {
         Thread.sleep((long) ((expectedRenderTime - renderTime) / 1E6));
       } catch (InterruptedException ex) {
-        ex.printStackTrace();
+        Logger.e(TAG, ex.getMessage());
       }
     }
     if (onFpsChangedListener != null) {
@@ -125,29 +125,26 @@ public abstract class MapRenderer implements MapRendererScheduler {
 
   private native void nativeRender();
 
-  private long frames;
   private long timeElapsed;
 
   private void updateFps() {
-    frames++;
     long currentTime = System.nanoTime();
-    double fps = frames / ((currentTime - timeElapsed) / 1E9);
+    double fps = 1E9 / ((currentTime - timeElapsed));
     onFpsChangedListener.onFpsChanged(fps);
     timeElapsed = currentTime;
-    frames = 0;
   }
 
   /**
-   * The preferred frame rate at which this render is rendered,
+   * The max frame rate at which this render is rendered,
    * but it can't excess the ability of device hardware.
    *
-   * @param preferredFramesPerSecond Can be set to arbitrary integer values.
+   * @param maximumFps Can be set to arbitrary integer values.
    */
-  public void setPreferredFramesPerSecond(int preferredFramesPerSecond) {
-    if (preferredFramesPerSecond <= 0) {
+  public void setMaximumFps(int maximumFps) {
+    if (maximumFps <= 0) {
       // Not valid, just return
       return;
     }
-    expectedRenderTime = 1E9 / preferredFramesPerSecond;
+    expectedRenderTime = 1E9 / maximumFps;
   }
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
index 310b0a88a0..bcb8f8d1b0 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
@@ -28,7 +28,6 @@ import java.util.List;
 import java.util.Locale;
 
 import com.mapbox.mapboxsdk.testapp.utils.IdleZoomListener;
-
 import timber.log.Timber;
 
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility;
@@ -171,10 +170,10 @@ public class DebugModeActivity extends AppCompatActivity implements OnMapReadyCa
 
   private void setupFpsChangeView() {
     findViewById(R.id.fps_30).setOnClickListener(view -> {
-      mapView.setPreferredFramesPerSecond(30);
+      mapView.setMaximumFps(30);
     });
     findViewById(R.id.fps_60).setOnClickListener(view -> {
-      mapView.setPreferredFramesPerSecond(60);
+      mapView.setMaximumFps(60);
     });
   }