@antv/l7-layers 2.9.24 → 2.9.25-alpha.0

package/es/line/index.js

@@ -12,6 +12,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import BaseLayer from "../core/BaseLayer";
 import LineModels from "./models";
+import { isVectorTile } from "../tile/utils";
 
 var LineLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(LineLayer, _BaseLayer);
@@ -103,7 +104,9 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
         return this.layerType;
       }
 
-      if (this.layerSource.parser.type === 'mvt') {
+      var parserType = this.layerSource.getParserType();
+
+      if (isVectorTile(parserType)) {
         return 'vectorline';
       }
 

package/es/plugins/FeatureScalePlugin.js

@@ -100,7 +100,6 @@ var FeatureScalePlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfi
         if (attribute.scale) {
           // 创建Scale
           var attributeScale = attribute.scale;
-          var type = attribute.name;
           attributeScale.names = _this2.parseFields(attribute.scale.field || []);
           var scales = []; // 为每个字段创建 Scale
 

package/es/point/index.js

@@ -18,6 +18,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import BaseLayer from "../core/BaseLayer";
 import PointModels from "./models/index";
+import { isVectorTile } from "../tile/utils";
 
 var PointLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(PointLayer, _BaseLayer);
@@ -152,8 +153,9 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
     key: "getModelType",
     value: function getModelType() {
       var PointTypes = ['fillImage', 'fill', 'radar', 'image', 'normal', 'simplePoint', 'extrude', 'text', 'vectorpoint', 'tile', 'earthFill', 'earthExtrude'];
+      var parserType = this.layerSource.getParserType();
 
-      if (this.layerSource.parser.type === 'mvt') {
+      if (isVectorTile(parserType)) {
         return 'vectorpoint';
       } // pointlayer
       //  2D、 3d、 shape、image、text、normal、

package/es/polygon/index.js

@@ -12,6 +12,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import BaseLayer from "../core/BaseLayer";
 import PolygonModels from "./models/";
+import { isVectorTile } from "../tile/utils";
 
 var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(PolygonLayer, _BaseLayer);
@@ -74,7 +75,9 @@ var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
     value: function getModelType() {
       var _shapeAttribute$scale;
 
-      if (this.layerSource.parser.type === 'mvt') {
+      var parserType = this.layerSource.getParserType();
+
+      if (isVectorTile(parserType)) {
         return 'vectorpolygon';
       }
 

package/es/raster/index.js

@@ -84,7 +84,9 @@ var RaterLayer = /*#__PURE__*/function (_BaseLayer) {
     key: "getModelType",
     value: function getModelType() {
       // 根据 source 的类型判断 model type
-      switch (this.layerSource.parser.type) {
+      var parserType = this.layerSource.getParserType();
+
+      switch (parserType) {
         case 'raster':
           return 'raster';
 

package/es/tile/manager/tileLayerManager.js

@@ -173,6 +173,7 @@ export var TileLayerManager = /*#__PURE__*/function () {
       var _ref2 = (source === null || source === void 0 ? void 0 : (_source$data = source.data) === null || _source$data === void 0 ? void 0 : _source$data.tilesetOptions) || {},
           coords = _ref2.coords;
 
+      var parentParserType = source.getParserType();
       var layerShape = getLayerShape(this.parent.type, this.parent);
 
       if (rampColors) {
@@ -186,7 +187,7 @@ export var TileLayerManager = /*#__PURE__*/function () {
         shape: layerShape,
         zIndex: zIndex,
         opacity: opacity,
-        sourceLayer: sourceLayer,
+        sourceLayer: parentParserType === 'geojsonvt' ? 'geojsonvt' : sourceLayer,
         coords: coords,
         featureId: featureId,
         color: colorValue,

package/es/tile/utils.d.ts

@@ -1,5 +1,7 @@
 import { ILayer, IMapService, IRendererService } from '@antv/l7-core';
 import { Tile } from '@antv/l7-utils';
+export declare const tileVectorParser: string[];
+export declare function isVectorTile(parserType: string): boolean;
 export declare function registerLayers(parentLayer: ILayer, layers: ILayer[]): void;
 export declare function getLayerShape(layerType: string, layer: ILayer): string | string[];
 export declare function getMaskValue(layerType: string, mask: boolean): boolean;

package/es/tile/utils.js

@@ -1,6 +1,10 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { createLayerContainer } from '@antv/l7-core';
 import { DOM } from '@antv/l7-utils';
+export var tileVectorParser = ['mvt', 'geojsonvt'];
+export function isVectorTile(parserType) {
+  return tileVectorParser.indexOf(parserType) > 0;
+}
 export function registerLayers(parentLayer, layers) {
   layers.map(function (layer) {
     var container = createLayerContainer(parentLayer.sceneContainer);

package/lib/line/index.js

@@ -27,6 +27,7 @@ __export(line_exports, {
 module.exports = __toCommonJS(line_exports);
 var import_BaseLayer = __toESM(require("../core/BaseLayer"));
 var import_models = __toESM(require("./models"));
+var import_utils = require("../tile/utils");
 var LineLayer = class extends import_BaseLayer.default {
   constructor() {
     super(...arguments);
@@ -76,7 +77,8 @@ var LineLayer = class extends import_BaseLayer.default {
     if (this.layerType) {
       return this.layerType;
     }
-    if (this.layerSource.parser.type === "mvt") {
+    const parserType = this.layerSource.getParserType();
+    if ((0, import_utils.isVectorTile)(parserType)) {
       return "vectorline";
     }
     const shapeAttribute = this.styleAttributeService.getLayerStyleAttribute("shape");

package/lib/plugins/FeatureScalePlugin.js

@@ -106,7 +106,6 @@ var FeatureScalePlugin = class {
     attributes.forEach((attribute) => {
       if (attribute.scale) {
         const attributeScale = attribute.scale;
-        const type = attribute.name;
         attributeScale.names = this.parseFields(attribute.scale.field || []);
         const scales = [];
         attributeScale.names.forEach((field) => {

package/lib/point/index.js

@@ -27,6 +27,7 @@ __export(point_exports, {
 module.exports = __toCommonJS(point_exports);
 var import_BaseLayer = __toESM(require("../core/BaseLayer"));
 var import_models = __toESM(require("./models/index"));
+var import_utils = require("../tile/utils");
 var PointLayer = class extends import_BaseLayer.default {
   constructor() {
     super(...arguments);
@@ -110,7 +111,8 @@ var PointLayer = class extends import_BaseLayer.default {
       "earthFill",
       "earthExtrude"
     ];
-    if (this.layerSource.parser.type === "mvt") {
+    const parserType = this.layerSource.getParserType();
+    if ((0, import_utils.isVectorTile)(parserType)) {
       return "vectorpoint";
     }
     const layerData = this.getEncodedData();

package/lib/polygon/index.js

@@ -27,6 +27,7 @@ __export(polygon_exports, {
 module.exports = __toCommonJS(polygon_exports);
 var import_BaseLayer = __toESM(require("../core/BaseLayer"));
 var import_models = __toESM(require("./models/"));
+var import_utils = require("../tile/utils");
 var PolygonLayer = class extends import_BaseLayer.default {
   constructor() {
     super(...arguments);
@@ -56,7 +57,8 @@ var PolygonLayer = class extends import_BaseLayer.default {
   }
   getModelType() {
     var _a;
-    if (this.layerSource.parser.type === "mvt") {
+    const parserType = this.layerSource.getParserType();
+    if ((0, import_utils.isVectorTile)(parserType)) {
       return "vectorpolygon";
     }
     const shapeAttribute = this.styleAttributeService.getLayerStyleAttribute("shape");

package/lib/raster/index.js

@@ -64,7 +64,8 @@ var RaterLayer = class extends import_BaseLayer.default {
     return defaultConfig[type];
   }
   getModelType() {
-    switch (this.layerSource.parser.type) {
+    const parserType = this.layerSource.getParserType();
+    switch (parserType) {
       case "raster":
         return "raster";
       case "rasterTile":

package/lib/tile/manager/tileLayerManager.js

@@ -140,6 +140,7 @@ var TileLayerManager = class {
     const sizeValue = this.tileConfigManager.getAttributeScale(this.parent, "size");
     const source = this.parent.getSource();
     const { coords } = ((_a = source == null ? void 0 : source.data) == null ? void 0 : _a.tilesetOptions) || {};
+    const parentParserType = source.getParserType();
     const layerShape = (0, import_utils.getLayerShape)(this.parent.type, this.parent);
     if (rampColors) {
       this.rampColorsData = (0, import_l7_utils.generateColorRamp)(rampColors);
@@ -150,7 +151,7 @@ var TileLayerManager = class {
       shape: layerShape,
       zIndex,
       opacity,
-      sourceLayer,
+      sourceLayer: parentParserType === "geojsonvt" ? "geojsonvt" : sourceLayer,
       coords,
       featureId,
       color: colorValue,

package/lib/tile/utils.js

@@ -22,13 +22,19 @@ __export(utils_exports, {
   getContainerSize: () => getContainerSize,
   getLayerShape: () => getLayerShape,
   getMaskValue: () => getMaskValue,
+  isVectorTile: () => isVectorTile,
   readPixel: () => readPixel,
   readRasterValue: () => readRasterValue,
-  registerLayers: () => registerLayers
+  registerLayers: () => registerLayers,
+  tileVectorParser: () => tileVectorParser
 });
 module.exports = __toCommonJS(utils_exports);
 var import_l7_core = require("@antv/l7-core");
 var import_l7_utils = require("@antv/l7-utils");
+var tileVectorParser = ["mvt", "geojsonvt"];
+function isVectorTile(parserType) {
+  return tileVectorParser.indexOf(parserType) > 0;
+}
 function registerLayers(parentLayer, layers) {
   layers.map((layer) => {
     const container = (0, import_l7_core.createLayerContainer)(parentLayer.sceneContainer);
@@ -126,7 +132,9 @@ function readPixel(x, y, rendererService) {
   getContainerSize,
   getLayerShape,
   getMaskValue,
+  isVectorTile,
   readPixel,
   readRasterValue,
-  registerLayers
+  registerLayers,
+  tileVectorParser
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.9.24",
+  "version": "2.9.25-alpha.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.1.0",
-    "@antv/l7-core": "2.9.24",
-    "@antv/l7-maps": "2.9.24",
-    "@antv/l7-source": "2.9.24",
-    "@antv/l7-utils": "2.9.24",
+    "@antv/l7-core": "2.9.25-alpha.0",
+    "@antv/l7-maps": "2.9.25-alpha.0",
+    "@antv/l7-source": "2.9.25-alpha.0",
+    "@antv/l7-utils": "2.9.25-alpha.0",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/helpers": "^6.1.4",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "0d84d477dc449e4541bdcaabbb29e6765d37b079",
+  "gitHead": "5216ad73535dbd3c4188dd9717952db3dfcb4f71",
   "publishConfig": {
     "access": "public"
   }