FIX: bunch of fixes

Author: farfromrefug

src/geometry/index.android.ts

@@ -1,4 +1,4 @@
-import { GeometryOptions, LineGeometryOptions, PointGeometryOptions } from '.';
+import { GeometryOptions, LineGeometryOptions, PointGeometryOptions, PolygonGeometryOptions } from '.';
 import { mapPosVectorFromArgs } from '..';
 import { MapPosVector, fromNativeMapBounds, fromNativeMapPos, toNativeMapPos } from '../core';
 import { BaseNative } from '../index.common';
@@ -29,3 +29,12 @@ export class LineGeometry extends Geometry<com.carto.geometry.LineGeometry, Line
         return new MapPosVector(this.getNative().getPoses());
     }
 }
+export class PolygonGeometry extends Geometry<com.carto.geometry.PolygonGeometry, PolygonGeometryOptions> {
+    createNative(options: PolygonGeometryOptions) {
+        return new com.carto.geometry.PolygonGeometry(mapPosVectorFromArgs(options.poses));
+    }
+
+    getPoses() {
+        return new MapPosVector(this.getNative().getPoses());
+    }
+}

src/geometry/index.d.ts

@@ -13,10 +13,17 @@ export interface PointGeometryOptions<T = DefaultLatLonKeys> extends GeometryOpt
 export interface LineGeometryOptions<T = DefaultLatLonKeys> extends GeometryOptions<T> {
     poses: MapPosVector<T>;
 }
+export interface PolygonGeometryOptions<T = DefaultLatLonKeys> extends GeometryOptions<T> {
+    poses: MapPosVector<T>;
+}
 export class PointGeometry<T = DefaultLatLonKeys> extends Geometry<T, PointGeometryOptions<T>> {
     getPos(): GenericMapPos<T>;
 }
 
 export class LineGeometry<T = DefaultLatLonKeys> extends Geometry<T, LineGeometryOptions<T>> {
     getPoses(): MapPosVector<T>;
 }
+
+export class PolygonGeometry<T = DefaultLatLonKeys> extends Geometry<T, PolygonGeometryOptions<T>> {
+    getPoses(): MapPosVector<T>;
+}

src/geometry/index.ios.ts

@@ -1,4 +1,4 @@
-import { GeometryOptions, LineGeometryOptions, PointGeometryOptions } from '.';
+import { GeometryOptions, LineGeometryOptions, PointGeometryOptions, PolygonGeometryOptions } from '.';
 import { mapPosVectorFromArgs } from '..';
 import { MapPosVector, fromNativeMapBounds, fromNativeMapPos, toNativeMapPos } from '../core';
 import { BaseNative } from '../index.common';
@@ -29,3 +29,13 @@ export class LineGeometry extends Geometry<NTLineGeometry, LineGeometryOptions>
         return new MapPosVector(this.getNative().getPoses());
     }
 }
+
+export class PolygonGeometry extends Geometry<NTLineGeometry, PolygonGeometryOptions> {
+    createNative(options: PolygonGeometryOptions) {
+        return NTPolygonGeometry.alloc().initWithPoses(mapPosVectorFromArgs(options.poses));
+    }
+
+    getPoses() {
+        return new MapPosVector(this.getNative().getPoses());
+    }
+}

src/geometry/reader.android.ts

@@ -4,7 +4,7 @@ import { FeatureCollection } from './feature';
 import { Projection } from '../projections';
 import { nativeProperty } from '..';
 import { MapPosVector } from '../core';
-import { Geometry } from '.';
+import { Geometry, PolygonGeometry } from '.';
 import { LineGeometry, PointGeometry } from './index.android';
 
 export class GeoJSONGeometryReader extends BaseNative<com.carto.geometry.GeoJSONGeometryReader, GeoJSONGeometryReaderOptions> {
@@ -20,8 +20,10 @@ export class GeoJSONGeometryReader extends BaseNative<com.carto.geometry.GeoJSON
             return new LineGeometry(null, result);
         } else if (result instanceof com.carto.geometry.PointGeometry) {
             return new PointGeometry(null, result);
+        } else if (result instanceof com.carto.geometry.PolygonGeometry) {
+            return new PolygonGeometry(null, result);
         }
-        return null;
+        return result;
     }
     set targetProjection(value: Projection) {
         this.native && this.native.setTargetProjection(value.getNative());

src/geometry/reader.ios.ts

@@ -2,7 +2,7 @@ import { BaseNative } from '../index.common';
 import { GeoJSONGeometryReaderOptions, WKBGeometryReaderOptions, WKTGeometryReaderOptions } from './reader';
 import { FeatureCollection } from './feature';
 import { Projection } from '../projections';
-import { Geometry } from '.';
+import { Geometry, PolygonGeometry } from '.';
 import { nativeProperty } from '..';
 import { LineGeometry, PointGeometry } from './index.ios';
 
@@ -19,8 +19,10 @@ export class GeoJSONGeometryReader extends BaseNative<NTGeoJSONGeometryReader, G
             return new LineGeometry(null, result);
         } else if (result instanceof NTPointGeometry) {
             return new PointGeometry(null, result);
+        } else if (result instanceof NTPolygonGeometry) {
+            return new PolygonGeometry(null, result);
         }
