fix: fix for circular reference (this time working)

Author: farfromrefug

src/BaseNative.ts

@@ -0,0 +1,27 @@
+import { Observable } from '@nativescript/core/data/observable';
+
+export abstract class BaseNative<T, U extends {}> extends Observable {
+    constructor(public options: U = {} as any, native?: T) {
+        super();
+        if (native) {
+            this.native = native;
+        }
+    }
+    native: T;
+    protected duringInit = false;
+    initNativeView(native: T, options: U) {
+        this.duringInit = true;
+        for (const key in options) {
+            (this as any)[key] = options[key];
+        }
+        this.duringInit = false;
+    }
+    getNative() {
+        if (!this.native) {
+            this.native = this.createNative(this.options);
+            this.initNativeView(this.native, this.options);
+        }
+        return this.native;
+    }
+    abstract createNative(options: U): T;
+}

src/core/index.android.ts

@@ -1,4 +1,4 @@
-import { BaseNative } from '../index.common';
+import { BaseNative } from '../BaseNative';
 import { AltitudeKey, DefaultLatLonKeys, GenericMapPos, LatitudeKey, LongitudeKey, MapPos, MapVec, ScreenBounds, ScreenPos, setMapPosKeys } from './index.common';
 export { LatitudeKey, LongitudeKey, MapPos, ScreenBounds, ScreenPos, setMapPosKeys };
 

src/core/index.ios.ts

@@ -1,4 +1,4 @@
-import { BaseNative } from '../index.common';
+import { BaseNative } from "../BaseNative";
 import { AltitudeKey, DefaultLatLonKeys, GenericMapPos, LatitudeKey, LongitudeKey, MapPos, MapVec, ScreenBounds, ScreenPos, setMapPosKeys } from './index.common';
 export { LatitudeKey, LongitudeKey, MapPos, ScreenBounds, ScreenPos, setMapPosKeys };
 

src/datasources/index.android.ts

@@ -1,7 +1,7 @@
 import { CombinedTileDataSourceOptions, DataSourceOptions, GeoJSONVectorTileDataSourceOptions, MergedMBVTTileDataSourceOptions, OrderedTileDataSourceOptions, TileDataSourceOptions } from '.';
 import { featureCollectionFromArgs, nativeProperty } from '..';
 import { FeatureCollection } from '../geometry/feature';
-import { BaseNative } from '../index.common';
+import { BaseNative } from "../BaseNative";
 import { Projection } from '../projections';
 import { JSVariantToNative, jsonVariant } from '../utils';
 

src/datasources/index.ios.ts

@@ -1,7 +1,7 @@
 import { CombinedTileDataSourceOptions, DataSourceOptions, GeoJSONVectorTileDataSourceOptions, MergedMBVTTileDataSourceOptions, OrderedTileDataSourceOptions, TileDataSourceOptions } from '.';
 import { featureCollectionFromArgs, nativeProperty } from '..';
 import { FeatureCollection } from '../geometry/feature.ios';
-import { BaseNative } from '../index.common';
+import { BaseNative } from "../BaseNative";
 import { Projection } from '../projections';
 import { JSVariantToNative, jsonVariant } from '../utils';
 

src/geocoding/service.common.ts

@@ -1,4 +1,4 @@
-import { BaseNative } from '../index.common';
+import { BaseNative } from '../BaseNative';
 import { GeocodingServiceOptions } from './service';
 
 export abstract class BaseGeocodingService<T, U extends GeocodingServiceOptions> extends BaseNative<T, U> {}

src/geometry/index.android.ts

@@ -1,7 +1,7 @@
 import { GeometryOptions, LineGeometryOptions, PointGeometryOptions, PolygonGeometryOptions } from '.';
 import { mapPosVectorFromArgs } from '..';
 import { MapPosVector, fromNativeMapBounds, fromNativeMapPos, toNativeMapPos } from '../core';
-import { BaseNative } from '../index.common';
+import { BaseNative } from "../BaseNative";
 
 export abstract class Geometry<T extends com.carto.geometry.Geometry, U extends GeometryOptions> extends BaseNative<T, U> {
     getCenterPos() {

src/geometry/index.d.ts

@@ -1,5 +1,5 @@
 import { DefaultLatLonKeys, GenericMapPos, MapBounds, MapPos, MapPosVector } from '../core';
-import { BaseNative } from '../index.common';
+import { BaseNative } from "../BaseNative";
 
 export interface GeometryOptions<T = DefaultLatLonKeys> {}
 export abstract class Geometry<T = DefaultLatLonKeys, U extends GeometryOptions = GeometryOptions<T>> extends BaseNative<any, U> {

src/geometry/index.ios.ts

@@ -1,7 +1,7 @@
 import { GeometryOptions, LineGeometryOptions, PointGeometryOptions, PolygonGeometryOptions } from '.';
 import { mapPosVectorFromArgs } from '..';
 import { MapPosVector, fromNativeMapBounds, fromNativeMapPos, toNativeMapPos } from '../core';
-import { BaseNative } from '../index.common';
+import { BaseNative } from "../BaseNative";
 
 export abstract class Geometry<T extends NTGeometry, U extends GeometryOptions> extends BaseNative<T, U> {
     getCenterPos() {

src/geometry/reader.android.ts

@@ -1,4 +1,4 @@
-import { BaseNative } from '../index.common';
+import { BaseNative } from "../BaseNative";
 import { GeoJSONGeometryReaderOptions, WKBGeometryReaderOptions, WKTGeometryReaderOptions } from './reader';
 import { FeatureCollection } from './feature';
 import { Projection } from '../projections';