chore: reafactor and fixes

farfromrefug · farfromrefug · commit fa444d8dbe9d · 2020-11-19T21:53:38.000+01:00
diff --git a/src/core/index.d.ts b/src/core/index.d.ts
@@ -66,6 +66,7 @@ export class MapBounds<T = DefaultLatLonKeys> extends BaseNative<any, {}> {
     equals(position: MapBounds<T>): boolean;
     getCenter(): GenericMapPos<T>;
 }
+// eslint-disable-next-line no-redeclare
 export interface MapBounds<T = DefaultLatLonKeys> {
     northeast: GenericMapPos<T>;
     southwest: GenericMapPos<T>;
diff --git a/src/geometry/feature.android.ts b/src/geometry/feature.android.ts
@@ -10,11 +10,11 @@ export class FeatureCollection implements IFeatureCollection {
         const nResult = this.native.getFeature(index);
         return {
             properties: nativeVariantToJS(nResult.getProperties()),
-            geometry: nResult.getGeometry(),
+            geometry: nResult.getGeometry() as any,
         } as Feature;
     }
     getGeometry(index: number) {
-        return this.native.getFeature(index).getGeometry();
+        return this.native.getFeature(index).getGeometry() as any;
     }
     getFeatureCount() {
         return this.native.getFeatureCount();
@@ -61,7 +61,7 @@ export class VectorTileFeatureCollection extends FeatureCollection {
         const nResult = this.native.getFeature(index) as com.carto.geometry.VectorTileFeature;
         return {
             properties: nativeVariantToJS(nResult.getProperties()),
-            geometry: nResult.getGeometry(),
+            geometry: nResult.getGeometry() as any,
             id: nResult.getId(),
             layerName: nResult.getLayerName()
         } as VectorTileFeature;
diff --git a/src/geometry/feature.d.ts b/src/geometry/feature.d.ts
@@ -1,8 +1,8 @@
 import { Geometry } from '.';
 
 export interface Feature<T = DefaultLatLonKeys> {
-    properties: {};
-    geometry: Geometry<T> | any;
+    properties: {[k: string]: any};
+    geometry: Geometry<T>;
     // getProperties(): any;
 
     // getGeometry(): Geometry;
@@ -17,7 +17,7 @@ export interface VectorTileFeature extends Feature {
 export class FeatureCollection<T = DefaultLatLonKeys> {
     constructor(native: any);
     getFeature(index: number): Feature<T>;
-    getGeometry(index: number): Geometry<T> | any;
+    getGeometry(index: number): Geometry<T>;
     getFeatureCount(): number;
     readonly featureCount: number;
     getNative();
diff --git a/src/geometry/feature.ios.ts b/src/geometry/feature.ios.ts
@@ -1,7 +1,6 @@
-import { Feature, FeatureCollection as IFeatureCollection, VectorTileFeature } from './feature';
+import { LatitudeKey, LongitudeKey, MapBounds, fromNativeMapBounds } from '../core';
 import { nativeVariantToJS } from '../utils';
-import { Geometry } from '.';
-import { DefaultLatLonKeys, fromNativeMapBounds, LatitudeKey, LongitudeKey, MapBounds } from '../core';
+import { Feature, FeatureCollection as IFeatureCollection, VectorTileFeature } from './feature';
 
 export class FeatureCollection implements IFeatureCollection {
     constructor(protected native: NTFeatureCollection) {}
@@ -63,7 +62,7 @@ export class VectorTileFeatureCollection extends FeatureCollection {
         const nResult = this.native.getFeature(index);
         return {
             properties: nativeVariantToJS(nResult.getProperties()),
-            geometry: nResult.getGeometry(),
+            geometry: nResult.getGeometry() as any,
             id: nResult.getId(),
             layerName: nResult.getLayerName(),
         } as VectorTileFeature;
diff --git a/src/geometry/index.d.ts b/src/geometry/index.d.ts
@@ -2,7 +2,7 @@ import { DefaultLatLonKeys, GenericMapPos, MapBounds, MapPos, MapPosVector } fro
 import { BaseNative } from '../index.common';
 
 export interface GeometryOptions<T = DefaultLatLonKeys> {}
-export abstract class Geometry<T = DefaultLatLonKeys, U extends GeometryOptions = GeometryOptions> extends BaseNative<any, U> {
+export abstract class Geometry<T = DefaultLatLonKeys, U extends GeometryOptions = GeometryOptions<T>> extends BaseNative<any, U> {
     getCenterPos(): GenericMapPos<T>;
     getBounds(): MapBounds<T>;
 }
diff --git a/src/geometry/writer.android.ts b/src/geometry/writer.android.ts
@@ -11,10 +11,10 @@ export class GeoJSONGeometryWriter extends BaseNative<com.carto.geometry.GeoJSON
         return new com.carto.geometry.GeoJSONGeometryWriter();
     }
     writePoses(value: MapPosVector) {
-        this.getNative().writeGeometry(new com.carto.geometry.LineGeometry(mapPosVectorFromArgs(value)));
+        return this.getNative().writeGeometry(new com.carto.geometry.LineGeometry(mapPosVectorFromArgs(value)));
     }
     writeFeatureCollection(value: FeatureCollection) {
-        this.getNative().writeFeatureCollection(featureCollectionFromArgs(value));
+        return this.getNative().writeFeatureCollection(featureCollectionFromArgs(value));
     }
     set sourceProjection(value: Projection) {
         this.native && this.native.setSourceProjection(value.getNative());
diff --git a/src/geometry/writer.ios.ts b/src/geometry/writer.ios.ts
@@ -11,10 +11,10 @@ export class GeoJSONGeometryWriter extends BaseNative<NTGeoJSONGeometryWriter, G
         return NTGeoJSONGeometryWriter.alloc().init();
     }
     writePoses(value: MapPosVector) {
-        this.getNative().writeGeometry(new NTLineGeometry(mapPosVectorFromArgs(value)));
+        return this.getNative().writeGeometry(new NTLineGeometry(mapPosVectorFromArgs(value)));
     }
     writeFeatureCollection(value: FeatureCollection) {
-        this.getNative().writeFeatureCollection(featureCollectionFromArgs(value));
+        return this.getNative().writeFeatureCollection(featureCollectionFromArgs(value));
     }
     set sourceProjection(value: Projection) {
         this.native && this.native.setSourceProjection(value.getNative());
diff --git a/src/index.d.ts b/src/index.d.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-redeclare */
 import { Observable } from '@nativescript/core/data/observable';
 import { DefaultLatLonKeys, GenericMapPos, MapPosVector, MapPosVectorVector } from './core';
 import { FeatureCollection } from './geometry/feature';
diff --git a/src/vectorelements/index.d.ts b/src/vectorelements/index.d.ts
@@ -37,7 +37,7 @@ export class BillboardVectorElementOptions<K = DefaultLatLonKeys> extends PointV
     rotation?: number;
 }
 export class LineVectorElementOptions<T = DefaultLatLonKeys> extends VectorElementOptions {
-    positions: MapPosVector<T> | GenericMapPos<T>[];
+    positions?: MapPosVector<T> | GenericMapPos<T>[];
     projection?: Projection;
     ignoreAltitude?: boolean;
 }
@@ -59,15 +59,15 @@ export abstract class BaseVectorElement<T, U extends VectorElementOptions> exten
     metaData: { [k: string]: string };
 }
 export abstract class BasePointVectorElement<T, U extends PointVectorElementOptions<K>, K = DefaultLatLonKeys> extends BaseVectorElement<T, U> {
-    position: GenericMapPos<K>;
+    position?: GenericMapPos<K>;
     projection?: Projection;
     getNativePos(pos: GenericMapPos<K>, projection?: Projection): any;
 }
 export abstract class BaseBillboardVectorElement<T, U extends BillboardVectorElementOptions<K>, K = DefaultLatLonKeys> extends BasePointVectorElement<T, U, K> {
     rotation?: number;
 }
 export abstract class BaseLineVectorElement<T, U extends LineVectorElementOptions<K>, K = DefaultLatLonKeys> extends BaseVectorElement<T, U> {
-    positions: MapPosVector<K> | GenericMapPos<K>[];
+    positions?: MapPosVector<K> | GenericMapPos<K>[];
     projection?: Projection;
 }
 export class VectorElement<T, U extends VectorElementOptions> extends BaseVectorElement<T, U> {}
diff --git a/src/vectorelements/line.android.ts b/src/vectorelements/line.android.ts
@@ -102,9 +102,12 @@ export class Line extends BaseLineVectorElement<com.carto.vectorelements.Line, L
     }
     createNative(options: LineOptions) {
         const style = this.buildStyle();
-        const result = new com.carto.vectorelements.Line(mapPosVectorFromArgs(options.positions, options.ignoreAltitude), style);
-        // result['owner'] = new WeakRef(this);
-        return result;
+        if (options.positions) {
+            return new com.carto.vectorelements.Line(mapPosVectorFromArgs(options.positions, options.ignoreAltitude), style);
+        } else if (options.geometry) {
+            return new com.carto.vectorelements.Line(geometryFromArgs(options.geometry), style);
+        }
+        return null;
     }
     buildStyle() {
         let style: com.carto.styles.LineStyle;
diff --git a/src/vectorelements/line.d.ts b/src/vectorelements/line.d.ts
@@ -25,7 +25,7 @@ export class LineStyleBuilderOptions extends VectorElementOptions {
     stretchFactor?: number;
 }
 export class LineOptions<T = DefaultLatLonKeys> extends LineVectorElementOptions<T> {
-    geometry?: LineGeometry;
+    geometry?: LineGeometry<T>;
     styleBuilder?: LineStyleBuilder | LineStyleBuilderOptions;
     projection?: Projection;
 }
@@ -40,7 +40,7 @@ export class LineStyleBuilder extends BaseVectorElementStyleBuilder<any, LineSty
 }
 
 export class Line<T = DefaultLatLonKeys> extends BaseLineVectorElement<any, LineOptions<T>, T> {
-    styleBuilder?: LineStyleBuilder | LineStyleBuilderOptions | any;
+    styleBuilder?: LineStyleBuilder | LineStyleBuilderOptions ;
     ignoreAltitude?: boolean;
     style?: any;
     color?: string | Color;
diff --git a/src/vectorelements/line.ios.ts b/src/vectorelements/line.ios.ts
@@ -87,8 +87,12 @@ export class Line extends BaseLineVectorElement<NTLine, LineOptions> {
 
     createNative(options: LineOptions) {
         const style = this.buildStyle();
-        const result = NTLine.alloc().initWithPosesStyle(mapPosVectorFromArgs(options.positions, options.ignoreAltitude), style);
-        return result;
+        if (options.positions) {
+            return NTLine.alloc().initWithPosesStyle(mapPosVectorFromArgs(options.positions, options.ignoreAltitude), style);
+        } else if (options.geometry) {
+            return NTLine.alloc().initWithGeometryStyle(geometryFromArgs(options.geometry), style);
+        }
+        return null;
     }
     buildStyle() {
         let style: NTLineStyle;
diff --git a/src/vectorelements/marker.android.ts b/src/vectorelements/marker.android.ts
@@ -34,8 +34,7 @@ export class Marker extends BaseBillboardVectorElement<com.carto.vectorelements.
         const style = this.buildStyle();
         let result: com.carto.vectorelements.Marker;
         if (options.geometry) {
-            const geometry = options.geometry.native ? options.geometry.getNative() : options.geometry;
-            result = new com.carto.vectorelements.Marker(geometry, style);
+            result = new com.carto.vectorelements.Marker(geometryFromArgs(options.geometry), style);
         } else {
             const nativePos = this.getNativePos(options.position, options.projection);
             result = new com.carto.vectorelements.Marker(nativePos, style);
diff --git a/src/vectorelements/marker.d.ts b/src/vectorelements/marker.d.ts
@@ -31,10 +31,11 @@ export class MarkerStyleBuilder extends BillboardStyleBuilder<any, MarkerStyleBu
 
 export class MarkerOptions<T = DefaultLatLonKeys> extends BillboardVectorElementOptions<T> {
     styleBuilder?: MarkerStyleBuilder | MarkerStyleBuilderOptions;
-    geometry?: Geometry;
+    geometry?: Geometry<T>;
 }
 export class Marker<T = DefaultLatLonKeys> extends BaseBillboardVectorElement<any, MarkerOptions<T>, T> {
-    styleBuilder?: MarkerStyleBuilder | MarkerStyleBuilderOptions | any;
+    styleBuilder?: MarkerStyleBuilder | MarkerStyleBuilderOptions ;
+    geometry?: Geometry<T>;
     style?: any;
     size?: number;
     placementPriority?: number;
diff --git a/src/vectorelements/marker.ios.ts b/src/vectorelements/marker.ios.ts
@@ -32,8 +32,7 @@ export class Marker extends BaseBillboardVectorElement<NTMarker, MarkerOptions>
         const style = this.buildStyle();
         let result: NTMarker;
         if (options.geometry) {
-            const geometry = options.geometry.native ? options.geometry.getNative() : options.geometry;
-            result = NTMarker.alloc().initWithGeometryStyle(geometry, style);
+            result = NTMarker.alloc().initWithGeometryStyle(geometryFromArgs(options.geometry), style);
         } else {
             const nativePos = this.getNativePos(options.position, options.projection);
             result = NTMarker.alloc().initWithPosStyle(nativePos, style);
diff --git a/src/vectorelements/point.d.ts b/src/vectorelements/point.d.ts
@@ -15,12 +15,12 @@ export class PointStyleBuilder extends BaseVectorElementStyleBuilder<any, PointS
 }
 
 export class PointOptions<T = DefaultLatLonKeys> extends PointVectorElementOptions<T> {
-    geometry?: Geometry;
+    geometry?: Geometry<T>;
     styleBuilder?: PointStyleBuilder | PointStyleBuilderOptions;
 }
 export class Point<T = DefaultLatLonKeys> extends BasePointVectorElement<any, PointOptions<T>, T> {
     styleBuilder?: PointStyleBuilder | PointStyleBuilderOptions;
-    geometry?: Geometry;
+    geometry?: Geometry<T>;
     style?: any;
     size?: number;
     color?: string | Color;
diff --git a/src/vectorelements/polygon.android.ts b/src/vectorelements/polygon.android.ts
@@ -50,11 +50,15 @@ export class PolygonStyleBuilder extends BaseVectorElementStyleBuilder<com.carto
 export class Polygon extends BaseLineVectorElement<com.carto.vectorelements.Polygon, PolygonOptions> {
     createNative(options: PolygonOptions) {
         const style = this.buildStyle();
-        const result = new com.carto.vectorelements.Polygon(mapPosVectorFromArgs(options.positions, options.ignoreAltitude), style);
+        let result: com.carto.vectorelements.Polygon;
+        if (options.positions) {
+            result = new com.carto.vectorelements.Polygon(mapPosVectorFromArgs(options.positions, options.ignoreAltitude), style);
+        } else if (options.geometry) {
+            result = new com.carto.vectorelements.Polygon(geometryFromArgs(options.geometry), style);
+        }
         if (options.holes) {
             result.setHoles(mapPosVectorVectorFromArgs(options.holes, options.ignoreAltitude));
         }
-        result['owner'] = new WeakRef(this);
         return result;
     }
     buildStyle() {
diff --git a/src/vectorelements/polygon.d.ts b/src/vectorelements/polygon.d.ts
@@ -11,21 +11,22 @@ export class PolygonStyleBuilderOptions extends VectorElementOptions {
 }
 export class PolygonStyleBuilder extends BaseVectorElementStyleBuilder<any, PolygonStyleBuilderOptions> {
     color: Color | string;
-    lineStyleBuilder: LineStyleBuilder | LineStyleBuilderOptions | any;
+    lineStyleBuilder: LineStyleBuilder | LineStyleBuilderOptions ;
     buildStyle(): any;
 }
 
 export class PolygonOptions<T = DefaultLatLonKeys> extends LineVectorElementOptions<T> {
     holes?: GenericMapPos<T>[][] | MapPosVectorVector<T>;
     projection?: Projection;
     styleBuilder?: PolygonStyleBuilder | PolygonStyleBuilderOptions;
-    geometry?: Geometry;
+    geometry?: Geometry<T>;
 }
 
 export class Polygon<T = DefaultLatLonKeys> extends BaseLineVectorElement<any, PolygonOptions<T>, T> {
-    styleBuilder?: PolygonStyleBuilder | PolygonStyleBuilderOptions | any;
+    styleBuilder?: PolygonStyleBuilder | PolygonStyleBuilderOptions ;
+    geometry?: Geometry<T>;
     style?: any;
     size?: number;
     color?: string | Color;
-    lineStyleBuilder?: LineStyleBuilder | LineStyleBuilderOptions | any;
+    lineStyleBuilder?: LineStyleBuilder | LineStyleBuilderOptions ;
 }
diff --git a/src/vectorelements/polygon.ios.ts b/src/vectorelements/polygon.ios.ts
@@ -50,11 +50,16 @@ export class PolygonStyleBuilder extends BaseVectorElementStyleBuilder<NTPolygon
 export class Polygon extends BaseLineVectorElement<NTPolygon, PolygonOptions> {
     createNative(options: PolygonOptions) {
         const style = this.buildStyle();
-        const result = NTPolygon.alloc().initWithPosesStyle(mapPosVectorFromArgs(options.positions, options.ignoreAltitude), style);
+
+        let result: NTPolygon;
+        if (options.positions) {
+            result = NTPolygon.alloc().initWithPosesStyle(mapPosVectorFromArgs(options.positions, options.ignoreAltitude), style);
+        } else if (options.geometry) {
+            result = NTPolygon.alloc().initWithGeometryStyle(geometryFromArgs(options.geometry), style);
+        }
         if (options.holes) {
             result.setHoles(mapPosVectorVectorFromArgs(options.holes, options.ignoreAltitude));
         }
-        // result['owner'] = new WeakRef(this);
         return result;
     }
     buildStyle() {
diff --git a/src/vectorelements/polygon3d.android.ts b/src/vectorelements/polygon3d.android.ts
@@ -2,7 +2,7 @@ import { BaseVectorElementStyleBuilder } from './index.common';
 import { BaseLineVectorElement } from './index.android';
 import { Polygon3DOptions, Polygon3DStyleBuilderOptions } from './polygon3d';
 import { Color } from '@nativescript/core/color';
-import { mapPosVectorFromArgs, mapPosVectorVectorFromArgs, nativeColorProperty } from '..';
+import { geometryFromArgs, mapPosVectorFromArgs, mapPosVectorVectorFromArgs, nativeColorProperty } from '..';
 
 export class Polygon3DStyleBuilder extends BaseVectorElementStyleBuilder<com.carto.styles.Polygon3DStyleBuilder, Polygon3DStyleBuilderOptions> {
     createNative(options: Polygon3DStyleBuilderOptions) {
@@ -23,7 +23,12 @@ export class Polygon3DStyleBuilder extends BaseVectorElementStyleBuilder<com.car
 export class Polygon3D extends BaseLineVectorElement<com.carto.vectorelements.Polygon3D, Polygon3DOptions> {
     createNative(options: Polygon3DOptions) {
         const style = this.buildStyle();
-        const result = new com.carto.vectorelements.Polygon3D(mapPosVectorFromArgs(options.positions, options.ignoreAltitude), style, options.height);
+        let result: com.carto.vectorelements.Polygon3D;
+        if (options.positions) {
+            result = new com.carto.vectorelements.Polygon3D(mapPosVectorFromArgs(options.positions, options.ignoreAltitude), style, options.height);
+        } else if (options.geometry) {
+            result = new com.carto.vectorelements.Polygon3D(geometryFromArgs(options.geometry), style, options.height);
+        }
         if (options.holes) {
             result.setHoles(mapPosVectorVectorFromArgs(options.holes, options.ignoreAltitude));
         }
diff --git a/src/vectorelements/polygon3d.d.ts b/src/vectorelements/polygon3d.d.ts
@@ -18,14 +18,16 @@ export class Polygon3DStyleBuilder extends BaseVectorElementStyleBuilder<any, Po
 
 export class Polygon3DOptions<T = DefaultLatLonKeys> extends LineVectorElementOptions<T> {
     height: number;
-    positions: MapPosVector<T> | GenericMapPos<T>[];
+    positions?: MapPosVector<T> | GenericMapPos<T>[];
+    geometry?: Geometry<T>;
     holes?: GenericMapPos<T>[][] | MapPosVectorVector<T>;
     projection?: Projection;
     styleBuilder?: Polygon3DStyleBuilder | Polygon3DStyleBuilderOptions;
 }
 
 export class Polygon3D<T = DefaultLatLonKeys> extends BaseLineVectorElement<any, Polygon3DOptions<T>, T> {
-    styleBuilder?: Polygon3DStyleBuilder | Polygon3DStyleBuilderOptions | any;
+    styleBuilder?: Polygon3DStyleBuilder | Polygon3DStyleBuilderOptions ;
+    geometry?: Geometry<T>;
     style?: any;
     size?: number;
     color?: string | Color;
diff --git a/src/vectorelements/polygon3d.ios.ts b/src/vectorelements/polygon3d.ios.ts
@@ -1,6 +1,6 @@
 import { BaseVectorElementStyleBuilder } from './index.common';
 import { Color } from '@nativescript/core';
-import { mapPosVectorFromArgs, mapPosVectorVectorFromArgs, nativeColorProperty } from '..';
+import { geometryFromArgs, mapPosVectorFromArgs, mapPosVectorVectorFromArgs, nativeColorProperty } from '..';
 import { Polygon3DOptions, Polygon3DStyleBuilderOptions } from './polygon3d';
 import { BaseLineVectorElement } from './index.ios';
 
@@ -23,11 +23,15 @@ export class Polygon3DStyleBuilder extends BaseVectorElementStyleBuilder<NTPolyg
 export class Polygon3D extends BaseLineVectorElement<NTPolygon3D, Polygon3DOptions> {
     createNative(options: Polygon3DOptions) {
         const style = this.buildStyle();
-        const result = NTPolygon3D.alloc().initWithPosesStyleHeight(mapPosVectorFromArgs(options.positions, options.ignoreAltitude), style, options.height);
+        let result: NTPolygon3D;
+        if (options.positions) {
+            result = NTPolygon3D.alloc().initWithPosesStyleHeight(mapPosVectorFromArgs(options.positions, options.ignoreAltitude), style, options.height);
+        } else if (options.geometry) {
+            result = NTPolygon3D.alloc().initWithGeometryStyleHeight(geometryFromArgs(options.geometry), style, options.height);
+        }
         if (options.holes) {
             result.setHoles(mapPosVectorVectorFromArgs(options.holes, options.ignoreAltitude));
         }
-        // result['owner'] = new WeakRef(this);
         return result;
     }
     buildStyle() {

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ export class MapBounds<T = DefaultLatLonKeys> extends BaseNative<any, {}> {`
`66`	`66`	`equals(position: MapBounds<T>): boolean;`
`67`	`67`	`getCenter(): GenericMapPos<T>;`
`68`	`68`	`}`
	`69`	`+// eslint-disable-next-line no-redeclare`
`69`	`70`	`export interface MapBounds<T = DefaultLatLonKeys> {`
`70`	`71`	`northeast: GenericMapPos<T>;`
`71`	`72`	`southwest: GenericMapPos<T>;`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import { DefaultLatLonKeys, GenericMapPos, MapBounds, MapPos, MapPosVector } fro`
`2`	`2`	`import { BaseNative } from '../index.common';`
`3`	`3`
`4`	`4`	`export interface GeometryOptions<T = DefaultLatLonKeys> {}`
`5`		`-export abstract class Geometry<T = DefaultLatLonKeys, U extends GeometryOptions = GeometryOptions> extends BaseNative<any, U> {`
	`5`	`+export abstract class Geometry<T = DefaultLatLonKeys, U extends GeometryOptions = GeometryOptions<T>> extends BaseNative<any, U> {`
`6`	`6`	`getCenterPos(): GenericMapPos<T>;`
`7`	`7`	`getBounds(): MapBounds<T>;`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,10 @@ export class GeoJSONGeometryWriter extends BaseNative<com.carto.geometry.GeoJSON`
`11`	`11`	`return new com.carto.geometry.GeoJSONGeometryWriter();`
`12`	`12`	`}`
`13`	`13`	`writePoses(value: MapPosVector) {`
`14`		`- this.getNative().writeGeometry(new com.carto.geometry.LineGeometry(mapPosVectorFromArgs(value)));`
	`14`	`+ return this.getNative().writeGeometry(new com.carto.geometry.LineGeometry(mapPosVectorFromArgs(value)));`
`15`	`15`	`}`
`16`	`16`	`writeFeatureCollection(value: FeatureCollection) {`
`17`		`- this.getNative().writeFeatureCollection(featureCollectionFromArgs(value));`
	`17`	`+ return this.getNative().writeFeatureCollection(featureCollectionFromArgs(value));`
`18`	`18`	`}`
`19`	`19`	`set sourceProjection(value: Projection) {`
`20`	`20`	`this.native && this.native.setSourceProjection(value.getNative());`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* eslint-disable no-redeclare */`
`1`	`2`	`import { Observable } from '@nativescript/core/data/observable';`
`2`	`3`	`import { DefaultLatLonKeys, GenericMapPos, MapPosVector, MapPosVectorVector } from './core';`
`3`	`4`	`import { FeatureCollection } from './geometry/feature';`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ export class BillboardVectorElementOptions<K = DefaultLatLonKeys> extends PointV`
`37`	`37`	`rotation?: number;`
`38`	`38`	`}`
`39`	`39`	`export class LineVectorElementOptions<T = DefaultLatLonKeys> extends VectorElementOptions {`
`40`		`- positions: MapPosVector<T> \| GenericMapPos<T>[];`
	`40`	`+ positions?: MapPosVector<T> \| GenericMapPos<T>[];`
`41`	`41`	`projection?: Projection;`
`42`	`42`	`ignoreAltitude?: boolean;`
`43`	`43`	`}`
`@@ -59,15 +59,15 @@ export abstract class BaseVectorElement<T, U extends VectorElementOptions> exten`
`59`	`59`	`metaData: { [k: string]: string };`
`60`	`60`	`}`
`61`	`61`	`export abstract class BasePointVectorElement<T, U extends PointVectorElementOptions<K>, K = DefaultLatLonKeys> extends BaseVectorElement<T, U> {`
`62`		`- position: GenericMapPos<K>;`
	`62`	`+ position?: GenericMapPos<K>;`
`63`	`63`	`projection?: Projection;`
`64`	`64`	`getNativePos(pos: GenericMapPos<K>, projection?: Projection): any;`
`65`	`65`	`}`
`66`	`66`	`export abstract class BaseBillboardVectorElement<T, U extends BillboardVectorElementOptions<K>, K = DefaultLatLonKeys> extends BasePointVectorElement<T, U, K> {`
`67`	`67`	`rotation?: number;`
`68`	`68`	`}`
`69`	`69`	`export abstract class BaseLineVectorElement<T, U extends LineVectorElementOptions<K>, K = DefaultLatLonKeys> extends BaseVectorElement<T, U> {`
`70`		`- positions: MapPosVector<K> \| GenericMapPos<K>[];`
	`70`	`+ positions?: MapPosVector<K> \| GenericMapPos<K>[];`
`71`	`71`	`projection?: Projection;`
`72`	`72`	`}`
`73`	`73`	`export class VectorElement<T, U extends VectorElementOptions> extends BaseVectorElement<T, U> {}`