【feature】支持match expression

Author: songyumeng

Diff for: .editorconfig

@@ -11,7 +11,3 @@ insert_final_newline = true
 [*.md]
 indent_size = 2
 trim_trailing_whitespace = false
-
-[Makefile]
-indent_style = tab
-indent_size = 4

Diff for: .eslintrc

@@ -1,10 +1,10 @@
 {
   "extends": "openlayers",
   "globals": {
-    Promise: false
+    "Promise": false
   },
   "parserOptions": {
     "ecmaVersion": 6,
-    "sourceType": module
+    "sourceType": "module"
   }
 }

Diff for: .gitignore

@@ -1,4 +1,3 @@
 node_modules
 dist
 coverage
-package-lock.json

Diff for: .npmrc

@@ -1 +1,8 @@
-package-lock=false
+.circleci/
+.git/
+examples/
+test/
+.editorconfig
+.eslintrc
+webpack.*.js
+tsconfig.*.json

Diff for: README.md

@@ -175,6 +175,7 @@ the specified `source`, which needs to be a `"type": "vector"` or
 -   `spriteImageUrl` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** Sprite image url for the sprite
     specified in the Mapbox Style object's `sprite` property. Only required if a
     `sprite` property is specified in the Mapbox Style object. (optional, default `undefined`)
+-   `spriteImage`  
 -   `fonts` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>** Array of available fonts, using the
     same font names as the Mapbox Style object. If not provided, the style
     function will always use the first font from the font array. (optional, default `undefined`)

Diff for: index.js

@@ -4,9 +4,9 @@ Copyright 2016-present Boundless Spatial, Inc.
 License: https://raw.githubusercontent.com/boundlessgeo/ol-mapbox-gl-style/master/LICENSE
 */
 
-import glfun from '@mapbox/mapbox-gl-style-spec/function';
+import {Color} from '@mapbox/mapbox-gl-style-spec';
 import mb2css from 'mapbox-to-css-font';
-import applyStyleFunction from './stylefunction';
+import applyStyleFunction, {getValue} from './stylefunction';
 import googleFonts from 'webfont-matcher/lib/fonts/google';
 import {fromLonLat} from 'ol/proj';
 import {createXYZ} from 'ol/tilegrid';
@@ -175,32 +175,29 @@ export function applyStyle(layer, glStyle, source, path, resolutions) {
 }
 
 function setBackground(map, layer) {
+  const background = {
+    type: layer.type
+  };
   function updateStyle() {
     var element = map.getTargetElement();
     if (!element) {
       return;
     }
     var layout = layer.layout || {};
     var paint = layer.paint || {};
+    background['paint'] = paint;
+    background.id = 'olms-bg-' + paint['background-opacity'] + paint['background-color'];
     var zoom = map.getView().getZoom();
-    if ('background-color' in paint) {
-      var bg = glfun(paint['background-color'], {function: 'interpolated', type: 'color'})(zoom);
-      if (Array.isArray(bg)) {
-        bg = 'rgba(' +
-            Math.round(bg[0] * 255) + ',' +
-            Math.round(bg[1] * 255) + ',' +
-            Math.round(bg[2] * 255) + ',' +
-            (bg[3] ? bg[3] : 1) + ')';
-      }
-      element.style.backgroundColor = bg;
+    if (paint['background-color'] !== undefined) {
+      const bg = getValue(background, 'paint', 'background-color', zoom, {});
+      element.style.background = Color.parse(bg).toString();
     }
-    if ('background-opacity' in paint) {
-      element.style.backgroundOpacity =
-          glfun(paint['background-opacity'], {function: 'interpolated', type: 'number'})(zoom);
+    if (paint['background-opacity'] !== undefined) {
+      element.style.opacity = getValue(background, 'paint', 'background-opacity', zoom, {});
     }
     if (layout.visibility == 'none') {
       element.style.backgroundColor = '';
-      element.style.backgroundOpacity = '';
+      element.style.opacity = '';
     }
   }
   if (map.getTargetElement()) {

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol-mapbox-style",
-  "version": "3.0.0-beta.7",
+  "version": "2.11.2-1",
   "description": "Create OpenLayers maps from Mapbox Style objects",
   "main": "index.js",
   "repository": {
@@ -71,8 +71,8 @@
     "cover": "jest --coverage"
   },
   "dependencies": {
-    "@mapbox/mapbox-gl-style-spec": "^9.0.1",
-    "mapbox-to-css-font": "^2.1.0",
+    "@mapbox/mapbox-gl-style-spec": "^13.14.0",
+    "mapbox-to-css-font": "^2.4.0",
     "webfont-matcher": "^1.1.0"
   },
   "peerDependencies": {
@@ -84,7 +84,6 @@
     "babel-jest": "^23.0.0-alpha.0",
     "babel-loader": "^7.1.4",
     "babel-preset-env": "^1.6.1",
-    "canvas": "^1.6.8",
     "copy-webpack-plugin": "^4.5.1",
     "css-loader": "^0.28.11",
     "deep-freeze": "0.0.1",
@@ -104,9 +103,9 @@
     "should": "^11.2.1",
     "should-approximately-deep": "^1.1.0",
     "style-loader": "^0.20.3",
-    "webpack": "^4.1.1",
-    "webpack-cli": "^2.0.12",
-    "webpack-dev-server": "^3.1.1"
+    "webpack": "^4.41.3",
+    "webpack-cli": "^3.3.10",
+    "webpack-dev-server": "^3.9.0"
   },
   "jest": {
     "setupFiles": [