maplibre-gl 3.0.0-pre.1 → 3.0.0-pre.3

package/README.md

@@ -2,12 +2,13 @@
 
 # MapLibre GL JS
 
-**[MapLibre GL JS](https://maplibre.org/maplibre-gl-js-docs/api/)** is an open-source library for publishing maps on your websites. Fast displaying of maps is possible thanks to GPU-accelerated vector tile rendering. 
+**[MapLibre GL JS](https://maplibre.org/maplibre-gl-js-docs/api/)** is an open-source library for publishing maps on your websites or webview based apps. Fast displaying of maps is possible thanks to GPU-accelerated vector tile rendering. 
 
-It originated as an open-source fork of [mapbox-gl-js](https://github.com/mapbox/mapbox-gl-js), before their switch to a non-OSS license in December 2020. The library is intended to be a drop-in replacement for the Mapbox’s version with additional functionality.
+It originated as an open-source fork of [mapbox-gl-js](https://github.com/mapbox/mapbox-gl-js), before their switch to a non-OSS license in December 2020. The library's initial versions (1.x) were intended to be a drop-in replacement for the Mapbox’s OSS version (1.x) with additional functionality, but have evolved a lot since then.
 
 [![License](https://img.shields.io/badge/License-BSD_3--Clause-blue.svg?style=flat)](LICENSE.txt)[![Version](https://img.shields.io/npm/v/maplibre-gl?style=flat)](https://www.npmjs.com/package/maplibre-gl)[![CI](https://github.com/maplibre/maplibre-gl-js/actions/workflows/ci.yml/badge.svg)](https://github.com/maplibre/maplibre-gl-js/actions/workflows/ci.yml)[![PRs](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)](https://opensource.org/licenses/BSD-3-Clause)
 
+**Call for Bounties💰** If you have ideas for new features in MapLibre, you can now nominate them for the MapLibre Bounty Program at https://maplibre.org/news/2022-10-16-call-for-bounties/
 <br />
 
 ## Getting Started
@@ -98,7 +99,8 @@ Use MapLibre GL JS bindings for React (https://visgl.github.io/react-map-gl/docs
 
 ### Getting Involved
 
-Join the #maplibre slack channel at OSMUS: get an invite at https://osmus-slack.herokuapp.com/
+Join the #maplibre slack channel at OSMUS: get an invite at https://slack.openstreetmap.us/
+Read the [CONTRIBUTING.md](CONTRIBUTING.md) guide in order to get familiar with how we do things around here.
 
 ### Community Leadership
 

package/build/generate-style-code.ts

@@ -29,6 +29,8 @@ function nativeType(property) {
             return 'Color';
         case 'padding':
             return 'Padding';
+        case 'sprite':
+            return 'Sprite';
         case 'formatted':
             return 'Formatted';
         case 'resolvedImage':
@@ -91,6 +93,8 @@ function runtimeType(property) {
             return 'ColorType';
         case 'padding':
             return 'PaddingType';
+        case 'sprite':
+            return 'SpriteType';
         case 'formatted':
             return 'FormattedType';
         case 'Image':

package/build/generate-style-spec.ts

@@ -122,6 +122,8 @@ export type ColorSpecification = string;
 
 export type PaddingSpecification = number | number[];
 
+export type SpriteSpecification = string | {id: string; url: string}[];
+
 export type FormattedSpecification = string;
 
 export type ResolvedImageSpecification = string;
@@ -130,19 +132,19 @@ export type PromoteIdSpecification = {[_: string]: string} | string;
 
 export type ExpressionInputType = string | number | boolean;
 
-export type CollatorExpressionSpecification = 
+export type CollatorExpressionSpecification =
     ['collator', {
-        'case-sensitive'?: boolean | ExpressionSpecification, 
-        'diacritic-sensitive'?: boolean | ExpressionSpecification, 
+        'case-sensitive'?: boolean | ExpressionSpecification,
+        'diacritic-sensitive'?: boolean | ExpressionSpecification,
         locale?: string | ExpressionSpecification}
     ]; // collator
 
 export type InterpolationSpecification =
-    | ['linear'] 
-    | ['exponential', number | ExpressionSpecification] 
+    | ['linear']
+    | ['exponential', number | ExpressionSpecification]
     | ['cubic-bezier', number | ExpressionSpecification, number | ExpressionSpecification, number | ExpressionSpecification, number | ExpressionSpecification]
 
-export type ExpressionSpecification = 
+export type ExpressionSpecification =
     // types
     | ['array', unknown | ExpressionSpecification] // array
     | ['array', ExpressionInputType | ExpressionSpecification, unknown | ExpressionSpecification] // array
@@ -174,7 +176,7 @@ export type ExpressionSpecification =
     | ['in', ExpressionInputType | ExpressionSpecification, ExpressionInputType | ExpressionSpecification]
     | ['index-of', ExpressionInputType | ExpressionSpecification, ExpressionInputType | ExpressionSpecification] // number
     | ['length', string | ExpressionSpecification]
-    | ['slice', string | ExpressionSpecification, number | ExpressionSpecification]
+    | ['slice', string | ExpressionSpecification, number | ExpressionSpecification, (number | ExpressionSpecification)?]
     // Decision
     | ['!', boolean | ExpressionSpecification] // boolean
     | ['!=', ExpressionInputType | ExpressionSpecification, ExpressionInputType | ExpressionSpecification, CollatorExpressionSpecification?] // boolean
@@ -185,20 +187,20 @@ export type ExpressionSpecification =
     | ['>=', ExpressionInputType | ExpressionSpecification, ExpressionInputType | ExpressionSpecification, CollatorExpressionSpecification?] // boolean
     | ['all', ...(boolean | ExpressionSpecification)[]] // boolean
     | ['any', ...(boolean | ExpressionSpecification)[]] // boolean
-    | ['case', boolean | ExpressionSpecification, ExpressionInputType | ExpressionSpecification, 
+    | ['case', boolean | ExpressionSpecification, ExpressionInputType | ExpressionSpecification,
         ...(boolean | ExpressionInputType | ExpressionSpecification)[], ExpressionInputType | ExpressionSpecification]
     | ['coalesce', ...(ExpressionInputType | ExpressionSpecification)[]] // at least two inputs required
-    | ['match', ExpressionInputType | ExpressionSpecification, 
-        ExpressionInputType | ExpressionInputType[], ExpressionInputType | ExpressionSpecification, 
+    | ['match', ExpressionInputType | ExpressionSpecification,
+        ExpressionInputType | ExpressionInputType[], ExpressionInputType | ExpressionSpecification,
         ...(ExpressionInputType | ExpressionInputType[] | ExpressionSpecification)[], // repeated as above
         ExpressionInputType | ExpressionSpecification]
     | ['within', unknown | ExpressionSpecification]
     // Ramps, scales, curves
-    | ['interpolate', InterpolationSpecification, number | ExpressionSpecification, 
-        ...(number | number[] | ColorSpecification)[]] // alternating number and number | number[] | ColorSpecification
-    | ['interpolate-hcl', InterpolationSpecification, number | ExpressionSpecification, 
+    | ['interpolate', InterpolationSpecification, number | ExpressionSpecification,
+        ...(number | number[] | ColorSpecification | ExpressionSpecification)[]] // alternating number and number | number[] | ColorSpecification
+    | ['interpolate-hcl', InterpolationSpecification, number | ExpressionSpecification,
         ...(number | ColorSpecification)[]] // alternating number and ColorSpecificaton
-    | ['interpolate-lab', InterpolationSpecification, number | ExpressionSpecification, 
+    | ['interpolate-lab', InterpolationSpecification, number | ExpressionSpecification,
         ...(number | ColorSpecification)[]] // alternating number and ColorSpecification
     | ['step', number | ExpressionSpecification, ExpressionInputType | ExpressionSpecification,
         ...(number | ExpressionInputType | ExpressionSpecification)[]] // alternating number and ExpressionInputType | ExpressionSpecification

package/build/rollup_plugins.ts

@@ -3,12 +3,11 @@ import typescript from '@rollup/plugin-typescript';
 import resolve from '@rollup/plugin-node-resolve';
 import replace from '@rollup/plugin-replace';
 import commonjs from '@rollup/plugin-commonjs';
-import json from '@rollup/plugin-json';
-import {terser} from 'rollup-plugin-terser';
+import terser from '@rollup/plugin-terser';
 import minifyStyleSpec from './rollup_plugin_minify_style_spec';
 import strip from '@rollup/plugin-strip';
 import {Plugin} from 'rollup';
-import {importAssertionsPlugin} from 'rollup-plugin-import-assert';
+import json from '@rollup/plugin-json';
 
 // Common set of plugins/transformations shared across different rollup
 // builds (main maplibre bundle, style-spec package, benchmarks bundle)
@@ -20,7 +19,6 @@ export const nodeResolve = resolve({
 
 export const plugins = (production: boolean): Plugin[] => [
     minifyStyleSpec(),
-    importAssertionsPlugin(),
     json(),
     // https://github.com/zaach/jison/issues/351
     replace({