migrate ios sdk from maplibre to vietmap

vietmap-company · Jan 30, 2024 · 7dc8324 · 7dc8324
1 parent 7544597
commit 7dc8324
Show file tree

Hide file tree

Showing 43 changed files with 89 additions and 85 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,3 +1,13 @@
+Copyright (c) 2024 VietMap contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+This project was originally forked from https://github.com/rnmapbox/maps, also under the MIT license, but without a copyright holder notice.
+//------------------------------------------------------------------------------------------------------------------------------
 Copyright (c) 2022 MapLibre contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

diff --git a/example/ios/RNMaplibreExample.xcodeproj/project.pbxproj b/example/ios/RNMaplibreExample.xcodeproj/project.pbxproj
@@ -12,7 +12,6 @@
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		51C0260825301F99008C5283 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 51C0260725301F99008C5283 /* LaunchScreen.storyboard */; };
 		AD8CDE4F410D2E699BE7E99D /* libPods-RNMaplibreExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A98F897FA1ECD18EB0F1C4DC /* libPods-RNMaplibreExample.a */; };
-		E9DD059E29705D4C0010A116 /* Mapbox in Frameworks */ = {isa = PBXBuildFile; productRef = 80AC8CF095DA4835C83255C8 /* Mapbox */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -63,7 +62,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E9DD059E29705D4C0010A116 /* Mapbox in Frameworks */,
 				AD8CDE4F410D2E699BE7E99D /* libPods-RNMaplibreExample.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -206,7 +204,6 @@
 			);
 			name = RNMaplibreExample;
 			packageProductDependencies = (
-				80AC8CF095DA4835C83255C8 /* Mapbox */,
 			);
 			productName = RNMaplibreExample;
 			productReference = 13B07F961A680F5B00A75B9A /* RNMaplibreExample.app */;
@@ -358,12 +355,14 @@
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/VietMap/VietMap.framework/VietMap",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/VietMap.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -620,14 +619,6 @@
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
-
-/* Begin XCSwiftPackageProductDependency section */
-		80AC8CF095DA4835C83255C8 /* Mapbox */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = DB11E3B9346BB8DFEB4101D5 /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */;
-			productName = Mapbox;
-		};
-/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 83CBB9F71A601CBA00E9B192 /* Project object */;
 }
diff --git a/ios/RCTMGL/CameraStop.h b/ios/RCTMGL/CameraStop.h
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-@import Mapbox;
+@import VietMap;
 #import "RCTMGLCamera.h"
 
 @interface CameraStop : NSObject

diff --git a/ios/RCTMGL/FilterParser.m b/ios/RCTMGL/FilterParser.m
@@ -7,7 +7,7 @@
 //
 
 #import "FilterParser.h"
-#import <Mapbox/Mapbox.h>
+#import <VietMap/VietMap.h>
 
 @implementation FilterParser
 

diff --git a/ios/RCTMGL/MGLCustomHeaders.m b/ios/RCTMGL/MGLCustomHeaders.m
@@ -6,8 +6,8 @@
 #import <objc/runtime.h>
 
 #import "MGLCustomHeaders.h"
-#import <Mapbox/Mapbox.h>
-#import <Mapbox/MGLNetworkConfiguration.h>
+#import <VietMap/VietMap.h>
+#import <VietMap/MGLNetworkConfiguration.h>
 
 @implementation NSMutableURLRequest (CustomHeaders)
 

diff --git a/ios/RCTMGL/MGLFaux3DUserLocationAnnotationView.h b/ios/RCTMGL/MGLFaux3DUserLocationAnnotationView.h
@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-@import Mapbox;
+@import VietMap;
 
 extern const CGFloat MGLUserLocationAnnotationDotSize;
 extern const CGFloat MGLUserLocationAnnotationHaloSize;

diff --git a/ios/RCTMGL/MGLModule.m b/ios/RCTMGL/MGLModule.m
@@ -12,7 +12,7 @@
 #import "CameraMode.h"
 #import "RCTMGLSource.h"
 #import "MGLCustomHeaders.h"
-@import Mapbox;
+@import VietMap;
 
 @implementation MGLModule
 

diff --git a/ios/RCTMGL/MGLOfflineModule.h b/ios/RCTMGL/MGLOfflineModule.h
@@ -9,7 +9,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
 
-@import Mapbox;
+@import VietMap;
 
 @interface MGLOfflineModule : RCTEventEmitter<RCTBridgeModule>
 

diff --git a/ios/RCTMGL/MGLSnapshotModule.m b/ios/RCTMGL/MGLSnapshotModule.m
@@ -9,7 +9,7 @@
 #import "MGLSnapshotModule.h"
 #import "RCTMGLUtils.h"
 #import "RNMBImageUtils.h"
-@import Mapbox;
+@import VietMap;
 
 @implementation MGLSnapshotModule
 

diff --git a/ios/RCTMGL/MGLUserLocationHeadingArrowLayer.h b/ios/RCTMGL/MGLUserLocationHeadingArrowLayer.h
@@ -1,6 +1,6 @@
 #import <QuartzCore/QuartzCore.h>
 #import "MGLUserLocationHeadingIndicator.h"
