@maplibre/maplibre-react-native 10.1.0-beta.1 → 10.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (166) hide show
  1. package/android/gradle.properties +1 -1
  2. package/ios/MLRN/CameraStop.h +1 -1
  3. package/ios/MLRN/CameraStop.m +58 -60
  4. package/ios/MLRN/CameraUpdateItem.h +2 -1
  5. package/ios/MLRN/CameraUpdateItem.m +132 -132
  6. package/ios/MLRN/CameraUpdateQueue.m +43 -47
  7. package/ios/MLRN/FilterParser.h +1 -1
  8. package/ios/MLRN/FilterParser.m +5 -6
  9. package/ios/MLRN/MLRNBackgroundLayer.m +10 -9
  10. package/ios/MLRN/MLRNBackgroundLayerManager.m +4 -5
  11. package/ios/MLRN/MLRNCallout.h +1 -1
  12. package/ios/MLRN/MLRNCallout.m +37 -36
  13. package/ios/MLRN/MLRNCalloutManager.m +2 -3
  14. package/ios/MLRN/MLRNCamera.h +1 -1
  15. package/ios/MLRN/MLRNCamera.m +169 -182
  16. package/ios/MLRN/MLRNCameraManager.m +4 -6
  17. package/ios/MLRN/MLRNCircleLayer.m +17 -14
  18. package/ios/MLRN/MLRNCircleLayerManager.m +4 -5
  19. package/ios/MLRN/MLRNCustomHeaders.h +2 -2
  20. package/ios/MLRN/MLRNCustomHeaders.m +63 -63
  21. package/ios/MLRN/MLRNEvent.h +3 -3
  22. package/ios/MLRN/MLRNEvent.m +19 -24
  23. package/ios/MLRN/MLRNEventProtocol.h +1 -1
  24. package/ios/MLRN/MLRNFillExtrusionLayer.m +18 -14
  25. package/ios/MLRN/MLRNFillExtrusionLayerManager.m +4 -5
  26. package/ios/MLRN/MLRNFillLayer.m +16 -14
  27. package/ios/MLRN/MLRNFillLayerManager.m +4 -5
  28. package/ios/MLRN/MLRNHeatmapLayer.m +17 -14
  29. package/ios/MLRN/MLRNHeatmapLayerManager.m +4 -5
  30. package/ios/MLRN/MLRNImageQueue.h +4 -1
  31. package/ios/MLRN/MLRNImageQueue.m +29 -32
  32. package/ios/MLRN/MLRNImageQueueOperation.h +1 -1
  33. package/ios/MLRN/MLRNImageQueueOperation.m +92 -91
  34. package/ios/MLRN/MLRNImageSource.m +36 -38
  35. package/ios/MLRN/MLRNImageSourceManager.m +2 -3
  36. package/ios/MLRN/MLRNImageUtils.h +3 -3
  37. package/ios/MLRN/MLRNImageUtils.m +15 -14
  38. package/ios/MLRN/MLRNImages.h +0 -1
  39. package/ios/MLRN/MLRNImages.m +89 -91
  40. package/ios/MLRN/MLRNImagesManager.m +4 -5
  41. package/ios/MLRN/MLRNLayer.h +9 -11
  42. package/ios/MLRN/MLRNLayer.m +170 -182
  43. package/ios/MLRN/MLRNLight.m +21 -23
  44. package/ios/MLRN/MLRNLightManager.m +2 -3
  45. package/ios/MLRN/MLRNLineLayer.m +17 -15
  46. package/ios/MLRN/MLRNLineLayerManager.m +4 -6
  47. package/ios/MLRN/MLRNLocation.h +1 -1
  48. package/ios/MLRN/MLRNLocation.m +16 -17
  49. package/ios/MLRN/MLRNLocationManager.m +109 -124
  50. package/ios/MLRN/MLRNLocationManagerDelegate.h +3 -3
  51. package/ios/MLRN/MLRNLocationModule.h +1 -1
  52. package/ios/MLRN/MLRNLocationModule.m +40 -55
  53. package/ios/MLRN/MLRNLogging.h +1 -4
  54. package/ios/MLRN/MLRNLogging.m +84 -89
  55. package/ios/MLRN/MLRNMapTouchEvent.h +2 -2
  56. package/ios/MLRN/MLRNMapTouchEvent.m +50 -49
  57. package/ios/MLRN/MLRNMapView.h +43 -36
  58. package/ios/MLRN/MLRNMapView.m +409 -440
  59. package/ios/MLRN/MLRNMapViewManager.m +489 -502
  60. package/ios/MLRN/MLRNModule.h +1 -1
  61. package/ios/MLRN/MLRNModule.m +111 -105
  62. package/ios/MLRN/MLRNNativeUserLocation.m +24 -27
  63. package/ios/MLRN/MLRNNativeUserLocationManager.m +4 -8
  64. package/ios/MLRN/MLRNOfflineModule.h +1 -1
  65. package/ios/MLRN/MLRNOfflineModule.m +416 -421
  66. package/ios/MLRN/MLRNPointAnnotation.h +2 -2
  67. package/ios/MLRN/MLRNPointAnnotation.m +154 -175
  68. package/ios/MLRN/MLRNPointAnnotationManager.m +2 -3
  69. package/ios/MLRN/MLRNRasterLayer.m +16 -12
  70. package/ios/MLRN/MLRNRasterLayerManager.m +4 -5
  71. package/ios/MLRN/MLRNRasterSource.m +21 -17
  72. package/ios/MLRN/MLRNRasterSourceManager.m +2 -3
  73. package/ios/MLRN/MLRNShapeSource.h +17 -16
  74. package/ios/MLRN/MLRNShapeSource.m +94 -102
  75. package/ios/MLRN/MLRNShapeSourceManager.h +2 -2
  76. package/ios/MLRN/MLRNShapeSourceManager.m +86 -90
  77. package/ios/MLRN/MLRNSnapshotModule.h +1 -1
  78. package/ios/MLRN/MLRNSnapshotModule.m +51 -53
  79. package/ios/MLRN/MLRNSource.h +12 -12
  80. package/ios/MLRN/MLRNSource.m +82 -88
  81. package/ios/MLRN/MLRNStyleValue.h +1 -1
  82. package/ios/MLRN/MLRNStyleValue.m +128 -128
  83. package/ios/MLRN/MLRNSymbolLayer.m +17 -13
  84. package/ios/MLRN/MLRNSymbolLayerManager.m +4 -5
  85. package/ios/MLRN/MLRNTileSource.h +1 -1
  86. package/ios/MLRN/MLRNTileSource.m +21 -20
  87. package/ios/MLRN/MLRNUserLocation.h +1 -1
  88. package/ios/MLRN/MLRNUserLocation.m +10 -12
  89. package/ios/MLRN/MLRNUtils.h +18 -11
  90. package/ios/MLRN/MLRNUtils.m +168 -160
  91. package/ios/MLRN/MLRNVectorLayer.m +28 -34
  92. package/ios/MLRN/MLRNVectorSource.h +3 -1
  93. package/ios/MLRN/MLRNVectorSource.m +14 -11
  94. package/ios/MLRN/MLRNVectorSourceManager.h +2 -2
  95. package/ios/MLRN/MLRNVectorSourceManager.m +36 -39
  96. package/ios/MLRN/ViewManager.h +1 -1
  97. package/ios/MLRN/ViewManager.m +29 -35
  98. package/lib/commonjs/components/MarkerView.js +1 -1
  99. package/lib/commonjs/components/UserLocation.js +8 -38
  100. package/lib/commonjs/components/UserLocation.js.map +1 -1
  101. package/lib/commonjs/components/UserLocationPuck.js +52 -0
  102. package/lib/commonjs/components/UserLocationPuck.js.map +1 -0
  103. package/lib/commonjs/components/{HeadingIndicator.js → UserLocationPuckHeading.js} +12 -9
  104. package/lib/commonjs/components/UserLocationPuckHeading.js.map +1 -0
  105. package/lib/commonjs/plugin/android.js +4 -6
  106. package/lib/commonjs/plugin/android.js.map +1 -1
  107. package/lib/module/components/MarkerView.js +1 -1
  108. package/lib/module/components/UserLocation.js +7 -36
  109. package/lib/module/components/UserLocation.js.map +1 -1
  110. package/lib/module/components/UserLocationPuck.js +48 -0
  111. package/lib/module/components/UserLocationPuck.js.map +1 -0
  112. package/lib/module/components/{HeadingIndicator.js → UserLocationPuckHeading.js} +11 -7
  113. package/lib/module/components/UserLocationPuckHeading.js.map +1 -0
  114. package/lib/module/plugin/android.js +3 -5
  115. package/lib/module/plugin/android.js.map +1 -1
  116. package/lib/typescript/commonjs/src/components/MarkerView.d.ts +1 -1
  117. package/lib/typescript/commonjs/src/components/UserLocation.d.ts +0 -1
  118. package/lib/typescript/commonjs/src/components/UserLocation.d.ts.map +1 -1
  119. package/lib/typescript/commonjs/src/components/UserLocationPuck.d.ts +9 -0
  120. package/lib/typescript/commonjs/src/components/UserLocationPuck.d.ts.map +1 -0
  121. package/lib/typescript/commonjs/src/components/UserLocationPuckHeading.d.ts +9 -0
  122. package/lib/typescript/commonjs/src/components/UserLocationPuckHeading.d.ts.map +1 -0
  123. package/lib/typescript/commonjs/src/plugin/MapLibrePluginProps.d.ts +1 -1
  124. package/lib/typescript/commonjs/src/plugin/android.d.ts +1 -0
  125. package/lib/typescript/commonjs/src/plugin/android.d.ts.map +1 -1
  126. package/lib/typescript/commonjs/src/utils/animated/AbstractAnimatedCoordinates.d.ts +0 -1
  127. package/lib/typescript/commonjs/src/utils/animated/AbstractAnimatedCoordinates.d.ts.map +1 -1
  128. package/lib/typescript/commonjs/src/utils/animated/AnimatedExtractCoordinateFromArray.d.ts +0 -1
  129. package/lib/typescript/commonjs/src/utils/animated/AnimatedExtractCoordinateFromArray.d.ts.map +1 -1
  130. package/lib/typescript/commonjs/src/utils/animated/AnimatedPoint.d.ts +0 -1
  131. package/lib/typescript/commonjs/src/utils/animated/AnimatedPoint.d.ts.map +1 -1
  132. package/lib/typescript/commonjs/src/utils/animated/AnimatedShape.d.ts +0 -1
  133. package/lib/typescript/commonjs/src/utils/animated/AnimatedShape.d.ts.map +1 -1
  134. package/lib/typescript/module/src/components/MarkerView.d.ts +1 -1
  135. package/lib/typescript/module/src/components/UserLocation.d.ts +0 -1
  136. package/lib/typescript/module/src/components/UserLocation.d.ts.map +1 -1
  137. package/lib/typescript/module/src/components/UserLocationPuck.d.ts +9 -0
  138. package/lib/typescript/module/src/components/UserLocationPuck.d.ts.map +1 -0
  139. package/lib/typescript/module/src/components/UserLocationPuckHeading.d.ts +9 -0
  140. package/lib/typescript/module/src/components/UserLocationPuckHeading.d.ts.map +1 -0
  141. package/lib/typescript/module/src/plugin/MapLibrePluginProps.d.ts +1 -1
  142. package/lib/typescript/module/src/plugin/android.d.ts +1 -0
  143. package/lib/typescript/module/src/plugin/android.d.ts.map +1 -1
  144. package/lib/typescript/module/src/utils/animated/AbstractAnimatedCoordinates.d.ts +0 -1
  145. package/lib/typescript/module/src/utils/animated/AbstractAnimatedCoordinates.d.ts.map +1 -1
  146. package/lib/typescript/module/src/utils/animated/AnimatedExtractCoordinateFromArray.d.ts +0 -1
  147. package/lib/typescript/module/src/utils/animated/AnimatedExtractCoordinateFromArray.d.ts.map +1 -1
  148. package/lib/typescript/module/src/utils/animated/AnimatedPoint.d.ts +0 -1
  149. package/lib/typescript/module/src/utils/animated/AnimatedPoint.d.ts.map +1 -1
  150. package/lib/typescript/module/src/utils/animated/AnimatedShape.d.ts +0 -1
  151. package/lib/typescript/module/src/utils/animated/AnimatedShape.d.ts.map +1 -1
  152. package/maplibre-react-native.podspec +1 -1
  153. package/package.json +8 -8
  154. package/src/components/MarkerView.tsx +1 -1
  155. package/src/components/UserLocation.tsx +13 -51
  156. package/src/components/UserLocationPuck.tsx +62 -0
  157. package/src/components/UserLocationPuckHeading.tsx +33 -0
  158. package/src/plugin/MapLibrePluginProps.ts +1 -1
  159. package/src/plugin/android.ts +7 -3
  160. package/lib/commonjs/components/HeadingIndicator.js.map +0 -1
  161. package/lib/module/components/HeadingIndicator.js.map +0 -1
  162. package/lib/typescript/commonjs/src/components/HeadingIndicator.d.ts +0 -7
  163. package/lib/typescript/commonjs/src/components/HeadingIndicator.d.ts.map +0 -1
  164. package/lib/typescript/module/src/components/HeadingIndicator.d.ts +0 -7
  165. package/lib/typescript/module/src/components/HeadingIndicator.d.ts.map +0 -1
  166. package/src/components/HeadingIndicator.tsx +0 -26
