@antv/l7-layers 2.20.20 → 2.21.0

package/lib/plugins/UpdateStyleAttributePlugin.js

@@ -7,13 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _inversify = require("inversify");
-require("reflect-metadata");
-var _dec, _class;
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建
  */
-var UpdateStyleAttributePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var UpdateStyleAttributePlugin = exports.default = /*#__PURE__*/function () {
   function UpdateStyleAttributePlugin() {
     (0, _classCallCheck2.default)(this, UpdateStyleAttributePlugin);
   }
@@ -78,4 +75,4 @@ var UpdateStyleAttributePlugin = exports.default = (_dec = (0, _inversify.inject
     }
   }]);
   return UpdateStyleAttributePlugin;
-}()) || _class);
+}();

package/lib/plugins/index.js

@@ -0,0 +1,26 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createPlugins = createPlugins;
+var _DataMappingPlugin = _interopRequireDefault(require("./DataMappingPlugin"));
+var _DataSourcePlugin = _interopRequireDefault(require("./DataSourcePlugin"));
+var _FeatureScalePlugin = _interopRequireDefault(require("./FeatureScalePlugin"));
+var _LayerAnimateStylePlugin = _interopRequireDefault(require("./LayerAnimateStylePlugin"));
+var _LayerMaskPlugin = _interopRequireDefault(require("./LayerMaskPlugin"));
+var _LayerModelPlugin = _interopRequireDefault(require("./LayerModelPlugin"));
+var _LayerStylePlugin = _interopRequireDefault(require("./LayerStylePlugin"));
+var _LightingPlugin = _interopRequireDefault(require("./LightingPlugin"));
+var _MultiPassRendererPlugin = _interopRequireDefault(require("./MultiPassRendererPlugin"));
+var _PixelPickingPlugin = _interopRequireDefault(require("./PixelPickingPlugin"));
+var _RegisterStyleAttributePlugin = _interopRequireDefault(require("./RegisterStyleAttributePlugin"));
+var _ShaderUniformPlugin = _interopRequireDefault(require("./ShaderUniformPlugin"));
+var _UpdateModelPlugin = _interopRequireDefault(require("./UpdateModelPlugin"));
+var _UpdateStyleAttributePlugin = _interopRequireDefault(require("./UpdateStyleAttributePlugin"));
+// import ConfigSchemaValidationPlugin from './ConfigSchemaValidationPlugin';
+
+function createPlugins() {
+  return [new _DataSourcePlugin.default(), new _RegisterStyleAttributePlugin.default(), new _FeatureScalePlugin.default(), new _DataMappingPlugin.default(), new _LayerStylePlugin.default(), new _LayerMaskPlugin.default(), new _UpdateStyleAttributePlugin.default(), new _UpdateModelPlugin.default(), new _MultiPassRendererPlugin.default(), new _ShaderUniformPlugin.default(), new _LayerAnimateStylePlugin.default(), new _LightingPlugin.default(), new _PixelPickingPlugin.default(), new _LayerModelPlugin.default()];
+}

package/lib/point/models/fill.js

@@ -104,17 +104,14 @@ var FillModel = exports.default = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref3, _ref3$animateOption, animateOption, _this$getShaders, frag, vert, type, model;
+        var _this$getShaders, frag, vert, type, model;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _ref3 = this.layer.getLayerConfig(), _ref3$animateOption = _ref3.animateOption, animateOption = _ref3$animateOption === void 0 ? {
-                enable: false
-              } : _ref3$animateOption;
-              _this$getShaders = this.getShaders(animateOption), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
+              _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
               this.layer.triangulation = _l7Utils.PointFillTriangulation;
               this.initUniformsBuffer();
-              _context2.next = 6;
+              _context2.next = 5;
               return this.layer.buildLayerModel({
                 moduleName: type,
                 vertexShader: vert,
@@ -125,10 +122,10 @@ var FillModel = exports.default = /*#__PURE__*/function (_BaseModel) {
                   enable: false
                 }
               });
