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

package/lib/image/models/image.js

@@ -69,7 +69,9 @@ var ImageModel = class extends import_BaseModel.default {
         this.texture = createTexture2D({
           data: imageData[0],
           width: imageData[0].width,
-          height: imageData[0].height
+          height: imageData[0].height,
+          mag: import_l7_core.gl.LINEAR,
+          min: import_l7_core.gl.LINEAR
         });
         this.layerService.updateLayerRenderList();
         this.layerService.renderLayers();
@@ -81,6 +83,9 @@ var ImageModel = class extends import_BaseModel.default {
       fragmentShader: import_image_frag.default,
       triangulation: import_triangulation.RasterImageTriangulation,
       primitive: import_l7_core.gl.TRIANGLES,
+      blend: {
+        enable: false
+      },
       depth: { enable: false },
       stencil: (0, import_l7_utils.getMask)(mask, maskInside)
     }).then((model) => {

package/lib/line/shaders/line_arc_vert.glsl

@@ -52,7 +52,8 @@ vec2 midPoint(vec2 source, vec2 target, float arcThetaOffset) {
   // return mid;
 }
 float getSegmentRatio(float index) {
-    return smoothstep(0.0, 1.0, index / (segmentNumber - 1.));
+    // return smoothstep(0.0, 1.0, index / (segmentNumber - 1.));
+     return index / (segmentNumber - 1.);
 }
 vec2 interpolate (vec2 source, vec2 target, float t, float arcThetaOffset) {
   // if the angularDist is PI, linear interpolation is applied. otherwise, use spherical interpolation
@@ -130,8 +131,9 @@ void main() {
    styleMappingMat[3].b = d_distance_ratio;
 
   // styleMappingMat[0][1] - arcThetaOffset
-  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, styleMappingMat[0][1]), 0.0, 1.0));
-  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, styleMappingMat[0][1]), 0.0, 1.0));
+  float arcThetaOffset = styleMappingMat[0][1];
+  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, arcThetaOffset), 0.0, 1.0));
+  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, arcThetaOffset), 0.0, 1.0));
   // v_normal = getNormal((next.xy - curr.xy) * indexDir, a_Position.y);
   //unProjCustomCoord
   

package/lib/line/shaders/simple/simpleline_vert.glsl

@@ -74,5 +74,6 @@ void main() {
     }
 
     gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, lineHeight + h, 1.0));
+    gl_PointSize = 10.0;
   }
 }

package/lib/point/models/fill.js

@@ -51,6 +51,7 @@ var FillModel = class extends import_BaseModel.default {
       blend,
       blur = 0,
       raisingHeight = 0,
+      heightfixed = false,
       unit = "l7size"
     } = this.layer.getLayerConfig();
     this.updateUnit(unit);
@@ -89,6 +90,7 @@ var FillModel = class extends import_BaseModel.default {
     }
     return {
       u_raisingHeight: Number(raisingHeight),
+      u_heightfixed: Number(heightfixed),
       u_meter2coord: this.meter2coord,
       u_meteryScale: this.meteryScale,
       u_isMeter: Number(this.isMeter),
@@ -142,7 +144,7 @@ var FillModel = class extends import_BaseModel.default {
       maxLat === minLat ? minLat + 0.1 : maxLat
     ]);
     this.meter2coord = (m1 + m2) / 2;
-    if (!Boolean(this.meter2coord)) {
+    if (!this.meter2coord) {
       this.meter2coord = 7.70681090738883;
     }
   }

package/lib/point/models/fillmage.js