@@ -0,0 +1,33 @@
1
+ import { memo } from "react";
2
+
3
+ import { SymbolLayer } from "./SymbolLayer";
4
+ import headingIcon from "../assets/heading.png";
5
+ import { type BaseProps } from "../types/BaseProps";
6
+ import type { SymbolLayerStyle } from "../types/MapLibreRNStyles";
7
+
8
+ const layerStyle: SymbolLayerStyle = {
9
+ iconImage: headingIcon,
10
+ iconAllowOverlap: true,
11
+ iconPitchAlignment: "map",
12
+ iconRotationAlignment: "map",
13
+ };
14
+
15
+ interface UserLocationPuckHeadingProps extends BaseProps {
16
+ sourceID: string;
17
+ belowLayerID?: string;
18
+ heading: number;
19
+ }
20
+
21
+ export const UserLocationPuckHeading = memo(
22
+ ({ sourceID, belowLayerID, heading }: UserLocationPuckHeadingProps) => (
23
+ <SymbolLayer
24
+ id="mlrn-user-location-puck-heading"
25
+ sourceID={sourceID}
26
+ belowLayerID={belowLayerID}
27
+ style={{
28
+ iconRotate: heading,
29
+ ...layerStyle,
30
+ }}
31
+ />
32
+ ),
33
+ );
@@ -17,7 +17,7 @@ export type MapLibrePluginProps =
17
17
  /**
18
18
  * Variant of `org.maplibre.gl:android-sdk-*`
19
19
  *
20
- * @default "vulkan"
20
+ * @default "opengl"
21
21
  */
