feat: feature as geojson

# Conflicts:
#	src/layers/vector.ios.ts

Author: farfromrefug

src/layers/vector.android.ts

@@ -52,6 +52,14 @@ export const VectorElementDragResult = {
     },
 };
 
+let geojsonWriter: com.carto.geometry.GeoJSONGeometryWriter;
+function getGeojsonWriter() {
+    if (!geojsonWriter) {
+        geojsonWriter = new com.carto.geometry.GeoJSONGeometryWriter();
+    }
+    return geojsonWriter;
+}
+
 export abstract class BaseVectorTileLayer<T extends com.carto.layers.VectorTileLayer, U extends VectorTileLayerOptions> extends TileLayer<T, U> {
     setLabelRenderOrder(order: com.carto.layers.VectorTileRenderOrder) {
         this.getNative().setLabelRenderOrder(order);
@@ -85,20 +93,31 @@ export abstract class BaseVectorTileLayer<T extends com.carto.layers.VectorTileL
             const geometry = feature.getGeometry();
             let position = info.getClickPos();
             let featurePos = geometry.getCenterPos();
-
+            let projection: com.carto.projections.Projection;
+            const dataSourceProjection = this.getNative().getDataSource().getProjection();
             if (this.projection) {
-                const layerProj = this.getNative().getDataSource().getProjection();
-                const nProj = this.projection.getNative();
-                featurePos = nProj.fromWgs84(layerProj.toWgs84(featurePos));
-                position = nProj.fromWgs84(layerProj.toWgs84(position));
+                projection = this.projection.getNative();
+                featurePos = projection.fromWgs84(dataSourceProjection.toWgs84(featurePos));
+                position = projection.fromWgs84(dataSourceProjection.toWgs84(position));
             }
+            const geoFeature = {
+                id: info.getFeatureId(),
+                layer: info.getFeatureLayerName(),
+                get geometry() {
+                    const writer = getGeojsonWriter();
+                    writer.setSourceProjection(dataSourceProjection);
+                    return JSON.parse(getGeojsonWriter().writeGeometry(geometry));
+                },
+                properties: nativeVariantToJS(info.getFeature().getProperties()),
+            };
             return (
                 this.listener.onVectorTileClicked.call(this.listener, {
                     clickType: info.getClickType().swigValue(),
                     layer: this,
-                    featureId: info.getFeatureId(),
-                    featureData: nativeVariantToJS(info.getFeature().getProperties()),
-                    featureLayerName: info.getFeatureLayerName(),
+                    feature: geoFeature,
+                    featureId: geoFeature.id,
+                    featureData: geoFeature.properties,
+                    featureLayerName: geoFeature.layer,
                     featureGeometry: geometry,
                     featurePosition: fromNativeMapPos(featurePos),
                     position: fromNativeMapPos(position),

src/layers/vector.d.ts

@@ -25,6 +25,7 @@ export enum VectorElementDragResult {
 export interface VectorTileEventData<T = DefaultLatLonKeys> {
     clickType: ClickType;
     layer: BaseVectorTileLayer<any, any>;
+    feature: any; // geojson object
     featureId: number;
     featureData: { [k: string]: string };
     featureLayerName: string;

src/layers/vector.ios.ts

@@ -74,6 +74,14 @@ export class NTVectorElementEventListenerImpl extends NTVectorElementEventListen
     }
 }
 
+let geojsonWriter: NTGeoJSONGeometryWriter;
+function getGeojsonWriter() {
+    if (!geojsonWriter) {
+        geojsonWriter = NTGeoJSONGeometryWriter.alloc().init();
+    }
+    return geojsonWriter;
+}
+
 @NativeClass
 export class NTVectorTileEventListenerImpl extends NTVectorTileEventListener {
     private _layer: WeakRef<BaseVectorLayer<any, any>>;
@@ -104,23 +112,31 @@ export class NTVectorTileEventListenerImpl extends NTVectorTileEventListener {
             let position = info.getClickPos();
             let featurePos = geometry.getCenterPos();
 
+            let projection: NTProjection;
+            const dataSourceProjection = this._layer.get().getNative().getDataSource().getProjection();
             if (this.projection) {
-                const layerProj = this._layer
-                    .get()
-                    .getNative()
-                    .getDataSource()
-                    .getProjection();
-                const nProj = this.projection.getNative();
-                featurePos = nProj.fromWgs84(layerProj.toWgs84(featurePos));
-                position = nProj.fromWgs84(layerProj.toWgs84(position));
+                projection = this.projection.getNative();
+                featurePos = projection.fromWgs84(dataSourceProjection.toWgs84(featurePos));
+                position = projection.fromWgs84(dataSourceProjection.toWgs84(position));
             }
+            const geoFeature = {
+                id: info.getFeatureId(),
+                layer: info.getFeatureLayerName(),
+                get geometry() {
+                    const writer = getGeojsonWriter();
+                    writer.setSourceProjection(dataSourceProjection);
+                    return JSON.parse(getGeojsonWriter().writeGeometry(geometry));
+                },
+                properties: nativeVariantToJS(info.getFeature().getProperties()),
+            };
             return (
                 owner.onVectorTileClicked({
                     clickType: info.getClickType() as any,
                     layer: this._layer.get() as any,
-                    featureId: info.getFeatureId(),
-                    featureData: nativeVariantToJS(info.getFeature().getProperties()),
-                    featureLayerName: info.getFeatureLayerName(),
+                    feature: geoFeature,
+                    featureId: geoFeature.id,
+                    featureData: geoFeature.properties,
+                    featureLayerName: geoFeature.layer,
                     featureGeometry: geometry,
                     featurePosition: fromNativeMapPos(featurePos),
                     position: fromNativeMapPos(position)
@@ -195,7 +211,7 @@ export class VectorLayer extends BaseVectorLayer<NTVectorLayer, VectorLayerOptio
         if (!!options.dataSource) {
             const dataSource = options.dataSource.getNative();
             if (dataSource) {
-                return NTVectorLayer.alloc().initWithDataSource((options.dataSource as VectorDataSource<any, any>).getNative());
+                return NTVectorLayer.alloc().initWithDataSource(options.dataSource.getNative());
             }
         }
         return null;
@@ -247,7 +263,7 @@ export class EditableVectorLayer extends BaseVectorLayer<NTEditableVectorLayer,
         if (!!options.dataSource) {
             const dataSource = options.dataSource.getNative();
             if (dataSource) {
-                const result = NTEditableVectorLayer.alloc().initWithDataSource((options.dataSource as VectorDataSource<any, any>).getNative());
+                const result = NTEditableVectorLayer.alloc().initWithDataSource(options.dataSource.getNative());
                 // result.setVectorEditEventListener(NTVectorEditEventListenerImpl.initWithOwner(new WeakRef(this)));
                 // result.setVectorElementEventListener(NTVectorElementEventListenerImpl.initWithOwner(new WeakRef(this)));
                 return result;