feat: geometry features

Author: farfromrefug

src/geometry/feature.android.ts

@@ -9,11 +9,11 @@ export class FeatureCollection implements IFeatureCollection {
         const nResult = this.native.getFeature(index);
         return {
             properties: nativeVariantToJS(nResult.getProperties()),
-            geometry: nResult.getGeometry() as Geometry,
+            geometry: nResult.getGeometry(),
         } as Feature;
     }
     getGeometry(index: number) {
-        return this.native.getFeature(index).getGeometry() as Geometry;
+        return this.native.getFeature(index).getGeometry();
     }
     getFeatureCount() {
         return this.native.getFeatureCount();
@@ -35,7 +35,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() as Geometry,
+            geometry: nResult.getGeometry(),
             id: nResult.getId(),
             layerName: nResult.getLayerName(),
         } as VectorTileFeature;

src/geometry/feature.d.ts

@@ -1,8 +1,8 @@
 import { Geometry } from '.';
 
-export interface Feature {
+export interface Feature<T = DefaultLatLonKeys> {
     properties: {};
-    geometry: Geometry;
+    geometry: Geometry<T> | any;
     // getProperties(): any;
 
     // getGeometry(): Geometry;
@@ -14,14 +14,14 @@ export interface VectorTileFeature extends Feature {
     mapTile: any;
 }
 
-export class FeatureCollection {
+export class FeatureCollection<T = DefaultLatLonKeys> {
     constructor(native: any);
-    getFeature(index: number): Feature;
-    getGeometry(index: number): Geometry;
+    getFeature(index: number): Feature<T>;
+    getGeometry(index: number): Geometry<T> | any;
     getFeatureCount(): number;
     readonly featureCount: number;
     getNative();
 }
-export class VectorTileFeatureCollection extends FeatureCollection {
-    getFeature(index: number): VectorTileFeature;
+export class VectorTileFeatureCollection<T = DefaultLatLonKeys> extends FeatureCollection {
+    getFeature(index: number): VectorTileFeature<T>;
 }

src/geometry/feature.ios.ts

@@ -1,6 +1,7 @@
 import { Feature, FeatureCollection as IFeatureCollection, VectorTileFeature } from './feature';
 import { nativeVariantToJS } from '../utils';
 import { Geometry } from '.';
+import { DefaultLatLonKeys } from '../core';
 
 export class FeatureCollection implements IFeatureCollection {
     constructor(protected native: NTFeatureCollection) {}
@@ -10,11 +11,11 @@ export class FeatureCollection implements IFeatureCollection {
         // const nGeo = nResult.getGeometry();
         return {
             properties: nativeVariantToJS(nResult.getProperties()),
-            geometry: nResult.getGeometry() as Geometry,
+            geometry: nResult.getGeometry() as any,
         } as Feature;
     }
     getGeometry(index: number) {
-        return this.native.getFeature(index).getGeometry() as Geometry;
+        return this.native.getFeature(index).getGeometry() as any;
     }
 
     getFeatureCount() {
@@ -37,7 +38,7 @@ export class VectorTileFeatureCollection extends FeatureCollection {
         const nResult = this.native.getFeature(index);
         return {
             properties: nativeVariantToJS(nResult.getProperties()),
-            geometry: nResult.getGeometry() as Geometry,
+            geometry: nResult.getGeometry(),
             id: nResult.getId(),
             layerName: nResult.getLayerName(),
         } as VectorTileFeature;

src/geometry/geojsonreader.android.ts

@@ -0,0 +1,32 @@
+import { GeometryOptions, LineGeometryOptions, PointGeometryOptions } from '.';
+import { mapPosVectorFromArgs } from '..';
+import { MapPosVector, fromNativeMapBounds, fromNativeMapPos, toNativeMapPos } from '../core';
+import { BaseNative } from '../index.common';
+
+export abstract class Geometry<T extends com.carto.geometry.Geometry, U extends GeometryOptions> extends BaseNative<T, U> {
+    getCenterPos() {
+        return fromNativeMapPos(this.getNative().getCenterPos());
+    }
+    getBounds() {
+        return fromNativeMapBounds(this.getNative().getBounds());
+    }
+}
+export class PointGeometry extends Geometry<com.carto.geometry.PointGeometry, PointGeometryOptions> {
+    createNative(options: PointGeometryOptions) {
+        return new com.carto.geometry.PointGeometry(toNativeMapPos(options.pos));
+    }
+
+    getPos() {
+        return fromNativeMapPos(this.getNative().getPos());
+    }
+}
+export class LineGeometry extends Geometry<com.carto.geometry.LineGeometry, LineGeometryOptions> {
+    createNative(options: LineGeometryOptions) {
+        console.log('create native LineGeometry', options.poses, mapPosVectorFromArgs(options.poses));
+        return new com.carto.geometry.LineGeometry(mapPosVectorFromArgs(options.poses));
+    }
+
+    getPoses() {
+        return new MapPosVector(this.getNative().getPoses());
+    }
+}

src/geometry/geojsonreader.d.ts

@@ -1,9 +1,22 @@
-import { MapBounds, MapPos } from '../core';
+import { DefaultLatLonKeys, GenericMapPos, MapBounds, MapPos, MapPosVector } from '../core';
+import { BaseNative } from '../index.common';
 
-export interface Geometry {
-    getCenterPos(): any; // native pos
-    getBounds(): any; // native bounds
+export interface GeometryOptions<T = DefaultLatLonKeys> {}
+export abstract class Geometry<T = DefaultLatLonKeys, U extends GeometryOptions = GeometryOptions> extends BaseNative<any, U> {
+    getCenterPos(): GenericMapPos<T>;
+    getBounds(): MapBounds<T>;
 }
-export interface PointGeometry extends Geometry {
-    getPos(): any; // native pos,
+
+export interface PointGeometryOptions<T = DefaultLatLonKeys> extends GeometryOptions<T> {
+    pos: GenericMapPos<T>;
+}
+export interface LineGeometryOptions<T = DefaultLatLonKeys> extends GeometryOptions<T> {
+    poses: MapPosVector<T>;
+}
+export class PointGeometry<T = DefaultLatLonKeys> extends Geometry<T, PointGeometryOptions<T>> {
+    getPos(): GenericMapPos<T>;
+}
+
+export class LineGeometry<T = DefaultLatLonKeys> extends Geometry<T, LineGeometryOptions<T>> {
+    getPoses(): MapPosVector<T>;
 }

src/geometry/geojsonreader.ios.ts

@@ -0,0 +1,31 @@
+import { GeometryOptions, LineGeometryOptions, PointGeometryOptions } from '.';
+import { mapPosVectorFromArgs } from '..';
+import { MapPosVector, fromNativeMapBounds, fromNativeMapPos, toNativeMapPos } from '../core';
+import { BaseNative } from '../index.common';
+
+export abstract class Geometry<T extends NTGeometry, U extends GeometryOptions> extends BaseNative<T, U> {
+    getCenterPos() {
+        return fromNativeMapPos(this.getNative().getCenterPos());
+    }
+    getBounds() {
+        return fromNativeMapBounds(this.getNative().getBounds());
+    }
+}
+export class PointGeometry extends Geometry<NTPointGeometry, PointGeometryOptions> {
+    createNative(options: PointGeometryOptions) {
+        return NTPointGeometry.alloc().initWithPos(toNativeMapPos(options.pos));
+    }
+
+    getPos() {
+        return fromNativeMapPos(this.getNative().getPos());
+    }
+}
+export class LineGeometry extends Geometry<NTLineGeometry, LineGeometryOptions> {
+    createNative(options: LineGeometryOptions) {
+        return NTLineGeometry.alloc().initWithPoses(mapPosVectorFromArgs(options.poses));
+    }
+
+    getPoses() {
+        return new MapPosVector(this.getNative().getPoses());
+    }
+}

src/geometry/index.android.ts

@@ -0,0 +1,68 @@
+import { BaseNative } from '../index.common';
+import { GeoJSONGeometryReaderOptions, WKBGeometryReaderOptions, WKTGeometryReaderOptions } from './reader';
+import { FeatureCollection } from './feature';
+import { Projection } from '../projections';
+import { nativeProperty } from '..';
+import { MapPosVector } from '../core';
+import { Geometry } from '.';
+import { LineGeometry, PointGeometry } from './index.android';
+
+export class GeoJSONGeometryReader extends BaseNative<com.carto.geometry.GeoJSONGeometryReader, GeoJSONGeometryReaderOptions> {
+    createNative() {
+        return new com.carto.geometry.GeoJSONGeometryReader();
+    }
+    readFeatureCollection(str: string) {
+        return new FeatureCollection(this.getNative().readFeatureCollection(str));
+    }
+    readGeometry(value: string) {
+        const result = this.getNative().readGeometry(value);
+        if (result instanceof com.carto.geometry.LineGeometry) {
+            return new LineGeometry(null, result);
+        } else if (result instanceof com.carto.geometry.PointGeometry) {
+            return new PointGeometry(null, result);
+        }
+        return null;
+    }
+    set targetProjection(value: Projection) {
+        this.native && this.native.setTargetProjection(value.getNative());
+    }
+    get targetProjection() {
+        return this.options.targetProjection;
+    }
+}
+
+export class WKBGeometryReader extends BaseNative<com.carto.geometry.WKBGeometryReader, WKBGeometryReaderOptions> {
+    @nativeProperty z: boolean;
+    createNative() {
+        return new com.carto.geometry.WKBGeometryReader();
+    }
+    readGeometry(value: number[] | ArrayBuffer | com.carto.core.BinaryData) {
+        console.log('readGeometry', value instanceof com.carto.core.BinaryData);
+        if (!(value instanceof com.carto.core.BinaryData)) {
+            value = new com.carto.core.BinaryData(value as any);
+        }
+        const result = this.getNative().readGeometry(value);
+        if (result instanceof com.carto.geometry.LineGeometry) {
+            return new LineGeometry(null, result);
+        } else if (result instanceof com.carto.geometry.PointGeometry) {
+            return new PointGeometry(null, result);
+        }
+        return null;
+    }
+}
+
+export class WKTGeometryReader extends BaseNative<com.carto.geometry.WKTGeometryReader, WKTGeometryReaderOptions> {
+    @nativeProperty z: boolean;
+    createNative() {
+        return new com.carto.geometry.WKTGeometryReader();
+    }
+    readGeometry(value) {
+        const result = this.getNative().readGeometry(value);
+        if (result instanceof com.carto.geometry.LineGeometry) {
+            return new LineGeometry(null, result);
+        } else if (result instanceof com.carto.geometry.PointGeometry) {
+            return new PointGeometry(null, result);
+        }
+        return null;
+    }
+}