22
22
  nativeVariant?: "opengl" | "vulkan";
23
23
  /**
@@ -12,6 +12,8 @@ type PropertyItem = {
12
12
  value: string;
13
13
  };
14
14
 
15
+ export const GRADLE_PROPERTIES_PREFIX = "org.maplibre.reactnative.";
16
+
15
17
  export const getGradleProperties = (
16
18
  props: MapLibrePluginProps,
17
19
  ): PropertyItem[] => {
@@ -20,7 +22,7 @@ export const getGradleProperties = (
20
22
  if (key && value) {
21
23
  properties.push({
22
24
  type: "property",
23
- key: `org.maplibre.reactnative.${key}`,
25
+ key: `${GRADLE_PROPERTIES_PREFIX}${key}`,
24
26
  value: value.toString(),
25
27
  });
26
28
  }
@@ -35,10 +37,12 @@ export const mergeGradleProperties = (
35
37
  oldProperties: PropertiesItem[],
36
38
  newProperties: PropertyItem[],
37
39
  ): PropertiesItem[] => {
38
- const newPropertiesKeys = newProperties.map(({ key }) => key);
39
40
  const merged = oldProperties.filter(
40
41
  (item) =>
41
- !(item.type === "property" && newPropertiesKeys.includes(item.key)),
42
+ !(
43
+ item.type === "property" &&
44
+ item.key.startsWith(GRADLE_PROPERTIES_PREFIX)
45
+ ),
42
46
  );
43
47
 
44
48
  merged.push(...newProperties);
@@ -1 +0,0 @@
1
- {"version":3,"names":["_SymbolLayer","require","_heading","_interopRequireDefault","_jsxRuntime","e","__esModule","default","style","iconImage","headingIcon","iconAllowOverlap","iconPitchAlignment","iconRotationAlignment","HeadingIndicator","heading","jsx","SymbolLayer","id","belowLayerID","iconRotate","exports"],"sourceRoot":"../../../src","sources":["components/HeadingIndicator.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAC,sBAAA,CAAAF,OAAA;AAAgD,IAAAG,WAAA,GAAAH,OAAA;AAAA,SAAAE,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAGhD,MAAMG,KAAK,GAAG;EACZC,SAAS,EAAEC,gBAAW;EACtBC,gBAAgB,EAAE,IAAI;EACtBC,kBAAkB,EAAE,KAAK;EACzBC,qBAAqB,EAAE;AACzB,CAAU;AAMH,MAAMC,gBAAgB,GAAGA,CAAC;EAAEC;AAA+B,CAAC,kBACjE,IAAAX,WAAA,CAAAY,GAAA,EAAChB,YAAA,CAAAiB,WAAW;EAEVC,EAAE,EAAC,oCAAoC;EACvCC,YAAY,EAAC,+BAA+B;EAC5CX,KAAK,EAAE;IACLY,UAAU,EAAEL,OAAO;IACnB,GAAGP;EACL;AAAE,GANE,oCAOL,CACF;AAACa,OAAA,CAAAP,gBAAA,GAAAA,gBAAA","ignoreList":[]}
@@ -1 +0,0 @@
1
- {"version":3,"names":["SymbolLayer","headingIcon","jsx","_jsx","style","iconImage","iconAllowOverlap","iconPitchAlignment","iconRotationAlignment","HeadingIndicator","heading","id","belowLayerID","iconRotate"],"sourceRoot":"../../../src","sources":["components/HeadingIndicator.tsx"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,kBAAe;AAC3C,OAAOC,WAAW,MAAM,uBAAuB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGhD,MAAMC,KAAK,GAAG;EACZC,SAAS,EAAEJ,WAAW;EACtBK,gBAAgB,EAAE,IAAI;EACtBC,kBAAkB,EAAE,KAAK;EACzBC,qBAAqB,EAAE;AACzB,CAAU;AAMV,OAAO,MAAMC,gBAAgB,GAAGA,CAAC;EAAEC;AAA+B,CAAC,kBACjEP,IAAA,CAACH,WAAW;EAEVW,EAAE,EAAC,oCAAoC;EACvCC,YAAY,EAAC,+BAA+B;EAC5CR,KAAK,EAAE;IACLS,UAAU,EAAEH,OAAO;IACnB,GAAGN;EACL;AAAE,GANE,oCAOL,CACF","ignoreList":[]}
@@ -1,7 +0,0 @@
1
- import { type BaseProps } from "../types/BaseProps";
2
- interface HeadingIndicatorProps extends BaseProps {
3
- heading?: number;
4
- }
5
- export declare const HeadingIndicator: ({ heading }: HeadingIndicatorProps) => import("react/jsx-runtime").JSX.Element;
6
- export {};
7
- //# sourceMappingURL=HeadingIndicator.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"HeadingIndicator.d.ts","sourceRoot":"","sources":["../../../../../src/components/HeadingIndicator.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AASpD,UAAU,qBAAsB,SAAQ,SAAS;IAC/C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,gBAAgB,gBAAiB,qBAAqB,4CAUlE,CAAC"}
@@ -1,7 +0,0 @@
1
- import { type BaseProps } from "../types/BaseProps";
2
- interface HeadingIndicatorProps extends BaseProps {
3
- heading?: number;
4
- }
5
- export declare const HeadingIndicator: ({ heading }: HeadingIndicatorProps) => import("react/jsx-runtime").JSX.Element;
6
- export {};
7
- //# sourceMappingURL=HeadingIndicator.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"HeadingIndicator.d.ts","sourceRoot":"","sources":["../../../../../src/components/HeadingIndicator.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AASpD,UAAU,qBAAsB,SAAQ,SAAS;IAC/C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,gBAAgB,gBAAiB,qBAAqB,4CAUlE,CAAC"}
@@ -1,26 +0,0 @@
1
- import { SymbolLayer } from "./SymbolLayer";
2
- import headingIcon from "../assets/heading.png";
3
- import { type BaseProps } from "../types/BaseProps";
4
-
5
- const style = {
6
- iconImage: headingIcon,
7
- iconAllowOverlap: true,
8
- iconPitchAlignment: "map",
9
- iconRotationAlignment: "map",
10
- } as const;
11
-
12
- interface HeadingIndicatorProps extends BaseProps {
13
- heading?: number;
14
- }
15
-
16
- export const HeadingIndicator = ({ heading }: HeadingIndicatorProps) => (
17
- <SymbolLayer
18
- key="mapboxUserLocationHeadingIndicator"
19
- id="mapboxUserLocationHeadingIndicator"
20
- belowLayerID="mapboxUserLocationWhiteCircle"
21
- style={{
22
- iconRotate: heading,
23
- ...style,
24
- }}
25
- />
26
- );