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

Merge branch 'release-agua' into master

Browse Source 
# Conflicts:
#	include/mbgl/style/conversion/layer.hpp
#	platform/android/MapboxGLAndroidSDK/build.gradle
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java
This commit is contained in:
Fabian Guerra
2018-01-25 14:39:18 -05:00
parent b6747a84f4 0ebc2ee91f
commit da7759a273
4 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
View File

@@ -68,7 +68,6 @@ public final class MapFragment extends Fragment implements OnMapReadyCallback {
super.onCreateView(inflater, container, savedInstanceState);
Context context = inflater.getContext();
map = new MapView(context, MapFragmentUtils.resolveArgs(context, getArguments()));
map.setVisibility(View.INVISIBLE);
return map;
}
@@ -91,7 +90,6 @@ public final class MapFragment extends Fragment implements OnMapReadyCallback {
for (OnMapReadyCallback onMapReadyCallback : mapReadyCallbackList) {
onMapReadyCallback.onMapReady(mapboxMap);
}
map.setVisibility(View.VISIBLE);
}
/**

2
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
View File

@@ -68,7 +68,6 @@ public class SupportMapFragment extends Fragment implements OnMapReadyCallback {
super.onCreateView(inflater, container, savedInstanceState);
Context context = inflater.getContext();
map = new MapView(context, MapFragmentUtils.resolveArgs(context, getArguments()));
map.setVisibility(View.INVISIBLE);
return map;
}
@@ -91,7 +90,6 @@ public class SupportMapFragment extends Fragment implements OnMapReadyCallback {
for (OnMapReadyCallback onMapReadyCallback : mapReadyCallbackList) {
onMapReadyCallback.onMapReady(mapboxMap);
}
map.setVisibility(View.VISIBLE);
}
/**

2
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
View File

@@ -261,7 +261,7 @@ final class Transform implements MapView.OnMapChangedListener {
setZoom(zoom, focalPoint, 0, false);
}
void setZoom(double zoom, @NonNull PointF focalPoint, long duration, boolean isAnimator) {
void setZoom(double zoom, @NonNull PointF focalPoint, long duration, final boolean isAnimator) {
if (mapView != null) {
mapView.addOnMapChangedListener(new MapView.OnMapChangedListener() {
@Override