@nativescript-community/ui-mapbox 6.2.10 → 6.2.14

package/layers/layer-factory.android.d.ts

@@ -1,4 +1,18 @@
-import { LayerCommon } from '../mapbox.common';
+import { LayerCommon, LayerType } from "../common";
+export declare class Layer implements LayerCommon {
+    id: string;
+    private instance;
+    constructor(instance: any);
+    visibility(): boolean;
+    show(): void;
+    hide(): void;
+    getNativeInstance(): any;
+    setFilter(filter: any[]): void;
+    getFilter(): any[];
+    setProperty(name: string, value: any): void;
+    getProperty(name: string): any;
+    type(): LayerType;
+}
 export declare class LayerFactory {
     static createLayer(style: any, source: any): Promise<LayerCommon>;
     private static parseProperties;

package/layers/layer-factory.android.js

@@ -1,5 +1,66 @@
-import { Layer } from '../mapbox.android';
-import { PropertyParser } from './parser/property-parser.android';
+import { ExpressionParser } from '../expression/expression-parser';
+import { PropertyParser } from './parser/property-parser';
+export class Layer {
+    constructor(instance) {
+        this.instance = instance;
+        this.id = instance.getId();
+    }
+    visibility() {
+        return this.instance.getVisibility().getValue() === 'visible' ? true : false;
+    }
+    show() {
+        this.instance.setProperties([new com.mapbox.mapboxsdk.style.layers.PropertyValue('visibility', 'visible')]);
+    }
+    hide() {
+        this.instance.setProperties([new com.mapbox.mapboxsdk.style.layers.PropertyValue('visibility', 'none')]);
+    }
+    getNativeInstance() {
+        return this.instance;
+    }
+    setFilter(filter) {
+        this.instance.setFilter(ExpressionParser.parseJson(filter));
+    }
+    getFilter() {
+        return ExpressionParser.toJson(this.instance.getFilter());
+    }
+    setProperty(name, value) {
+        const properties = PropertyParser.parsePropertiesForLayer({ [name]: value });
+        this.instance.setProperties(properties);
+    }
+    getProperty(name) {
+        return PropertyParser.propertyValueFromLayer(this.instance, name);
+    }
+    type() {
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.FillLayer) {
+            return "fill";
+        }
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.LineLayer) {
+            return "line";
+        }
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.SymbolLayer) {
+            return "symbol";
+        }
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.CircleLayer) {
+            return "circle";
+        }
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.HeatmapLayer) {
+            return "heatmap";
+        }
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.FillExtrusionLayer) {
+            return "fill-extrusion";
+        }
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.RasterLayer) {
+            return "raster";
+        }
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.HillshadeLayer) {
+            return "hillshade";
+        }
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.BackgroundLayer) {
+            return "background";
+        }
+        return null;
+    }
+}
 export class LayerFactory {
     static async createLayer(style, source) {
         const layerProperties = this.parseProperties(style.type, Object.assign(style.paint || {}, style.layout || {}));

package/layers/layer-factory.d.ts

@@ -1,5 +1,20 @@
-import { LayerCommon } from '..';
+import { LayerCommon, LayerType } from "../common"
 
 declare class LayerFactory {
     static createLayer(style, source): Promise<LayerCommon>;
-}
+}
+
+export declare class Layer implements LayerCommon {
+    id: string;
+    private instance;
+    constructor(instance: any);
+    visibility(): boolean;
+    show(): void;
+    hide(): void;
+    getNativeInstance(): any;
+    setFilter(filter: any[]): void;
+    getFilter(): any[];
+    setProperty(name: string, value: any): void;
+    getProperty(name: string): any;
+    type(): LayerType;
+}

package/layers/layer-factory.ios.d.ts

@@ -1,5 +1,19 @@
-import { LayerCommon } from '../mapbox.common';
+import { LayerCommon, LayerType } from "../common";
 export declare class LayerFactory {
     static createLayer(style: any, source: any): Promise<LayerCommon>;
     private static parseProperties;
 }
+export declare class Layer implements LayerCommon {
+    id: string;
+    private instance;
+    constructor(instance: MGLStyleLayer);
+    type(): LayerType;
+    visibility(): boolean;
+    show(): void;
+    hide(): void;
+    getNativeInstance(): any;
+    setFilter(filter: any[]): void;
+    getFilter(): any[];
+    setProperty(name: string, value: any): void;
+    getProperty(name: string): any;
+}

package/layers/layer-factory.ios.js

@@ -1,5 +1,5 @@
-import { Layer } from '../mapbox.ios';
-import { PropertyParser } from './parser/property-parser.ios';
+import { ExpressionParser } from '../expression/expression-parser';
+import { PropertyParser } from './parser/property-parser';
 export class LayerFactory {
     static async createLayer(style, source) {
         let nativeLayer;
@@ -44,4 +44,74 @@ export class LayerFactory {
         return PropertyParser.parsePropertiesForLayer(propertiesObject);
     }
 }
+export class Layer {
+    constructor(instance) {
+        this.instance = instance;
+        this.id = instance.identifier;
+    }
+    type() {
+        if (this.instance instanceof MGLFillStyleLayer) {
+            return "fill";
+        }
+        if (this.instance instanceof MGLLineStyleLayer) {
+            return "line";
+        }
+        if (this.instance instanceof MGLSymbolStyleLayer) {
+            return "symbol";
+        }
+        if (this.instance instanceof MGLCircleStyleLayer) {
+            return "circle";
+        }
+        if (this.instance instanceof MGLHeatmapStyleLayer) {
+            return "heatmap";
+        }
+        if (this.instance instanceof MGLFillExtrusionStyleLayer) {
+            return "fill-extrusion";
+        }
+        if (this.instance instanceof MGLRasterStyleLayer) {
+            return "raster";
+        }
+        if (this.instance instanceof MGLHillshadeStyleLayer) {
+            return "hillshade";
+        }
+        if (this.instance instanceof MGLBackgroundStyleLayer) {
+            return "background";
+        }
+        return null;
+    }
+    visibility() {
+        return this.instance.visible;
+    }
+    show() {
+        this.instance.visible = true;
+    }
+    hide() {
+        this.instance.visible = false;
+    }
+    getNativeInstance() {
+        return this.instance;
+    }
+    setFilter(filter) {
+        if (this.instance instanceof MGLVectorStyleLayer) {
+            this.instance.predicate = ExpressionParser.parseJson(filter);
+        }
+        else {
+            throw new Error('Set filter only support for vector layer.');
+        }
+    }
+    getFilter() {
+        return ExpressionParser.toJson(this.instance.predicate);
+    }
+    setProperty(name, value) {
+        const properties = PropertyParser.parsePropertiesForLayer({ [name]: value });
+        for (const propKey in properties) {
+            if (Object.prototype.hasOwnProperty.call(properties, propKey)) {
+                this.instance[propKey] = properties[propKey];
+            }
+        }
+    }
+    getProperty(name) {
+        return PropertyParser.propertyValueFromLayer(this.instance, name);
+    }
+}
 //# sourceMappingURL=layer-factory.ios.js.map

package/layers/parser/property-parser.android.d.ts

@@ -1,3 +1,4 @@
 export declare class PropertyParser {
     static parsePropertiesForLayer(propertiesObject: any): any[];
+    static propertyValueFromLayer(layer: any, key: string): any;
 }

package/layers/parser/property-parser.android.js

@@ -2,6 +2,9 @@ import { Color } from '@nativescript/core';
 function toCamelCase(s) {
     return s.replace(/([-_][a-z])/gi, ($1) => $1.toUpperCase().replace('-', '').replace('_', ''));
 }
+function toPascalCase(s) {
+    return s.replace(/(^[a-z]|[-_][a-z])/gi, ($1) => $1.toUpperCase().replace('-', '').replace('_', ''));
+}
 const Expression = com.mapbox.mapboxsdk.style.expressions.Expression;
 function transformValue(key, value) {
     let nValue = value;
@@ -34,5 +37,27 @@ export class PropertyParser {
         }
         return nProperties;
     }
+    static propertyValueFromLayer(layer, key) {
+        const getterMethodName = `get${toPascalCase(key)}`;
+        let nValue;
+        try {
+            nValue = layer[getterMethodName]();
+        }
+        catch (e) {
+            return null;
+        }
+        if (!nValue || nValue.isNull()) {
+            return null;
+        }
+        if (nValue.isExpression()) {
+            return JSON.parse(nValue.getExpression().toString());
+        }
+        else if (!!nValue.getColorInt()) {
+            return new Color(nValue.getColorInt().intValue());
+        }
+        else {
+            return nValue.getValue();
+        }
+    }
 }
 //# sourceMappingURL=property-parser.android.js.map

package/layers/parser/property-parser.d.ts

@@ -0,0 +1,4 @@
+export declare class PropertyParser {
+    static parsePropertiesForLayer(propertiesObject: any): any;
+    static propertyValueFromLayer(layer, key: string): any;
+}

package/layers/parser/property-parser.ios.d.ts

@@ -1,3 +1,4 @@
 export declare class PropertyParser {
     static parsePropertiesForLayer(propertiesObject: any): {};
+    static propertyValueFromLayer(layer: any, key: string): any;
 }

package/layers/parser/property-parser.ios.js

@@ -77,5 +77,26 @@ export class PropertyParser {
         }
         return nProperties;
     }
