From 1429a24de98eebe770e066a0cd19f4dbb84bd328 Mon Sep 17 00:00:00 2001
From: Jan Aagaard <jan@aagaard.net>
Date: Mon, 3 Dec 2018 08:46:09 +0100
Subject: [PATCH] Import react-native-maps through expo

---
 types/expo/expo-tests.tsx | 18 ++++++++----------
 types/expo/index.d.ts     |  3 ++-
 types/expo/tsconfig.json  |  1 -
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index a3789873a9..aa69df28ad 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -20,6 +20,9 @@ import {
     CameraObject,
     Constants,
     DocumentPicker,
+    EdgeInsets,
+    EdgePadding,
+    EventUserLocation,
     Facebook,
     FacebookAds,
     FaceDetector,
@@ -29,29 +32,24 @@ import {
     ImagePicker,
     IntentLauncherAndroid,
     KeepAwake,
+    KmlMapEvent,
     LinearGradient,
     Linking,
     Location,
     MailComposer,
+    MapEvent,
+    MapStyleElement,
+    MapView,
     MediaLibrary,
     Permissions,
     PublisherBanner,
+    Region,
     registerRootComponent,
     ScreenOrientation,
     Svg,
     Updates
 } from 'expo';
 
-import MapView, {
-    EdgeInsets,
-    EdgePadding,
-    EventUserLocation,
-    KmlMapEvent,
-    MapEvent,
-    MapStyleElement,
-    Region
-} from 'react-native-maps';
-
 const reverseGeocode: Promise<Location.GeocodeData[]> = Location.reverseGeocodeAsync({
     latitude: 0,
     longitude: 0
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 30a36743f4..55dc4ffd06 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -16,7 +16,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-export { default } from 'react-native-maps';
+export * from 'react-native-maps';
+export { default as MapView } from 'react-native-maps';
 
 import { EventSubscription } from 'fbemitter';
 import { Component, ComponentClass, Ref, ComponentType } from 'react';
diff --git a/types/expo/tsconfig.json b/types/expo/tsconfig.json
index 67acb42d2e..e00f046e0e 100644
--- a/types/expo/tsconfig.json
+++ b/types/expo/tsconfig.json
@@ -17,7 +17,6 @@
     },
     "files": [
         "index.d.ts",
-        "MapView.d.ts",
         "expo-tests.tsx"
     ]
 }