Skip to content

Commit a509377

Browse files
author
Rodrigo Solis
committed
* 'master' of https://github.com/airbnb/react-native-maps: v0.16.2 Revert "Issue1176 improve ios marker performance by X100 (react-native-maps#1187)" Fix initial region android (react-native-maps#1563) v0.16.1 Enhance Podfile. (react-native-maps#1252) Update marker component (react-native-maps#1428) Add legalNotice constant (react-native-maps#1458) Issue1176 improve ios marker performance by X100 (react-native-maps#1187) Fix initial region native prop (react-native-maps#1546) fix `Archive` configuration for iOS builds (react-native-maps#1550) v0.16.0 Document MapView min/max zoom properties (react-native-maps#1538) Fix timing function used in AnimatedRegion.spring (react-native-maps#1479) Fix crashing the application when a user presses on the map and the Google Play Services need to be updated or at the moment of the process of updating (react-native-maps#1469) skip region monitoring if map object is null (react-native-maps#1443) Zoom level fixes (react-native-maps#1485) Attempt to fix crashes. A variant of react-native-maps#1403 but for another lifecycle method, as proposed by @Nelrohd. (react-native-maps#1464) Handle Android RN 0.47 breaking change (react-native-maps#1481) add MKTileOverlayRenderer (react-native-maps#1357) Add onMapReady callback (react-native-maps#1369)
2 parents ff2faad + fad3aab commit a509377

File tree

19 files changed

+125
-39
lines changed

19 files changed

+125
-39
lines changed

‎CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# Change Log
22