@@ -66,7 +66,9 @@ var FillImageModel = class extends import_BaseModel.default {
     const {
       opacity = 1,
       offsets = [0, 0],
-      rotation
+      rotation,
+      raisingHeight = 0,
+      heightfixed = false
     } = this.layer.getLayerConfig();
     if (this.rendererService.getDirty()) {
       this.texture.bind();
@@ -104,6 +106,8 @@ var FillImageModel = class extends import_BaseModel.default {
       });
     }
     return {
+      u_raisingHeight: Number(raisingHeight),
+      u_heightfixed: Number(heightfixed),
       u_isMeter: Number(this.isMeter),
       u_RotateMatrix: new Float32Array([
         Math.cos(this.radian),
@@ -154,7 +158,7 @@ var FillImageModel = class extends import_BaseModel.default {
       maxLat === minLat ? minLat + 0.1 : maxLat
     ]);
     this.meter2coord = (m1 + m2) / 2;
-    if (!Boolean(this.meter2coord)) {
+    if (!this.meter2coord) {
       this.meter2coord = 7.70681090738883;
     }
   }

package/lib/point/models/image.js

@@ -61,7 +61,9 @@ var ImageModel = class extends import_BaseModel.default {
   getUninforms() {
     const {
       opacity = 1,
-      offsets = [0, 0]
+      offsets = [0, 0],
+      raisingHeight = 0,
+      heightfixed = false
     } = this.layer.getLayerConfig();
     if (this.rendererService.getDirty()) {
       this.texture.bind();
@@ -94,6 +96,8 @@ var ImageModel = class extends import_BaseModel.default {
       });
     }
     return {
+      u_raisingHeight: Number(raisingHeight),
+      u_heightfixed: Number(heightfixed),
       u_dataTexture: this.dataTexture,
       u_cellTypeLayout: this.getCellTypeLayout(),
       u_texture: this.texture,

package/lib/point/models/radar.js

@@ -125,7 +125,7 @@ var RadarModel = class extends import_BaseModel.default {
       maxLat === minLat ? minLat + 0.1 : maxLat
     ]);
     this.meter2coord = (m1 + m2) / 2;
-    if (!Boolean(this.meter2coord)) {
+    if (!this.meter2coord) {
       this.meter2coord = 7.70681090738883;
     }
   }
@@ -169,8 +169,7 @@ var RadarModel = class extends import_BaseModel.default {
         },
         size: 3,
         update: (feature, featureIdx, vertex, attributeIdx) => {
-          let extrude;
-          extrude = [1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0];
+          const extrude = [1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0];
           const extrudeIndex = attributeIdx % 4 * 3;
           return [
             extrude[extrudeIndex],

package/lib/point/models/tile.js

@@ -131,7 +131,7 @@ var FillModel = class extends import_BaseModel.default {
       maxLat === minLat ? minLat + 0.1 : maxLat
     ]);
     this.meter2coord = (m1 + m2) / 2;
-    if (!Boolean(this.meter2coord)) {
+    if (!this.meter2coord) {
       this.meter2coord = 7.70681090738883;
     }
   }

package/lib/point/shaders/fill_vert.glsl

@@ -24,6 +24,7 @@ uniform vec2 u_offsets;
 
 uniform float u_blur : 0.0;
 uniform float u_raisingHeight: 0.0;
+uniform float u_heightfixed: 0.0;
 
 #pragma include "styleMapping"
 #pragma include "styleMappingCalOpacity"
@@ -164,16 +165,22 @@ void main() {
   vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));
   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));
 
-  float raiseHeight = u_raisingHeight;
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-    float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);
-    raiseHeight = u_raisingHeight * mapboxZoomScale;
+  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(project_pos.xy + offset, raiseHeight, 1.0);
+    gl_Position = u_Mvp * vec4(project_pos.xy + offset, raisingHeight, 1.0);
   } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, u_raisingHeight, 1.0));
+    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));
   }
  
   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));

package/lib/point/shaders/image/fillImage_vert.glsl

@@ -15,6 +15,8 @@ uniform float u_isMeter;
 varying vec2 v_uv; // 本身的 uv 坐标
 varying vec2 v_Iconuv; // icon 贴图的 uv 坐标
 
