tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] #2748 - added a coordinatebounds unit test

Browse Source
This commit is contained in:
Tobrun
2015-10-23 09:42:23 +02:00
parent 267e33ba5a
commit 0ff57342fd
3 changed files with 102 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateBounds.java
View File

@@ -5,27 +5,54 @@ package com.mapbox.mapboxsdk.geometry;
*/
public class CoordinateBounds {
private LatLng sw;
private LatLng ne;
private LatLng southWest;
private LatLng northEast;
public CoordinateBounds(LatLng sw, LatLng ne) {
this.sw = sw;
this.ne = ne;
public CoordinateBounds(LatLng southWest, LatLng northEast) {
this.southWest = southWest;
this.northEast = northEast;
}
public LatLng getSw() {
return sw;
public LatLng getSouthWest() {
return southWest;
}
public void setSw(LatLng sw) {
this.sw = sw;
public void setSouthWest(LatLng southWest) {
this.southWest = southWest;
}
public LatLng getNe() {
return ne;
public LatLng getNorthEast() {
return northEast;
}
public void setNe(LatLng ne) {
this.ne = ne;
public void setNorthEast(LatLng northEast) {
this.northEast = northEast;
}
@Override
public int hashCode() {
int result;
long temp;
temp = southWest.hashCode();
result = (int) (temp ^ (temp >>> 32));
temp = northEast.hashCode();
result = 31 * result + (int) (temp ^ (temp >>> 32));
return result;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o instanceof CoordinateBounds) {
CoordinateBounds other = (CoordinateBounds) o;
return getNorthEast().equals(other.getNorthEast())
&& getSouthWest() == other.getSouthWest();
}
return false;
}
@Override
public String toString() {
return "CoordinateBounds [northEast[" + getNorthEast() + "], southWest[]" + getSouthWest() + "]";
}
}

8
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
View File

@@ -2019,10 +2019,10 @@ public final class MapView extends FrameLayout {
@UiThread
public void setVisibleCoordinateBounds(@NonNull CoordinateBounds bounds, @NonNull RectF padding, boolean animated) {
LatLng[] coordinates = {
new LatLng(bounds.getNe().getLatitude(), bounds.getSw().getLongitude()),
bounds.getSw(),
new LatLng(bounds.getSw().getLatitude(), bounds.getNe().getLongitude()),
bounds.getNe()
new LatLng(bounds.getNorthEast().getLatitude(), bounds.getSouthWest().getLongitude()),
bounds.getSouthWest(),
new LatLng(bounds.getSouthWest().getLatitude(), bounds.getNorthEast().getLongitude()),
bounds.getNorthEast()
};
setVisibleCoordinateBounds(coordinates, padding, animated);