issue #356 - fix bad source reference.

Yermo · Apr 29, 2020 · c505088 · c505088 · mircobabini · Jul 16, 2020
1 parent 6714df2
commit c505088
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/demo-angular/src/app/components/map/map.component.ts b/demo-angular/src/app/components/map/map.component.ts
@@ -270,6 +270,8 @@ export class MapComponent implements OnInit, OnDestroy {
 
     console.log( "MapComponent:onMapReady(): after declareReady()" );
 
+    this.addTestCircle();
+
   } // end of onMapReady()
 
   // --------------------------------------

diff --git a/src/mapbox.android.ts b/src/mapbox.android.ts
@@ -2959,15 +2959,21 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
     return new Promise((resolve, reject) => {
       try {
         const { url, type } = options;
-        const theMap = nativeMap;
+        let theMap = nativeMap;
         let source;
 
-        if (!theMap) {
-          reject("No map has been loaded");
-          return;
+        if ( ! theMap ) {
+
+          if ( !this._mapboxMapInstance ) {
+            reject("No map has been loaded");
+            return;
+          }
+
+          theMap = this._mapboxMapInstance;
+
         }
 
-        if ( theMap.mapboxMap.getSource(id) ) {
+        if ( theMap.getStyle().getSource(id) ) {
           reject("Source exists: " + id);
           return;
         }
@@ -2990,14 +2996,12 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
 
             // com.mapbox.mapboxsdk.maps.Style
 
-            let geoJsonSource = new com.mapbox.mapboxsdk.style.sources.GeoJsonSource(
+            source = new com.mapbox.mapboxsdk.style.sources.GeoJsonSource(
               id,
               feature
             );
 
-            this._mapboxMapInstance.getStyle().addSource( geoJsonSource );
-
-            this.gcFix( 'com.mapbox.mapboxsdk.style.sources.GeoJsonSource', geoJsonSource );
+            this.gcFix( 'com.mapbox.mapboxsdk.style.sources.GeoJsonSource', source );
 
             // To support handling click events on lines and circles, we keep the underlying 
             // feature.
@@ -3039,7 +3043,7 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
           return;
         }
 
-        theMap.mapboxMap.addSource(source);
+        theMap.getStyle().addSource( source );
         resolve();
       } catch (ex) {
         console.log("Error in mapbox.addSource: " + ex);