feat: Models and ModelLayer (#3209)

* feat: model to add 3d models to map * feat: add model-layer * feat: add model-layer on android * fix(android): fix build error in android * fix(ios): fix new arch errors
rnmapbox · Nov 29, 2023 · 983bfcf · 983bfcf
1 parent 73272d4
commit 983bfcf
Show file tree

Hide file tree

Showing 69 changed files with 6,767 additions and 546 deletions.
diff --git a/__tests__/interface.test.js b/__tests__/interface.test.js
@@ -31,6 +31,7 @@ describe('Public Interface', () => {
       'CircleLayer',
       'HeatmapLayer',
       'LineLayer',
+      'ModelLayer',
       'SymbolLayer',
       'BackgroundLayer',
       'RasterLayer',
@@ -46,6 +47,7 @@ describe('Public Interface', () => {
       'RasterDemSource',
       'Images',
       'Image',
+      'Models',
 
       // constants
       'UserTrackingModes', // deprecated

diff --git a/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt b/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt
@@ -30,10 +30,12 @@ import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillExtrusionLayerManage
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXHeatmapLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXLineLayerManager
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXModelLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXRasterLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXSkyLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXSymbolLayerManager
 import com.rnmapbox.rnmbx.components.styles.light.RNMBXLightManager
+import com.rnmapbox.rnmbx.components.styles.model.RNMBXModelsManager
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXImageSourceManager
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterDemSourceManager
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterSourceManager
@@ -111,6 +113,7 @@ class RNMBXPackage : TurboReactPackage() {
         managers.add(RNMBXViewportManager(reactApplicationContext))
         managers.add(RNMBXMapViewManager(reactApplicationContext, getViewTagResolver(reactApplicationContext, "RNMBXMapViewManager")))
         managers.add(RNMBXStyleImportManager(reactApplicationContext))
+        managers.add(RNMBXModelsManager(reactApplicationContext))
 
         // annotations
         managers.add(RNMBXMarkerViewManager(reactApplicationContext))
@@ -146,6 +149,7 @@ class RNMBXPackage : TurboReactPackage() {
         managers.add(RNMBXAtmosphereManager())
         managers.add(RNMBXBackgroundLayerManager())
         managers.add(RNMBXLightManager())
+        managers.add(RNMBXModelLayerManager())
         return managers
     }
 

diff --git a/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt b/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt
@@ -14,6 +14,7 @@ import com.mapbox.maps.ImageContent
 import com.mapbox.maps.ImageStretches
 import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 import com.rnmapbox.rnmbx.events.constants.EventKeys
+import com.rnmapbox.rnmbx.events.constants.eventMapOf
 import com.rnmapbox.rnmbx.utils.ImageEntry
 import com.rnmapbox.rnmbx.utils.Logger
 import com.rnmapbox.rnmbx.utils.ResourceUtils