3+
## 0.16.2 (August 17, 2017)
4+
* Android: [#1563](https://github.com/airbnb/react-native-maps/pull/#1563) Add missing native method for setting initial region
5+
* iOS: [#1187](https://github.com/airbnb/react-native-maps/pull/1187) Reverted due to build issues
6+
7+
## 0.16.1 (August 15, 2017)
8+
* Android: [#1428](https://github.com/airbnb/react-native-maps/pull/#1428) Add ability to load marker image from drawable
9+
* iOS: [#1187](https://github.com/airbnb/react-native-maps/pull/1187) Improve marker performance
10+
* iOS/Android: [#1458](https://github.com/airbnb/react-native-maps/pull/1458) Add Google Maps legalNotice constant
11+
* JS: [#1546](https://github.com/airbnb/react-native-maps/pull/1546) Fix initial region native prop
12+
13+
## 0.16.0 (August 9, 2017)
14+
* Android: [#1481](https://github.com/airbnb/react-native-maps/pull/1481) Handle Android RN 0.47 breaking change
15+
* iOS: [#1357](https://github.com/airbnb/react-native-maps/pull/1357) add MKTileOverlayRenderer
16+
* iOS: [#1369](https://github.com/airbnb/react-native-maps/pull/1369) Add onMapReady callback
17+
* Android/iOS/JS: [#1360](https://github.com/airbnb/react-native-maps/pull/1360) Add minZoom and maxZoom properties for android and ios
18+
* JS: [#1479](https://github.com/airbnb/react-native-maps/pull/1479) Fix timing function used in AnimatedRegion.spring
19+
320
## 0.15.3 (June 27, 2017)
421

522
* iOS: [#1362](https://github.com/airbnb/react-native-maps/pull/1362) Updates for React 0.43-0.45 and React 16.

‎docs/mapview.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
| `showsIndoors` | `Boolean` | `true` | A Boolean indicating whether indoor maps should be enabled.
2323
| `showsIndoorLevelPicker` | `Boolean` | `false` | A Boolean indicating whether indoor level picker should be enabled. **Note:** Android only.
2424
| `zoomEnabled` | `Boolean` | `true` | If `false` the user won't be able to pinch/zoom the map.
25+
| `minZoomLevel` | `Number` | `0` | Minimum zoom value for the map, must be between 0 and 20
26+
| `maxZoomLevel` | `Number` | `20` | Maximum zoom value for the map, must be between 0 and 20
2527
| `rotateEnabled` | `Boolean` | `true` | If `false` the user won't be able to pinch/rotate the map.
2628
| `scrollEnabled` | `Boolean` | `true` | If `false` the user won't be able to change the map region being displayed.
2729
| `pitchEnabled` | `Boolean` | `true` | If `false` the user won't be able to adjust the camera’s pitch angle.
@@ -40,6 +42,7 @@ To access event data, you will need to use `e.nativeEvent`. For example, `onPres
4042

4143
| Event Name | Returns | Notes
4244
|---|---|---|
45+
| `onMapReady` | | Callback that is called once the map is fully loaded.
4346
| `onRegionChange` | `Region` | Callback that is called continuously when the region changes, such as when a user is dragging the map.
4447
| `onRegionChangeComplete` | `Region` | Callback that is called once when the region changes, such as when the user is done moving the map.
4548
| `onPress` | `{ coordinate: LatLng, position: Point }` | Callback that is called when user taps on the map.

‎example/ios/Podfile‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ platform :ios, '8.0'
55

66
# Change 'AirMapsExplorer' to match the target in your Xcode project.
77
target 'AirMapsExplorer' do
8+
rn_path = '../../node_modules/react-native'
89

9-
pod 'Yoga', :path => '../../node_modules/react-native/ReactCommon/yoga/Yoga.podspec'
10-
pod 'React', path: '../../node_modules/react-native', :subspecs => [
10+
pod 'Yoga', path: "#{rn_path}/ReactCommon/yoga/Yoga.podspec"
11+
pod 'React', path: rn_path, subspecs: [
1112
'Core',
1213
'RCTActionSheet',
1314
'RCTAnimation',
@@ -22,19 +23,21 @@ target 'AirMapsExplorer' do
2223
'BatchedBridge'
2324
]
2425

25-
pod 'GoogleMaps' # <~~ remove this line if you do not want to support GoogleMaps on iOS
26+
pod 'GoogleMaps' # Remove this line if you don't want to support GoogleMaps on iOS
2627
pod 'react-native-maps', path: '../../'
27-
pod 'react-native-google-maps', path: '../../' # <~~ if you need GoogleMaps support on iOS
28-
28+
pod 'react-native-google-maps', path: '../../' # If you need GoogleMaps support on iOS
2929
end
3030

31-
3231
post_install do |installer|
3332
installer.pods_project.targets.each do |target|
34-
if target.name == "react-native-google-maps"
33+
if target.name == 'react-native-google-maps'
3534
target.build_configurations.each do |config|
3635
config.build_settings['CLANG_ENABLE_MODULES'] = 'No'
3736
end
3837
end
38+
39+
if target.name == "React"
40+
target.remove_from_project
41+
end
3942
end
4043
end

‎lib/android/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VERSION_CODE=4
2-
VERSION_NAME=0.15.3
2+
VERSION_NAME=0.16.2
33
GROUP=com.airbnb.android
44

55
POM_DESCRIPTION=React Native Map view component for Android

‎lib/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ public void setRegion(AirMapView view, ReadableMap region) {
7575
view.setRegion(region);
7676
}
7777

78+
@ReactProp(name = "initialRegion")
79+
public void setInitialRegion(AirMapView view, ReadableMap initialRegion) {
80+
view.setInitialRegion(initialRegion);
81+
}
82+
7883
@ReactProp(name = "mapType")
7984
public void setMapType(AirMapView view, @Nullable String mapType) {
8085
int typeId = MAP_TYPES.get(mapType);

‎lib/android/src/main/java/com/airbnb/android/react/maps/AirMapModule.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,17 @@
1515
import com.facebook.react.uimanager.UIBlock;
1616
import com.facebook.react.uimanager.UIManagerModule;
1717
import com.google.android.gms.maps.GoogleMap;
18+
import com.google.android.gms.common.GoogleApiAvailability;
1819

1920
import java.io.ByteArrayOutputStream;
2021
import java.io.Closeable;
2122
import java.io.File;
2223
import java.io.FileOutputStream;
2324
import java.io.IOException;
2425

26+
import java.util.Map;
27+
import java.util.HashMap;
28+
2529
import javax.annotation.Nullable;
2630

2731
public class AirMapModule extends ReactContextBaseJavaModule {
@@ -40,6 +44,13 @@ public String getName() {
4044
return "AirMapModule";
4145
}
4246

47+
@Override
48+
public Map<String, Object> getConstants() {
49+
final Map<String, Object> constants = new HashMap<>();
50+
constants.put("legalNotice", GoogleApiAvailability.getInstance().getOpenSourceSoftwareLicenseInfo(getReactApplicationContext()));
51+
return constants;
52+
}
53+
4354
public Activity getActivity() {
4455
return getCurrentActivity();
4556
}

‎lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
7171
private boolean handlePanDrag = false;
7272
private boolean moveOnMarkerPress = true;
7373
private boolean cacheEnabled = false;
74+
private boolean initialRegionSet = false;
7475

7576
private static final String[] PERMISSIONS = new String[]{
7677
"android.permission.ACCESS_FINE_LOCATION", "android.permission.ACCESS_COARSE_LOCATION"};
@@ -305,7 +306,9 @@ public void onHostResume() {
305306
map.setMyLocationEnabled(showUserLocation);
306307
}
307308
synchronized (AirMapView.this) {
308-
AirMapView.this.onResume();
309+
if (!destroyed) {
310+
AirMapView.this.onResume();
311+
}
309312
paused = false;
310313
}
311314
}
@@ -359,6 +362,13 @@ public synchronized void doDestroy() {
359362
onDestroy();
360363
}
361364

365+
public void setInitialRegion(ReadableMap initialRegion) {
366+
if (!initialRegionSet && initialRegion != null) {
367+
setRegion(initialRegion);
368+
initialRegionSet = true;
369+
}
370+
}
371+
362372
public void setRegion(ReadableMap region) {
363373
if (region == null) return;
364374

@@ -713,13 +723,13 @@ public boolean dispatchTouchEvent(MotionEvent ev) {
713723
// Timer Implementation
714724

715725
public void startMonitoringRegion() {
716-
if (isMonitoringRegion) return;
726+
if (map == null || isMonitoringRegion) return;
717727
timerHandler.postDelayed(timerRunnable, 100);
718728
isMonitoringRegion = true;
719729
}
720730

721731
public void stopMonitoringRegion() {
722-
if (!isMonitoringRegion) return;
732+
if (map == null || !isMonitoringRegion) return;
723733
timerHandler.removeCallbacks(timerRunnable);
724734
isMonitoringRegion = false;
725735
}
@@ -732,16 +742,18 @@ public void stopMonitoringRegion() {
732742
@Override
733743
public void run() {
734744

735-
Projection projection = map.getProjection();
736-
VisibleRegion region = (projection != null) ? projection.getVisibleRegion() : null;
737-
LatLngBounds bounds = (region != null) ? region.latLngBounds : null;
738-
739-
if ((bounds != null) &&
740-
(lastBoundsEmitted == null ||
741-
LatLngBoundsUtils.BoundsAreDifferent(bounds, lastBoundsEmitted))) {
742-
LatLng center = map.getCameraPosition().target;
743-
lastBoundsEmitted = bounds;
744-
eventDispatcher.dispatchEvent(new RegionChangeEvent(getId(), bounds, center, true));
745+
if (map != null) {
746+
Projection projection = map.getProjection();
747+
VisibleRegion region = (projection != null) ? projection.getVisibleRegion() : null;
748+
LatLngBounds bounds = (region != null) ? region.latLngBounds : null;
749+
750+
if ((bounds != null) &&
751+
(lastBoundsEmitted == null ||
752+
LatLngBoundsUtils.BoundsAreDifferent(bounds, lastBoundsEmitted))) {
753+
LatLng center = map.getCameraPosition().target;
754+
lastBoundsEmitted = bounds;
755+
eventDispatcher.dispatchEvent(new RegionChangeEvent(getId(), bounds, center, true));
756+
}
745757
}
746758

747759
timerHandler.postDelayed(this, 100);

‎lib/android/src/main/java/com/airbnb/android/react/maps/MapsPackage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
2424
return Arrays.<NativeModule>asList(new AirMapModule(reactContext));
2525
}
2626

27-
@Override
27+
// Deprecated RN 0.47
2828
public List<Class<? extends JavaScriptModule>> createJSModules() {
2929
return Collections.emptyList();
3030
}

‎lib/components/AnimatedRegion.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,25 +111,25 @@ export default class AnimatedMapRegion extends AnimatedWithChildren {
111111
spring(config) {
112112
var animations = [];
113113
config.hasOwnProperty('latitude') &&
114-
animations.push(Animated.timing(this.latitude, {
114+
animations.push(Animated.spring(this.latitude, {
115115
...config,
116116
toValue: config.latitude
117117
}));
118118

119119
config.hasOwnProperty('longitude') &&
120-
animations.push(Animated.timing(this.longitude, {
120+
animations.push(Animated.spring(this.longitude, {
121121
...config,
122122
toValue: config.longitude
123123
}));
124124

125125
config.hasOwnProperty('latitudeDelta') &&
126-
animations.push(Animated.timing(this.latitudeDelta, {
126+
animations.push(Animated.spring(this.latitudeDelta, {
127127
...config,
128128
toValue: config.latitudeDelta
129129
}));
130130

131131
config.hasOwnProperty('longitudeDelta') &&
132-
animations.push(Animated.timing(this.longitudeDelta, {
132+
animations.push(Animated.spring(this.longitudeDelta, {
133133
...config,
134134
toValue: config.longitudeDelta
135135
}));

‎lib/components/MapMarker.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ class MapMarker extends React.Component {
257257
let image;
258258
if (this.props.image) {
259259
image = resolveAssetSource(this.props.image) || {};
260-
image = image.uri;
260+
image = image.uri || this.props.image;
261261
}
262262

263263
const AIRMapMarker = this.getAirComponent();

0 commit comments

Comments
 (0)