From de88afb7785293b589dcdd06919157f743c2866c Mon Sep 17 00:00:00 2001 From: Naftali Beder Date: Thu, 27 Oct 2022 22:32:19 -0500 Subject: [PATCH 1/9] Fix v10 interface signature --- ios/RCTMGL-v10/MGLModule.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/RCTMGL-v10/MGLModule.m b/ios/RCTMGL-v10/MGLModule.m index 3b25c4a93..072c1d2e3 100644 --- a/ios/RCTMGL-v10/MGLModule.m +++ b/ios/RCTMGL-v10/MGLModule.m @@ -2,7 +2,7 @@ @interface RCT_EXTERN_MODULE(MGLModule, NSObject) -RCT_EXTERN_METHOD(setAccessToken:) +RCT_EXTERN_METHOD(setAccessToken:(NSString *)accessToken resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(addCustomHeader:(NSString *)headerName forHeaderValue:(NSString *) headerValue) RCT_EXTERN_METHOD(removeCustomHeader:(NSString *)headerName) From 8fa722f44386ec50ea7a53592a89d8c63a535684 Mon Sep 17 00:00:00 2001 From: Naftali Beder Date: Thu, 27 Oct 2022 22:42:56 -0500 Subject: [PATCH 2/9] Add dividers and padding for readability --- example/src/examples/Map/Ornaments.tsx | 27 ++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/example/src/examples/Map/Ornaments.tsx b/example/src/examples/Map/Ornaments.tsx index 2c654aa4f..ea1d47c2f 100755 --- a/example/src/examples/Map/Ornaments.tsx +++ b/example/src/examples/Map/Ornaments.tsx @@ -1,6 +1,7 @@ import React, { FC, useState } from 'react'; import MapboxGL from '@rnmapbox/maps'; import { Button, StyleSheet, Text } from 'react-native'; +import { Divider } from '@rneui/base'; import sheet from '../../styles/sheet'; import Page from '../common/Page'; @@ -27,12 +28,6 @@ const POSITIONS = { [OrnamentPosition.BottomLeft]: { bottom: 8, left: 8 }, }; -const styles = StyleSheet.create({ - bubble: { - marginBottom: 96, - }, -}); - type OrnamentButtonsProps = { ornamentType: OrnamentType; visibility: Record; @@ -135,6 +130,8 @@ const ShowMap: FC = (props) => { onPressPosition={handlePressPosition} /> + + Attribution = (props) => { onPressPosition={handlePressPosition} /> + + Compass = (props) => { onPressPosition={handlePressPosition} /> + + ScaleBar = (props) => { ); }; +const styles = StyleSheet.create({ + divider: { + width: '100%', + marginTop: 5, + marginBottom: 10, + }, + bubble: { + flex: 0, + alignItems: 'flex-start', + padding: 10, + marginBottom: 96, + }, +}); + export default ShowMap; From 3298d227672704a23c70c20d3d7c1b2eaaeb1e7f Mon Sep 17 00:00:00 2001 From: Naftali Beder Date: Fri, 28 Oct 2022 12:06:26 -0500 Subject: [PATCH 3/9] Enable setting compass image on iOS --- docs/MapView.md | 1 + docs/docs.json | 7 +++++ example/src/assets/compass1.png | Bin 0 -> 7789 bytes example/src/assets/compass2.png | Bin 0 -> 31838 bytes example/src/examples/Map/Ornaments.tsx | 23 ++++++++++++++ index.d.ts | 1 + ios/RCTMGL-v10/RCTMGLMapView.swift | 42 ++++++++++++++++++++----- ios/RCTMGL-v10/RCTMGLMapViewManager.m | 3 ++ javascript/components/MapView.js | 5 +++ 9 files changed, 75 insertions(+), 7 deletions(-) create mode 100644 example/src/assets/compass1.png create mode 100644 example/src/assets/compass2.png diff --git a/docs/MapView.md b/docs/MapView.md index bfeb02b47..d8f923d12 100644 --- a/docs/MapView.md +++ b/docs/MapView.md @@ -26,6 +26,7 @@ MapView backed by Mapbox Native GL | compassPosition | `custom` | `none` | `false` | [`mapbox` (v10) implementation only] Adds compass offset, e.g. `{top: 8, left: 8}` will put the compass in top-left corner of the map | | compassViewPosition | `number` | `none` | `false` | Change corner of map the compass starts at. 0: TopLeft, 1: TopRight, 2: BottomLeft, 3: BottomRight | | compassViewMargins | `object` | `none` | `false` | Add margins to the compass with x and y values | +| compassImage | `string` | `none` | `false` | [`mapbox` (v10) implementation only] A string referencing an image key. Requires an `Images` component. | | scaleBarEnabled | `bool` | `true` | `false` | [`mapbox` (v10) implementation only] Enable/Disable the scale bar from appearing on the map | | scaleBarPosition | `custom` | `none` | `false` | [`mapbox` (v10) implementation only] Adds scale bar offset, e.g. `{top: 8, left: 8}` will put the scale bar in top-left corner of the map | | surfaceView | `bool` | `false` | `false` | [Android only] Enable/Disable use of GLSurfaceView instead of TextureView. | diff --git a/docs/docs.json b/docs/docs.json index 2510004ed..023b101c3 100644 --- a/docs/docs.json +++ b/docs/docs.json @@ -3031,6 +3031,13 @@ "default": "none", "description": "Add margins to the compass with x and y values" }, + { + "name": "compassImage", + "required": false, + "type": "string", + "default": "none", + "description": "[`mapbox` (v10) implementation only] A string referencing an image key. Requires an `Images` component." + }, { "name": "scaleBarEnabled", "required": false, diff --git a/example/src/assets/compass1.png b/example/src/assets/compass1.png new file mode 100644 index 0000000000000000000000000000000000000000..a29dd3b1f8f7c4b97ba26c61eb3e92995caacaa7 GIT binary patch literal 7789 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 dSw!F&iK;&FrwBAh`1wDk8Y_hmJkNiOyQmU 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 m<6>esr81-;1U`_H literal 0 HcmV?d00001 diff --git a/example/src/examples/Map/Ornaments.tsx b/example/src/examples/Map/Ornaments.tsx index ea1d47c2f..76f16bc55 100755 --- a/example/src/examples/Map/Ornaments.tsx +++ b/example/src/examples/Map/Ornaments.tsx @@ -6,6 +6,13 @@ import { Divider } from '@rneui/base'; import sheet from '../../styles/sheet'; import Page from '../common/Page'; import Bubble from '../common/Bubble'; +import { Images } from '../../../../javascript'; + +type CompassImage = 'compass1' | 'compass2'; +const images: Record = { + compass1: require('../../assets/compass1.png'), + compass2: require('../../assets/compass2.png'), +}; enum OrnamentType { Logo = 'logo', @@ -70,6 +77,8 @@ const ShowMap: FC = (props) => { [OrnamentType.ScaleBar]: OrnamentPosition.TopLeft, }); + const [compassImage, setCompassImage] = useState(); + const handlePressVisibility = (ornamentType: OrnamentType): void => { setVisibility((prevState) => { let newValue; @@ -114,9 +123,11 @@ const ShowMap: FC = (props) => { attributionPosition={POSITIONS[position[OrnamentType.Attribution]]} compassEnabled={visibility[OrnamentType.Compass]} compassPosition={POSITIONS[position[OrnamentType.Compass]]} + compassImage={compassImage} scaleBarEnabled={visibility[OrnamentType.ScaleBar]} scaleBarPosition={POSITIONS[position[OrnamentType.ScaleBar]]} > + @@ -151,6 +162,18 @@ const ShowMap: FC = (props) => { onPressVisibility={handlePressVisibility} onPressPosition={handlePressPosition} /> +