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

[android] - correct degrees/radiants integration into transform.cpp, fixes camera position restoration from core and missing return value occurrence. (#6641)

Browse Source
This commit is contained in:
Tobrun
2016-10-10 23:51:56 +02:00
committed by GitHub
parent e598bbfa7c
commit 5bbd27eb8f
3 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
View File

@@ -158,7 +158,7 @@ public final class CameraPosition implements Parcelable {
double lat = typedArray.getFloat(R.styleable.MapView_center_latitude, 0.0f);
double lng = typedArray.getFloat(R.styleable.MapView_center_longitude, 0.0f);
this.target = new LatLng(lat, lng);
this.tilt = Math.toRadians(typedArray.getFloat(R.styleable.MapView_tilt, 0.0f));
this.tilt = typedArray.getFloat(R.styleable.MapView_tilt, 0.0f);
this.zoom = typedArray.getFloat(R.styleable.MapView_zoom, 0.0f);
}
}
@@ -192,16 +192,19 @@ public final class CameraPosition implements Parcelable {
/**
* Create Builder from an existing array of doubles.
* <p>
* These values conform to map.ccp representation of a camera position.
* </p>
*
* @param values Values containing target, bearing, tilt and zoom
* @param nativeCameraValues Values containing target, bearing, tilt and zoom
*/
public Builder(double[] values) {
public Builder(double[] nativeCameraValues) {
super();
if (values != null && values.length == 5) {
this.target = new LatLng(values[0], values[1]);
this.bearing = Math.toDegrees(values[2]);
this.tilt = Math.toRadians(values[3]);
this.zoom = (float) values[4];
if (nativeCameraValues != null && nativeCameraValues.length == 5) {
target(new LatLng(nativeCameraValues[0], nativeCameraValues[1]));
bearing(-nativeCameraValues[2]);
tilt(nativeCameraValues[3]);
zoom((float) nativeCameraValues[4]);
}
}
@@ -212,7 +215,16 @@ public final class CameraPosition implements Parcelable {
* @return Builder
*/
public Builder bearing(double bearing) {
this.bearing = bearing;
double direction = bearing;
while (direction > 360) {
direction -= 360;
}
while (direction < 0) {
direction += 360;
}
this.bearing = direction;
return this;
}
@@ -237,13 +249,16 @@ public final class CameraPosition implements Parcelable {
}
/**
* Set the tilt
* Set the tilt in degrees
* <p>
* value is clamped to 0 and 60.
* <p/>
*
* @param tilt Tilt value
* @return Builder
*/
public Builder tilt(double tilt) {
this.tilt = (float) Math.toRadians(MathUtils.clamp(tilt, MapboxConstants.MINIMUM_TILT, MapboxConstants.MAXIMUM_TILT));
this.tilt = (float) MathUtils.clamp(tilt, MapboxConstants.MINIMUM_TILT, MapboxConstants.MAXIMUM_TILT);
return this;
}

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

@@ -87,6 +87,7 @@ import com.mapbox.mapboxsdk.maps.widgets.MyLocationViewSettings;
import com.mapbox.mapboxsdk.telemetry.MapboxEvent;
import com.mapbox.mapboxsdk.telemetry.MapboxEventManager;
import com.mapbox.mapboxsdk.utils.ColorUtils;
import com.mapbox.mapboxsdk.utils.MathUtils;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -1314,7 +1315,7 @@ public class MapView extends FrameLayout {
return;
}
nativeMapView.cancelTransitions();
nativeMapView.jumpTo(bearing, center, pitch, zoom);
nativeMapView.jumpTo(Math.toRadians(bearing), center, Math.toRadians(MathUtils.clamp(pitch, MapboxConstants.MINIMUM_TILT, MapboxConstants.MAXIMUM_TILT)), zoom);
}
void easeTo(double bearing, LatLng center, long duration, double pitch, double zoom, boolean easingInterpolator, @Nullable final MapboxMap.CancelableCallback cancelableCallback) {
@@ -1338,7 +1339,7 @@ public class MapView extends FrameLayout {
});
}
nativeMapView.easeTo(bearing, center, duration, pitch, zoom, easingInterpolator);
nativeMapView.easeTo(Math.toRadians(bearing), center, duration, Math.toRadians(MathUtils.clamp(pitch, MapboxConstants.MINIMUM_TILT, MapboxConstants.MAXIMUM_TILT)), zoom, easingInterpolator);
}
void flyTo(double bearing, LatLng center, long duration, double pitch, double zoom, @Nullable final MapboxMap.CancelableCallback cancelableCallback) {
@@ -1362,7 +1363,7 @@ public class MapView extends FrameLayout {
});
}
nativeMapView.flyTo(bearing, center, duration, pitch, zoom);
nativeMapView.flyTo(Math.toRadians(bearing), center, duration, Math.toRadians(MathUtils.clamp(pitch, MapboxConstants.MINIMUM_TILT, MapboxConstants.MAXIMUM_TILT)), zoom);
}
private void adjustTopOffsetPixels() {
@@ -2503,6 +2504,7 @@ public class MapView extends FrameLayout {
if (mapboxMap.getUiSettings().isZoomControlsEnabled()) {
zoomButtonsController.setVisible(false);
}
return true;
default:
// We are not interested in this event