fix(ios): Layers fix

Author: farfromrefug

src/ui-carto/ui/index.android.ts

@@ -7,17 +7,18 @@ import {
     fromNativeMapBounds,
     fromNativeMapPos,
     fromNativeScreenPos,
+    nativeVectorToArray,
     toNativeMapBounds,
     toNativeMapPos,
     toNativeScreenBounds,
     toNativeScreenPos
 } from '../core';
-import { TileLayer } from '../layers';
+import { Layer, TileLayer } from '../layers';
 import { IProjection } from '../projections';
 import { restrictedPanningProperty } from './cssproperties';
 import {
+    Layers as BaseLayers,
     CartoViewBase,
-    Layers,
     MapClickedEvent,
     MapIdleEvent,
     MapInteractionEvent,
@@ -249,7 +250,7 @@ export class CartoMap<T = DefaultLatLonKeys> extends CartoViewBase {
 
     getLayers() {
         if (this.mapView) {
-            return new Layers<com.carto.components.Layers>(this.mapView.getLayers());
+            return new Layers(this.mapView.getLayers());
         }
         return null;
     }
@@ -336,3 +337,46 @@ export const useTextureViewProperty = new Property<CartoMap, boolean>({
     valueConverter: booleanConverter
 });
 useTextureViewProperty.register(CartoMap);
+
+export class Layers extends BaseLayers<com.carto.components.Layers> {
+    count() {
+        return this.native.count();
+    }
+    insert(index: number, layer: Layer<any, any>) {
+        return this.native.insert(index, layer.getNative());
+    }
+    //@ts-ignore
+    set(index: number, layer: Layer<any, any>) {
+        return this.native.set(index, layer.getNative());
+    }
+    removeAll(layers: Layer<any, any>[]) {
+        layers.forEach(this.remove);
+    }
+    remove(layer: Layer<any, any>) {
+        return this.native.remove(layer.getNative());
+    }
+    add(layer: Layer<any, any>) {
+        return this.native.add(layer.getNative());
+    }
+    //@ts-ignore
+    get(index: number) {
+        return this.native.get(index);
+    }
+    addAll(layers: Layer<any, any>[]) {
+        layers.forEach(this.add);
+    }
+    setAll(layers: Layer<any, any>[]) {
+        this.clear();
+        this.addAll(layers);
+    }
+    getAll() {
+        return nativeVectorToArray(this.native.getAll());
+    }
+    clear() {
+        return this.native.clear();
+    }
+
+    // public getNative() {
+    //     return this.native;
+    // }
+}

src/ui-carto/ui/index.common.ts

@@ -78,46 +78,23 @@ export function mapProperty(...args) {
     }
 }
 
-export class Layers<T extends any> extends BaseNative<any, {}> {
+export abstract class Layers<T = any> extends BaseNative<T, {}> {
     constructor(native) {
         super(null, native);
     }
-    count() {
-        return this.native.count();
-    }
-    insert(index: number, layer: Layer<any, any>) {
-        return this.native.insert(index, layer.getNative());
-    }
+    abstract count(): number;
+    abstract insert(index: number, layer: Layer<any, any>);
+    abstract removeAll(layers: Layer<any, any>[]);
+    abstract remove(layer: Layer<any, any>);
+    abstract add(layer: Layer<any, any>);
     //@ts-ignore
-    set(index: number, layer: Layer<any, any>) {
-        return this.native.set(index, layer.getNative());
-    }
-    removeAll(layers: Layer<any, any>[]) {
-        layers.forEach(this.remove);
-    }
-    remove(layer: Layer<any, any>) {
-        return this.native.remove(layer.getNative());
-    }
-    add(layer: Layer<any, any>) {
-        return this.native.add(layer.getNative());
-    }
+    abstract set(index: number, layer: Layer<any, any>);
     //@ts-ignore
-    get(index: number) {
-        return this.native.get(index);
-    }
-    addAll(layers: Layer<any, any>[]) {
-        layers.forEach(this.add);
-    }
-    setAll(layers: Layer<any, any>[]) {
-        this.clear();
-        this.addAll(layers);
-    }
-    getAll() {
-        return nativeVectorToArray(this.native.getAll());
-    }
-    clear() {
-        return this.native.clear();
-    }
+    abstract get(index: number): Layer<any, any>;
+    abstract addAll(layers: Layer<any, any>[]);
+    abstract setAll(layers: Layer<any, any>[]);
+    abstract getAll(): Layer<any, any>[];
+    abstract clear();
 
     // public getNative() {
     //     return this.native;

src/ui-carto/ui/index.ios.ts

@@ -7,18 +7,19 @@ import {
     fromNativeMapBounds,
     fromNativeMapPos,
     fromNativeScreenPos,
+    nativeVectorToArray,
     toNativeMapPos,
     toNativeScreenBounds,
     toNativeScreenPos
 } from '../core';
-import { TileLayer } from '../layers';
+import { Layer, TileLayer } from '../layers';
 import { EPSG4326 } from '../projections/epsg4326';
 import { IProjection } from '../projections';
 import { restrictedPanningProperty } from './cssproperties';
 import { MapOptions } from '.';
 import {
+    Layers as BaseLayers,
     CartoViewBase,
-    Layers,
     MapClickedEvent,
     MapIdleEvent,
     MapInteractionEvent,
@@ -74,7 +75,7 @@ function mainThread(target: any, propertyKey: string, descriptor: PropertyDescri
 }
 
 @NativeClass
-class AKMapEventListenerImpl extends NSObject implements  AKMapEventListener {
+class AKMapEventListenerImpl extends NSObject implements AKMapEventListener {
     public static ObjCProtocols = [AKMapEventListener];
     private _owner: WeakRef<CartoMap<any>>;
 
@@ -308,7 +309,7 @@ export class CartoMap<T = DefaultLatLonKeys> extends CartoViewBase {
 
     getLayers() {
         if (this.mapView) {
-            return new Layers<NTLayers>(this.mapView.getLayers());
+            return new Layers(this.mapView.getLayers());
         }
         return null;
     }
@@ -382,3 +383,42 @@ export class CartoMap<T = DefaultLatLonKeys> extends CartoViewBase {
         });
     }
 }
+
+export class Layers extends BaseLayers<NTLayers> {
+    count() {
+        return this.native.count();
+    }
+    insert(index: number, layer: Layer<any, any>) {
+        return this.native.insertLayer(index, layer.getNative());
+    }
+    //@ts-ignore
+    set(index: number, layer: Layer<any, any>) {
+        return this.native.setLayer(index, layer.getNative());
+    }
+    removeAll(layers: Layer<any, any>[]) {
+        layers.forEach(this.remove);
+    }
+    remove(layer: Layer<any, any>) {
+        return this.native.remove(layer.getNative());
+    }
+    add(layer: Layer<any, any>) {
+        return this.native.add(layer.getNative());
+    }
+    //@ts-ignore
+    get(index: number) {
+        return this.native.get(index);
+    }
+    addAll(layers: Layer<any, any>[]) {
+        layers.forEach(this.add);
+    }
+    setAll(layers: Layer<any, any>[]) {
+        this.clear();
+        this.addAll(layers);
+    }
+    getAll() {
+        return nativeVectorToArray(this.native.getAll());
+    }
+    clear() {
+        return this.native.clear();
+    }
+}