Skip to content

Commit

Permalink
Merge branch 'main' into feat/package-name
Browse files Browse the repository at this point in the history
# Conflicts:
#	android/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNCircleLayerManager.java
#	android/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNFillLayerManager.java
#	android/src/main/java/org/maplibre/reactnative/MLRNPackage.java
#	android/src/main/java/org/maplibre/reactnative/components/AbstractMapFeature.java
#	android/src/main/java/org/maplibre/reactnative/components/annotation/MLRNCallout.java
#	android/src/main/java/org/maplibre/reactnative/components/annotation/MLRNCalloutManager.java
#	android/src/main/java/org/maplibre/reactnative/components/annotation/MLRNPointAnnotationManager.java
#	android/src/main/java/org/maplibre/reactnative/components/camera/CameraStop.java
#	android/src/main/java/org/maplibre/reactnative/components/mapview/MLRNAndroidTextureMapView.java
#	android/src/main/java/org/maplibre/reactnative/components/mapview/MLRNAndroidTextureMapViewManager.java
#	android/src/main/java/org/maplibre/reactnative/components/mapview/MLRNMapView.java
#	android/src/main/java/org/maplibre/reactnative/components/mapview/MLRNMapViewManager.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/MLRNStyle.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/MLRNStyleFunctionParser.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/MLRNStyleValue.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNBackgroundLayer.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNBackgroundLayerManager.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNCircleLayer.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNCircleLayerManager.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNFillExtrusionLayer.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNFillExtrusionLayerManager.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNFillLayer.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNFillLayerManager.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNHeatmapLayer.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNHeatmapLayerManager.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNLayer.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNLineLayer.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNLineLayerManager.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNRasterLayer.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNRasterLayerManager.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNSymbolLayer.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNSymbolLayerManager.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/light/MLRNLight.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/light/MLRNLightManager.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/sources/MLRNImageSource.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/sources/MLRNImageSourceManager.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/sources/MLRNRasterSource.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/sources/MLRNRasterSourceManager.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/sources/MLRNShapeSource.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/sources/MLRNShapeSourceManager.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/sources/MLRNSource.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/sources/MLRNVectorSource.java
#	android/src/main/java/org/maplibre/reactnative/components/styles/sources/MLRNVectorSourceManager.java
#	android/src/main/java/org/maplibre/reactnative/events/AndroidCallbackEvent.java
#	android/src/main/java/org/maplibre/reactnative/events/MapChangeEvent.java
#	android/src/main/java/org/maplibre/reactnative/events/MapClickEvent.java
#	android/src/main/java/org/maplibre/reactnative/events/MapUserTrackingModeEvent.java
#	android/src/main/java/org/maplibre/reactnative/events/PointAnnotationClickEvent.java
#	android/src/main/java/org/maplibre/reactnative/events/constants/EventKeys.java
#	android/src/main/java/org/maplibre/reactnative/events/constants/EventTypes.java
#	android/src/main/java/org/maplibre/reactnative/location/UserLocationVerticalAlignment.java
#	android/src/main/java/org/maplibre/reactnative/location/UserTrackingState.java
#	android/src/main/java/org/maplibre/reactnative/modules/MLRNModule.java
#	android/src/main/java/org/maplibre/reactnative/modules/MLRNOfflineModule.java
#	android/src/main/java/org/maplibre/reactnative/modules/MLRNSnapshotModule.java
#	android/src/main/java/org/maplibre/reactnative/utils/SimpleEventCallback.java
#	ios/MLRN/CameraMode.h
#	ios/MLRN/CameraMode.m
#	ios/MLRN/CameraStop.h
#	ios/MLRN/CameraStop.m
#	ios/MLRN/CameraUpdateItem.h
#	ios/MLRN/CameraUpdateItem.m
#	ios/MLRN/CameraUpdateQueue.h
#	ios/MLRN/CameraUpdateQueue.m
#	ios/MLRN/FilterParser.h
#	ios/MLRN/FilterParser.m
#	ios/MLRN/MLRN.h
#	ios/MLRN/MLRN.m
#	ios/MLRN/MLRNBackgroundLayer.h
#	ios/MLRN/MLRNBackgroundLayer.m
#	ios/MLRN/MLRNBackgroundLayerManager.h
#	ios/MLRN/MLRNBackgroundLayerManager.m
#	ios/MLRN/MLRNCallout.h
#	ios/MLRN/MLRNCallout.m
#	ios/MLRN/MLRNCalloutManager.h
#	ios/MLRN/MLRNCalloutManager.m
#	ios/MLRN/MLRNCamera.h
#	ios/MLRN/MLRNCamera.m
#	ios/MLRN/MLRNCameraManager.h
#	ios/MLRN/MLRNCameraManager.m
#	ios/MLRN/MLRNCircleLayer.h
#	ios/MLRN/MLRNCircleLayer.m
#	ios/MLRN/MLRNCircleLayerManager.h
#	ios/MLRN/MLRNCircleLayerManager.m
#	ios/MLRN/MLRNEvent.h
#	ios/MLRN/MLRNEvent.m
#	ios/MLRN/MLRNEventProtocol.h
#	ios/MLRN/MLRNEventTypes.h
#	ios/MLRN/MLRNEventTypes.m
#	ios/MLRN/MLRNFillExtrusionLayer.h
#	ios/MLRN/MLRNFillExtrusionLayer.m
#	ios/MLRN/MLRNFillExtrusionLayerManager.h
#	ios/MLRN/MLRNFillExtrusionLayerManager.m
#	ios/MLRN/MLRNFillLayer.h
#	ios/MLRN/MLRNFillLayer.m
#	ios/MLRN/MLRNFillLayerManager.h
#	ios/MLRN/MLRNFillLayerManager.m
#	ios/MLRN/MLRNHeatmapLayer.h
#	ios/MLRN/MLRNHeatmapLayer.m
#	ios/MLRN/MLRNHeatmapLayerManager.h
#	ios/MLRN/MLRNHeatmapLayerManager.m
#	ios/MLRN/MLRNImageQueue.h
#	ios/MLRN/MLRNImageQueue.m
#	ios/MLRN/MLRNImageQueueOperation.h
#	ios/MLRN/MLRNImageQueueOperation.m
#	ios/MLRN/MLRNImageSource.h
#	ios/MLRN/MLRNImageSource.m
#	ios/MLRN/MLRNImageSourceManager.h
#	ios/MLRN/MLRNImageSourceManager.m
#	ios/MLRN/MLRNImageUtils.h
#	ios/MLRN/MLRNImageUtils.m
#	ios/MLRN/MLRNLayer.h
#	ios/MLRN/MLRNLayer.m
#	ios/MLRN/MLRNLight.h
#	ios/MLRN/MLRNLight.m
#	ios/MLRN/MLRNLightManager.h
#	ios/MLRN/MLRNLightManager.m
#	ios/MLRN/MLRNLineLayer.h
#	ios/MLRN/MLRNLineLayer.m
#	ios/MLRN/MLRNLineLayerManager.h
#	ios/MLRN/MLRNLineLayerManager.m
#	ios/MLRN/MLRNLocation.h
#	ios/MLRN/MLRNLocation.m
#	ios/MLRN/MLRNLocationManager.h
#	ios/MLRN/MLRNLocationManager.m
#	ios/MLRN/MLRNLocationManagerDelegate.h
#	ios/MLRN/MLRNLocationModule.h
#	ios/MLRN/MLRNLocationModule.m
#	ios/MLRN/MLRNMapTouchEvent.h
#	ios/MLRN/MLRNMapTouchEvent.m
#	ios/MLRN/MLRNMapView.h
#	ios/MLRN/MLRNMapView.m
#	ios/MLRN/MLRNMapViewManager.h
#	ios/MLRN/MLRNMapViewManager.m
#	ios/MLRN/MLRNModule.h
#	ios/MLRN/MLRNModule.m
#	ios/MLRN/MLRNNativeUserLocation.h
#	ios/MLRN/MLRNNativeUserLocation.m
#	ios/MLRN/MLRNOfflineModule.h
#	ios/MLRN/MLRNOfflineModule.m
#	ios/MLRN/MLRNPointAnnotation.h
#	ios/MLRN/MLRNPointAnnotation.m
#	ios/MLRN/MLRNPointAnnotationManager.h
#	ios/MLRN/MLRNPointAnnotationManager.m
#	ios/MLRN/MLRNRasterLayer.h
#	ios/MLRN/MLRNRasterLayer.m
#	ios/MLRN/MLRNRasterLayerManager.h
#	ios/MLRN/MLRNRasterLayerManager.m
#	ios/MLRN/MLRNRasterSource.h
#	ios/MLRN/MLRNRasterSource.m
#	ios/MLRN/MLRNRasterSourceManager.h
#	ios/MLRN/MLRNRasterSourceManager.m
#	ios/MLRN/MLRNShapeSource.h
#	ios/MLRN/MLRNShapeSource.m
#	ios/MLRN/MLRNShapeSourceManager.h
#	ios/MLRN/MLRNShapeSourceManager.m
#	ios/MLRN/MLRNSnapshotModule.h
#	ios/MLRN/MLRNSnapshotModule.m
#	ios/MLRN/MLRNSource.h
#	ios/MLRN/MLRNSource.m
#	ios/MLRN/MLRNStyleValue.h
#	ios/MLRN/MLRNStyleValue.m
#	ios/MLRN/MLRNSymbolLayer.h
#	ios/MLRN/MLRNSymbolLayer.m
#	ios/MLRN/MLRNSymbolLayerManager.h
#	ios/MLRN/MLRNSymbolLayerManager.m
#	ios/MLRN/MLRNUtils.h
#	ios/MLRN/MLRNUtils.m
#	ios/MLRN/MLRNVectorLayer.h
#	ios/MLRN/MLRNVectorLayer.m
#	ios/MLRN/MLRNVectorSource.h
#	ios/MLRN/MLRNVectorSource.m
#	ios/MLRN/MLRNVectorSourceManager.h
#	ios/MLRN/MLRNVectorSourceManager.m
#	ios/MLRN/ViewManager.h
#	ios/MLRN/ViewManager.m
#	ios/RCTMLN/RCTMLNBackgroundLayerManager.m
#	ios/RCTMLN/RCTMLNRasterLayerManager.m
  • Loading branch information
KiwiKilian committed Nov 28, 2024
2 parents 9c89250 + d476d5c commit ed57f82
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit ed57f82

Please sign in to comment.