@antv/l7-layers 2.11.6 → 2.12.0

package/es/plugins/FeatureScalePlugin.js

@@ -14,8 +14,9 @@ import * as d3 from 'd3-scale';
 import { injectable } from 'inversify';
 import { isNil, isString, uniq } from 'lodash';
 import 'reflect-metadata';
+import identity from "../utils/identityScale";
 var dateRegex = /^(?:(?!0000)[0-9]{4}([-/.]+)(?:(?:0?[1-9]|1[0-2])\1(?:0?[1-9]|1[0-9]|2[0-8])|(?:0?[13-9]|1[0-2])\1(?:29|30)|(?:0?[13578]|1[02])\1(?:31))|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)([-/.]?)0?2\2(?:29))(\s+([01]|([01][0-9]|2[0-3])):([0-9]|[0-5][0-9]):([0-9]|[0-5][0-9]))?$/;
-var scaleMap = (_scaleMap = {}, _defineProperty(_scaleMap, ScaleTypes.LINEAR, d3.scaleLinear), _defineProperty(_scaleMap, ScaleTypes.POWER, d3.scalePow), _defineProperty(_scaleMap, ScaleTypes.LOG, d3.scaleLog), _defineProperty(_scaleMap, ScaleTypes.IDENTITY, d3.scaleIdentity), _defineProperty(_scaleMap, ScaleTypes.SEQUENTIAL, d3.scaleSequential), _defineProperty(_scaleMap, ScaleTypes.TIME, d3.scaleTime), _defineProperty(_scaleMap, ScaleTypes.QUANTILE, d3.scaleQuantile), _defineProperty(_scaleMap, ScaleTypes.QUANTIZE, d3.scaleQuantize), _defineProperty(_scaleMap, ScaleTypes.THRESHOLD, d3.scaleThreshold), _defineProperty(_scaleMap, ScaleTypes.CAT, d3.scaleOrdinal), _defineProperty(_scaleMap, ScaleTypes.DIVERGING, d3.scaleDiverging), _scaleMap);
+var scaleMap = (_scaleMap = {}, _defineProperty(_scaleMap, ScaleTypes.LINEAR, d3.scaleLinear), _defineProperty(_scaleMap, ScaleTypes.POWER, d3.scalePow), _defineProperty(_scaleMap, ScaleTypes.LOG, d3.scaleLog), _defineProperty(_scaleMap, ScaleTypes.IDENTITY, identity), _defineProperty(_scaleMap, ScaleTypes.SEQUENTIAL, d3.scaleSequential), _defineProperty(_scaleMap, ScaleTypes.TIME, d3.scaleTime), _defineProperty(_scaleMap, ScaleTypes.QUANTILE, d3.scaleQuantile), _defineProperty(_scaleMap, ScaleTypes.QUANTIZE, d3.scaleQuantize), _defineProperty(_scaleMap, ScaleTypes.THRESHOLD, d3.scaleThreshold), _defineProperty(_scaleMap, ScaleTypes.CAT, d3.scaleOrdinal), _defineProperty(_scaleMap, ScaleTypes.DIVERGING, d3.scaleDiverging), _scaleMap);
 /**
  * 根据 Source 原始数据为指定字段创建 Scale，保存在 StyleAttribute 上，供下游插件使用
  */
@@ -183,6 +184,10 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
 
                     break;
 
+                  case ScaleTypes.IDENTITY:
+                    // 不做处理xe
+                    break;
+
                   case ScaleTypes.CAT:
                     attributeScale.values ? scale.scale.range(attributeScale.values) : scale.scale.range(scale.option.domain);
                     break;