+    static propertyValueFromLayer(layer, key) {
+        const actualKey = keysMap[key] || toCamelCase(key);
+        const nValue = layer[actualKey];
+        if (!nValue) {
+            return null;
+        }
+        if (nValue.expressionType === 0) {
+            if (nValue.constantValue instanceof UIColor) {
+                return Color.fromIosColor(nValue.constantValue);
+            }
+            else {
+                return nValue.constantValue;
+            }
+        }
+        else {
+            const expressionObj = nValue.mgl_jsonExpressionObject;
+            const data = NSJSONSerialization.dataWithJSONObjectOptionsError(expressionObj, 0);
+            const expression = NSString.alloc().initWithDataEncoding(data, NSUTF8StringEncoding);
+            return JSON.parse(expression);
+        }
+    }
 }
 //# sourceMappingURL=property-parser.ios.js.map

package/package.json

@@ -1,52 +1,58 @@
 {
-  "name": "@nativescript-community/ui-mapbox",
-  "version": "6.2.10",
-  "description": "Interactive, thoroughly customizable maps powered by vector tiles and OpenGL.",
-  "main": "mapbox",
-  "typings": "index.d.ts",
-  "nativescript": {
-    "platforms": {
-      "android": "3.0.0",
-      "ios": "3.0.0"
-    }
-  },
-  "keywords": [
-    "NativeScript",
-    "Map",
-    "Maps",
-    "Native Maps",
-    "Mapbox",
-    "iOS",
-    "Android",
-    "Angular",
-    "preview|https://raw.githubusercontent.com/nativescript-community/ui-mapbox/master/images/preview.png"
-  ],
-  "author": {
-    "name": "Yermo Lamers",
-    "email": "yml@yml.com",
-    "url": "https://miles-by-motorcycle.com/flyingbricksoftware/about"
-  },
-  "contributors": [
-    {
-      "name": "Eddy Verbruggen - Original Author",
-      "email": "eddyverbruggen@gmail.com"
+    "name": "@nativescript-community/ui-mapbox",
+    "version": "6.2.14",
+    "description": "Interactive, thoroughly customizable maps powered by vector tiles and OpenGL.",
+    "main": "index",
+    "typings": "index.d.ts",
+    "scripts": {
+        "build": "npm run tsc && npm run readme",
+        "readme": "../../node_modules/.bin/readme generate -c ../../tools/readme/blueprint.json",
+        "tsc": "../../node_modules/.bin/cpy '**/*.d.ts' '../../packages/ui-mapbox' --parents --cwd=../../src/ui-mapbox && ../../node_modules/.bin/tsc -skipLibCheck -d",
+        "clean": "../../node_modules/.bin/rimraf ./*.d.ts ./*.js ./*.js.map"
     },
-    {
-      "name": "Alex Wells",
-      "email": "autaut03@gmail.com"
-    }
-  ],
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/nativescript-community/ui-mapbox/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/nativescript-community/ui-mapbox"
-  },
-  "readmeFilename": "README.md",
-  "dependencies": {
-    "@nativescript-community/perms": "^2.1.1"
-  },
-  "gitHead": "4d9cf3782e07e94b05b161306b89b5c9bcfd4149"
+    "nativescript": {
+        "platforms": {
+            "android": "3.0.0",
+            "ios": "3.0.0"
+        }
+    },
+    "keywords": [
+        "NativeScript",
+        "Map",
+        "Maps",
+        "Native Maps",
+        "Mapbox",
+        "iOS",
+        "Android",
+        "Angular",
+        "preview|https://raw.githubusercontent.com/nativescript-community/ui-mapbox/master/images/preview.png"
+    ],
+    "author": {
+        "name": "Yermo Lamers",
+        "email": "yml@yml.com",
+        "url": "https://miles-by-motorcycle.com/flyingbricksoftware/about"
+    },
+    "contributors": [
+        {
+            "name": "Eddy Verbruggen - Original Author",
+            "email": "eddyverbruggen@gmail.com"
+        },
+        {
+            "name": "Alex Wells",
+            "email": "autaut03@gmail.com"
+        }
+    ],
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/nativescript-community/ui-mapbox/issues"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/nativescript-community/ui-mapbox"
+    },
+    "readmeFilename": "README.md",
+    "dependencies": {
+        "@nativescript-community/perms": "^2.2.0"
+    },
+    "gitHead": "f3399295d88474fe637cacc301445c977a91540d"
 }

