@nativescript-community/ui-mapbox 6.2.12 → 6.2.13

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.2.13](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.12...v6.2.13) (2022-01-19)
+
+**Note:** Version bump only for package @nativescript-community/ui-mapbox
+
+
+
+
+
 ## [6.2.12](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.11...v6.2.12) (2022-01-17)
 
 **Note:** Version bump only for package @nativescript-community/ui-mapbox

package/common.d.ts

@@ -1,6 +1,6 @@
 import { Color, ContentView, ImageSource, Property } 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';
 export declare const MapboxTraceCategory = "NativescriptMapbox";
@@ -170,6 +170,9 @@ export interface GeoJSONSource extends Source {
     cluster?: {
         radius: any;
         maxZoom: any;
+        properties?: {
+            [property: string]: [any, any];
+        };
     };
 }
 export declare type UserLocationCameraMode = 'NONE' | 'NONE_COMPASS' | 'NONE_GPS' | 'TRACKING' | 'TRACKING_COMPASS' | 'TRACKING_GPS' | 'TRACKING_GPS_NORTH';

package/common.js

@@ -1,6 +1,6 @@
 import { ContentView, 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';
 export const MapboxTraceCategory = 'NativescriptMapbox';

package/{filter/filter-parser.android.d.ts → expression/expression-parser.android.d.ts}

@@ -1,4 +1,4 @@
-export declare class FilterParser {
+export declare class ExpressionParser {
     static parseJson(json: any[]): com.mapbox.mapboxsdk.style.expressions.Expression;
     static toJson(filter: com.mapbox.mapboxsdk.style.expressions.Expression): any[];
 }

package/{filter/filter-parser.android.js → expression/expression-parser.android.js}

@@ -1,4 +1,4 @@
-export class FilterParser {
+export class ExpressionParser {
     static parseJson(json) {
         const expression = com.mapbox.mapboxsdk.style.expressions.Expression.Converter.convert(JSON.stringify(json));
         return expression;
@@ -13,4 +13,4 @@ export class FilterParser {
         return JSON.parse(filter.toString());
     }
 }
-//# sourceMappingURL=filter-parser.android.js.map
+//# sourceMappingURL=expression-parser.android.js.map

package/{filter/filter-parser.d.ts → 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[];
 }

package/{filter/filter-parser.ios.d.ts → expression/expression-parser.ios.d.ts}

@@ -1,4 +1,4 @@
-export declare class FilterParser {
+export declare class ExpressionParser {
     static parseJson(json: any[]): NSPredicate;
     static toJson(filter: NSPredicate): any[];
 }

package/{filter/filter-parser.ios.js → expression/expression-parser.ios.js}

@@ -1,4 +1,4 @@
-export class FilterParser {
+export class ExpressionParser {
     static parseJson(json) {
         const filterStr = NSString.stringWithString(JSON.stringify(json));
         const filterData = filterStr.dataUsingEncoding(NSUTF8StringEncoding);
@@ -19,4 +19,4 @@ export class FilterParser {
         return JSON.parse(expression);
     }
 }
-//# sourceMappingURL=filter-parser.ios.js.map
+//# sourceMappingURL=expression-parser.ios.js.map

package/index.android.js

@@ -1,6 +1,6 @@
 import { request } from '@nativescript-community/perms';
 import { AndroidApplication, Application, Color, File, Http, 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 { CLog, CLogTypes, MapStyle, MapboxCommon, MapboxViewBase, telemetryProperty } from './common';
 export * from './common';
@@ -1085,7 +1085,7 @@ export class Mapbox extends MapboxCommon {
                 const mapboxPoint = new com.mapbox.mapboxsdk.geometry.LatLng(options.point.lat, options.point.lng);
                 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++) {
@@ -1117,7 +1117,7 @@ export class Mapbox extends MapboxCommon {
                     throw new Error(`Source with id "${sourceId}" not found.`);
                 }
                 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);
                 }
@@ -1855,6 +1855,16 @@ export class Mapbox extends MapboxCommon {
                                 .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);
                         if (options.data) {
@@ -1961,7 +1971,7 @@ export class Mapbox extends MapboxCommon {
             if (!lineSource) {
                 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');
             }

package/index.ios.js

@@ -1,7 +1,7 @@
 import { Color, File, Http, ImageSource, Trace, Utils, knownFolders, path } from '@nativescript/core';
 import { CLog, CLogTypes, MapStyle, MapboxCommon, MapboxViewBase, telemetryProperty } from './common';
 import { Layer, LayerFactory } from './layers/layer-factory';
-import { FilterParser } from './filter/filter-parser';
+import { ExpressionParser } from './expression/expression-parser';
 var MGLMapViewDelegateImpl = /** @class */ (function (_super) {
     __extends(MGLMapViewDelegateImpl, _super);
     function MGLMapViewDelegateImpl() {
@@ -1436,7 +1436,7 @@ export class Mapbox extends MapboxCommon {
                 }
                 const { x, y } = theMap.convertCoordinateToPointToView({ latitude: options.point.lat, longitude: options.point.lng }, theMap);
                 const queryLayerIds = options.layers ? NSSet.setWithArray(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 = [];
                 for (let i = 0; i < features.count; i++) {
@@ -1466,7 +1466,7 @@ export class Mapbox extends MapboxCommon {
                     throw new Error(`Source with id "${sourceId}" not found.`);
                 }
                 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);
                 }
@@ -2143,6 +2143,18 @@ export class Mapbox extends MapboxCommon {
                             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);
                         break;
@@ -2269,7 +2281,7 @@ export class Mapbox extends MapboxCommon {
             throw new Error(`no source found with id: ${sId}`);
         }
         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');
             }

package/layers/layer-factory.android.js

@@ -1,4 +1,4 @@
-import { FilterParser } from '../filter/filter-parser';
+import { ExpressionParser } from '../expression/expression-parser';
 import { PropertyParser } from './parser/property-parser';
 export class Layer {
     constructor(instance) {
@@ -18,10 +18,10 @@ export class Layer {
         return this.instance;
     }
     setFilter(filter) {
-        this.instance.setFilter(FilterParser.parseJson(filter));
+        this.instance.setFilter(ExpressionParser.parseJson(filter));
     }
     getFilter() {
-        return FilterParser.toJson(this.instance.getFilter());
+        return ExpressionParser.toJson(this.instance.getFilter());
     }
     setProperty(name, value) {
         const properties = PropertyParser.parsePropertiesForLayer({ [name]: value });

package/layers/layer-factory.ios.js

@@ -1,4 +1,4 @@
-import { FilterParser } from '../filter/filter-parser';
+import { ExpressionParser } from '../expression/expression-parser';
 import { PropertyParser } from './parser/property-parser';
 export class LayerFactory {
     static async createLayer(style, source) {
@@ -63,14 +63,14 @@ export class Layer {
     }
     setFilter(filter) {
         if (this.instance instanceof MGLVectorStyleLayer) {
-            this.instance.predicate = FilterParser.parseJson(filter);
+            this.instance.predicate = ExpressionParser.parseJson(filter);
         }
         else {
             throw new Error('Set filter only support for vector layer.');
         }
     }
     getFilter() {
-        return FilterParser.toJson(this.instance.predicate);
+        return ExpressionParser.toJson(this.instance.predicate);
     }
     setProperty(name, value) {
         const properties = PropertyParser.parsePropertiesForLayer({ [name]: value });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-mapbox",
-    "version": "6.2.12",
+    "version": "6.2.13",
     "description": "Interactive, thoroughly customizable maps powered by vector tiles and OpenGL.",
     "main": "index",
     "typings": "index.d.ts",
@@ -54,5 +54,5 @@
     "dependencies": {
         "@nativescript-community/perms": "^2.2.0"
     },
-    "gitHead": "44fe8fec4a1d5ddfcd529919346f238afecabc94"
+    "gitHead": "e6c89b9d4b3505ecdb5864fd58c01721a3b572ff"
 }

package/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;