-        return null;
+        return result;
     }
     set targetProjection(value: Projection) {
         this.native && this.native.setTargetProjection(value.getNative());

src/index.android.ts

@@ -20,7 +20,7 @@ export function nativeColorProperty(...args) {
                     return new Color((value as com.carto.graphics.Color).getARGB()).hex;
                 },
                 toNative(value) {
-                    const theColor = typeof value === 'string' ? new Color(value) : value;
+                    const theColor = value instanceof Color ? value : value._argb ? new Color(value._argb) : new Color(value);
                     return new com.carto.graphics.Color(theColor.r, theColor.g, theColor.b, theColor.a);
                 },
             },

src/index.ios.ts

@@ -16,7 +16,7 @@ export function nativeColorProperty(...args) {
                     return new Color(value.getARGB() as number).hex;
                 },
                 toNative(value) {
-                    const theColor = typeof value === 'string' ? new Color(value) : value;
+                    const theColor = value instanceof Color ? value : value._argb ? new Color(value._argb) : new Color(value);
                     return NTColor.alloc().initWithRGBA(theColor.r, theColor.g, theColor.b, theColor.a);
                 }
             }

src/vectorelements/index.android.ts

@@ -32,7 +32,7 @@ export const BillboardScaling = {
     },
 };
 
-export class BaseVectorElement<T extends com.carto.vectorelements.VectorElement, U extends VectorElementOptions> extends BaseNative<T, U> {
+export abstract class BaseVectorElement<T extends com.carto.vectorelements.VectorElement, U extends VectorElementOptions> extends BaseNative<T, U> {
     @nativeProperty visible: boolean;
     createNative(options: U) {
         return null;
@@ -54,6 +54,10 @@ export class BaseVectorElement<T extends com.carto.vectorelements.VectorElement,
             this.native.setMetaData(theMap);
         }
     }
+    abstract buildStyle();
+    rebuildStyle() {
+        (this.native as any).setStyle(this.buildStyle());
+    }
 }
 export abstract class BasePointVectorElement<
     T extends com.carto.vectorelements.VectorElement & {
@@ -116,6 +120,7 @@ export class VectorElement extends BaseVectorElement<com.carto.vectorelements.Ve
     createNative() {
         return null;
     }
+    buildStyle() {}
 }
 
 export class VectorElementVector extends BaseNative<com.carto.vectorelements.VectorElementVector, any> {
@@ -130,7 +135,7 @@ export class VectorElementVector extends BaseNative<com.carto.vectorelements.Vec
         return result;
     }
     getElement(index: number): BaseVectorElement<any, any> {
-        return this.elements[index] || new BaseVectorElement(undefined, this.native.get(index));
+        return this.elements[index] || new VectorElement(undefined, this.native.get(index));
     }
     size() {
         if (this.native) {

src/vectorelements/index.common.ts

@@ -1,6 +1,31 @@
 import { BaseNative } from '../index.common';
 import { VectorElementStyleBuilderOptions } from '.';
 
+export function styleBuilderProperty(target: any, propertyKey?, desc?: PropertyDescriptor): any {
+    Object.defineProperty(target, propertyKey, {
+        get() {
+            return this.options.styleBuilder[propertyKey];
+        },
+        set(value) {
+            this.options.styleBuilder[propertyKey] = value;
+            this.rebuildStyle();
+        },
+    });
+}
+
+export function lineStyleBuilderProperty(target: any, propertyKey?, desc?: PropertyDescriptor): any {
+    const realKey = propertyKey.charAt(4).toLowerCase() + propertyKey.slice(5);
+    Object.defineProperty(target, propertyKey, {
+        get() {
+            return this.options.styleBuilder.lineStyleBuilder[realKey];
+        },
+        set(value) {
+            this.options.styleBuilder.lineStyleBuilder[realKey] = value;
+            this.rebuildLineStyle();
+        },
+    });
+}
+
 export abstract class BaseVectorElementStyleBuilder<T, U extends VectorElementStyleBuilderOptions> extends BaseNative<T, U> {
     abstract buildStyle(): any;
 

src/vectorelements/index.ios.ts

@@ -30,7 +30,7 @@ export const BillboardScaling = {
     }
 };
 
-export class BaseVectorElement<T extends NTVectorElement, U extends VectorElementOptions> extends BaseNative<T, U> {
+export abstract class BaseVectorElement<T extends NTVectorElement, U extends VectorElementOptions> extends BaseNative<T, U> {
     @nativeProperty visible: boolean;
     createNative(options: U) {
         return null;
@@ -52,6 +52,10 @@ export class BaseVectorElement<T extends NTVectorElement, U extends VectorElemen
             this.native.setMetaData(theMap);
         }
     }
+    abstract buildStyle();
+    rebuildStyle() {
+        (this.native as any).setStyle(this.buildStyle());
+    }
 }
 
 export abstract class BasePointVectorElement<
@@ -122,6 +126,7 @@ export class VectorElement extends BaseVectorElement<NTVectorElement, VectorElem
     createNative() {
         return null;
     }
+    buildStyle() {}
 }
 export class VectorElementVector extends BaseNative<NTVectorElementVector, any> {
     elements: BaseVectorElement<any, any>[];
@@ -141,7 +146,7 @@ export class VectorElementVector extends BaseNative<NTVectorElementVector, any>
         return this.elements.length;
     }
     getElement(index: number): BaseVectorElement<any, any> {
-        return this.elements[index] || new BaseVectorElement(undefined, this.native.get(index));
+        return this.elements[index] || new VectorElement(undefined, this.native.get(index));
     }
     add(element: BaseVectorElement<any, any>) {
         this.elements.push(element);