-@import Mapbox;
+@import VietMap;
 
 @interface MGLUserLocationHeadingArrowLayer : CAShapeLayer <MGLUserLocationHeadingIndicator>
 

diff --git a/ios/RCTMGL/MGLUserLocationHeadingBeamLayer.h b/ios/RCTMGL/MGLUserLocationHeadingBeamLayer.h
@@ -1,6 +1,6 @@
 #import <QuartzCore/QuartzCore.h>
 #import "MGLUserLocationHeadingIndicator.h"
-@import Mapbox;
+@import VietMap;
 
 @interface MGLUserLocationHeadingBeamLayer : CALayer <MGLUserLocationHeadingIndicator>
 

diff --git a/ios/RCTMGL/MGLUserLocationHeadingIndicator.h b/ios/RCTMGL/MGLUserLocationHeadingIndicator.h
@@ -1,5 +1,5 @@
 #import <QuartzCore/QuartzCore.h>
-@import Mapbox;
+@import VietMap;
 
 @protocol MGLUserLocationHeadingIndicator <NSObject>
 

diff --git a/ios/RCTMGL/RCTMGLBackgroundLayer.h b/ios/RCTMGL/RCTMGLBackgroundLayer.h
@@ -7,7 +7,7 @@
 //
 
 #import "RCTMGLLayer.h"
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLBackgroundLayer : RCTMGLLayer
 

diff --git a/ios/RCTMGL/RCTMGLCallout.h b/ios/RCTMGL/RCTMGLCallout.h
@@ -8,7 +8,7 @@
 
 #import <React/RCTView.h>
 
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLCallout : RCTView<MGLCalloutView>
 

diff --git a/ios/RCTMGL/RCTMGLFillExtrusionLayer.h b/ios/RCTMGL/RCTMGLFillExtrusionLayer.h
@@ -7,7 +7,7 @@
 //
 
 #import "RCTMGLVectorLayer.h"
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLFillExtrusionLayer : RCTMGLVectorLayer
 

diff --git a/ios/RCTMGL/RCTMGLFillLayer.h b/ios/RCTMGL/RCTMGLFillLayer.h
@@ -7,7 +7,7 @@
 //
 
 #import "RCTMGLVectorLayer.h"
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLFillLayer : RCTMGLVectorLayer
 

diff --git a/ios/RCTMGL/RCTMGLImageSource.m b/ios/RCTMGL/RCTMGLImageSource.m
@@ -7,7 +7,7 @@
 //
 
 #import "RCTMGLImageSource.h"
-@import Mapbox;
+@import VietMap;
 
 @implementation RCTMGLImageSource
 

diff --git a/ios/RCTMGL/RCTMGLImages.h b/ios/RCTMGL/RCTMGLImages.h
@@ -2,7 +2,7 @@
 #import <React/RCTComponent.h>
 #import <UIKit/UIKit.h>
 
-@import Mapbox;
+@import VietMap;
 
 @class RCTMGLMapView;
 

diff --git a/ios/RCTMGL/RCTMGLLayer.h b/ios/RCTMGL/RCTMGLLayer.h
@@ -12,7 +12,7 @@
 
 @class RCTMGLMapView;
 
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLLayer<T> : UIView
 

diff --git a/ios/RCTMGL/RCTMGLLight.h b/ios/RCTMGL/RCTMGLLight.h
@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLLight : UIView
 

diff --git a/ios/RCTMGL/RCTMGLLineLayer.h b/ios/RCTMGL/RCTMGLLineLayer.h
@@ -7,7 +7,7 @@
 //
 
 #import "RCTMGLVectorLayer.h"
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLLineLayer : RCTMGLVectorLayer
 

diff --git a/ios/RCTMGL/RCTMGLLogging.m b/ios/RCTMGL/RCTMGLLogging.m
@@ -1,6 +1,6 @@
 #import "RCTMGLLogging.h"
 
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLLogging()
 @property (nonatomic) BOOL hasListeners;

diff --git a/ios/RCTMGL/RCTMGLMapTouchEvent.h b/ios/RCTMGL/RCTMGLMapTouchEvent.h
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import "RCTMGLEvent.h"
 #import "RCTMGLPointAnnotation.h"
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLMapTouchEvent : RCTMGLEvent
 

diff --git a/ios/RCTMGL/RCTMGLMapTouchEvent.m b/ios/RCTMGL/RCTMGLMapTouchEvent.m
@@ -9,7 +9,7 @@
 #import "RCTMGLMapTouchEvent.h"
 #import "RCTMGLEventTypes.h"
 #import "RCTMGLPointAnnotation.h"
-@import Mapbox;
+@import VietMap;
 
 @implementation RCTMGLMapTouchEvent
 

diff --git a/ios/RCTMGL/RCTMGLMapView.h b/ios/RCTMGL/RCTMGLMapView.h
@@ -12,7 +12,7 @@
 #import "RCTMGLPointAnnotation.h"
 #import "RCTMGLLight.h"
 