+uniform float u_raisingHeight: 0.0;
+uniform float u_heightfixed: 0.0;
 uniform float u_opacity : 1;
 uniform vec2 u_offsets;
 
@@ -91,15 +93,21 @@ void main() {
     }
   }
 
-
-  // vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));
   vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));
-  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));
+  float raisingHeight = u_raisingHeight;
+  if(u_heightfixed < 1.0) { // height fixed
+    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(project_pos.xy + offset, 0.0, 1.0);
+    gl_Position = u_Mvp * vec4(project_pos.xy + offset, raisingHeight, 1.0);
   } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));
+    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));
   }
  
   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));

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/tile/manager/tileLayerManager.js

@@ -31,11 +31,12 @@ var import_utils = require("../utils");
 var import_tileConfigManager = __toESM(require("./tileConfigManager"));
 var import_tilePickerManager = __toESM(require("./tilePickerManager"));
 var TileLayerManager = class {
-  constructor(parent, mapService, rendererService, pickingService, layerService) {
+  constructor(parent, mapService, rendererService, pickingService, layerService, transforms) {
     this.parent = parent;
     this.children = parent.layerChildren;
     this.mapService = mapService;
     this.rendererService = rendererService;
+    this.transforms = transforms;
     this.tilePickManager = new import_tilePickerManager.default(parent, rendererService, pickingService, this.children, layerService);
     this.tileConfigManager = new import_tileConfigManager.default();
     this.setSubLayerInitOptipn();
@@ -145,6 +146,7 @@ var TileLayerManager = class {
     }
     this.initOptions = {
       layerType: this.parent.type,
+      transforms: this.transforms,
       shape: layerShape,
       zIndex,
       opacity,

package/lib/tile/models/tileModel.js

@@ -32,14 +32,15 @@ var RasterTileModel = class extends import_BaseModel.default {
     return {};
   }
   initModels() {
-    var _a;
-    if ((_a = this.layer.getSource()) == null ? void 0 : _a.data.isTile) {
+    const source = this.layer.getSource();
+    if (source == null ? void 0 : source.data.isTile) {
       this.layer.tileLayer = new import_tmsTileLayer.TMSTileLayer({
         parent: this.layer,
         rendererService: this.rendererService,
         mapService: this.mapService,
         layerService: this.layerService,
-        pickingService: this.pickingService
+        pickingService: this.pickingService,
+        transforms: source.transforms
       });
     }
     return this.buildModels();

package/lib/tile/tileFactory/base.js

@@ -32,6 +32,7 @@ var import_utils = require("../utils");
 var import_vectorLayer = __toESM(require("./vectorLayer"));
 var turf = __toESM(require("@turf/helpers"));
 var import_union = __toESM(require("@turf/union"));
+var import_polygon_to_line = __toESM(require("@turf/polygon-to-line"));
 var TileFactory = class {
   constructor(option) {
     this.outSideEventTimer = null;
@@ -62,7 +63,7 @@ var TileFactory = class {
       vectorTileLayer: null,
       source: null
     };
-    const { sourceLayer, featureId } = initOptions;
+    const { sourceLayer, featureId, transforms, layerType, shape } = initOptions;
     if (!sourceLayer) {
       return emptyData;
     }
@@ -71,17 +72,34 @@ var TileFactory = class {
     if (!(Array.isArray(features) && features.length > 0)) {
       return emptyData;
     } else {
+      let geofeatures = [];
+      if (layerType === "LineLayer" && shape === "simple") {
+        features.map((feature) => {
+          if (feature.geometry.type === "MultiPolygon") {
+            const linefeatures = (0, import_polygon_to_line.default)(feature).features;
+            geofeatures.push(...linefeatures);
+          } else if (feature.geometry.type === "Polygon") {
+            feature.geometry.type = "MultiLineString";
+            geofeatures.push(feature);
+          } else {
+            geofeatures.push(feature);
+          }
+        });
+      } else {
+        geofeatures = features;
+      }
       const source = new import_l7_source.default({
         type: "FeatureCollection",
-        features
+        features: geofeatures
       }, {
         parser: {
           type: "geojson",
           featureId
-        }
+        },
+        transforms
       });
       return {
-        features,
+        features: geofeatures,
         featureId,
         vectorTileLayer,
         source

package/lib/tile/tileFactory/vectorLayer.js

@@ -27,6 +27,7 @@ __export(vectorLayer_exports, {
 module.exports = __toCommonJS(vectorLayer_exports);
 var import_BaseLayer = __toESM(require("../../core/BaseLayer"));
 var import_tile = __toESM(require("../../line/models/tile"));
+var import_simpleLine = __toESM(require("../../line/models/simpleLine"));
 var import_text = __toESM(require("../../point/models/text"));
 var import_tile2 = __toESM(require("../../point/models/tile"));
 var import_tile3 = __toESM(require("../../polygon/models/tile"));
@@ -59,13 +60,27 @@ var VectorLayer = class extends import_BaseLayer.default {
       case "PolygonLayer":
         return import_tile3.default;
       case "LineLayer":
-        return import_tile.default;
+        return this.getLineModel();
       case "PointLayer":
         return this.getPointModel();
       default:
         return import_tile2.default;
     }
   }
+  getLineModel() {
+    var _a;
+    const shapeAttribute = this.styleAttributeService.getLayerStyleAttribute("shape");
+    const shape = (_a = shapeAttribute == null ? void 0 : shapeAttribute.scale) == null ? void 0 : _a.field;
+    switch (shape) {
+      case "tileline":
+      case "line":
+        return import_tile.default;
+      case "simple":
+        return import_simpleLine.default;
+      default:
+        return import_tile.default;
+    }
+  }
   getPointModel() {
     const layerData = this.getEncodedData();
     const { shape2d } = this.getLayerConfig();

package/lib/tile/tileLayer/baseTileLayer.js

@@ -30,7 +30,8 @@ var BaseTileLayer = class {
     rendererService,
     mapService,
     layerService,
-    pickingService
+    pickingService,
+    transforms
   }) {
     this.type = "baseTile";
     this.initedTileset = false;
@@ -45,7 +46,7 @@ var BaseTileLayer = class {
     this.parent = parent;
     this.mapService = mapService;
     this.layerService = layerService;
-    this.tileLayerManager = new import_tileLayerManager.TileLayerManager(parent, mapService, rendererService, pickingService, layerService);
+    this.tileLayerManager = new import_tileLayerManager.TileLayerManager(parent, mapService, rendererService, pickingService, layerService, transforms);
     this.initTileSetManager();
     this.bindSubLayerEvent();
     this.bindSubLayerPick();

package/lib/tile/utils.js

@@ -73,7 +73,7 @@ function getMaskValue(layerType, mask) {
   }
 }
 function getContainerSize(container) {
-  if (!!container.getContext) {
+  if (container.getContext) {
     return {
       width: container.width / import_l7_utils.DOM.DPR,
       height: container.height / import_l7_utils.DOM.DPR

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.9.22-alpha.0",
+  "version": "2.9.24",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -27,14 +27,15 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.1.0",
-    "@antv/l7-core": "2.9.22-alpha.0",
-    "@antv/l7-maps": "2.9.22-alpha.0",
-    "@antv/l7-source": "2.9.22-alpha.0",
-    "@antv/l7-utils": "2.9.22-alpha.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",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/helpers": "^6.1.4",
     "@turf/meta": "^6.0.2",
+    "@turf/polygon-to-line": "^6.5.0",
     "@turf/union": "^6.5.0",
     "d3-array": "1",
     "d3-color": "^1.4.0",
@@ -60,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "df0d36c7370eaa2712be99e81b558cfb4f1d8322",
+  "gitHead": "0d84d477dc449e4541bdcaabbb29e6765d37b079",
   "publishConfig": {
     "access": "public"
   }