Merge branch 'master' of https://github.com/antvis/L7

examples/gallery/animate/demo/grid.js

@@ -338,7 +338,7 @@ img.onload = function() {
   const layer = new LineLayer({})
     .source(geoData)
     .size(1)
-    .shape('simpleline')
+    .shape('simple')
     .color('rgb(22, 119, 255)')
     .style({
       vertexHeightScale: 2000,

packages/layers/src/line/index.ts

@@ -29,7 +29,7 @@ export default class LineLayer extends BaseLayer<ILineLayerStyleOptions> {
     const type = this.getModelType();
     const defaultConfig = {
       line: {},
-      simpleline: {},
+      simple: {},
       wall: {},
       arc3d: { blend: 'additive' },
       arc: { blend: 'additive' },

packages/layers/src/line/models/index.ts

@@ -12,7 +12,7 @@ export type LineModelType =
   | 'arc3d'
   | 'greatcircle'
   | 'wall'
-  | 'simpleline'
+  | 'simple'
   | 'line';
 
 const LineModels: { [key in LineModelType]: any } = {
@@ -22,7 +22,7 @@ const LineModels: { [key in LineModelType]: any } = {
   greatcircle: GreatCircleModel,
   wall: LineWallModel,
   line: LineModel,
-  simpleline: SimpleLineModel,
+  simple: SimpleLineModel,
 };
 
 export default LineModels;

packages/layers/src/line/models/simpleLine.ts

@@ -97,7 +97,7 @@ export default class SimpleLineModel extends BaseModel {
   public buildModels(): IModel[] {
     return [
       this.layer.buildLayerModel({
-        moduleName: 'line',
+        moduleName: 'simpleline',
         vertexShader: line_vert,
         fragmentShader: line_frag,
         triangulation: SimpleLineTriangulation,

stories/Map/components/gridTile.tsx

@@ -343,7 +343,7 @@ export default class GridTile extends React.Component {
       const layer = new LineLayer({})
         .source(geoData)
         .size(1)
-        .shape('simpleline')
+        .shape('simple')
         .color('rgb(22, 119, 255)')
         .style({
           vertexHeightScale: 2000,

stories/Map/components/gridTile2.tsx

@@ -295,7 +295,7 @@ export default class GridTile2 extends React.Component {
       const layer = new LineLayer({})
         .source(geoData)
         .size(1)
-        .shape('simpleline')
+        .shape('simple')
         .color('rgb(22, 119, 255)')
         .style({
           vertexHeightScale: 2000,