fix: cluster images fix (scale)

Author: farfromrefug

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

@@ -41,6 +41,12 @@ public class AKClusterElementBuilder extends ClusterElementBuilder {
     public interface Interface {
         VectorElement buildClusterElement(MapPos pos, VectorElementVector nElements);
     }
+
+    public AKClusterElementBuilder(float screenScale) {
+        super();
+        this.screenScale = screenScale;
+    }
+    private float screenScale;
     Interface inter = null;
     public void setInterface(Interface inter) {
         this.inter = inter;
@@ -140,24 +146,25 @@ public VectorElement nativeBuildClusterElement(MapPos pos, VectorElementVector e
             StyleBuilder styleBuilder = null;
             Bitmap cBitmap = null;
             if (markerBitmap != null || textColor != null) {
-                 android.graphics.Bitmap canvasBitmap;
-                if (markerBitmap != null) {
-                    canvasBitmap = markerBitmap.copy(android.graphics.Bitmap.Config.ARGB_8888, true);
-                } else {
-                    canvasBitmap = android.graphics.Bitmap.createBitmap(markerSize, markerSize, android.graphics.Bitmap.Config.ARGB_8888);
-                }
+                int size = int)(markerSize * scale);
+                android.graphics.Bitmap canvasBitmap = android.graphics.Bitmap.createBitmap(size, size, android.graphics.Bitmap.Config.ARGB_8888);
                 android.graphics.Canvas canvas = new android.graphics.Canvas(canvasBitmap);
-
+                canvas.scale(screenScale, screenScale);
                 Paint paint = AKClusterElementBuilder.paint;
+                Rect bounds = AKClusterElementBuilder.tempRect;
+                if (markerBitmap != null) {
+                    bounds.set(0,0, markerBitmap.getWidth(), markerBitmap.getHeight());
+                    Rect dst = AKClusterElementBuilder.tempRect2;
+                    dst.set(0,0, markerSize, markerSize);
+                    canvas.drawBitmap(markerBitmap, bounds, dst, paint);
+                }
 
                 paint.setTextAlign(Paint.Align.CENTER);
                 paint.setTextSize(textSize);
                 if (typeface != null) {
                     paint.setTypeface(typeface);
                 }
-                Typeface typeface = paint.getTypeface();
                 String text = Integer.toString(nbElements);
-                Rect bounds = AKClusterElementBuilder.tempRect;
                 paint.getTextBounds(text, 0, text.length(), bounds);
 
                 if (textColor != null) {
@@ -166,8 +173,8 @@ public VectorElement nativeBuildClusterElement(MapPos pos, VectorElementVector e
                     paint.setColor(Color.WHITE);
                 }
 
-                float x = canvasBitmap.getWidth() / 2;
-                float y = canvasBitmap.getHeight() / 2 + bounds.height()/2;
+                float x = markerSize / 2;
+                float y = markerSize / 2 + bounds.height()/2;
 
                 canvas.drawText(text, x, y, paint);
                 cBitmap = BitmapUtils.createBitmapFromAndroidBitmap(canvasBitmap);

plugin/platforms/ios/src/AkClusterElementBuilder.mm

@@ -56,15 +56,10 @@ -(NTVectorElement*)buildClusterElement:(NTMapPos *)mapPos elements:(NTVectorElem
     if (!markerStyle) {
         NTBitmap* markerBitmap;
         if (self.markerImage || self.textColor) {
-            CGSize size;
+            CGSize size = CGSizeMake(self.markerSize, self.markerSize);
+            UIGraphicsBeginImageContextWithOptions(size, false, 0);
             if(self.markerImage) {
-                size = self.markerImage.size;
-            } else {
-                size = CGSizeMake(self.markerSize, self.markerSize);
-            }
-            UIGraphicsBeginImageContext(size);
-            if(self.markerImage) {
-                [self.markerImage drawAtPoint:CGPointMake(0, 0)];
+                [self.markerImage drawInRect:CGRectMake(0, 0, size.width, size.height)];
             }
 
             NSMutableParagraphStyle* style = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];

src/layers/cluster.android.ts

@@ -1,4 +1,4 @@
-import { Font } from '@nativescript/core';
+import { Font, Screen } from '@nativescript/core';
 import { Color } from '@nativescript/core/color';
 import { nativeColorProperty, nativeFontProperty, nativeImageProperty } from '..';
 import { MapPos, fromNativeMapPos } from '../core';
@@ -17,7 +17,7 @@ export class ClusterElementBuilder extends BaseNative<com.akylas.carto.additions
     @nativeProperty bbox: boolean;
     buildClusterElement?: (position: MapPos, elements: VectorElementVector) => BaseVectorElement<any, any> | com.carto.vectorelements.VectorElement;
     createNative(options: ClusterElementBuilderOptions) {
-        const result = new com.akylas.carto.additions.AKClusterElementBuilder();
+        const result = new com.akylas.carto.additions.AKClusterElementBuilder(Screen.mainScreen.scale);
         if (!!options.buildClusterElement) {
             result.setInterface(
                 new com.akylas.carto.additions.AKClusterElementBuilder.Interface({

src/typings/ak.carto.android.d.ts

@@ -70,6 +70,7 @@ declare namespace com {
         export namespace carto {
             export namespace additions {
                 export class AKClusterElementBuilder extends com.carto.layers.ClusterElementBuilder {
+                    public constructor(screenScale: number);
                     public static class: java.lang.Class<AKClusterElementBuilder>;
                     public buildClusterElement(param0: com.carto.core.MapPos, param1: com.carto.vectorelements.VectorElementVector): com.carto.vectorelements.VectorElement;
                     public setShape(param0: string): void;