feat: raster layer click

Author: farfromrefug

plugin/layers/raster.ios.d.ts

@@ -1,7 +1,19 @@
-import { CartoOnlineRasterTileLayerOptions, RasterTileLayerOptions } from './raster';
+import { CartoOnlineRasterTileLayerOptions, RasterTileEventListener as IRasterTileEventListener, RasterTileLayerOptions } from './raster';
 import { RasterTileLayerBase } from './raster.common';
-export declare class RasterTileLayer extends RasterTileLayerBase<NTRasterTileLayer, RasterTileLayerOptions> {
+import { Projection } from '../projections';
+export declare class NTRasterTileEventListenerImpl extends NTRasterTileEventListener {
+    private _layer;
+    private _owner;
+    private projection?;
+    static initWithOwner(owner: WeakRef<IRasterTileEventListener>, layer: WeakRef<RasterTileLayer>, projection?: Projection): NTRasterTileEventListenerImpl;
+    onRasterTileClicked(info: NTRasterTileClickInfo): boolean;
+}
+export declare abstract class RasterTileLayerCommon<NativeClass extends NTRasterTileLayer, U extends RasterTileLayerOptions> extends RasterTileLayerBase<NativeClass, U> {
+    setRasterTileEventListener(listener: IRasterTileEventListener, projection?: Projection): void;
+}
+export declare class RasterTileLayer extends RasterTileLayerCommon<NTRasterTileLayer, RasterTileLayerOptions> {
     createNative(options: RasterTileLayerOptions): NTRasterTileLayer;
+    setRasterTileEventListener(listener: IRasterTileEventListener, projection?: Projection): void;
 }
 export declare class CartoOnlineRasterTileLayer extends RasterTileLayerBase<NTCartoOnlineRasterTileLayer, CartoOnlineRasterTileLayerOptions> {
     createNative(options: any): NTCartoOnlineRasterTileLayer;

plugin/platforms/android/java/com/akylas/carto/additions/AKRasterTileEventListener.java

@@ -0,0 +1,57 @@
+package com.akylas.carto.additions;
+
+import android.os.Handler;
+import android.util.Log;
+
+import com.carto.layers.RasterTileEventListener;
+import com.carto.ui.RasterTileClickInfo;
+
+public class AKRasterTileEventListener extends RasterTileEventListener {
+    Handler mainHandler = null;
+
+    public interface Listener {
+        boolean onRasterTileClicked(final RasterTileClickInfo clickInfo);
+    }
+
+    Listener listener = null;
+
+    public void setListener(Listener listener) {
+        this.listener = listener;
+    }
+
+    public AKRasterTileEventListener(Listener listener) {
+        super();
+        setListener(listener);
+    }
+
+    @Override
+    public boolean onRasterTileClicked(final RasterTileClickInfo clickInfo) {
+        if (AKMapView.RUN_ON_MAIN_THREAD) {
+            final Object[] arr = new Object[1];
+            if (mainHandler == null) {
+                mainHandler = new Handler(android.os.Looper.getMainLooper());
+            }
+            SynchronousHandler.postAndWait(mainHandler, new Runnable() {
+                @Override
+                public void run() {
+                    if (listener != null) {
+                        arr[0] = new Boolean(listener.onRasterTileClicked(clickInfo));
+                    } else {
+                        arr[0] = new Boolean(AKRasterTileEventListener.super.onRasterTileClicked(clickInfo));
+                    }
+                }
+            });
+            if (arr[0] != null) {
+                return (Boolean) arr[0];
+            } else {
+                return false;
+            }
+        } else {
+            if (listener != null) {
+                return new Boolean(listener.onRasterTileClicked(clickInfo));
+            } else {
+                return new Boolean(super.onRasterTileClicked(clickInfo));
+            }
+        }
+    }
+}

src/layers/raster.d.ts

@@ -10,13 +10,25 @@ export enum RasterTileFilterMode {
     RASTER_TILE_FILTER_MODE_BICUBIC,
 }
 
+export interface RasterTileClickInfo<T = DefaultLatLonKeys> {
+    clickType: ClickType;
+    layer: BaseVectorTileLayer<any, any>;
+    position: GenericMapPos<T>;
+    nearestColor: Color;
+    interpolatedColor: Color;
+}
+export interface RasterTileEventListener<T = DefaultLatLonKeys> {
+    onRasterTileClicked(info: RasterTileClickInfo<T>): boolean;
+}
+
 export interface RasterTileLayerOptions extends TileLayerOptions {
     tileFilterMode?: RasterTileFilterMode;
     dataSource?: TileDataSource<any, any>;
 }
 export class RasterTileLayer extends TileLayer<any, RasterTileLayerOptions> {
     // dataSource?: TileDataSource<any, any>;
     tileFilterMode?: RasterTileFilterMode;
+    setRasterTileEventListener<T = DefaultLatLonKeys>(listener: RasterTileEventListener<T>, projection?: Projection): void;
 }
 
 export interface CartoOnlineRasterTileLayerOptions extends RasterTileLayerOptions {
@@ -49,4 +61,5 @@ export class HillshadeRasterTileLayer extends TileLayer<any, HillshadeRasterTile
     public getElevationAsync<T = DefaultLatLonKeys>(pos: GenericMapPos<T>, callback: (error: Error, res: number) => void);
     public getElevations<T = DefaultLatLonKeys>(pos: MapPosVector<T> | GenericMapPos<T>[]): DoubleVector;
     public getElevationsAsync<T = DefaultLatLonKeys>(pos: MapPosVector<T> | GenericMapPos<T>[], callback: (error: Error, res: DoubleVector) => void);
+    setRasterTileEventListener<T = DefaultLatLonKeys>(listener: RasterTileEventListener<T>, projection?: Projection): void;
 }

src/layers/raster.ios.ts

@@ -1,11 +1,67 @@
-import { CartoOnlineRasterTileLayerOptions, HillshadeRasterTileLayerOptions, RasterTileLayerOptions } from './raster';
+import { CartoOnlineRasterTileLayerOptions, HillshadeRasterTileLayerOptions, RasterTileEventListener as IRasterTileEventListener, RasterTileLayerOptions } from './raster';
 import { RasterTileLayerBase } from './raster.common';
 import { nativeProperty } from '../';
+import { Projection } from '../projections';
+import { fromNativeMapPos } from '../core';
+import { Color } from '@nativescript/core';
 
-export class RasterTileLayer extends RasterTileLayerBase<NTRasterTileLayer, RasterTileLayerOptions> {
+@NativeClass
+export class NTRasterTileEventListenerImpl extends NTRasterTileEventListener {
+    private _layer: WeakRef<RasterTileLayer>;
+    private _owner: WeakRef<IRasterTileEventListener>;
+    private projection?: Projection;
+
+    public static initWithOwner(owner: WeakRef<IRasterTileEventListener>, layer: WeakRef<RasterTileLayer>, projection?: Projection): NTRasterTileEventListenerImpl {
+        const delegate = NTRasterTileEventListenerImpl.new() as NTRasterTileEventListenerImpl;
+        delegate._owner = owner;
+        delegate._layer = layer;
+        delegate.projection = projection;
+        return delegate;
+    }
+    public onRasterTileClicked(info: NTRasterTileClickInfo) {
+        const owner = this._owner.get();
+        if (owner && owner.onRasterTileClicked) {
+            let position = info.getClickPos();
+            if (this.projection) {
+                const layerProj = this._layer.get().getNative().getDataSource().getProjection();
+                const nProj = this.projection.getNative();
+                position = nProj.fromWgs84(layerProj.toWgs84(position));
+            }
+            return (
+                owner.onRasterTileClicked({
+                    clickType: info.getClickType() as any,
+                    layer: this._layer.get() as any,
+                    nearestColor: new Color(info.getNearestColor().getARGB()),
+                    interpolatedColor: new Color(info.getInterpolatedColor().getARGB()),
+                    position: fromNativeMapPos(position),
+                }) || false
+            );
+        }
+        return false;
+    }
+}
+
+export abstract class RasterTileLayerCommon<NativeClass extends NTRasterTileLayer, U extends RasterTileLayerOptions> extends RasterTileLayerBase<NativeClass, U> {
+    setRasterTileEventListener(listener: IRasterTileEventListener, projection?: Projection) {
+        if (listener) {
+            this.getNative().setRasterTileEventListener(NTRasterTileEventListenerImpl.initWithOwner(new WeakRef(listener), new WeakRef(this), projection));
+        } else {
+            this.getNative().setRasterTileEventListener(null);
+        }
+    }
+}
+
+export class RasterTileLayer extends RasterTileLayerCommon<NTRasterTileLayer, RasterTileLayerOptions> {
     createNative(options: RasterTileLayerOptions) {
         return NTRasterTileLayer.alloc().initWithDataSource(options.dataSource.getNative());
     }
+    setRasterTileEventListener(listener: IRasterTileEventListener, projection?: Projection) {
+        if (listener) {
+            this.getNative().setRasterTileEventListener(NTRasterTileEventListenerImpl.initWithOwner(new WeakRef(listener), new WeakRef(this), projection));
+        } else {
+            this.getNative().setRasterTileEventListener(null);
+        }
+    }
 }
 
 export class CartoOnlineRasterTileLayer extends RasterTileLayerBase<NTCartoOnlineRasterTileLayer, CartoOnlineRasterTileLayerOptions> {