fix: reloadStyle and missing MBVectorTileDecoder

Author: farfromrefug

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

@@ -2,7 +2,7 @@ import { MBVectorTileDecoderOptions, VectorTileDecoderOptions } from '.';
 import { File } from '@nativescript/core/file-system';
 import { BaseVectorTileDecoder } from './index.common';
 import { getFileName, getRelativePathToApp } from '../index.common';
-import { DirAssetPackage } from '../utils';
+import { DirAssetPackage, nativeVectorToArray } from '../utils';
 import { profile } from '@nativescript/core';
 
 export class VectorTileDecoder extends BaseVectorTileDecoder<com.carto.vectortiles.VectorTileDecoder, VectorTileDecoderOptions> {
@@ -55,7 +55,52 @@ export class MBVectorTileDecoder extends BaseVectorTileDecoder<com.carto.vectort
         return this.options.style;
     }
 
+    reloadStyle() {
+        if (this.native) {
+            if (this.pack) {
+                if (this.options.style) {
+                    this.getNative().setCompiledStyleSet(new com.carto.styles.CompiledStyleSet(this.pack, this.options.style));
+                } else if (this.options.cartoCss) {
+                    this.getNative().setCartoCSSStyleSet(new com.carto.styles.CartoCSSStyleSet(this.options.cartoCss, this.pack));
+                }
+            } else if (this.options.cartoCss) {
+                this.getNative().setCartoCSSStyleSet(new com.carto.styles.CartoCSSStyleSet(this.options.cartoCss));
+            }
+        }
+    }
+
     setStyleParameter(param: string, value: string) {
         this.getNative().setStyleParameter(param, value);
     }
+    setCartoCSSStyleSet(cartoCss: string) {
+        if (this.pack) {
+            this.getNative().setCartoCSSStyleSet(new com.carto.styles.CartoCSSStyleSet(cartoCss, this.pack));
+        } else {
+            this.getNative().setCartoCSSStyleSet(new com.carto.styles.CartoCSSStyleSet(cartoCss));
+        }
+    }
+    setCompiledStyleSet(param0: com.carto.styles.CompiledStyleSet) {
+        this.getNative().setCompiledStyleSet(param0);
+    }
+    getCompiledStyleSet() {
+        return this.getNative().getCompiledStyleSet();
+    }
+    getCartoCSSStyleSet() {
+        return this.getNative().getCartoCSSStyleSet();
+    }
+    getStyleParameter(param0: string) {
+        return this.getNative().getStyleParameter(param0);
+    }
+    getStyleParameters() {
+        return nativeVectorToArray(this.getNative().getStyleParameters());
+    }
+    addFallbackFont(param0: com.carto.core.BinaryData) {
+        return this.getNative().addFallbackFont(param0);
+    }
+    getMinZoom() {
+        return this.getNative().getMinZoom();
+    }
+    getMaxZoom() {
+        return this.getNative().getMaxZoom();
+    }
 }

src/ui-carto/vectortiles/index.d.ts

@@ -17,7 +17,27 @@ export class MBVectorTileDecoder extends BaseNative<any, MBVectorTileDecoderOpti
     style?: string;
     liveReload?: boolean;
     constructor(options: MBVectorTileDecoderOptions, native?: any);
+    reloadStyle();
     setStyleParameter(param: string, value: string);
+    setCartoCSSStyleSet(param0: string): void;
+
+    setCompiledStyleSet(param0: any): void;
+    getCompiledStyleSet(): any;
+
+    getCartoCSSStyleSet(): any;
+    getStyleParameter(param0: string): string;
+    getStyleParameters(): core.StringVector;
+    addFallbackFont(param0: core.BinaryData): void;
+    getMaxZoom(): number;
+    getMinZoom(): number;
+
+    // setFeatureIdOverride(value: boolean);
+    // isFeatureIdOverride(): boolean;
+    // setCartoCSSLayerNamesIgnored(ignore: boolean);
+    // isCartoCSSLayerNamesIgnored(): boolean;
+
+    // setLayerNameOverride(name: string);
+    // getLayerNameOverride(): string;
 }
 
 // export interface CartoVectorTileDecoderOptions extends VectorTileDecoderOptions {

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

@@ -1,4 +1,4 @@
-import { DirAssetPackage } from '../utils';
+import { DirAssetPackage, nativeVectorToArray } from '../utils';
 import { File } from '@nativescript/core/file-system';
 import { getFileName, getRelativePathToApp } from '../index.common';
 import { MBVectorTileDecoderOptions, VectorTileDecoderOptions } from '.';
@@ -56,7 +56,53 @@ export class MBVectorTileDecoder extends BaseVectorTileDecoder<NTMBVectorTileDec
         return this.options.style;
     }
 
+    reloadStyle() {
+        if (this.native) {
+            if (this.pack) {
+                if (this.options.style) {
+                    this.getNative().setCompiledStyleSet(NTCompiledStyleSet.alloc().initWithAssetPackageStyleName(this.pack, this.options.style));
+                } else if (this.options.cartoCss) {
+                    this.getNative().setCartoCSSStyleSet(NTCartoCSSStyleSet.alloc().initWithCartoCSSAssetPackage(this.options.cartoCss, this.pack));
+                }
+            } else if (this.options.cartoCss) {
+                this.getNative().setCartoCSSStyleSet(NTCartoCSSStyleSet.alloc().initWithCartoCSS(this.options.cartoCss));
+            }
+        }
+    }
+
     setStyleParameter(param: string, value: string) {
         this.getNative().setStyleParameterValue(param, value);
     }
+    setCartoCSSStyleSet(cartoCss: string) {
+        this.options.cartoCss = cartoCss;
+        if (this.pack) {
+            this.getNative().setCartoCSSStyleSet(NTCartoCSSStyleSet.alloc().initWithCartoCSSAssetPackage(cartoCss, this.pack));
+        } else {
+            this.getNative().setCartoCSSStyleSet(NTCartoCSSStyleSet.alloc().initWithCartoCSS(cartoCss));
+        }
+    }
+    setCompiledStyleSet(param0: NTCompiledStyleSet) {
+        this.getNative().setCompiledStyleSet(param0);
+    }
+    getCompiledStyleSet() {
+        return this.getNative().getCompiledStyleSet();
+    }
+    getCartoCSSStyleSet() {
+        return this.getNative().getCartoCSSStyleSet();
+    }
+    getStyleParameter(param0: string) {
+        return this.getNative().getStyleParameter(param0);
+    }
+    getStyleParameters() {
+        return nativeVectorToArray(this.getNative().getStyleParameters());
+    }
+    addFallbackFont(param0: NTBinaryData) {
+        return this.getNative().addFallbackFont(param0);
+    }
+    getMinZoom() {
+        return this.getNative().getMinZoom();
+    }
+    getMaxZoom() {
+        return this.getNative().getMaxZoom();
+    }
 }