@antv/l7-layers 2.9.23 → 2.9.25

package/lib/point/shaders/image_vert.glsl

@@ -10,6 +10,8 @@ uniform mat4 u_Mvp;
 uniform vec2 u_offsets;
 
 uniform float u_opacity : 1;
+uniform float u_raisingHeight: 0.0;
+uniform float u_heightfixed: 0.0;
 
 varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
 
@@ -61,21 +63,28 @@ void main() {
   }
 
   // cal style mapping - 数据纹理映射部分的计算
-   v_color = a_Color;
-   v_uv = a_Uv;
-   vec4 project_pos = project_position(vec4(a_Position, 1.0));
+  v_color = a_Color;
+  v_uv = a_Uv;
+  vec4 project_pos = project_position(vec4(a_Position, 1.0));
    
-  //  vec2 offset = project_pixel(u_offsets);
   vec2 offset = project_pixel(textrueOffsets);
 
-  //  gl_Position = project_common_position_to_clipspace(vec4(vec2(project_pos.xy + offset),project_pos.z, 1.0));
+  float raisingHeight = u_raisingHeight;
+  if(u_heightfixed < 1.0) { // false
+    raisingHeight = project_pixel(u_raisingHeight);
+  } else {
+     if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
+      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);
+      raisingHeight = u_raisingHeight * mapboxZoomScale;
+    }
+  }
 
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * vec4(vec2(project_pos.xy + offset),project_pos.z, 1.0);
+    gl_Position = u_Mvp * vec4(project_pos.xy + offset, raisingHeight, 1.0);
   } else {
-    gl_Position = project_common_position_to_clipspace(vec4(vec2(project_pos.xy + offset),project_pos.z, 1.0));
+    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));
   }
-  gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;
 
+  gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;
   setPickingColor(a_PickingColor);
 }

package/lib/point/shape/extrude.js

@@ -1,74 +1,78 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/point/shape/extrude.ts
-var extrude_exports = {};
-__export(extrude_exports, {
-  default: () => extrudePolygon,
-  fillPolygon: () => fillPolygon
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(extrude_exports);
-var import_earcut = __toESM(require("earcut"));
+exports.default = extrudePolygon;
+exports.fillPolygon = fillPolygon;
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _earcut = _interopRequireDefault(require("earcut"));
+
+/**
+ * 拉伸多边形顶点，返回拉伸后的顶点信息
+ * @param paths 路径数据组
+ * @param extrude 是否拉伸
+ */
 function extrudePolygon(path) {
-  const p1 = path[0][0];
-  const p2 = path[0][path[0].length - 1];
+  var p1 = path[0][0];
+  var p2 = path[0][path[0].length - 1];
+
   if (p1[0] === p2[0] && p1[1] === p2[1]) {
     path[0] = path[0].slice(0, path[0].length - 1);
   }
-  const n = path[0].length;
-  const flattengeo = import_earcut.default.flatten(path);
-  const positions = [];
-  const indexArray = [];
-  const normals = [];
-  for (let j = 0; j < flattengeo.vertices.length / 3; j++) {
+
+  var n = path[0].length;
+
+  var flattengeo = _earcut.default.flatten(path);
+
+  var positions = [];
+  var indexArray = [];
+  var normals = []; // 设置顶部z值
+
+  for (var j = 0; j < flattengeo.vertices.length / 3; j++) {
     flattengeo.vertices[j * 3 + 2] = 1;
     normals.push(0, 0, 1);
   }
-  positions.push(...flattengeo.vertices);
-  const triangles = (0, import_earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
-  indexArray.push(...triangles);
-  for (let i = 0; i < n; i++) {
-    const prePoint = flattengeo.vertices.slice(i * 3, i * 3 + 3);
-    let nextPoint = flattengeo.vertices.slice(i * 3 + 3, i * 3 + 6);
+
+  positions.push.apply(positions, (0, _toConsumableArray2.default)(flattengeo.vertices));
+  var triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
+  indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)(triangles));
+
+  var _loop = function _loop(i) {
+    var prePoint = flattengeo.vertices.slice(i * 3, i * 3 + 3);
+    var nextPoint = flattengeo.vertices.slice(i * 3 + 3, i * 3 + 6);
+
     if (nextPoint.length === 0) {
       nextPoint = flattengeo.vertices.slice(0, 3);
     }
-    const indexOffset = positions.length / 3;
+
+    var indexOffset = positions.length / 3;
     positions.push(prePoint[0], prePoint[1], 1, nextPoint[0], nextPoint[1], 1, prePoint[0], prePoint[1], 0, nextPoint[0], nextPoint[1], 0);
-    indexArray.push(...[1, 2, 0, 3, 2, 1].map((v) => v + indexOffset));
+    indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)([1, 2, 0, 3, 2, 1].map(function (v) {
+      return v + indexOffset;
+    })));
+  };
+
+  for (var i = 0; i < n; i++) {
+    _loop(i);
   }
+
   return {
-    positions,
+    positions: positions,
     index: indexArray
   };
 }
+
 function fillPolygon(points) {
-  const flattengeo = import_earcut.default.flatten(points);
-  const triangles = (0, import_earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
+  var flattengeo = _earcut.default.flatten(points);
+
+  var triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
   return {
     positions: flattengeo.vertices,
     index: triangles
   };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  fillPolygon
-});
+}

package/lib/polygon/index.js

