chore: refactoring

Author: farfromrefug

src/ui-carto/layers/vector.android.ts

@@ -2,9 +2,7 @@ import { Layer, TileLayer } from '.';
 import { BaseNative, nativeProperty } from '..';
 import { fromNativeMapPos, fromNativeScreenPos } from '../core';
 import { Projection } from '../projections';
-import { nativeVariantToJS } from '../utils';
 import { VectorElement } from '../vectorelements';
-import { Line } from '../vectorelements/line';
 import { MBVectorTileDecoder, VectorTileDecoder } from '../vectortiles';
 import {
     CartoOfflineVectorTileLayerOptions,
@@ -219,13 +217,9 @@ export abstract class BaseVectorLayer<T extends com.carto.layers.VectorLayer, U
     }
     onElementClicked(info: com.carto.ui.VectorElementClickInfo) {
         if (this.elementListener && this.elementListener.onVectorElementClicked) {
-            let element: VectorElement<any, any>;
             const nElement = info.getVectorElement();
-            if (nElement instanceof com.carto.vectorelements.Line) {
-                element = new Line(undefined, nElement);
-            } else {
-                element = new VectorElement(undefined, nElement);
-            }
+            const element = new VectorElement(undefined, nElement);
+
             let position = info.getClickPos();
             let elementPos = info.getElementClickPos();
             if (this.projection) {
@@ -239,6 +233,7 @@ export abstract class BaseVectorLayer<T extends com.carto.layers.VectorLayer, U
                     clickType: info.getClickType(),
                     layer: this,
                     element,
+                    native: nElement,
                     metaData: element.metaData,
                     position: fromNativeMapPos(position),
                     elementPos: fromNativeMapPos(elementPos)

src/ui-carto/layers/vector.d.ts

@@ -36,6 +36,7 @@ export interface VectorTileEventData<T = DefaultLatLonKeys> {
 export interface VectorElementEventData<T = DefaultLatLonKeys> {
     clickType: ClickType;
     layer: BaseVectorTileLayer<any, any>;
+    native: any;
     // featureId: number;
     // featureData: { [k: string]: string };
     // featureLayerName: string;

src/ui-carto/layers/vector.ios.ts

@@ -45,7 +45,8 @@ export class NTVectorElementEventListenerImpl extends NTVectorElementEventListen
     public onVectorElementClicked(info: NTVectorElementClickInfo) {
         const owner = this._owner.get();
         if (owner && owner.onVectorElementClicked) {
-            const element = new VectorElement(undefined, info.getVectorElement());
+            const nElement = info.getVectorElement();
+            const element = new VectorElement(undefined, nElement);
             let position = info.getClickPos();
             let elementPos = info.getElementClickPos();
             if (this.projection) {
@@ -59,6 +60,7 @@ export class NTVectorElementEventListenerImpl extends NTVectorElementEventListen
                     clickType: info.getClickType() as any,
                     layer: this._layer.get() as any,
                     element,
+                    native: nElement,
                     metaData: element.metaData,
                     position: fromNativeMapPos(position),
                     elementPos: fromNativeMapPos(elementPos)
@@ -300,7 +302,8 @@ export class ClusteredVectorLayer extends BaseVectorLayer<NTClusteredVectorLayer
     @nativeProperty maximumClusterZoom: number;
     @nativeProperty({
         nativeGetterName: 'isAnimatedClusters'
-    }) animatedClusters: boolean;
+    })
+    animatedClusters: boolean;
 
     expandCluster(element: VectorElement<any, any>, px: number) {
         this.getNative().expandClusterPx(element.getNative(), px);