-@import Mapbox;
+@import VietMap;
 
 @class CameraUpdateQueue;
 @class RCTMGLImages;

diff --git a/ios/RCTMGL/RCTMGLMapView.m b/ios/RCTMGL/RCTMGLMapView.m
@@ -265,7 +265,8 @@ - (void)setReactRotateEnabled:(BOOL)reactRotateEnabled
 - (void)setReactAttributionEnabled:(BOOL)reactAttributionEnabled
 {
     _reactAttributionEnabled = reactAttributionEnabled;
-    self.attributionButton.hidden = !_reactAttributionEnabled;
+//    self.attributionButton.hidden = !_reactAttributionEnabled;
+
 
 }
 

diff --git a/ios/RCTMGL/RCTMGLMapViewManager.h b/ios/RCTMGL/RCTMGLMapViewManager.h
@@ -7,7 +7,7 @@
 //
 
 #import "ViewManager.h"
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLMapViewManager : ViewManager
 

diff --git a/ios/RCTMGL/RCTMGLPointAnnotation.h b/ios/RCTMGL/RCTMGLPointAnnotation.h
@@ -11,7 +11,7 @@
 #import <React/RCTView.h>
 #import "RCTMGLCallout.h"
 
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLPointAnnotation : MGLAnnotationView<MGLAnnotation>
 

diff --git a/ios/RCTMGL/RCTMGLRasterLayer.h b/ios/RCTMGL/RCTMGLRasterLayer.h
@@ -7,7 +7,7 @@
 //
 
 #import "RCTMGLLayer.h"
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLRasterLayer : RCTMGLLayer
 

diff --git a/ios/RCTMGL/RCTMGLRasterSource.h b/ios/RCTMGL/RCTMGLRasterSource.h
@@ -7,7 +7,7 @@
 //
 
 #import "RCTMGLTileSource.h"
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLRasterSource : RCTMGLTileSource
 

diff --git a/ios/RCTMGL/RCTMGLShapeSource.h b/ios/RCTMGL/RCTMGLShapeSource.h
@@ -9,7 +9,7 @@
 #import <React/RCTBridge.h>
 #import "RCTMGLSource.h"
 
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLShapeSource : RCTMGLSource
 

diff --git a/ios/RCTMGL/RCTMGLSource.h b/ios/RCTMGL/RCTMGLSource.h
@@ -9,7 +9,7 @@
 #import <React/RCTComponent.h>
 #import "RCTMGLLayer.h"
 #import <UIKit/UIKit.h>
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLSource : UIView
 

diff --git a/ios/RCTMGL/RCTMGLStyle.h b/ios/RCTMGL/RCTMGLStyle.h
@@ -5,7 +5,7 @@
 #import "RCTMGLStyleValue.h"
 #import <React/RCTBridge.h>
 
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLStyle : NSObject
 

diff --git a/ios/RCTMGL/RCTMGLStyleValue.h b/ios/RCTMGL/RCTMGLStyleValue.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLStyleValue : NSObject
 

diff --git a/ios/RCTMGL/RCTMGLTileSource.h b/ios/RCTMGL/RCTMGLTileSource.h
@@ -4,7 +4,7 @@
 //
 
 #import "RCTMGLSource.h"
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLTileSource : RCTMGLSource
 

diff --git a/ios/RCTMGL/RCTMGLUserLocation.h b/ios/RCTMGL/RCTMGLUserLocation.h
@@ -4,7 +4,7 @@
 
 #import <Foundation/Foundation.h>
 #import <CoreLocation/CoreLocation.h>
-#import <Mapbox/MGLUserLocationAnnotationView.h>
+#import <VietMap/MGLUserLocationAnnotationView.h>
 
 @interface RCTMGLUserLocation : NSObject
 

diff --git a/ios/RCTMGL/RCTMGLUserLocation.m b/ios/RCTMGL/RCTMGLUserLocation.m
@@ -4,7 +4,7 @@
 //
 
 #import "RCTMGLUserLocation.h"
-#import <Mapbox/MGLUserLocationAnnotationView.h>
+#import <VietMap/MGLUserLocationAnnotationView.h>
 
 @interface HiddenUserLocationAnnotationView : MGLUserLocationAnnotationView
 

diff --git a/ios/RCTMGL/RCTMGLUtils.h b/ios/RCTMGL/RCTMGLUtils.h
@@ -11,7 +11,7 @@
 #import <React/RCTConvert.h>
 #import <React/RCTImageLoader.h>
 
-@import Mapbox;
+@import VietMap;
 
 @interface RCTMGLUtils: NSObject
 

diff --git a/ios/RCTMGL/RCTMGLUtils.m b/ios/RCTMGL/RCTMGLUtils.m
@@ -9,7 +9,7 @@
 #import "RCTMGLUtils.h"
 #import "RCTMGLImageQueue.h"
 
-@import Mapbox;
+@import VietMap;
 
 @implementation RCTMGLUtils