package/platforms/android/include.gradle

@@ -10,6 +10,7 @@ dependencies {
 	def mapboxPluginsVersion =  project.hasProperty("mapboxPluginsVersion") ? project.mapboxPluginsVersion : "v9"
 	def mapboxAnnotationPluginVersion =  project.hasProperty("mapboxAnnotationPluginVersion") ? project.mapboxAnnotationPluginVersion : "0.9.0"
 	def mapboxGesturesVersion =  project.hasProperty("mapboxGesturesVersion") ? project.mapboxGesturesVersion : "0.7.0"
+	def squareupVersion =  project.hasProperty("squareupVersion") ? project.mapboxGesturesVersion : "4.9.0"
 
     implementation "com.mapbox.mapboxsdk:mapbox-android-telemetry:$mapboxTelemetryVersion"
 
@@ -28,6 +29,8 @@ dependencies {
     // Annotation Plugin
 
     implementation "com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-$mapboxPluginsVersion:$mapboxAnnotationPluginVersion"
+
+    implementation "com.squareup.okhttp3:okhttp:$squareupVersion"
 }
 
 android {

package/platforms/ios/Podfile

@@ -1,3 +1,3 @@
-platform :ios, '10.0'
+platform :ios, '13.0'
 
-pod 'Mapbox-iOS-SDK'
+pod 'Mapbox-iOS-SDK', '~> 5.1.1'

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;

package/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright 2018 Eddy Verbruggen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.