@@ -313,10 +318,7 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
 
       if (scaleOption !== null && scaleOption !== void 0 && scaleOption.domain) {
         cfg.domain = scaleOption === null || scaleOption === void 0 ? void 0 : scaleOption.domain;
-      } else if (type !== ScaleTypes.CAT && type !== ScaleTypes.QUANTILE && type !== ScaleTypes.DIVERGING) {
-        // linear/
-        cfg.domain = extent(values);
-      } else if (type === ScaleTypes.CAT) {
+      } else if (type === ScaleTypes.CAT || type === ScaleTypes.IDENTITY) {
         cfg.domain = uniq(values);
       } else if (type === ScaleTypes.QUANTILE) {
         cfg.domain = values;
@@ -324,6 +326,9 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
         var minMax = extent(values);
         var neutral = (scaleOption === null || scaleOption === void 0 ? void 0 : scaleOption.neutral) !== undefined ? scaleOption === null || scaleOption === void 0 ? void 0 : scaleOption.neutral : (minMax[0] + minMax[1]) / 2;
         cfg.domain = [minMax[0], neutral, minMax[1]];
+      } else {
+        // linear/Power/log
+        cfg.domain = extent(values);
       }
 
       return _objectSpread(_objectSpread({}, cfg), scaleOption);

package/es/point/models/text.js

@@ -585,7 +585,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
 
       var _ref9 = this.layer.getLayerConfig(),
           _ref9$padding = _ref9.padding,
-          padding = _ref9$padding === void 0 ? [4, 4] : _ref9$padding,
+          padding = _ref9$padding === void 0 ? [0, 0] : _ref9$padding,
           _ref9$textAllowOverla = _ref9.textAllowOverlap,
           textAllowOverlap = _ref9$textAllowOverla === void 0 ? false : _ref9$textAllowOverla;
 

package/es/utils/identityScale.d.ts

@@ -0,0 +1,8 @@
+export default function identity(d: any): {
+    (x: any): any;
+    invert: any;
+    domain: (v?: any) => any;
+    range(v?: any): any;
+    unknown(v: any): any;
+    copy(): any;
+};

package/es/utils/identityScale.js

@@ -0,0 +1,34 @@
+export default function identity(d) {
+  var unknown;
+  var domain = [];
+
+  function scale(x) {
+    return x == null ? unknown : x;
+  }
+
+  scale.invert = scale;
+
+  scale.domain = scale.range = function (v) {
+    if (v) {
+      domain = v;
+      return v;
+    }
+
+    return domain;
+  };
+
+  scale.unknown = function (v) {
+    if (v) {
+      unknown = v;
+      return v;
+    }
+
+    return unknown;
+  };
+
+  scale.copy = function () {
+    return identity(d).unknown(unknown);
+  };
+
+  return scale;
+}

package/lib/plugins/FeatureScalePlugin.js

@@ -35,6 +35,8 @@ var _lodash = require("lodash");
 
 require("reflect-metadata");
 
+var _identityScale = _interopRequireDefault(require("../utils/identityScale"));
+
 var _scaleMap, _dec, _class;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -42,7 +44,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var dateRegex = /^(?:(?!0000)[0-9]{4}([-/.]+)(?:(?:0?[1-9]|1[0-2])\1(?:0?[1-9]|1[0-9]|2[0-8])|(?:0?[13-9]|1[0-2])\1(?:29|30)|(?:0?[13578]|1[02])\1(?:31))|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)([-/.]?)0?2\2(?:29))(\s+([01]|([01][0-9]|2[0-3])):([0-9]|[0-5][0-9]):([0-9]|[0-5][0-9]))?$/;
-var scaleMap = (_scaleMap = {}, (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.LINEAR, d3.scaleLinear), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.POWER, d3.scalePow), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.LOG, d3.scaleLog), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.IDENTITY, d3.scaleIdentity), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.SEQUENTIAL, d3.scaleSequential), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.TIME, d3.scaleTime), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.QUANTILE, d3.scaleQuantile), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.QUANTIZE, d3.scaleQuantize), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.THRESHOLD, d3.scaleThreshold), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.CAT, d3.scaleOrdinal), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.DIVERGING, d3.scaleDiverging), _scaleMap);
+var scaleMap = (_scaleMap = {}, (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.LINEAR, d3.scaleLinear), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.POWER, d3.scalePow), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.LOG, d3.scaleLog), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.IDENTITY, _identityScale.default), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.SEQUENTIAL, d3.scaleSequential), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.TIME, d3.scaleTime), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.QUANTILE, d3.scaleQuantile), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.QUANTIZE, d3.scaleQuantize), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.THRESHOLD, d3.scaleThreshold), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.CAT, d3.scaleOrdinal), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.DIVERGING, d3.scaleDiverging), _scaleMap);
 /**
  * 根据 Source 原始数据为指定字段创建 Scale，保存在 StyleAttribute 上，供下游插件使用
  */