@@ -1,108 +1,162 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/polygon/index.ts
-var polygon_exports = {};
-__export(polygon_exports, {
-  default: () => PolygonLayer
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(polygon_exports);
-var import_BaseLayer = __toESM(require("../core/BaseLayer"));
-var import_models = __toESM(require("./models/"));
-var PolygonLayer = class extends import_BaseLayer.default {
-  constructor() {
-    super(...arguments);
-    this.type = "PolygonLayer";
-  }
-  buildModels() {
-    const shape = this.getModelType();
-    this.layerModel = new import_models.default[shape](this);
-    this.layerModel.initModels((models) => {
-      this.models = models;
-      this.renderLayers();
-    });
-  }
-  rebuildModels() {
-    this.layerModel.buildModels((models) => this.models = models);
-  }
-  getConfigSchema() {
-    return {
-      properties: {
-        opacity: {
-          type: "number",
-          minimum: 0,
-          maximum: 1
-        }
-      }
-    };
+exports.default = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
+
+var _models = _interopRequireDefault(require("./models/"));
+
+var _utils = require("../tile/utils");
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
+  (0, _inherits2.default)(PolygonLayer, _BaseLayer);
+
+  var _super = _createSuper(PolygonLayer);
+
+  function PolygonLayer() {
+    var _this;
+
+    (0, _classCallCheck2.default)(this, PolygonLayer);
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", 'PolygonLayer');
+    return _this;
   }
-  getModelType() {
-    var _a;
-    if (this.layerSource.parser.type === "mvt") {
-      return "vectorpolygon";
+
+  (0, _createClass2.default)(PolygonLayer, [{
+    key: "buildModels",
+    value: function buildModels() {
+      var _this2 = this;
+
+      var shape = this.getModelType();
+      this.layerModel = new _models.default[shape](this);
+      this.layerModel.initModels(function (models) {
+        _this2.models = models;
+
+        _this2.renderLayers();
+      });
     }
-    const shapeAttribute = this.styleAttributeService.getLayerStyleAttribute("shape");
-    const shape = (_a = shapeAttribute == null ? void 0 : shapeAttribute.scale) == null ? void 0 : _a.field;
-    if (shape === "fill") {
-      return "fill";
-    } else if (shape === "extrude") {
-      return "extrude";
-    } else if (shape === "water") {
-      return "water";
-    } else if (shape === "ocean") {
-      return "ocean";
-    } else if (shape === "line") {
-      return "line";
-    } else if (shape === "tile") {
-      return "tile";
-    } else {
-      return this.getPointModelType();
+  }, {
+    key: "rebuildModels",
+    value: function rebuildModels() {
+      var _this3 = this;
+
+      this.layerModel.buildModels(function (models) {
+        return _this3.models = models;
+      });
     }
-  }
-  getPointModelType() {
-    const layerData = this.getEncodedData();
-    const { shape2d, shape3d } = this.getLayerConfig();
-    const iconMap = this.iconService.getIconMap();
-    const item = layerData.find((fe) => {
-      return fe.hasOwnProperty("shape");
-    });
-    if (!item) {
-      return "fill";
-    } else {
-      const shape = item.shape;
-      if (shape === "dot") {
-        return "point_normal";
-      }
-      if ((shape2d == null ? void 0 : shape2d.indexOf(shape)) !== -1) {
-        return "point_fill";
+  }, {
+    key: "getConfigSchema",
+    value: function getConfigSchema() {
+      return {
+        properties: {
+          opacity: {
+            type: 'number',
+            minimum: 0,
+            maximum: 1
+          }
+        }
+      };
+    }
+  }, {
+    key: "getModelType",
+    value: function getModelType() {
+      var _shapeAttribute$scale;
+
+      var parserType = this.layerSource.getParserType();
+
+      if ((0, _utils.isVectorTile)(parserType)) {
+        return 'vectorpolygon';
       }
-      if ((shape3d == null ? void 0 : shape3d.indexOf(shape)) !== -1) {
-        return "point_extrude";
+
+      var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
+      var shape = shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
+
+      if (shape === 'fill') {
+        return 'fill';
+      } else if (shape === 'extrude') {
+        return 'extrude';
+      } else if (shape === 'water') {
+        return 'water';
+      } else if (shape === 'ocean') {
+        return 'ocean';
+      } else if (shape === 'line') {
+        return 'line';
+      } else if (shape === 'tile') {
+        return 'tile';
+      } else {
+        return this.getPointModelType();
       }
-      if (iconMap.hasOwnProperty(shape)) {
-        return "point_image";
+    }
+  }, {
+    key: "getPointModelType",
+    value: function getPointModelType() {
+      // pointlayer
+      //  2D、 3d、 shape、image、text、normal、
+      var layerData = this.getEncodedData();
+
+      var _this$getLayerConfig = this.getLayerConfig(),
+          shape2d = _this$getLayerConfig.shape2d,
+          shape3d = _this$getLayerConfig.shape3d;
+
+      var iconMap = this.iconService.getIconMap();
+      var item = layerData.find(function (fe) {
+        return fe.hasOwnProperty('shape');
+      });
+
+      if (!item) {
+        return 'fill';
+      } else {
+        var shape = item.shape;
+
+        if (shape === 'dot') {
+          return 'point_normal';
+        }
+
+        if ((shape2d === null || shape2d === void 0 ? void 0 : shape2d.indexOf(shape)) !== -1) {
+          return 'point_fill';
+        }
+
+        if ((shape3d === null || shape3d === void 0 ? void 0 : shape3d.indexOf(shape)) !== -1) {
+          return 'point_extrude';
+        }
+
+        if (iconMap.hasOwnProperty(shape)) {
+          return 'point_image';
+        }
+
+        return 'text';
       }
-      return "text";
     }
-  }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+  }]);
+  return PolygonLayer;
+}(_BaseLayer2.default);
+
+exports.default = PolygonLayer;