-            case 6:
+            case 5:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 8:
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -145,7 +142,7 @@ var FillModel = exports.default = /*#__PURE__*/function (_BaseModel) {
      */
   }, {
     key: "getShaders",
-    value: function getShaders(animateOption) {
+    value: function getShaders() {
       return {
         frag: pointFillFrag,
         vert: pointFillVert,

package/lib/point/models/fillImage.js

@@ -78,7 +78,8 @@ var FillImageModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         _ref$unit = _ref.unit,
         unit = _ref$unit === void 0 ? 'pixel' : _ref$unit;
       if (this.rendererService.getDirty()) {
-        this.texture.bind();
+        var _this$texture;
+        (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
       }
       /**
        *               rotateFlag
@@ -164,9 +165,9 @@ var FillImageModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "clearModels",
     value: function clearModels() {
-      var _this$texture;
+      var _this$texture2;
       this.iconService.off('imageUpdate', this.updateTexture);
-      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
     }
 
     // overwrite baseModel func

package/lib/point/models/image.js

@@ -69,7 +69,8 @@ var ImageModel = exports.default = /*#__PURE__*/function (_BaseModel) {
     value: function getUninforms() {
       // ThreeJS 图层兼容
       if (this.rendererService.getDirty()) {
-        this.texture.bind();
+        var _this$texture;
+        (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
       }
       var commonInfo = this.getCommonUniformsInfo();
       var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
@@ -118,8 +119,8 @@ var ImageModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "clearModels",
     value: function clearModels() {
-      var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+      var _this$texture2;
+      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
       this.iconService.off('imageUpdate', this.updateTexture);
     }
   }, {

package/lib/polygon/models/extrude.js

@@ -222,7 +222,6 @@ var ExtrudeModel = exports.default = /*#__PURE__*/function (_BaseModel) {
           update: function update(feature, featureIdx, vertex) {
             var lng = vertex[0];
             var lat = vertex[1];
-            // console.log((lng - bounds[0]) / lngLen, (lat - bounds[1]) / latLen, vertex[4])
             // 临时 兼容高德V2
             return [(lng - bounds[0]) / lngLen, (lat - bounds[1]) / latLen, vertex[4]];
           }

package/lib/polygon/models/ocean.js

@@ -25,7 +25,6 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var ocean_frag = "\nlayout(std140) uniform commonUniforms {\n  vec4 u_watercolor;\n  vec4 u_watercolor2;\n  float u_time;\n};\n\nin vec2 v_uv;\nin float v_opacity;\nout vec4 outputColor;\n\nfloat coast2water_fadedepth = 0.10;\nfloat large_waveheight      = .750; // change to adjust the \"heavy\" waves\nfloat large_wavesize        = 3.4;  // factor to adjust the large wave size\nfloat small_waveheight      = 0.6;  // change to adjust the small random waves\nfloat small_wavesize        = 0.5;   // factor to ajust the small wave size\nfloat water_softlight_fact  = 15.;  // range [1..200] (should be << smaller than glossy-fact)\nfloat water_glossylight_fact= 120.; // range [1..200]\nfloat particle_amount       = 70.;\n\nvec3 water_specularcolor    = vec3(1.3, 1.3, 0.9);    // specular Color (RGB) of the water-highlights\n#define light                 vec3(-0., sin(u_time*0.5)*.5 + .35, 2.8) // position of the sun\n\nuniform sampler2D u_texture1;\nuniform sampler2D u_texture2;\nuniform sampler2D u_texture3;\n\n  \n\nfloat hash( float n ) {\n    return fract(sin(n)*43758.5453123);\n}\n\n// 2d noise function\nfloat noise1( in vec2 x ) {\n  vec2 p  = floor(x);\n  vec2 f  = smoothstep(0.0, 1.0, fract(x));\n  float n = p.x + p.y*57.0;\n  return mix(mix( hash(n+  0.0), hash(n+  1.0),f.x),\n    mix( hash(n+ 57.0), hash(n+ 58.0),f.x),f.y);\n}\n\nfloat noise(vec2 p) {\n    return texture(SAMPLER_2D(u_texture2),p*vec2(1./256.)).x;\n}\n\nvec4 highness(vec2 p) {\n    vec4 t = texture(SAMPLER_2D(u_texture1),fract(p));\n    float clipped = -2.0-smoothstep(3.,10.,t.a)*6.9-smoothstep(10.,100.,t.a)*89.9-smoothstep(0.,10000.,t.a)*10000.0;\n    return clamp(t, 0.0,3.0)+clamp(t/3.0-1.0, 0.0,1.0)+clamp(t/16.0-1.0, 0.0,1.0);\n}\n\nfloat height_map( vec2 p ) {\n    vec4 height=highness(p);\n    /*\n    height = -0.5+\n        0.5*smoothstep(-100.,0.,-height)+\n        2.75*smoothstep(0.,2.,height)+\n        1.75*smoothstep(2.,4.,height)+\n        2.75*smoothstep(4.,16.,height)+\n        1.5*smoothstep(16.,1000.,height);\n    */\n\n    mat2 m = mat2( 0.9563*1.4,  -0.2924*1.4,  0.2924*1.4,  0.9563*1.4 );\n    //p = p*6.;\n    float f = 0.6000*noise1( p ); p = m*p*1.1*6.;\n    f += 0.2500*noise( p ); p = m*p*1.32;\n    f += 0.1666*noise( p ); p = m*p*1.11;\n    f += 0.0834*noise( p ); p = m*p*1.12;\n    f += 0.0634*noise( p ); p = m*p*1.13;\n    f += 0.0444*noise( p ); p = m*p*1.14;\n    f += 0.0274*noise( p ); p = m*p*1.15;\n    f += 0.0134*noise( p ); p = m*p*1.16;\n    f += 0.0104*noise( p ); p = m*p*1.17;\n    f += 0.0084*noise( p );\n    f = .25*f+dot(height,vec4(-.03125,-.125,.25,.25))*.5;\n        const float FLAT_LEVEL = 0.92525;\n        //f = f*0.25+height*0.75;\n    if (f<FLAT_LEVEL)\n        f = f;\n    else\n        f = pow((f-FLAT_LEVEL)/(1.-FLAT_LEVEL), 2.)*(1.-FLAT_LEVEL)*2.0+FLAT_LEVEL; // makes a smooth coast-increase\n    return clamp(f, 0., 10.);\n}\n\nvec3 plasma_quintic( float x ) {\n    x = clamp( x, 0.0, 1.0);\n    vec4 x1 = vec4( 1.0, x, x * x, x * x * x ); // 1 x x2 x3\n    vec4 x2 = x1 * x1.w * x; // x4 x5 x6 x7\n    return vec3(\n        dot( x1.xyzw, vec4( +0.063861086, +1.992659096, -1.023901152, -0.490832805 ) ) + dot( x2.xy, vec2( +1.308442123, -0.914547012 ) ),\n        dot( x1.xyzw, vec4( +0.049718590, -0.791144343, +2.892305078, +0.811726816 ) ) + dot( x2.xy, vec2( -4.686502417, +2.717794514 ) ),\n        dot( x1.xyzw, vec4( +0.513275779, +1.580255060, -5.164414457, +4.559573646 ) ) + dot( x2.xy, vec2( -1.916810682, +0.570638854 ) ) );\n}\n\nvec4 color(vec2 p){\n    vec4 c1 = vec4(1.7,1.6,.9,1);\n    vec4 c2 = vec4(.2,.94,.1,1);\n    vec4 c3 = vec4(.3,.2,.0,1);\n    vec4 c4 = vec4(.99,.99,1.6,1);\n    vec4 v = highness(p);\n    float los = smoothstep(0.1,1.1,v.b);\n    float his = smoothstep(3.5,6.5,v.b);\n    float ces = smoothstep(1.,5.,v.a);\n    vec4 lo = mix(c1,c2,los);\n    vec4 hi = mix(c3,c4,his);\n    vec4 ce = mix(lo,hi,ces);\n\n    return vec4(plasma_quintic(ces),1).ragb;\n}\n\nvec3 terrain_map( vec2 p )\n{\n  return color(p).rgb*0.75+0.25*vec3(0.7, .55, .4)+texture(SAMPLER_2D(u_texture3), fract(p*5.)).rgb*.5; // test-terrain is simply 'sandstone'\n}\n\nconst mat2 m = mat2( 0.72, -1.60,  1.60,  0.72 );\n\nfloat water_map( vec2 p, float height ) {\n    vec2 p2 = p*large_wavesize;\n    vec2 shift1 = 0.001*vec2( u_time*160.0*2.0, u_time*120.0*2.0 );\n    vec2 shift2 = 0.001*vec2( u_time*190.0*2.0, -u_time*130.0*2.0 );\n\n    // coarse crossing 'ocean' waves...\n    float f = 0.6000*noise( p );\n    f += 0.2500*noise( p*m );\n    f += 0.1666*noise( p*m*m );\n    float wave = sin(p2.x*0.622+p2.y*0.622+shift2.x*4.269)*large_waveheight*f*height*height ;\n\n    p *= small_wavesize;\n    f = 0.;\n    float amp = 1.0, s = .5;\n    for (int i=0; i<9; i++)\n    { p = m*p*.947; f -= amp*abs(sin((noise( p+shift1*s )-.5)*2.)); amp = amp*.59; s*=-1.329; }\n    \n    return wave+f*small_waveheight;\n}\n\nfloat nautic(vec2 p) {\n    p *= 18.;\n    float f = 0.;\n    float amp = 1.0, s = .5;\n    for (int i=0; i<3; i++)\n    { p = m*p*1.2; f += amp*abs(smoothstep(0., 1., noise( p+u_time*s ))-.5); amp = amp*.5; s*=-1.227; }\n    return pow(1.-f, 5.);\n}\n\nfloat particles(vec2 p) {\n    p *= 200.;\n    float f = 0.;\n    float amp = 1.0, s = 1.5;\n    for (int i=0; i<3; i++)\n    { p = m*p*1.2; f += amp*noise( p+u_time*s ); amp = amp*.5; s*=-1.227; }\n    return pow(f*.35, 7.)*particle_amount;\n}\n\nfloat test_shadow( vec2 xy, float height) {\n    vec3 r0 = vec3(xy, height);\n    vec3 rd = normalize( light - r0 );\n    \n    float hit = 1.0;\n    float t   = 0.001;\n    for (int j=1; j<25; j++)\n    {\n        vec3 p = r0 + t*rd;\n        float h = height_map( p.xy );\n        float height_diff = p.z - h;\n        if (height_diff<0.0)\n        {\n            return 0.0;\n        }\n        t += 0.01+height_diff*.02;\n        hit = min(hit, 2.*height_diff/t); // soft shaddow   \n    }\n    return hit;\n}\n\nvec3 CalcTerrain(vec2 uv, float height) {\n    vec3 col = terrain_map( uv );\n    vec2 iResolution = vec2(512.);\n    float h1 = height_map(uv-vec2(0., 0.5)/ iResolution.xy);\n    float h2 = height_map(uv+vec2(0., 0.5)/ iResolution.xy);\n    float h3 = height_map(uv-vec2(0.5, 0.)/ iResolution.xy);\n    float h4 = height_map(uv+vec2(0.5, 0.)/ iResolution.xy);\n    vec3 norm = normalize(vec3(h3-h4, h1-h2, 1.));\n    vec3 r0 = vec3(uv, height);\n    vec3 rd = normalize( light - r0 );\n    float grad = dot(norm, rd);\n    col *= grad+pow(grad, 8.);\n    float terrainshade = test_shadow( uv, height );\n    col = mix(col*.25, col, terrainshade);\n    return col;\n}\n\n\nvoid main() {\n  vec3 watercolor = u_watercolor.rgb;\n  vec3 watercolor2 = u_watercolor2.rgb;\n  vec2 uv = v_uv;\n  float WATER_LEVEL = 0.84; // Water level (range: 0.0 - 2.0)\n  float deepwater_fadedepth   = 0.4 + coast2water_fadedepth;\n  float height = height_map( uv );\n  vec3 col;\n\n    float waveheight = clamp(WATER_LEVEL*3.-1.5, 0., 1.);\n    float level = WATER_LEVEL + .2*water_map(uv*15. + vec2(u_time*.1), waveheight);\n    if (height > level)\n    {\n        col = CalcTerrain(uv, height);\n    }\n    if (height <= level)\n    {\n        vec2 dif = vec2(.0, .01);\n        vec2 pos = uv*15. + vec2(u_time*.01);\n        float h1 = water_map(pos-dif,waveheight);\n        float h2 = water_map(pos+dif,waveheight);\n        float h3 = water_map(pos-dif.yx,waveheight);\n        float h4 = water_map(pos+dif.yx,waveheight);\n        vec3 normwater = normalize(vec3(h3-h4, h1-h2, .125)); // norm-vector of the 'bumpy' water-plane\n        uv += normwater.xy*.002*(level-height);\n        \n        col = CalcTerrain(uv, height);\n\n        float coastfade = clamp((level-height)/coast2water_fadedepth, 0., 1.);\n        float coastfade2= clamp((level-height)/deepwater_fadedepth, 0., 1.);\n        float intensity = col.r*.2126+col.g*.7152+col.b*.0722;\n        watercolor = mix(watercolor*intensity, watercolor2, smoothstep(0., 1., coastfade2));\n\n        vec3 r0 = vec3(uv, WATER_LEVEL);\n        vec3 rd = normalize( light - r0 ); // ray-direction to the light from water-position\n        float grad     = dot(normwater, rd); // dot-product of norm-vector and light-direction\n        float specular = pow(grad, water_softlight_fact);  // used for soft highlights                          \n        float specular2= pow(grad, water_glossylight_fact); // used for glossy highlights\n        float gradpos  = dot(vec3(0., 0., 1.), rd);\n        float specular1= smoothstep(0., 1., pow(gradpos, 5.));  // used for diffusity (some darker corona around light's specular reflections...)                          \n        float watershade  = test_shadow( uv, level );\n        watercolor *= 2.2+watershade;\n        watercolor += (.2+.8*watershade) * ((grad-1.0)*.5+specular) * .25;\n        watercolor /= (1.+specular1*1.25);\n        watercolor += watershade*specular2*water_specularcolor;\n        watercolor += watershade*coastfade*(1.-coastfade2)*(vec3(.5, .6, .7)*nautic(uv)+vec3(1., 1., 1.)*particles(uv));\n        \n        col = mix(col, watercolor, coastfade);\n    }\n    \n  outputColor = vec4(col, v_opacity);  \n}\n";
 /* babel-plugin-inline-import '../shaders/ocean/ocean_vert.glsl' */
 var ocean_vert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_uv;\n\nlayout(std140) uniform commonUniforms {\n  vec4 u_watercolor;\n  vec4 u_watercolor2;\n  float u_time;\n};\n\n\nout vec2 v_uv;\nout float v_opacity;\n\n#pragma include \"projection\"\n\nvoid main() {\n  v_uv = a_uv;\n  v_opacity = opacity;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));\n}\n\n";
-var isNumber = _l7Utils.lodashUtil.isNumber;
 var OceanModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(OceanModel, _BaseModel);
   var _super = _createSuper(OceanModel);

package/lib/polygon/models/water.js

@@ -15,7 +15,6 @@ 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 _l7Core = require("@antv/l7-core");
-var _l7Utils = require("@antv/l7-utils");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 var _triangulation = require("../../core/triangulation");
@@ -25,7 +24,6 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var water_frag = "uniform sampler2D u_texture;\nlayout(std140) uniform commonUniforms {\n  float u_speed;\n  float u_time;\n};\n\nout vec4 outputColor;\n\n\nin vec4 v_Color;\nin vec2 v_uv;\n\nfloat rand(vec2 n) { return 0.5 + 0.5 * fract(sin(dot(n.xy, vec2(12.9898, 78.233)))* 43758.5453); }\n\nfloat water(vec3 p) {\n  float t = u_time * u_speed;\n  p.z += t * 2.; p.x += t * 2.;\n  vec3 c1 = texture(SAMPLER_2D(u_texture), p.xz / 30.).xyz;\n  p.z += t * 3.; p.x += t * 0.52;\n  vec3 c2 = texture(SAMPLER_2D(u_texture), p.xz / 30.).xyz;\n  p.z += t * 4.; p.x += t * 0.8;\n  vec3 c3 = texture(SAMPLER_2D(u_texture), p.xz / 30.).xyz;\n  c1 += c2 - c3;\n  float z = (c1.x + c1.y + c1.z) / 3.;\n  return p.y + z / 4.;\n}\n\nfloat map(vec3 p) {\n  float d = 100.0;\n  d = water(p);\n  return d;\n}\n\nfloat intersect(vec3 ro, vec3 rd) {\n  float d = 0.0;\n  for (int i = 0; i <= 100; i++) {\n    float h = map(ro + rd * d);\n    if (h < 0.1) return  d;\n    d += h;\n  }\n  return 0.0;\n}\n\nvec3 norm(vec3 p) {\n  float eps = .1;\n  return normalize(vec3(\n    map(p + vec3(eps, 0, 0)) - map(p + vec3(-eps, 0, 0)),\n    map(p + vec3(0, eps, 0)) - map(p + vec3(0, -eps, 0)),\n    map(p + vec3(0, 0, eps)) - map(p + vec3(0, 0, -eps))\n  ));\n} \n\nfloat calSpc() {\n  vec3 l1 = normalize(vec3(1, 1, 1));\n  vec3 ro = vec3(-3, 20, -8);\n  vec3 rc = vec3(0, 0, 0);\n  vec3 ww = normalize(rc - ro);\n  vec3 uu = normalize(cross(vec3(0,1,0), ww));\n  vec3 vv = normalize(cross(rc - ro, uu));\n  vec3 rd = normalize(uu * v_uv.x + vv * v_uv.y + ww);\n  float d = intersect(ro, rd);\n  vec3 p = ro + rd * d;\n  vec3 n = norm(p);\n  float spc = pow(max(0.0, dot(reflect(l1, n), rd)), 30.0);\n  return spc;\n}\n\nvoid main() {\n\n  outputColor = v_Color;\n  float spc = calSpc();\n  outputColor += spc * 0.4;\n}\n";
 /* babel-plugin-inline-import '../shaders/water/polygon_water_vert.glsl' */
 var water_vert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 14) in vec2 a_uv;\nlayout(std140) uniform commonUniforms {\n  float u_speed;\n  float u_time;\n};\nout vec4 v_Color;\nout vec2 v_uv;\n\n\n#pragma include \"projection\"\n\nvoid main() {\n  v_uv = a_uv;\n  v_Color = a_Color;\n  v_Color.a *= opacity;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));\n}\n\n";
-var isNumber = _l7Utils.lodashUtil.isNumber;
 var WaterModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(WaterModel, _BaseModel);
   var _super = _createSuper(WaterModel);

package/lib/tile/core/BaseLayer.js

@@ -10,7 +10,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _TileLayerService = require("../service/TileLayerService");
 var _TilePickService = require("../service/TilePickService");
@@ -62,10 +61,10 @@ var BaseTileLayer = exports.default = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "viewchange", debounce(this.mapchange, 24));
     this.parent = parent;
     var container = this.parent.getContainer();
-    this.rendererService = container.get(_l7Core.TYPES.IRendererService);
-    this.layerService = container.get(_l7Core.TYPES.ILayerService);
-    this.mapService = container.get(_l7Core.TYPES.IMapService);
-    this.pickingService = container.get(_l7Core.TYPES.IPickingService);
+    this.rendererService = container.rendererService;
+    this.layerService = container.layerService;
+    this.mapService = container.mapService;
+    this.pickingService = container.pickingService;
 
     // 初始化瓦片管理服务
     this.tileLayerService = new _TileLayerService.TileLayerService({

package/lib/tile/interaction/getRasterData.js

@@ -45,8 +45,6 @@ function readPixel(x, y, rendererService) {
   var _getViewportSize = getViewportSize(),
     width = _getViewportSize.width,
     height = _getViewportSize.height;
-  width *= _l7Utils.DOM.DPR;
-  height *= _l7Utils.DOM.DPR;
   if (xInDevicePixel > width - 1 * _l7Utils.DOM.DPR || xInDevicePixel < 0 || yInDevicePixel > height - 1 * _l7Utils.DOM.DPR || yInDevicePixel < 0) {
     return false;
   }

package/lib/tile/service/TileLayerService.js

@@ -11,7 +11,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-require("reflect-metadata");
 var TileLayerService = exports.TileLayerService = /*#__PURE__*/function () {
   function TileLayerService(_ref) {
     var rendererService = _ref.rendererService,

package/lib/tile/service/TilePickService.js

@@ -12,7 +12,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _TileSourceService = require("./TileSourceService");
 var SELECT = 'select';
@@ -49,7 +48,7 @@ var TilePickService = exports.TilePickService = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               container = this.parent.getContainer();
-              pickingService = container.get(_l7Core.TYPES.IPickingService);
+              pickingService = container.pickingService;
               if (!(layer.type === 'RasterLayer')) {
                 _context.next = 8;
                 break;
@@ -177,7 +176,7 @@ var TilePickService = exports.TilePickService = /*#__PURE__*/function () {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
   }, {
     key: "pickRasterLayer",
-    value: function pickRasterLayer(layer, target, parent) {
+    value: function pickRasterLayer() {
       return false;
     }
   }]);

package/lib/tile/tile/Tile.js

@@ -125,8 +125,8 @@ var Tile = exports.default = /*#__PURE__*/function (_EventEmitter) {
               }).shape('fill').color('#0f0').style({
                 opacity: 0.5
               });
-              container = (0, _l7Core.createLayerContainer)(this.parent.sceneContainer);
-              mask.setContainer(container, this.parent.sceneContainer);
+              container = (0, _l7Core.createLayerContainer)(this.parent.container);
+              mask.setContainer(container);
               _context.next = 5;
               return mask.init();
             case 5:
@@ -155,8 +155,8 @@ var Tile = exports.default = /*#__PURE__*/function (_EventEmitter) {
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              container = (0, _l7Core.createLayerContainer)(this.parent.sceneContainer);
-              mask.setContainer(container, this.parent.sceneContainer);
+              container = (0, _l7Core.createLayerContainer)(this.parent.container);
+              mask.setContainer(container);
               _context2.next = 4;
               return mask.init();
             case 4:
@@ -183,8 +183,8 @@ var Tile = exports.default = /*#__PURE__*/function (_EventEmitter) {
             case 0:
               // set flag
               layer.isTileLayer = true;
-              container = (0, _l7Core.createLayerContainer)(this.parent.sceneContainer);
-              layer.setContainer(container, this.parent.sceneContainer);
+              container = (0, _l7Core.createLayerContainer)(this.parent.container);
+              layer.setContainer(container);
               this.layers.push(layer);
               _context3.next = 6;
               return layer.init();
@@ -221,6 +221,7 @@ var Tile = exports.default = /*#__PURE__*/function (_EventEmitter) {
     value: function getMainLayer() {
       return this.layers[0];
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   }, {
     key: "getFeatures",
     value: function getFeatures(sourceLayer) {
@@ -232,6 +233,7 @@ var Tile = exports.default = /*#__PURE__*/function (_EventEmitter) {
      * @param id
      * @returns
      */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   }, {
     key: "getFeatureById",
     value: function getFeatureById(id) {

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.20.20",
+  "version": "2.21.0",
   "description": "L7's collection of built-in layers",
-  "main": "lib/index.js",
-  "module": "es/index.js",
-  "types": "es/index.d.ts",
+  "license": "ISC",
+  "author": "xiaoiver",
   "sideEffects": [
     "./es/index.js"
   ],
+  "main": "lib/index.js",
+  "module": "es/index.js",
+  "types": "es/index.d.ts",
   "files": [
     "dist",
     "lib",
@@ -15,22 +17,20 @@
     "README.md"
   ],
   "scripts": {
-    "tsc": "tsc --project tsconfig.build.json",
-    "clean": "rimraf dist; rimraf es; rimraf lib;",
     "build": "father build",
     "build:cjs": "BABEL_ENV=cjs babel src --root-mode upward --out-dir lib --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments",
     "build:esm": "BABEL_ENV=esm babel src --root-mode upward --out-dir es --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments",
-    "watch": "BABEL_ENV=cjs babel src --watch --root-mode upward --out-dir lib --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments",
-    "sync": "tnpm sync"
+    "clean": "rimraf dist; rimraf es; rimraf lib;",
+    "sync": "tnpm sync",
+    "tsc": "tsc --project tsconfig.build.json",
+    "watch": "BABEL_ENV=cjs babel src --watch --root-mode upward --out-dir lib --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments"
   },
-  "author": "xiaoiver",
-  "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.2.9",
-    "@antv/l7-core": "2.20.20",
-    "@antv/l7-maps": "2.20.20",
-    "@antv/l7-source": "2.20.20",
-    "@antv/l7-utils": "2.20.20",
+    "@antv/l7-core": "2.21.0",
+    "@antv/l7-maps": "2.21.0",
+    "@antv/l7-source": "2.21.0",
+    "@antv/l7-utils": "2.21.0",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -47,12 +47,10 @@
     "extrude-polyline": "^1.0.6",
     "gl-matrix": "^3.1.0",
     "gl-vec2": "^1.3.0",
-    "inversify": "^5.0.1",
-    "polyline-miter-util": "^1.0.1",
-    "reflect-metadata": "^0.1.13"
+    "polyline-miter-util": "^1.0.1"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.20.20",
+    "@antv/l7-test-utils": "2.21.0",
     "@types/d3-array": "^2.0.0",
     "@types/d3-color": "^1.2.2",
     "@types/d3-interpolate": "1.1.6",
@@ -61,8 +59,8 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "1966dbadf9efee8d69d22beb4d89947c158da634",
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "gitHead": "7fa1b00b5262c98bb4cceef4eaf87a7b10af7e29"
 }