fix(ios): cluster layer in pair with android

farfromrefug · farfromrefug · commit 016471e67c65 · 2021-10-07T11:10:48.000+02:00
diff --git a/plugin/platforms/android/java/com/akylas/carto/additions/AKClusterElementBuilder.java b/plugin/platforms/android/java/com/akylas/carto/additions/AKClusterElementBuilder.java
@@ -4,6 +4,7 @@
 import android.content.Context;
 import android.graphics.BitmapFactory;
 import android.graphics.Paint;
+import android.graphics.Color;
 import android.util.Log;
 
 // import com.carto.layers.VectorLayer;
@@ -41,7 +42,9 @@ public void setInterface(Interface inter) {
     private Map<Integer, Style> markerStyles = new HashMap<>();
     private android.graphics.Bitmap markerBitmap = null;
     private com.carto.graphics.Color markerColor = null;
+    private com.carto.graphics.Color textColor = null;
     private int markerSize = 20;
+    private float textSize = 12;
 
     private String shape = "marker";
     private final String TAG = "AKClusterElementBuilder";
@@ -62,10 +65,16 @@ public void setSize(int value) {
         markerSize = value;
     }
     public void setShape(String value) {
-        Log.d(TAG, "setShape " + value);
         shape = value;
     }
 
+    public void setTextSize(float value) {
+        textSize = value;
+    }
+    public void setTextColor(Color value) {
+        textColor = value;
+    }
+
     @Override
     public VectorElement buildClusterElement(final MapPos pos, final VectorElementVector elements) {
         if (useNativeBuilder) {
@@ -159,11 +168,15 @@ public VectorElement nativeBuildClusterElement(MapPos pos, VectorElementVector e
                 android.graphics.Paint paint = new android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG);
 
                 paint.setTextAlign(Paint.Align.CENTER);
-                paint.setTextSize(12);
-                paint.setColor(android.graphics.Color.argb(255, 0, 0, 0));
+                paint.setTextSize(textSize);
+                if (textColor != null) {
+                    paint.setColor(textColor.getARGB());
+                } else {
+                    paint.setColor(Color.WHITE);
+                }
 
                 float x = markerBitmap.getWidth() / 2;
-                float y = markerBitmap.getHeight() / 2 - 5;
+                float y = markerBitmap.getHeight() / 2 - textSize/2;
 
                 canvas.drawText(Integer.toString((int) elements.size()), x, y, paint);
                 cBitmap = BitmapUtils.createBitmapFromAndroidBitmap(canvasBitmap);
diff --git a/plugin/platforms/ios/src/AkClusterElementBuilder.h b/plugin/platforms/ios/src/AkClusterElementBuilder.h
@@ -0,0 +1,12 @@
+#include <CartoMobileSDK/CartoMobileSDK.h>
+@interface AkClusterElementBuilder : NTClusterElementBuilder
+
+- (void) setBitmap: (UIImage *)value;
+- (void) setColor: (UIColor *)value;
+- (void) setTextColor: (UIColor *)value;
+- (void) setSize: (NSUInteger)value;
+- (void) setTextSize: (NSUInteger)value;
+- (void) setShape: (NSString *)value;
+
+
+@end
diff --git a/plugin/platforms/ios/src/AkClusterElementBuilder.mm b/plugin/platforms/ios/src/AkClusterElementBuilder.mm
@@ -0,0 +1,127 @@
+#include "AkClusterElementBuilder.h"
+#include "Utils.h"
+
+@interface AkClusterElementBuilder ()
+
+@property NSMutableDictionary* markerStyles;
+@property (nonatomic) UIImage *markerImage;
+@property (nonatomic) UIColor *markerColor;
+@property (nonatomic) UIColor *textColor;
+@property (nonatomic) NSUInteger markerSize;
+@property (nonatomic) NSUInteger textSize;
+@property (nonatomic) NSString* shape;
+
+@end
+@implementation AkClusterElementBuilder : NTClusterElementBuilder
+
+-(id)init {
+     if (self = [super init])  {
+       self.markerSize = 20;
+       self.textSize = 12;
+     }
+     return self;
+}
+
+- (void) setBitmap: (UIImage *)value {
+    self.markerImage = value;
+}
+- (void) setColor: (UIColor *)value{
+        self.markerColor = value;
+    }
+- (void) setTextColor: (UIColor *)value{
+    self.textColor = value;
+}
+- (void) setSize: (NSUInteger)value{
+    self.markerSize = value;
+}
+- (void) setTextSize: (NSUInteger)value{
+    self.textSize = value;
+}
+- (void) setShape: (NSString *)value {
+    self.shape = value;
+}
+
+
+
+-(NTVectorElement*)buildClusterElement:(NTMapPos *)mapPos elements:(NTVectorElementVector *)elements
+{
+    if (!self.markerStyles) {
+        self.markerStyles = [NSMutableDictionary new];
+    }
+    
+    NSString* styleKey = [NSString stringWithFormat:@"%d",(int)[elements size]];
+    
+    NTStyle* markerStyle = [self.markerStyles valueForKey:styleKey];
+    
+    if ([elements size] == 1) {
+        markerStyle = [(NTMarker*)[elements get:0] getStyle];
+    }
+    
+    if (!markerStyle) {
+        
+        if (!self.markerImage) {
+            self.markerImage = [UIImage imageNamed:@"marker_black.png"];
+        }
+        
+        UIGraphicsBeginImageContext(self.markerImage.size);
+        [self.markerImage drawAtPoint:CGPointMake(0, 0)];
+        
+        CGRect rect = CGRectMake(0, 15, self.markerImage.size.width, self.markerImage.size.height);
+        if(self.textColor) {
+            [self.textColor set];
+        } else {
+            [[UIColor whiteColor] set];
+        }
+        
+        NSMutableParagraphStyle* style = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
+        [style setAlignment:NSTextAlignmentCenter];
+        
+        NSDictionary* attr = [NSDictionary dictionaryWithObject:style forKey:NSParagraphStyleAttributeName];
+        [styleKey drawInRect:CGRectIntegral(rect) withAttributes:attr];
+        
+        UIImage* newImage = UIGraphicsGetImageFromCurrentImageContext();
+        UIGraphicsEndImageContext();
+        
+        NTBitmap* markerBitmap = [NTBitmapUtils createBitmapFromUIImage:newImage];
+
+
+        if ([self.shape isEqualToString:@"point"]) {
+            NTPointStyleBuilder* styleBuilder = [[NTPointStyleBuilder alloc] init];
+            
+            [styleBuilder setBitmap:markerBitmap];
+            [styleBuilder setSize:self.markerSize];
+            
+            if (self.markerColor != nil) {
+                [styleBuilder setColor:[CartoAdditionsUtils toNTColor:self.markerColor]];
+            }
+            markerStyle = [styleBuilder buildStyle];
+        } else {
+            NTMarkerStyleBuilder* styleBuilder = [[NTMarkerStyleBuilder alloc] init];
+            
+            [styleBuilder setBitmap:markerBitmap];
+            [styleBuilder setSize:self.markerSize];
+            [styleBuilder setHideIfOverlapped:NO];
+            [styleBuilder setPlacementPriority:(int)[elements size]];
+            
+            if (self.markerColor != nil) {
+              [styleBuilder setColor:[CartoAdditionsUtils toNTColor:self.markerColor]];
+            }
+            markerStyle = [styleBuilder buildStyle];
+        }
+        [self.markerStyles setValue:markerStyle forKey:styleKey];
+       
+    }
+
+    if( [markerStyle isKindOfClass:[NTPointStyle class]]) {
+        NTPoint* marker = [[NTPoint alloc] initWithPos:mapPos style:(NTPointStyle*)markerStyle];
+        [marker setMetaDataElement:@"elements" element:[[NTVariant alloc] initWithLongVal:[elements size]]];
+        return marker;
+    }
+    if( [markerStyle isKindOfClass:[NTMarkerStyle class]]) {
+        NTMarker* marker = [[NTMarker alloc] initWithPos:mapPos style:(NTMarkerStyle*)markerStyle];
+        [marker setMetaDataElement:@"elements" element:[[NTVariant alloc] initWithLongVal:[elements size]]];
+        return marker;
+    }
+    return nil;
+}
+@end
diff --git a/plugin/platforms/ios/src/CartoAdditions.h b/plugin/platforms/ios/src/CartoAdditions.h
@@ -3,4 +3,5 @@
 #import <UIKit/UIKit.h>
 #import <Foundation/Foundation.h>
 
+#import "AkMarkerClusterElementBuilder.h"
 #import "Utils.h"
diff --git a/plugin/platforms/ios/src/Utils.h b/plugin/platforms/ios/src/Utils.h
@@ -5,6 +5,8 @@
 
 #pragma mark Public
 
++(NTColor*) toNTColor: (UIColor*)color;
+
 + (long)isLocationOn:(NTMapPos *)point
                  poly:(NTMapPosVector *)poly;
 
diff --git a/plugin/platforms/ios/src/Utils.m b/plugin/platforms/ios/src/Utils.m
@@ -10,6 +10,17 @@ @interface CartoAdditionsUtils ()
 
 @implementation CartoAdditionsUtils
 
++(NTColor*) toNTColor: (UIColor*)color {
+  CGFloat fRed  = 0;
+  CGFloat fGreen = 0;
+  CGFloat fBlue = 0;
+  CGFloat fAlpha = 0;
+        
+  [color getRed:&fRed green:&fGreen blue:&fBlue alpha:&fAlpha];
+  
+  return [[NTColor alloc] initWithR:(int)(fRed * 255.0) g:(int)(fRed * 255.0) b:(int)(fRed * 255.0) a:(int)(fRed * 255.0)];
+}
+
 + (long)isLocationOn:(NTMapPos *)point
                  poly:(NTMapPosVector *)poly {
   return [CartoAdditionsUtils isLocationOn:point poly:poly closed:false];
diff --git a/plugin/typings/ak.carto.ios.d.ts b/plugin/typings/ak.carto.ios.d.ts
@@ -21,3 +21,5 @@ declare class CartoAdditionsUtils extends NSObject {
 
     static new(): CartoAdditionsUtils; // inherited from NSObject
 }
+
+declare class AkMarkerClusterElementBuilder extends NTClusterElementBuilder {}
diff --git a/src/layers/cluster.android.ts b/src/layers/cluster.android.ts
@@ -10,6 +10,8 @@ export class ClusterElementBuilder extends BaseNative<com.akylas.carto.additions
     @nativeColorProperty color: string | Color;
     @nativeProperty size: number;
     @nativeProperty shape: string;
+    @nativeProperty textSize: number;
+    @nativeColorProperty textColor: string | Color;
     buildClusterElement?: (position: MapPos, elements: VectorElementVector) => BaseVectorElement<any, any> | com.carto.vectorelements.VectorElement;
     createNative(options: ClusterElementBuilderOptions) {
         // initClusterElementBuilderNative();
diff --git a/src/layers/cluster.ios.ts b/src/layers/cluster.ios.ts
@@ -2,16 +2,19 @@ import { BaseNative } from '../index.common';
 import { MapPos, fromNativeMapPos } from '../core';
 import { BaseVectorElement, VectorElementVector } from '../vectorelements';
 import { ClusterElementBuilderOptions } from './cluster';
+import { nativeColorProperty, nativeImageProperty, nativeProperty } from '..';
+import { Color } from '@nativescript/core';
 
 @NativeClass
-export class ClusterElementBuilderImpl extends NTClusterElementBuilder {
+export class ClusterElementBuilderImpl extends AkMarkerClusterElementBuilder {
     private _owner: WeakRef<ClusterElementBuilder>;
+
     public static initWithOwner(owner: WeakRef<ClusterElementBuilder>): ClusterElementBuilderImpl {
         const delegate = ClusterElementBuilderImpl.new() as ClusterElementBuilderImpl;
         delegate._owner = owner;
         return delegate;
     }
-    buildClusterElementSwigExplicitNTClusterElementBuilderElements(position: NTMapPos, nElements: NTVectorElementVector | number) {
+    buildClusterElementElements(position: NTMapPos, nElements: NTVectorElementVector | number) {
         const owner = this._owner.get();
         if (owner.buildClusterElement) {
             const result = owner.buildClusterElement(fromNativeMapPos(position), new VectorElementVector(undefined, nElements));
@@ -21,13 +24,23 @@ export class ClusterElementBuilderImpl extends NTClusterElementBuilder {
                 return result;
             }
         }
-        return super.buildClusterElementSwigExplicitNTClusterElementBuilderElements(position, nElements as NTVectorElementVector);
+        return super.buildClusterElementElements(position, nElements as NTVectorElementVector);
     }
 }
 
 export class ClusterElementBuilder extends BaseNative<NTClusterElementBuilder, ClusterElementBuilderOptions> {
-    createNative() {
-        return ClusterElementBuilderImpl.initWithOwner(new WeakRef(this));
+    @nativeImageProperty bitmap: string;
+    @nativeColorProperty color: string | Color;
+    @nativeProperty size: number;
+    @nativeProperty shape: string;
+    @nativeProperty textSize: number;
+    @nativeColorProperty textColor: string | Color;
+    createNative(options) {
+        if (!!options.buildClusterElement) {
+            return ClusterElementBuilderImpl.initWithOwner(new WeakRef(this));
+        } else {
+            return AkMarkerClusterElementBuilder.new();
+        }
     }
     buildClusterElement?: (position: MapPos, elements: VectorElementVector) => BaseVectorElement<any, any> | NTVectorElement;
 }
diff --git a/src/typings/ak.carto.ios.d.ts b/src/typings/ak.carto.ios.d.ts
@@ -21,3 +21,5 @@ declare class CartoAdditionsUtils extends NSObject {
 
     static new(): CartoAdditionsUtils; // inherited from NSObject
 }
+
+declare class AkMarkerClusterElementBuilder extends NTClusterElementBuilder {}

Original file line number	Diff line number	Diff line change
`@@ -21,3 +21,5 @@ declare class CartoAdditionsUtils extends NSObject {`
`21`	`21`
`22`	`22`	`static new(): CartoAdditionsUtils; // inherited from NSObject`
`23`	`23`	`}`
	`24`	`+`
	`25`	`+declare class AkMarkerClusterElementBuilder extends NTClusterElementBuilder {}`