fix: a lot of fixes and improvements

farfromrefug · farfromrefug · commit c35ecb112d8c · 2021-01-15T16:01:00.000+01:00
# Conflicts:
#	src/index.ios.ts
#	src/projections/epsg3857.d.ts
#	src/projections/epsg4326.d.ts
#	src/projections/index.d.ts
#	src/search/index.d.ts
diff --git a/plugin/platforms/android/java/com/akylas/carto/additions/AKVectorTileSearchService.java b/plugin/platforms/android/java/com/akylas/carto/additions/AKVectorTileSearchService.java
@@ -22,10 +22,11 @@ public AKVectorTileSearchService(TileDataSource source, VectorTileDecoder decode
     static Handler mainHandler = null;
 
     public void findFeaturesCallback(final SearchRequest request, final VectorTileSearchServiceCallback callback) {
+        final AKVectorTileSearchService that = this;
         new Thread(new Runnable() {
             @Override
             public void run() {
-                final VectorTileFeatureCollection results = AKVectorTileSearchService.this.findFeatures(request);
+                final VectorTileFeatureCollection results = that.findFeatures(request);
                 if (AKMapView.RUN_ON_MAIN_THREAD) {
                     if (mainHandler == null) {
                         mainHandler = new Handler(android.os.Looper.getMainLooper());
diff --git a/src/core/index.android.ts b/src/core/index.android.ts
@@ -114,7 +114,10 @@ export function toNativeMapRange(value: MapRange) {
     //  ignore z for now as points can get under the map!
     return new com.carto.core.MapRange(value.min, value.max);
 }
-export function toNativeMapVec(value: MapVec) {
+export function toNativeMapVec(value: MapVec | [number, number, number]) {
+    if (Array.isArray(value)) {
+        return new com.carto.core.MapVec(value[0], value[1], value[2]);
+    }
     if (value instanceof com.carto.core.MapVec) {
         return value;
     }
diff --git a/src/core/index.d.ts b/src/core/index.d.ts
@@ -13,7 +13,7 @@ export declare function toNativeScreenPos(position: ScreenPos): any;
 export declare function fromNativeScreenBounds(pos): ScreenBounds;
 export declare function toNativeScreenBounds(position: ScreenBounds): any;
 export declare function fromNativeMapVec(value): MapVec;
-export declare function toNativeMapVec(value: MapVec): any;
+export declare function toNativeMapVec(value: MapVec | [number, number, number]): any;
 export declare function fromNativeMapRange(value): MapRange;
 export declare function toNativeMapRange(value: MapRange): any;
 export declare function setMapPosKeys(latitude: LatitudeKeys, longitude: LongitudeKeys, altitude?: AltitudeKeys);
diff --git a/src/core/index.ios.ts b/src/core/index.ios.ts
@@ -105,7 +105,10 @@ export function toNativeMapRange(value: MapRange) {
     //  ignore z for now as points can get under the map!
     return NTMapRange.alloc().initWithMinMax(value.min, value.max);
 }
-export function toNativeMapVec(value: MapVec) {
+export function toNativeMapVec(value: MapVec | [number, number, number]) {
+    if (Array.isArray(value)) {
+        return NTMapVec.alloc().initWithXYZ(value[0], value[1], value[2]);
+    }
     if (value instanceof NTMapVec) {
         return value;
     }
diff --git a/src/datasources/index.android.ts b/src/datasources/index.android.ts
@@ -1,4 +1,4 @@
-import { DataSourceOptions, GeoJSONVectorTileDataSourceOptions, MergedMBVTTileDataSourceOptions, OrderedTileDataSourceOptions, TileDataSourceOptions } from '.';
+import { CombinedTileDataSourceOptions, DataSourceOptions, GeoJSONVectorTileDataSourceOptions, MergedMBVTTileDataSourceOptions, OrderedTileDataSourceOptions, TileDataSourceOptions } from '.';
 import { BaseNative } from '../index.common';
 import { Projection } from '../projections';
 import { FeatureCollection } from '../geometry/feature';
@@ -33,17 +33,21 @@ export class TileDataSource<T extends com.carto.datasources.TileDataSource, U ex
 
 export class OrderedTileDataSource extends TileDataSource<com.carto.datasources.OrderedTileDataSource, OrderedTileDataSourceOptions> {
     createNative(options: OrderedTileDataSourceOptions) {
-        const array: com.carto.datasources.TileDataSource[] = Array.create(com.carto.datasources.TileDataSource, options.dataSources.length);
-        options.dataSources.forEach((d, i) => (array[i] = d.getNative()));
-        return new com.carto.datasources.OrderedTileDataSource(array[0], array[1]);
+        const dataSources: com.carto.datasources.TileDataSource[] = options.dataSources.map((d) => d.getNative());
+        return new com.carto.datasources.OrderedTileDataSource(dataSources[0], dataSources[1]);
+    }
+}
+export class CombinedTileDataSource extends TileDataSource<com.carto.datasources.CombinedTileDataSource, CombinedTileDataSourceOptions> {
+    createNative(options: CombinedTileDataSourceOptions) {
+        const dataSources: com.carto.datasources.TileDataSource[] = options.dataSources.map((d) => d.getNative());
+        return new com.carto.datasources.CombinedTileDataSource(dataSources[0], dataSources[1], options.zoomLevel);
     }
 }
 
 export class MergedMBVTTileDataSource extends TileDataSource<com.carto.datasources.MergedMBVTTileDataSource, MergedMBVTTileDataSourceOptions> {
     createNative(options: MergedMBVTTileDataSourceOptions) {
-        const array: com.carto.datasources.TileDataSource[] = Array.create(com.carto.datasources.TileDataSource, options.dataSources.length);
-        options.dataSources.forEach((d, i) => (array[i] = d.getNative()));
-        return new com.carto.datasources.MergedMBVTTileDataSource(array[0], array[1]);
+        const dataSources: com.carto.datasources.TileDataSource[] = options.dataSources.map((d) => d.getNative());
+        return new com.carto.datasources.MergedMBVTTileDataSource(dataSources[0], dataSources[1]);
     }
 }
 
diff --git a/src/datasources/index.d.ts b/src/datasources/index.d.ts
@@ -18,12 +18,17 @@ export class TileDataSource<T, U extends TileDataSourceOptions> extends DataSour
 export interface OrderedTileDataSourceOptions extends DataSourceOptions {
     dataSources: TileDataSource<any, any>[];
 }
+export interface CombinedTileDataSourceOptions extends DataSourceOptions {
+    dataSources: TileDataSource<any, any>[];
+    zoomLevel: number;
+}
 export class OrderedTileDataSource<T, U extends OrderedTileDataSourceOptions> extends TileDataSource<T, U> {}
 
 export interface MergedMBVTTileDataSourceOptions extends DataSourceOptions {
     dataSources: TileDataSource<any, any>[];
 }
 export class MergedMBVTTileDataSource<T, U extends MergedMBVTTileDataSourceOptions> extends TileDataSource<T, U> {}
+export class CombinedTileDataSource<T, U extends CombinedTileDataSourceOptions> extends TileDataSource<T, U> {}
 
 export interface GeoJSONVectorTileDataSourceOptions extends TileDataSourceOptions {}
 export class GeoJSONVectorTileDataSource extends TileDataSource<any, GeoJSONVectorTileDataSourceOptions> {
diff --git a/src/datasources/index.ios.ts b/src/datasources/index.ios.ts
@@ -1,5 +1,5 @@
 import { BaseNative } from '../index.common';
-import { DataSourceOptions, GeoJSONVectorTileDataSourceOptions, MergedMBVTTileDataSourceOptions, OrderedTileDataSourceOptions, TileDataSourceOptions } from '.';
+import { CombinedTileDataSourceOptions, DataSourceOptions, GeoJSONVectorTileDataSourceOptions, MergedMBVTTileDataSourceOptions, OrderedTileDataSourceOptions, TileDataSourceOptions } from '.';
 import { JSVariantToNative } from '../utils';
 import { FeatureCollection } from '../geometry/feature.ios';
 import { Projection } from '../projections';
@@ -25,6 +25,12 @@ export class OrderedTileDataSource extends TileDataSource<NTOrderedTileDataSourc
     }
 }
 
+export class CombinedTileDataSource extends TileDataSource<NTCombinedTileDataSource, CombinedTileDataSourceOptions> {
+    createNative(options: CombinedTileDataSourceOptions) {
+        const dataSources: NTTileDataSource[] = options.dataSources.map((d) => d.getNative());
+        return NTCombinedTileDataSource.alloc().initWithDataSource1DataSource2ZoomLevel(dataSources[0], dataSources[1], options.zoomLevel);
+    }
+}
 export class MergedMBVTTileDataSource extends TileDataSource<NTMergedMBVTTileDataSource, MergedMBVTTileDataSourceOptions> {
     createNative(options: MergedMBVTTileDataSourceOptions) {
         const dataSources: NTTileDataSource[] = options.dataSources.map(d => d.getNative());
diff --git a/src/geometry/feature.android.ts b/src/geometry/feature.android.ts
@@ -34,19 +34,19 @@ export class FeatureCollection implements IFeatureCollection {
         for (let index = 0; index < featureCount; index++) {
             const geometry = this.getGeometry(index);
             const bounds = fromNativeMapBounds(geometry.getBounds());
-            minLat = Math.min(minLat, bounds.northeast[LatitudeKey]);
-            minLon = Math.min(minLon, bounds.northeast[LongitudeKey]);
-            maxLat = Math.max(maxLat, bounds.southwest[LatitudeKey]);
-            maxLon = Math.max(maxLon, bounds.southwest[LongitudeKey]);
+            minLat = Math.min(minLat, bounds.southwest[LatitudeKey]);
+            minLon = Math.min(minLon, bounds.southwest[LongitudeKey]);
+            maxLat = Math.max(maxLat, bounds.northeast[LatitudeKey]);
+            maxLon = Math.max(maxLon, bounds.northeast[LongitudeKey]);
         }
         return new MapBounds(
-            {
-                [LatitudeKey]: minLat,
-                [LongitudeKey]: minLon,
-            },
             {
                 [LatitudeKey]: maxLat,
                 [LongitudeKey]: maxLon,
+            },
+            {
+                [LatitudeKey]: minLat,
+                [LongitudeKey]: minLon,
             }
         );
     }
diff --git a/src/geometry/index.d.ts b/src/geometry/index.d.ts
@@ -11,10 +11,10 @@ export interface PointGeometryOptions<T = DefaultLatLonKeys> extends GeometryOpt
     pos: GenericMapPos<T>;
 }
 export interface LineGeometryOptions<T = DefaultLatLonKeys> extends GeometryOptions<T> {
-    poses: MapPosVector<T>;
+    poses: MapPosVector<T> | GenericMapPos<T>[];
 }
 export interface PolygonGeometryOptions<T = DefaultLatLonKeys> extends GeometryOptions<T> {
-    poses: MapPosVector<T>;
+    poses: MapPosVector<T> | GenericMapPos<T>[];
 }
 export class PointGeometry<T = DefaultLatLonKeys> extends Geometry<T, PointGeometryOptions<T>> {
     getPos(): GenericMapPos<T>;
diff --git a/src/index.android.ts b/src/index.android.ts
@@ -1,11 +1,11 @@
 /* eslint-disable no-redeclare */
 import { Color } from '@nativescript/core/color';
 import { NativePropertyOptions } from '.';
-import { BaseNative, _createImageSourceFromSrc, nativeProperty } from './index.common';
+import { BaseNative, _createImageSourceFromSrc, nativeMapVecProperty, nativeProperty } from './index.common';
 import { DefaultLatLonKeys, GenericMapPos, MapPos, MapPosVector, MapPosVectorVector, toNativeMapPos } from './core';
 import { FeatureCollection } from './geometry/feature';
 import { Geometry } from './geometry';
-export { BaseNative, nativeProperty };
+export { BaseNative, nativeProperty, nativeMapVecProperty };
 
 export function nativeColorProperty(target: any, k?, desc?: PropertyDescriptor): any;
 export function nativeColorProperty(options: NativePropertyOptions): (target: any, k?, desc?: PropertyDescriptor) => any;
diff --git a/src/index.common.ts b/src/index.common.ts
@@ -137,6 +137,7 @@ export function capitalize(s) {
 
 import { knownFolders, path } from '@nativescript/core/file-system';
 import { NativePropertyOptions } from '.';
+import { fromNativeMapVec, toNativeMapVec } from './core';
 let currentAppFolder: string;
 
 export function getFileName(str: string): string {
diff --git a/src/index.d.ts b/src/index.d.ts
@@ -55,3 +55,7 @@ export declare function nativeCartoImageProperty(...args);
 export declare function nativeImageProperty(target: any, k?, desc?: PropertyDescriptor): any;
 export declare function nativeImageProperty(options: NativePropertyOptions): (target: any, k?, desc?: PropertyDescriptor) => any;
 export declare function nativeImageProperty(...args);
+
+export declare function nativeMapVecProperty(target: any, k?, desc?: PropertyDescriptor): any;
+export declare function nativeMapVecProperty(options: NativePropertyOptions): (target: any, k?, desc?: PropertyDescriptor) => any;
+export declare function nativeMapVecProperty(...args);
diff --git a/src/index.ios.ts b/src/index.ios.ts
@@ -1,10 +1,11 @@
-import { BaseNative, _createImageSourceFromSrc, nativeProperty } from './index.common';
+/* eslint-disable no-redeclare */
+import { BaseNative, _createImageSourceFromSrc, nativeMapVecProperty, nativeProperty } from './index.common';
 import { Color } from '@nativescript/core/color';
 import { DefaultLatLonKeys, MapPos, MapPosVector, MapPosVectorVector, toNativeMapPos } from './core';
 import { NativePropertyOptions } from '.';
 import { FeatureCollection } from './geometry/feature';
 import { Geometry } from './geometry';
-export { BaseNative, nativeProperty };
+export { BaseNative, nativeMapVecProperty, nativeProperty };
 
 export function nativeColorProperty(target: any, k?, desc?: PropertyDescriptor): any;
 export function nativeColorProperty(options: NativePropertyOptions): (target: any, k?, desc?: PropertyDescriptor) => any;
diff --git a/src/layers/index.android.ts b/src/layers/index.android.ts
@@ -37,7 +37,7 @@ export abstract class TileLayer<T extends com.carto.layers.TileLayer, U extends
     @nativeProperty zoomLevelBias: number;
     @nativeProperty maxOverzoomLevel: number;
     @nativeProperty maxUnderzoomLevel: number;
-    @nativeAndroidEnumProperty(com.carto.layers.TileSubstitutionPolicy, {}) tileSubstitutionPolicy;
+    @nativeProperty tileSubstitutionPolicy;
 
     clearTileCaches(all: boolean) {
         if (this.native) {
diff --git a/src/projections/epsg3857.android.ts b/src/projections/epsg3857.android.ts
@@ -1,7 +1,7 @@
 import { ProjectionClass } from '.';
 import { EPSG3857Options } from './epsg3857';
 
-export class EPSG3857 extends ProjectionClass<com.carto.projections.EPSG3857, EPSG3857Options> {
+export class EPSG3857 extends ProjectionClass<any, com.carto.projections.EPSG3857, EPSG3857Options> {
     createNative() {
         return new com.carto.projections.EPSG3857();
     }
diff --git a/src/projections/epsg3857.d.ts b/src/projections/epsg3857.d.ts
@@ -1,6 +1,6 @@
 import { ProjectionClass, ProjectionOptions } from '.';
 
 export interface EPSG3857Options extends ProjectionOptions {}
-export class EPSG3857 extends ProjectionClass<any, EPSG3857Options> {
-    createNative()
+export class EPSG3857<G = DefaultLatLonKeys> extends ProjectionClass<G, any, EPSG3857Options> {
+    createNative();
 }
diff --git a/src/projections/epsg3857.ios.ts b/src/projections/epsg3857.ios.ts
@@ -1,7 +1,7 @@
 import { ProjectionClass } from '.';
 import { EPSG3857Options } from './epsg3857';
 
-export class EPSG3857 extends ProjectionClass<NTEPSG3857, EPSG3857Options> {
+export class EPSG3857 extends ProjectionClass<any, NTEPSG3857, EPSG3857Options> {
     createNative() {
         return NTEPSG3857.alloc().init();
     }
diff --git a/src/projections/epsg4326.android.ts b/src/projections/epsg4326.android.ts
@@ -1,7 +1,7 @@
 import { ProjectionClass } from '.';
 import { EPSG4326Options } from './epsg4326';
 
-export class EPSG4326 extends ProjectionClass<com.carto.projections.EPSG4326, EPSG4326Options> {
+export class EPSG4326 extends ProjectionClass<any, com.carto.projections.EPSG4326, EPSG4326Options> {
     createNative() {
         return new com.carto.projections.EPSG4326();
     }
diff --git a/src/projections/epsg4326.d.ts b/src/projections/epsg4326.d.ts
@@ -1,6 +1,6 @@
 import { ProjectionClass, ProjectionOptions } from '.';
 
 export interface EPSG4326Options extends ProjectionOptions {}
-export class EPSG4326 extends ProjectionClass<any, EPSG4326Options> {
-    createNative()
+export class EPSG4326<G = DefaultLatLonKeys> extends ProjectionClass<G, any, EPSG4326Options> {
+    createNative();
 }
diff --git a/src/projections/epsg4326.ios.ts b/src/projections/epsg4326.ios.ts
@@ -1,7 +1,7 @@
 import { ProjectionClass } from '.';
 import { EPSG4326Options } from './epsg4326';
 
-export class EPSG4326 extends ProjectionClass<NTEPSG4326, EPSG4326Options> {
+export class EPSG4326 extends ProjectionClass<any, NTEPSG4326, EPSG4326Options> {
     createNative() {
         return NTEPSG4326.alloc().init();
     }
diff --git a/src/projections/index.d.ts b/src/projections/index.d.ts
@@ -4,15 +4,14 @@ import { MapPos } from '../core';
 
 export class ProjectionOptions {}
 export abstract class BaseProjection<T, U extends ProjectionOptions> extends BaseNative<T, U> {}
-export abstract class ProjectionClass<T, U extends ProjectionOptions> extends BaseProjection<T, U> {
-    fromWgs84(position: MapPos): MapPos;
-    toWgs84(position: MapPos): MapPos;
-    fromLatLong(lat, lon): MapPos;
-    toLatLong(x, y): MapPos;
+export abstract class ProjectionClass<G = DefaultLatLonKeys, T, U extends ProjectionOptions> extends BaseProjection<T, U> {
+    fromWgs84<U = G>(position: GenericMapPos<U>): GenericMapPos<U>;
+    toWgs84<U = G>(position: GenericMapPos<U>): GenericMapPos<U>;
+    fromLatLong<U = G>(lat, lon): GenericMapPos<U>;
+    toLatLong<U = G>(x, y): GenericMapPos<U>;
 }
-export declare class Projection extends ProjectionClass<any, ProjectionOptions> {
+export declare class Projection extends ProjectionClass<DefaultLatLonKeys, any, ProjectionOptions> {
     createNative(): any;
 }
 
-export interface IProjection extends ProjectionClass<any, any>  {
-}
+export interface IProjection extends ProjectionClass<any, any, any> {}
diff --git a/src/routing/index.d.ts b/src/routing/index.d.ts
@@ -24,13 +24,13 @@ declare enum RoutingAction {
     WAIT,
 }
 export interface RoutingRequest<T = DefaultLatLonKeys> {
-    projection: Projection;
+    projection: Projection<T>;
     points: GenericMapPos<T>[];
     customOptions: any;
 }
 
 export interface RouteMatchingRequest<T = DefaultLatLonKeys> {
-    projection: Projection;
+    projection: Projection<T>;
     points: GenericMapPos<T>[];
     accuracy: number;
 }
diff --git a/src/search/index.android.ts b/src/search/index.android.ts
@@ -2,6 +2,7 @@ import { BaseNative, nativeProperty } from '../index.common';
 import { toNativeMapPos } from '../core';
 import { FeatureCollection, VectorTileFeatureCollection } from '../geometry/feature';
 import { FeatureCollectionSearchServiceOptions, SearchRequest, VectorTileSearchServiceOptions } from '.';
+import { geometryFromArgs } from '..';
 
 export class VectorTileSearchService extends BaseNative<com.akylas.carto.additions.AKVectorTileSearchService, VectorTileSearchServiceOptions> {
     @nativeProperty
@@ -31,11 +32,9 @@ export class VectorTileSearchService extends BaseNative<com.akylas.carto.additio
             nRequest.setRegexFilter(options.regexFilter);
         }
         if (options.geometry) {
-            nRequest.setGeometry(options.geometry as any);
-        } else {
-            if (options.position) {
-                nRequest.setGeometry(new com.carto.geometry.PointGeometry(toNativeMapPos(options.position)));
-            }
+            nRequest.setGeometry(geometryFromArgs(options.geometry));
+        } else if (options.position) {
+            nRequest.setGeometry(new com.carto.geometry.PointGeometry(toNativeMapPos(options.position)));
         }
         if (callback) {
             this.getNative().findFeaturesCallback(
@@ -46,6 +45,7 @@ export class VectorTileSearchService extends BaseNative<com.akylas.carto.additio
                     }
                 })
             );
+            return null;
         }
         return new VectorTileFeatureCollection(this.getNative().findFeatures(nRequest));
     }
@@ -85,6 +85,7 @@ export class FeatureCollectionSearchService extends BaseNative<com.akylas.carto.
                     }
                 })
             );
+            return null;
         }
         return new FeatureCollection(this.getNative().findFeatures(nRequest));
     }
diff --git a/src/search/index.d.ts b/src/search/index.d.ts
@@ -5,15 +5,15 @@ import { VectorTileDecoder } from '../vectortiles';
 import { Projection } from '../projections';
 import { Geometry } from '../geometry';
 import { Feature, FeatureCollection, VectorTileFeatureCollection } from '../geometry/feature';
-import { MapPos } from '../core';
+import { GenericMapPos, MapPos } from '../core';
 
-export interface SearchRequest {
-    projection?: Projection;
+export interface SearchRequest<T = DefaultLatLonKeys> {
+    projection?: Projection<T>;
     regexFilter?: string;
     filterExpression?: string;
     searchRadius?: number;
-    geometry?: Geometry;
-    position?: MapPos;
+    geometry?: Geometry<T>;
+    position?: GenericMapPos<T>;
 }
 
 export interface SearchServiceOptions {
@@ -34,13 +34,13 @@ export interface VectorTileSearchServiceOptions extends SearchServiceOptions {
 export class VectorTileSearchService extends BaseNative<any, VectorTileSearchServiceOptions> {
     minZoom?: number;
     maxZoom?: number;
-    findFeatures(options: SearchRequest, callback?: (res: VectorTileFeatureCollection) => void): VectorTileFeatureCollection;
+    findFeatures<T = DefaultLatLonKeys>(options: SearchRequest<T>, callback?: (res: VectorTileFeatureCollection<T>) => void): VectorTileFeatureCollection<T>;
 }
 
 export interface FeatureCollectionSearchServiceOptions {
     projection: Projection;
     features: FeatureCollection;
 }
-export class FeatureCollectionSearchService<U extends FeatureCollectionSearchServiceOptions>   extends BaseNative<any, U> {
-    findFeatures(options: SearchRequest, callback?: (res: FeatureCollection) => void): FeatureCollection;
+export class FeatureCollectionSearchService<U extends FeatureCollectionSearchServiceOptions> extends BaseNative<any, U> {
+    findFeatures<T = DefaultLatLonKeys>(options: SearchRequest<T>, callback?: (res: FeatureCollection<T>) => void): FeatureCollection<T>;
 }
diff --git a/src/search/index.ios.ts b/src/search/index.ios.ts
diff --git a/src/vectorelements/point.d.ts b/src/vectorelements/point.d.ts

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,10 @@ export function toNativeMapRange(value: MapRange) {`
`114`	`114`	`// ignore z for now as points can get under the map!`
`115`	`115`	`return new com.carto.core.MapRange(value.min, value.max);`
`116`	`116`	`}`
`117`		`-export function toNativeMapVec(value: MapVec) {`
	`117`	`+export function toNativeMapVec(value: MapVec \| [number, number, number]) {`
	`118`	`+ if (Array.isArray(value)) {`
	`119`	`+ return new com.carto.core.MapVec(value[0], value[1], value[2]);`
	`120`	`+ }`
`118`	`121`	`if (value instanceof com.carto.core.MapVec) {`
`119`	`122`	`return value;`
`120`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,10 @@ export function toNativeMapRange(value: MapRange) {`
`105`	`105`	`// ignore z for now as points can get under the map!`
`106`	`106`	`return NTMapRange.alloc().initWithMinMax(value.min, value.max);`
`107`	`107`	`}`
`108`		`-export function toNativeMapVec(value: MapVec) {`
	`108`	`+export function toNativeMapVec(value: MapVec \| [number, number, number]) {`
	`109`	`+ if (Array.isArray(value)) {`
	`110`	`+ return NTMapVec.alloc().initWithXYZ(value[0], value[1], value[2]);`
	`111`	`+ }`
`109`	`112`	`if (value instanceof NTMapVec) {`
`110`	`113`	`return value;`
`111`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,10 @@ export interface PointGeometryOptions<T = DefaultLatLonKeys> extends GeometryOpt`
`11`	`11`	`pos: GenericMapPos<T>;`
`12`	`12`	`}`
`13`	`13`	`export interface LineGeometryOptions<T = DefaultLatLonKeys> extends GeometryOptions<T> {`
`14`		`- poses: MapPosVector<T>;`
	`14`	`+ poses: MapPosVector<T> \| GenericMapPos<T>[];`
`15`	`15`	`}`
`16`	`16`	`export interface PolygonGeometryOptions<T = DefaultLatLonKeys> extends GeometryOptions<T> {`
`17`		`- poses: MapPosVector<T>;`
	`17`	`+ poses: MapPosVector<T> \| GenericMapPos<T>[];`
`18`	`18`	`}`
`19`	`19`	`export class PointGeometry<T = DefaultLatLonKeys> extends Geometry<T, PointGeometryOptions<T>> {`
`20`	`20`	`getPos(): GenericMapPos<T>;`