From 4681d0b54577715cf1e9fcf33fa483b07b164987 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Tue, 15 Mar 2016 11:45:40 -0400 Subject: [android] #4320 - rename including to contains --- .../src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java | 2 +- .../test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java index 3b63871382..5251ab4d6d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java @@ -162,7 +162,7 @@ public class LatLngBounds implements Parcelable { * @param latLng the point which may be contained * @return true, if the point is contained within the box. */ - public boolean including(final ILatLng latLng) { + public boolean contains(final ILatLng latLng) { final double latitude = latLng.getLatitude(); final double longitude = latLng.getLongitude(); return ((latitude < this.mLatNorth) diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java index e3870b63e2..f9cdf29b81 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java @@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.geometry; import com.mapbox.mapboxsdk.exceptions.InvalidLatLngBoundsException; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -100,12 +99,12 @@ public class LatLngBoundsTest { @Test public void testIncluding() { - assertTrue("LatLng should be included", mLatLngBounds.including(new LatLng(1, 1))); + assertTrue("LatLng should be included", mLatLngBounds.contains(new LatLng(1, 1))); } @Test public void testNoIncluding() { - assertFalse("LatLng should not be included", mLatLngBounds.including(new LatLng(3, 1))); + assertFalse("LatLng should not be included", mLatLngBounds.contains(new LatLng(3, 1))); } @Test -- cgit v1.2.1