maplibre-gl 3.0.0-pre.4 → 3.0.0-pre.6

package/README.md

@@ -43,9 +43,9 @@ Check out the features through [examples](https://maplibre.org/maplibre-gl-js-do
 
 | Showcases |      |
 | ---- | ---- |
-|![Display a map](https://maplibre.org/maplibre-gl-js-docs/assets/simple-map-800-22a3f5b6410f543ab214e14f68fb42ec.png)	|![Third party vector tile source](https://maplibre.org/maplibre-gl-js-docs/assets/third-party-800-e047007bba338f6ec7d6cd47abfed279.png)	|
-|![Animate a series of images](https://maplibre.org/maplibre-gl-js-docs/assets/animate-images-800-497358611dbe047f300faeb9465aad5f.png)	|![Create a heatmap layer](https://maplibre.org/maplibre-gl-js-docs/assets/heatmap-layer-800-05c0f97ddb6b1a10e84b5064564e86ff.png)	|
-|![3D buildings](https://maplibre.org/maplibre-gl-js-docs/assets/3d-buildings-800-bd7885f07050dbbfee7a9bb800ff5ce8.png)	|![Visualize population density](https://maplibre.org/maplibre-gl-js-docs/assets/visualize-population-density-800-6c65712d9ea94eb6d2bd3348a82b9bdf.png)	|
+|![Display a map](https://maplibre.org/maplibre-gl-js-docs/assets/simple-map-800-1427cd84c8c693ead996f81b06e467bb.png)	|![Third party vector tile source](https://maplibre.org/maplibre-gl-js-docs/assets/third-party-800-72a3092888152ba26920ec0ba5aeacd0.png)	|
+|![Animate a series of images](https://maplibre.org/maplibre-gl-js-docs/assets/animate-images-800-522ec4f83d7988b2d6f23a0c1d5eb924.png)	|![Create a heatmap layer](https://maplibre.org/maplibre-gl-js-docs/assets/heatmap-layer-800-a23e44d9c1238315f191187c5c628719.png)	|
+|![3D buildings](https://maplibre.org/maplibre-gl-js-docs/assets/3d-buildings-800-18cda57800c107d1dee5f269bf7a12f2.png)	|![Visualize population density](https://maplibre.org/maplibre-gl-js-docs/assets/visualize-population-density-800-dc0290780f7b2842031bdf1b9347981a.png)	|
 
 <br />
 
@@ -64,11 +64,11 @@ The overall migration happens by uninstalling `mapbox-gl` and installing `maplib
 
 #### Compatibility branch
 
-Maplibre v1 is completely backward compatible with Mapbox v1. This compatibility branch (named 1.x) is tagged v1 on npm, and its current verison is 1.15.3. 
+Maplibre v1 is completely backward compatible with Mapbox v1. This compatibility branch (named 1.x) is tagged v1 on npm, and its current version is 1.15.3. 
 
 #### CDN Links
 
-> MapLibre GL JS is distributed via [unpkg.com](https://unpkg.com). For more informations please see [MapLibre GL is on unpkg.com](./docs/README-unpkg.md#maplibre-gl-on-unpkgcom).
+> MapLibre GL JS is distributed via [unpkg.com](https://unpkg.com). For more information, please see [MapLibre GL is on unpkg.com](./documents_and_diagrams/README-unpkg.md#maplibre-gl-on-unpkgcom).
 
 ```diff
 -    <script src="https://api.mapbox.com/mapbox-gl-js/v#.#.#/mapbox-gl.js"></script>
@@ -110,6 +110,14 @@ If you depend on a free software alternative to `mapbox-gl-js`, please consider
 
 > **MapLibre GL** is developed following [Semantic Versioning (2.0.0)](https://semver.org/spec/v2.0.0.html).
 
+### Bounties
+
+We offer Bounties for some tasks in the MapLibre GL JS repo. Read more about the Bounties in our step-by-step guide:
+
+https://maplibre.org/roadmap/step-by-step-bounties-guide/
+
+And find all currently published Bounties in MapLibre GL JS [here](https://github.com/maplibre/maplibre-gl-js/issues?q=is%3Aissue+is%3Aopen+label%3A%22%F0%9F%92%B0+bounty+L%22%2C%22%F0%9F%92%B0+bounty+S%22%2C%22%F0%9F%92%B0+bounty+M%22%2C%22%F0%9F%92%B0+bounty+XL%22%2C%22%F0%9F%92%B0+bounty+XXL%22+).
+
 <br />
 
 ## Sponsors
@@ -120,16 +128,16 @@ Read more about the MapLibre Sponsorship Program at [https://maplibre.org/sponso
 
 Platinum:
 
-<img src="https://maplibre.org/img/aws-logo.svg" alt="Logo AWS" width="25%"/>
-
+<a href="https://aws.com"><img src="https://maplibre.org/img/aws-logo.svg" alt="Logo AWS" width="25%"/></a>
 
 Silver:
 
-<img src="https://maplibre.org/img/meta-logo.svg" alt="Logo Meta" width="50%"/>
+<a href="https://meta.com"><img src="https://maplibre.org/img/meta-logo.svg" alt="Logo Meta" width="25%"/></a>
+
+<a href="https://www.mierune.co.jp/?lang=en"><img src="https://maplibre.org/img/mierune-logo.svg" alt="Logo MIERUNE" width="25%"/></a>
 
-Stone:
+<a href="https://komoot.com/"><img src="https://maplibre.org/img/komoot-logo.svg" alt="Logo komoot" width="25%"/></a>
 
-[MIERUNE Inc.](https://www.mierune.co.jp/?lang=en)
 
 Backers and Supporters:
 

package/build/generate-shaders.ts

@@ -1,5 +1,6 @@
 import fs from 'fs';
-import glob from 'glob';
+import {globSync} from 'glob';
+import path from 'path';
 
 console.log('Generating shaders');
 
@@ -11,22 +12,21 @@ console.log('Generating shaders');
  * It will also create a simple package.json file to allow importing this package in webpack
  */
 
-glob('./src/shaders/*.glsl', null, (_err, files) => {
-    for (const file of files) {
-        const code = fs.readFileSync(file, 'utf8');
-        const content = glslToTs(code);
-        const fileName = `./src/shaders/${file.split('/').splice(-1)}.g.ts`;
-        fs.writeFileSync(fileName, content);
-    }
-    console.log(`Finished converting ${files.length} glsl files`);
-});
+const files = globSync('./src/shaders/*.glsl');
+for (const file of files) {
+    const code = fs.readFileSync(file, 'utf8');
+    const content = glslToTs(code);
+    const fileName = path.join('.', 'src', 'shaders', `${file.split(path.sep).splice(-1)}.g.ts`);
+    fs.writeFileSync(fileName, content);
+}
+console.log(`Finished converting ${files.length} glsl files`);
 
 function glslToTs(code: string): string {
     code = code
         .trim() // strip whitespace at the start/end
         .replace(/\s*\/\/[^\n]*\n/g, '\n') // strip double-slash comments
         .replace(/\n+/g, '\n') // collapse multi line breaks
-        .replace(/\n\s+/g, '\n') // strip identation
+        .replace(/\n\s+/g, '\n') // strip indentation
         .replace(/\s?([+-\/*=,])\s?/g, '$1') // strip whitespace around operators
         .replace(/([;\(\),\{\}])\n(?=[^#])/g, '$1'); // strip more line breaks
 

package/build/generate-style-code.ts

@@ -2,7 +2,7 @@
 
 import * as fs from 'fs';
 
-import spec from '../src/style-spec/reference/v8.json' assert {type: 'json'};
+import {v8} from '@maplibre/maplibre-gl-style-spec';
 
 function camelCase(str: string): string {
     return str.replace(/-(.)/g, (_, x) => {
@@ -137,20 +137,20 @@ function propertyValue(property, type) {
     }
 }
 
-const layers = Object.keys(spec.layer.type.values).map((type) => {
-    const layoutProperties = Object.keys(spec[`layout_${type}`]).reduce((memo, name) => {
+const layers = Object.keys(v8.layer.type.values).map((type) => {
+    const layoutProperties = Object.keys(v8[`layout_${type}`]).reduce((memo, name) => {
         if (name !== 'visibility') {
-            spec[`layout_${type}`][name].name = name;
-            spec[`layout_${type}`][name].layerType = type;
-            memo.push(spec[`layout_${type}`][name]);
+            v8[`layout_${type}`][name].name = name;
+            v8[`layout_${type}`][name].layerType = type;
+            memo.push(v8[`layout_${type}`][name]);
         }
         return memo;
     }, []);
 
-    const paintProperties = Object.keys(spec[`paint_${type}`]).reduce((memo, name) => {
-        spec[`paint_${type}`][name].name = name;
-        spec[`paint_${type}`][name].layerType = type;
-        memo.push(spec[`paint_${type}`][name]);
+    const paintProperties = Object.keys(v8[`paint_${type}`]).reduce((memo, name) => {
+        v8[`paint_${type}`][name].name = name;
+        v8[`paint_${type}`][name].layerType = type;
+        memo.push(v8[`paint_${type}`][name]);
         return memo;
     }, []);
 
@@ -169,7 +169,7 @@ function emitlayerProperties(locals) {
         `// This file is generated. Edit build/generate-style-code.ts, then run 'npm run codegen'.
 /* eslint-disable */
 
-import styleSpec from '../../style-spec/reference/latest';
+import {latest as styleSpec} from '@maplibre/maplibre-gl-style-spec';
 
 import {
     Properties,
@@ -182,22 +182,23 @@ import {
     CrossFaded
 } from '../properties';
 
-import type Color from '../../style-spec/util/color';
-import type Padding from '../../style-spec/util/padding';
+import type {Color} from '@maplibre/maplibre-gl-style-spec';
+import type {Padding} from '@maplibre/maplibre-gl-style-spec';
 
-import type Formatted from '../../style-spec/expression/types/formatted';
+import type {Formatted} from '@maplibre/maplibre-gl-style-spec';
 
-import type ResolvedImage from '../../style-spec/expression/types/resolved_image';
-import {StylePropertySpecification} from '../../style-spec/style-spec';
+import type {ResolvedImage} from '@maplibre/maplibre-gl-style-spec';
+import {StylePropertySpecification} from '@maplibre/maplibre-gl-style-spec';
 `);
 
     const overridables = paintProperties.filter(p => p.overridable);
     if (overridables.length) {
-        output.push(
-            `import {
-    ${overridables.reduce((imports, prop) => { imports.push(runtimeType(prop)); return imports; }, []).join(',\n    ')}
-} from '../../style-spec/expression/types';
-`);
+        const overridesArray = `import {
+            ${overridables.reduce((imports, prop) => { imports.push(runtimeType(prop)); return imports; }, []).join(',\n    ')}
+        } from '@maplibre/maplibre-gl-style-spec';
+        `;
+        console.log(overridesArray);
+        output.push(overridesArray);
     }
 
     if (layoutProperties.length) {
@@ -222,7 +223,8 @@ export type ${layerType}LayoutPropsPossiblyEvaluated = {`);
         output.push(
             `};
 
-const layout: Properties<${layerType}LayoutProps> = new Properties({`);
+let layout: Properties<${layerType}LayoutProps>;
+const getLayout = () => layout = layout || new Properties({`);
 
         for (const property of layoutProperties) {
             output.push(
@@ -262,7 +264,8 @@ export type ${layerType}PaintPropsPossiblyEvaluated = {`);
 
     output.push(
         `
-const paint: Properties<${layerType}PaintProps> = new Properties({`);
+let paint: Properties<${layerType}PaintProps>;
+const getPaint = () => paint = paint || new Properties({`);
 
     for (const property of paintProperties) {
         output.push(
@@ -272,9 +275,7 @@ const paint: Properties<${layerType}PaintProps> = new Properties({`);
     output.push(
         `});
 
-export default ({ paint${layoutProperties.length ? ', layout' : ''} } as {
-    paint: Properties<${layerType}PaintProps>${layoutProperties.length ? `,\n    layout: Properties<${layerType}LayoutProps>` : ''}
-});`);
+export default ({ get paint() { return getPaint() }${layoutProperties.length ? ', get layout() { return getLayout() }' : ''} });`);
 
     return output.join('\n');
 }

package/build/generate-typings.ts

@@ -7,20 +7,12 @@ if (!fs.existsSync('dist')) {
 }
 
 console.log('Starting bundling types');
-let outputFile = './dist/maplibre-gl.d.ts';
+const outputFile = './dist/maplibre-gl.d.ts';
 childProcess.execSync(`dts-bundle-generator --umd-module-name=maplibregl -o ${outputFile} ./src/index.ts`);
 let types = fs.readFileSync(outputFile, 'utf8');
 // Classes are not exported but should be since this is exported as UMD - fixing...
 types = types.replace(/declare class/g, 'export declare class');
 fs.writeFileSync(outputFile, types);
 
-console.log('Finifhed bundling types for maplibre-gl starting style-spec');
+console.log('Finifhed bundling types for maplibre-gl ');
 
-const outputPath = './dist/style-spec';
-if (!fs.existsSync(outputPath)) {
-    fs.mkdirSync(outputPath);
-}
-outputFile = `${outputPath}/index.d.ts`;
-childProcess.execSync(`dts-bundle-generator -o ${outputFile} ./src/style-spec/style-spec.ts`);
-
-console.log('Finished bundling types');

package/build/readme.md

@@ -35,7 +35,7 @@ This file is used by CI to make sure the bundle size is kept constant
 <hr>
 
 ### `npm run codegen`
-The `codegen` command runs the following three scripts, to update the corresponding code files based on the `v8.json` style source, and other data files. Contributers should run this command manually when the underlying style data is modified. The generated code files are then commited to the repo.
+The `codegen` command runs the following three scripts, to update the corresponding code files based on the `v8.json` style source, and other data files. Contributors should run this command manually when the underlying style data is modified. The generated code files are then committed to the repo.
 #### generate-struct-arrays.ts		
 Generates `data/array_types.ts`, which consists of:
  - `StructArrayLayout_*` subclasses, one for each underlying memory layout

package/build/rollup_plugins.ts

@@ -4,7 +4,6 @@ import resolve from '@rollup/plugin-node-resolve';
 import replace from '@rollup/plugin-replace';
 import commonjs from '@rollup/plugin-commonjs';
 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 json from '@rollup/plugin-json';
@@ -18,7 +17,6 @@ export const nodeResolve = resolve({
 });
 
 export const plugins = (production: boolean): Plugin[] => [
-    minifyStyleSpec(),
     json(),
     // https://github.com/zaach/jison/issues/351
     replace({