@@ -209,6 +211,10 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
 
                     break;
 
+                  case _l7Core.ScaleTypes.IDENTITY:
+                    // 不做处理xe
+                    break;
+
                   case _l7Core.ScaleTypes.CAT:
                     attributeScale.values ? scale.scale.range(attributeScale.values) : scale.scale.range(scale.option.domain);
                     break;
@@ -339,10 +345,7 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
 
       if (scaleOption !== null && scaleOption !== void 0 && scaleOption.domain) {
         cfg.domain = scaleOption === null || scaleOption === void 0 ? void 0 : scaleOption.domain;
-      } else if (type !== _l7Core.ScaleTypes.CAT && type !== _l7Core.ScaleTypes.QUANTILE && type !== _l7Core.ScaleTypes.DIVERGING) {
-        // linear/
-        cfg.domain = (0, _d3Array.extent)(values);
-      } else if (type === _l7Core.ScaleTypes.CAT) {
+      } else if (type === _l7Core.ScaleTypes.CAT || type === _l7Core.ScaleTypes.IDENTITY) {
         cfg.domain = (0, _lodash.uniq)(values);
       } else if (type === _l7Core.ScaleTypes.QUANTILE) {
         cfg.domain = values;
@@ -350,6 +353,9 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
         var minMax = (0, _d3Array.extent)(values);
         var neutral = (scaleOption === null || scaleOption === void 0 ? void 0 : scaleOption.neutral) !== undefined ? scaleOption === null || scaleOption === void 0 ? void 0 : scaleOption.neutral : (minMax[0] + minMax[1]) / 2;
         cfg.domain = [minMax[0], neutral, minMax[1]];
+      } else {
+        // linear/Power/log
+        cfg.domain = (0, _d3Array.extent)(values);
       }
 
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, cfg), scaleOption);

package/lib/point/models/text.js

@@ -602,7 +602,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
 
       var _ref9 = this.layer.getLayerConfig(),
           _ref9$padding = _ref9.padding,
-          padding = _ref9$padding === void 0 ? [4, 4] : _ref9$padding,
+          padding = _ref9$padding === void 0 ? [0, 0] : _ref9$padding,
           _ref9$textAllowOverla = _ref9.textAllowOverlap,
           textAllowOverlap = _ref9$textAllowOverla === void 0 ? false : _ref9$textAllowOverla;
 

package/lib/utils/identityScale.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = identity;
+
+function identity(d) {
+  var unknown;
+  var domain = [];
+
+  function scale(x) {
+    return x == null ? unknown : x;
+  }
+
+  scale.invert = scale;
+
+  scale.domain = scale.range = function (v) {
+    if (v) {
+      domain = v;
+      return v;
+    }
+
+    return domain;
+  };
+
+  scale.unknown = function (v) {
+    if (v) {
+      unknown = v;
+      return v;
+    }
+
+    return unknown;
+  };
+
+  scale.copy = function () {
+    return identity(d).unknown(unknown);
+  };
+
+  return scale;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.11.6",
+  "version": "2.12.0",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -27,10 +27,10 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.2.9",
-    "@antv/l7-core": "2.11.6",
-    "@antv/l7-maps": "2.11.6",
-    "@antv/l7-source": "2.11.6",
-    "@antv/l7-utils": "2.11.6",
+    "@antv/l7-core": "2.12.0",
+    "@antv/l7-maps": "2.12.0",
+    "@antv/l7-source": "2.12.0",
+    "@antv/l7-utils": "2.12.0",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "40a3dbc1cf1070f70054a1fc05de18c7b2c55cdc",
+  "gitHead": "2c0d52810384b8ccfd6b62884c569cad2a5fb116",
   "publishConfig": {
     "access": "public"
   }