Merge pull request #5 from nativescript-community/types/carto-bitmap

chore: Small type improvements

Author: farfromrefug

.project

@@ -22,12 +22,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1603897336119</id>
+			<id>1734097060941</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

src-native/android/cartoadditions/.project

@@ -22,12 +22,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1599142976819</id>
+			<id>1734097060939</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

src/ui-carto/vectorelements/balloonpopup.android.ts

@@ -1,4 +1,4 @@
-import { Color } from '@nativescript/core';
+import { Color, ImageAsset, ImageSource } from '@nativescript/core';
 import { BasePointVectorElement, BillboardStyleBuilder } from '.';
 import { nativeCartoImageProperty, nativeColorProperty, nativeProperty } from '..';
 import { BalloonPopupOptions, BalloonPopupStyleBuilderOptions } from './balloonpopup';
@@ -14,9 +14,9 @@ export class BalloonPopupStyleBuilder extends BillboardStyleBuilder<com.carto.st
     @nativeProperty descriptionFontSize: number;
     @nativeProperty descriptionWrap: boolean;
     @nativeColorProperty leftColor: string | Color;
-    @nativeCartoImageProperty leftImage: string;
+    @nativeCartoImageProperty leftImage: string | ImageSource | ImageAsset;
     @nativeColorProperty rightColor: string | Color;
-    @nativeCartoImageProperty rightImage: string;
+    @nativeCartoImageProperty rightImage: string | ImageSource | ImageAsset;
     @nativeColorProperty strokeColor: string | Color;
     @nativeProperty strokeWidth: number;
     @nativeColorProperty titleColor: string | Color;

src/ui-carto/vectorelements/balloonpopup.d.ts

@@ -1,4 +1,4 @@
-import { Color } from '@nativescript/core';
+import { Color, ImageAsset, ImageSource } from '@nativescript/core';
 import { BasePointVectorElement, BillboardStyleBuilderOptions, PointVectorElementOptions } from '.';
 import { DefaultLatLonKeys } from '../core';
 import { BillboardStyleBuilder } from './index.ios';
@@ -12,9 +12,9 @@ export class BalloonPopupStyleBuilderOptions extends BillboardStyleBuilderOption
     descriptionFontSize?: number;
     descriptionWrap?: boolean;
     leftColor?: string | Color;
-    leftImage?: string;
+    leftImage?: string | ImageSource | ImageAsset;
     rightColor?: string | Color;
-    rightImage?: string;
+    rightImage?: string | ImageSource | ImageAsset;
     strokeColor?: string | Color;
     strokeWidth?: number;
     titleColor?: string | Color;
@@ -28,6 +28,7 @@ export class BalloonPopupStyleBuilder<T, U extends BalloonPopupStyleBuilderOptio
     constructor(options: U);
     size?: number;
     color?: string | Color;
+    buildStyle();
 }
 
 export class BalloonPopupOptions<T = DefaultLatLonKeys> extends PointVectorElementOptions<T> {
@@ -47,9 +48,9 @@ export class BalloonPopup<T = DefaultLatLonKeys> extends BasePointVectorElement<
     description?: string;
     descriptionWrap?: boolean;
     leftColor?: string | Color;
-    leftImage?: string;
+    leftImage?: string | ImageSource | ImageAsset;
     rightColor?: string | Color;
-    rightImage?: string;
+    rightImage?: string | ImageSource | ImageAsset;
     strokeColor?: string | Color;
     strokeWidth?: number;
     titleColor?: string | Color;

src/ui-carto/vectorelements/balloonpopup.ios.ts

@@ -1,4 +1,4 @@
-import { Color } from '@nativescript/core';
+import { Color, ImageAsset, ImageSource } from '@nativescript/core';
 import { nativeCartoImageProperty, nativeColorProperty, nativeProperty } from '..';
 import { BalloonPopupOptions, BalloonPopupStyleBuilderOptions } from './balloonpopup';
 import { BasePointVectorElement, BillboardStyleBuilder } from './index.ios';
@@ -14,9 +14,9 @@ export class BalloonPopupStyleBuilder extends BillboardStyleBuilder<NTBalloonPop
     @nativeProperty descriptionFontSize: number;
     @nativeProperty descriptionWrap: boolean;
     @nativeColorProperty leftColor: string | Color;
-    @nativeCartoImageProperty leftImage: string;
+    @nativeCartoImageProperty leftImage: string | ImageSource | ImageAsset;
     @nativeColorProperty rightColor: string | Color;
-    @nativeCartoImageProperty rightImage: string;
+    @nativeCartoImageProperty rightImage: string | ImageSource | ImageAsset;
     @nativeColorProperty strokeColor: string | Color;
     @nativeProperty strokeWidth: number;
     @nativeColorProperty titleColor: string | Color;

src/ui-carto/vectorelements/marker.android.ts

@@ -1,4 +1,4 @@
-import { Color } from '@nativescript/core';
+import { Color, ImageAsset, ImageSource } from '@nativescript/core';
 import { BillboardOrientation, BillboardScaling } from '.';
 import { geometryFromArgs, nativeAndroidEnumProperty, nativeCartoImageProperty, nativeColorProperty, nativeProperty } from '..';
 import { Geometry } from '../geometry';
@@ -13,7 +13,7 @@ export class MarkerStyleBuilder extends BillboardStyleBuilder<com.carto.styles.M
     @nativeProperty width: number;
     @nativeProperty size: number;
     @nativeColorProperty color: Color | string;
-    @nativeCartoImageProperty bitmap: string;
+    @nativeCartoImageProperty bitmap: string | ImageSource | ImageAsset;
     @nativeProperty anchorPointX: number;
     @nativeProperty anchorPointY: number;
     @nativeProperty clickSize: number;

src/ui-carto/vectorelements/marker.ios.ts

@@ -1,4 +1,4 @@
-import { Color } from '@nativescript/core';
+import { Color, ImageAsset, ImageSource } from '@nativescript/core';
 import { BillboardOrientation, BillboardScaling, BillboardStyleBuilder } from '.';
 import { geometryFromArgs, nativeCartoImageProperty, nativeColorProperty, nativeProperty } from '..';
 import { Geometry } from '../geometry';
@@ -13,7 +13,7 @@ export class MarkerStyleBuilder extends BillboardStyleBuilder<NTMarkerStyleBuild
     @nativeProperty width: number;
     @nativeProperty size: number;
     @nativeColorProperty color: Color | string;
-    @nativeCartoImageProperty bitmap: string;
+    @nativeCartoImageProperty bitmap: string | ImageSource | ImageAsset;
     @nativeProperty clickSize: number;
     @nativeProperty scalingMode: BillboardScaling;
     @nativeProperty orientationMode: BillboardOrientation;