Merge pull request #62 from vhdirk/clusterproperties

keerl · web-flow · commit 7d22787fb93d · 2022-01-19T05:37:45.000-07:00
support clusterproperties
diff --git a/src/ui-mapbox/common.ts b/src/ui-mapbox/common.ts
@@ -1,7 +1,7 @@
 import { Color, ContentView, ImageSource, Property, Trace, booleanConverter } from '@nativescript/core';
 
 export * from './geo.utils';
-export * from './filter/filter-parser';
+export * from './expression/expression-parser';
 export * from './layers/layer-factory';
 export * from './layers/parser/property-parser';
 
@@ -345,6 +345,7 @@ export interface GeoJSONSource extends Source {
     cluster?: {
         radius;
         maxZoom;
+        properties?: { [property: string]: [any, any] } ;
     };
 }
 
diff --git a/src/ui-mapbox/expression/expression-parser.android.ts b/src/ui-mapbox/expression/expression-parser.android.ts
@@ -1,4 +1,4 @@
-export class FilterParser {
+export class ExpressionParser {
     static parseJson(json: any[]): com.mapbox.mapboxsdk.style.expressions.Expression {
         const expression = com.mapbox.mapboxsdk.style.expressions.Expression.Converter.convert(JSON.stringify(json));
         return expression;
diff --git a/src/ui-mapbox/expression/expression-parser.d.ts b/src/ui-mapbox/expression/expression-parser.d.ts
@@ -1,4 +1,4 @@
-export declare class FilterParser {
+export declare class ExpressionParser {
     static parseJson(json: any[]): any;
     static toJson(filter: any): any[];
 }
diff --git a/src/ui-mapbox/expression/expression-parser.ios.ts b/src/ui-mapbox/expression/expression-parser.ios.ts
@@ -1,4 +1,4 @@
-export class FilterParser {
+export class ExpressionParser {
     static parseJson(json: any[]): NSPredicate {
         const filterStr = NSString.stringWithString(JSON.stringify(json));
         const filterData = filterStr.dataUsingEncoding(NSUTF8StringEncoding);
diff --git a/src/ui-mapbox/index.android.ts b/src/ui-mapbox/index.android.ts
@@ -6,7 +6,7 @@
 
 import { request } from '@nativescript-community/perms';
 import { AndroidApplication, Application, Color, File, Http, Image, ImageSource, Trace, Utils, knownFolders, path } from '@nativescript/core';
-import { FilterParser } from './filter/filter-parser';
+import { ExpressionParser } from './expression/expression-parser';
 import { Layer, LayerFactory } from './layers/layer-factory';
 import {
     AddExtrusionOptions,
@@ -1610,7 +1610,7 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
                 const screenLocation = this._mapboxMapInstance.getProjection().toScreenLocation(mapboxPoint);
 
                 if (this._mapboxMapInstance.queryRenderedFeatures) {
-                    const queryFilter = options.filter ? FilterParser.parseJson(options.filter) : null;
+                    const queryFilter = options.filter ? ExpressionParser.parseJson(options.filter) : null;
                     const features = this._mapboxMapInstance.queryRenderedFeatures(screenLocation, queryFilter, options.layers);
                     const result = [];
                     for (let i = 0; i < features.size(); i++) {
@@ -1643,7 +1643,7 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
                 }
 
                 let features;
-                const queryFilter = options.filter ? FilterParser.parseJson(options.filter) : null;
+                const queryFilter = options.filter ? ExpressionParser.parseJson(options.filter) : null;
                 if (source instanceof com.mapbox.mapboxsdk.style.sources.GeoJsonSource) {
                     features = source.querySourceFeatures(queryFilter);
                 } else if (source instanceof com.mapbox.mapboxsdk.style.sources.VectorSource) {
@@ -2510,6 +2510,17 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
                                 .withCluster(true)
                                 .withClusterMaxZoom(options.cluster.maxZoom || 13)
                                 .withClusterRadius(options.cluster.radius || 40);
+
+                            if (options.cluster.properties) {
+                                for (const property of Object.keys(options.cluster.properties)) {
+                                    const propertyValues = options.cluster.properties[property];
+                                    let operator = propertyValues[0];
+                                    if (!Array.isArray(operator)) {
+                                        operator = [operator];
+                                    }
+                                    geojsonOptions.withClusterProperty(property, ExpressionParser.parseJson(operator), ExpressionParser.parseJson(propertyValues[1]));
+                                }
+                            }
                         }
 
                         const geoJsonSource = new com.mapbox.mapboxsdk.style.sources.GeoJsonSource(id, geojsonOptions);
@@ -2679,7 +2690,7 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
                 throw new Error(`no source found with id: ${sId}`);
             }
 
-            const lineFeatures = lineSource.querySourceFeatures(FilterParser.parseJson(['==', '$type', 'LineString']));
+            const lineFeatures = lineSource.querySourceFeatures(ExpressionParser.parseJson(['==', '$type', 'LineString']));
 
             if (lineFeatures.size() === 0) {
                 throw new Error('no line string feature found');
diff --git a/src/ui-mapbox/index.ios.ts b/src/ui-mapbox/index.ios.ts
@@ -36,7 +36,7 @@ import {
     telemetryProperty
 } from './common';
 import { Layer, LayerFactory } from './layers/layer-factory';
-import { FilterParser } from './filter/filter-parser';
+import { ExpressionParser } from './expression/expression-parser';
 
 /**
  * "Delegate" for catching mapview events
@@ -1939,7 +1939,7 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
 
                 const { x, y } = theMap.convertCoordinateToPointToView({ latitude: options.point.lat, longitude: options.point.lng }, theMap);
                 const queryLayerIds = options.layers ? NSSet.setWithArray<string>(Utils.ios.collections.jsArrayToNSArray(options.layers)) : null;
-                const queryFilter = options.filter ? FilterParser.parseJson(options.filter) : null;
+                const queryFilter = options.filter ? ExpressionParser.parseJson(options.filter) : null;
                 const features = theMap.visibleFeaturesAtPointInStyleLayersWithIdentifiersPredicate({ x, y }, queryLayerIds, queryFilter);
 
                 const result = [];
@@ -1973,7 +1973,7 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
                 }
 
                 let features;
-                const queryFilter = options.filter ? FilterParser.parseJson(options.filter) : null;
+                const queryFilter = options.filter ? ExpressionParser.parseJson(options.filter) : null;
                 if (source instanceof MGLShapeSource) {
                     features = source.featuresMatchingPredicate(queryFilter);
                 } else if (source instanceof MGLVectorTileSource) {
@@ -2778,6 +2778,19 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
                             sourceOptions[MGLShapeSourceOptionClustered] = true;
                             sourceOptions[MGLShapeSourceOptionClusterRadius] = options.cluster.radius || 40;
                             sourceOptions[MGLShapeSourceOptionMaximumZoomLevelForClustering] = options.cluster.maxZoom || 13;
+
+                            if (options.cluster.properties) {
+                                const clusterProperties = {};
+                                for (const property of Object.keys(options.cluster.properties)) {
+                                    let [operator, operand] = options.cluster.properties[property];
+                                    if (!Array.isArray(operator)) {
+                                        operator = [operator];
+                                    }
+                                    const expressions = Utils.ios.collections.jsArrayToNSArray([ExpressionParser.parseJson(operator), ExpressionParser.parseJson(operand)]);
+                                    clusterProperties[property] = expressions;
+                                }
+                                sourceOptions[MGLShapeSourceOptionClusterProperties] = clusterProperties;
+                            }
                         }
 
                         source = MGLShapeSource.alloc().initWithIdentifierShapeOptions(id, geoJsonShape, sourceOptions);
@@ -2969,7 +2982,7 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
         }
 
         try {
-            const lineFeatures = lineSource.featuresMatchingPredicate(FilterParser.parseJson(['==', '$type', 'LineString']));
+            const lineFeatures = lineSource.featuresMatchingPredicate(ExpressionParser.parseJson(['==', '$type', 'LineString']));
 
             if (lineFeatures.count === 0) {
                 throw new Error('no line string feature found');
diff --git a/src/ui-mapbox/layers/layer-factory.android.ts b/src/ui-mapbox/layers/layer-factory.android.ts
@@ -1,5 +1,5 @@
 import { LayerCommon } from '../common';
-import { FilterParser } from '../filter/filter-parser';
+import { ExpressionParser } from '../expression/expression-parser';
 import { PropertyParser } from './parser/property-parser';
 
 export class Layer implements LayerCommon {
@@ -28,11 +28,11 @@ export class Layer implements LayerCommon {
     }
 
     public setFilter(filter: any[]) {
-        this.instance.setFilter(FilterParser.parseJson(filter));
+        this.instance.setFilter(ExpressionParser.parseJson(filter));
     }
 
     public getFilter(): any[] {
-        return FilterParser.toJson(this.instance.getFilter());
+        return ExpressionParser.toJson(this.instance.getFilter());
     }
 
     public setProperty(name: string, value: any) {
diff --git a/src/ui-mapbox/layers/layer-factory.ios.ts b/src/ui-mapbox/layers/layer-factory.ios.ts
@@ -1,5 +1,5 @@
 import { LayerCommon } from '../common';
-import { FilterParser } from '../filter/filter-parser';
+import { ExpressionParser } from '../expression/expression-parser';
 import { PropertyParser } from './parser/property-parser';
 
 export class LayerFactory {
@@ -81,14 +81,14 @@ export class Layer implements LayerCommon {
             // MGLVectorStyleLayer is the base type of many layer types. Predicates only supported on vector style layers.
             // See https://docs.mapbox.com/ios/maps/api/6.3.0/Classes/MGLVectorStyleLayer.html
 
-            this.instance.predicate = FilterParser.parseJson(filter);
+            this.instance.predicate = ExpressionParser.parseJson(filter);
         } else {
             throw new Error('Set filter only support for vector layer.');
         }
     }
 
     getFilter(): any[] {
-        return FilterParser.toJson(this.instance.predicate);
+        return ExpressionParser.toJson(this.instance.predicate);
     }
 
     setProperty(name: string, value: any) {
diff --git a/src/ui-mapbox/typings/Mapbox.ios.d.ts b/src/ui-mapbox/typings/Mapbox.ios.d.ts
@@ -2661,6 +2661,8 @@ declare var MGLShapeSourceOptionClusterRadius: string;
 
 declare var MGLShapeSourceOptionClustered: string;
 
+declare var MGLShapeSourceOptionClusterProperties: string;
+
 declare var MGLShapeSourceOptionLineDistanceMetrics: string;
 
 declare var MGLShapeSourceOptionMaximumZoomLevel: string;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-export class FilterParser {`
	`1`	`+export class ExpressionParser {`
`2`	`2`	`static parseJson(json: any[]): com.mapbox.mapboxsdk.style.expressions.Expression {`
`3`	`3`	`const expression = com.mapbox.mapboxsdk.style.expressions.Expression.Converter.convert(JSON.stringify(json));`
`4`	`4`	`return expression;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-export declare class FilterParser {`
	`1`	`+export declare class ExpressionParser {`
`2`	`2`	`static parseJson(json: any[]): any;`
`3`	`3`	`static toJson(filter: any): any[];`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import { LayerCommon } from '../common';`
`2`		`-import { FilterParser } from '../filter/filter-parser';`
	`2`	`+import { ExpressionParser } from '../expression/expression-parser';`
`3`	`3`	`import { PropertyParser } from './parser/property-parser';`
`4`	`4`
`5`	`5`	`export class Layer implements LayerCommon {`
`@@ -28,11 +28,11 @@ export class Layer implements LayerCommon {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public setFilter(filter: any[]) {`
`31`		`- this.instance.setFilter(FilterParser.parseJson(filter));`
	`31`	`+ this.instance.setFilter(ExpressionParser.parseJson(filter));`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public getFilter(): any[] {`
`35`		`- return FilterParser.toJson(this.instance.getFilter());`
	`35`	`+ return ExpressionParser.toJson(this.instance.getFilter());`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public setProperty(name: string, value: any) {`