@antv/l7-layers 2.15.2 → 2.15.3

package/lib/raster/models/rasterTerrainRgb.js

@@ -1,86 +1,63 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 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 _triangulation = require("../../core/triangulation");
-
 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; } }
-
 /* babel-plugin-inline-import '../shaders/raster_terrain_rgb_frag.glsl' */
 var Raster_terrainFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\n\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\n\nvarying vec2 v_texCoord;\n\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nuniform vec4 u_unpack;\n\nfloat getElevation(vec2 coord, float bias) {\n    // Convert encoded elevation value to meters\n    vec4 data = texture2D(u_texture, coord,bias) * 255.0;\n    data.a = -1.0;\n    return dot(data, u_unpack);\n}\n\nvec4 getColor(float value) {\n   float normalisedValue =(value- u_domain[0]) / (u_domain[1] - u_domain[0]);\n    vec2 coord = vec2(normalisedValue, 0);\n    return texture2D(u_colorTexture, coord);\n}\n\nvoid main() {\n  float value = getElevation(v_texCoord,0.0);\n  if (value == u_noDataValue) {\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {\n     gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n   \n    gl_FragColor = getColor(value);\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n      if(gl_FragColor.a < 0.01)\n      discard;\n  }\n}\n";
-
 /* babel-plugin-inline-import '../shaders/rater_terrain_rgb_vert.glsl' */
 var Raster_terrainVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
-
 var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(RasterTerrainRGB, _BaseModel);
-
   var _super = _createSuper(RasterTerrainRGB);
-
   function RasterTerrainRGB() {
     (0, _classCallCheck2.default)(this, RasterTerrainRGB);
     return _super.apply(this, arguments);
   }
-
   (0, _createClass2.default)(RasterTerrainRGB, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
-          opacity = _ref.opacity,
-          _ref$clampLow = _ref.clampLow,
-          clampLow = _ref$clampLow === void 0 ? true : _ref$clampLow,
-          _ref$clampHigh = _ref.clampHigh,
-          clampHigh = _ref$clampHigh === void 0 ? true : _ref$clampHigh,
-          _ref$noDataValue = _ref.noDataValue,
-          noDataValue = _ref$noDataValue === void 0 ? -9999999 : _ref$noDataValue,
-          domain = _ref.domain,
-          rampColors = _ref.rampColors,
-          colorTexture = _ref.colorTexture,
-          _ref$rScaler = _ref.rScaler,
-          rScaler = _ref$rScaler === void 0 ? 6553.6 : _ref$rScaler,
-          _ref$gScaler = _ref.gScaler,
-          gScaler = _ref$gScaler === void 0 ? 25.6 : _ref$gScaler,
-          _ref$bScaler = _ref.bScaler,
-          bScaler = _ref$bScaler === void 0 ? 0.1 : _ref$bScaler,
-          _ref$offset = _ref.offset,
-          offset = _ref$offset === void 0 ? 10000 : _ref$offset;
-
+        opacity = _ref.opacity,
+        _ref$clampLow = _ref.clampLow,
+        clampLow = _ref$clampLow === void 0 ? true : _ref$clampLow,
+        _ref$clampHigh = _ref.clampHigh,
+        clampHigh = _ref$clampHigh === void 0 ? true : _ref$clampHigh,
+        _ref$noDataValue = _ref.noDataValue,
+        noDataValue = _ref$noDataValue === void 0 ? -9999999 : _ref$noDataValue,
+        domain = _ref.domain,
+        rampColors = _ref.rampColors,
+        colorTexture = _ref.colorTexture,
+        _ref$rScaler = _ref.rScaler,
+        rScaler = _ref$rScaler === void 0 ? 6553.6 : _ref$rScaler,
+        _ref$gScaler = _ref.gScaler,
+        gScaler = _ref$gScaler === void 0 ? 25.6 : _ref$gScaler,
+        _ref$bScaler = _ref.bScaler,
+        bScaler = _ref$bScaler === void 0 ? 0.1 : _ref$bScaler,
+        _ref$offset = _ref.offset,
+        offset = _ref$offset === void 0 ? 10000 : _ref$offset;
       var newdomain = domain || (0, _l7Utils.getDefaultDomain)(rampColors);
       var texture = colorTexture;
-
       if (!colorTexture) {
         texture = this.layer.textureService.getColorTexture(rampColors, newdomain);
       } else {
         this.layer.textureService.setColorTexture(colorTexture, rampColors, newdomain);
       }
-
       return {
         u_opacity: opacity || 1,
         u_texture: this.texture,
@@ -98,58 +75,50 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var source, createTexture2D, imageData, model;
         return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                source = this.layer.getSource();
-                createTexture2D = this.rendererService.createTexture2D;
-                _context.next = 4;
-                return source.data.images;
-
-              case 4:
-                imageData = _context.sent;
-                this.texture = createTexture2D({
-                  data: imageData[0],
-                  width: imageData[0].width,
-                  height: imageData[0].height,
-                  min: _l7Core.gl.LINEAR,
-                  mag: _l7Core.gl.LINEAR
-                });
-                _context.next = 8;
-                return this.layer.buildLayerModel({
-                  moduleName: 'RasterTileDataImage',
-                  vertexShader: Raster_terrainVert,
-                  fragmentShader: Raster_terrainFrag,
-                  triangulation: _triangulation.RasterImageTriangulation,
-                  primitive: _l7Core.gl.TRIANGLES,
-                  depth: {
-                    enable: false
-                  }
-                });
-
-              case 8:
-                model = _context.sent;
-                return _context.abrupt("return", [model]);
-
-              case 10:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              source = this.layer.getSource();
+              createTexture2D = this.rendererService.createTexture2D;
+              _context.next = 4;
+              return source.data.images;
+            case 4:
+              imageData = _context.sent;
+              this.texture = createTexture2D({
+                data: imageData[0],
+                width: imageData[0].width,
+                height: imageData[0].height,
+                min: _l7Core.gl.LINEAR,
+                mag: _l7Core.gl.LINEAR
+              });
+              _context.next = 8;
+              return this.layer.buildLayerModel({
+                moduleName: 'RasterTileDataImage',
+                vertexShader: Raster_terrainVert,
+                fragmentShader: Raster_terrainFrag,
+                triangulation: _triangulation.RasterImageTriangulation,
+                primitive: _l7Core.gl.TRIANGLES,
+                depth: {
+                  enable: false
+                }
+              });
+            case 8:
+              model = _context.sent;
+              return _context.abrupt("return", [model]);
+            case 10:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function initModels() {
         return _initModels.apply(this, arguments);
       }
-
       return initModels;
     }()
   }, {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-
       (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
     }
   }, {
@@ -157,23 +126,18 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                return _context2.abrupt("return", this.initModels());
-
-              case 1:
-              case "end":
-                return _context2.stop();
-            }
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              return _context2.abrupt("return", this.initModels());
+            case 1:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2, this);
       }));
-
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
-
       return buildModels;
     }()
   }, {
@@ -199,5 +163,4 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
   }]);
   return RasterTerrainRGB;
 }(_BaseModel2.default);
-
 exports.default = RasterTerrainRGB;

package/lib/tile/interaction/getRasterData.js

@@ -1,39 +1,34 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.readPixel = readPixel;
 exports.readRasterValue = readRasterValue;
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _l7Utils = require("@antv/l7-utils");
-
 function readRasterValue(tile, mapService, x, y) {
   var _tile$bboxPolygon, _tile$data, _tile$data2, _tile$data3;
-
   var bbox = (tile === null || tile === void 0 ? void 0 : (_tile$bboxPolygon = tile.bboxPolygon) === null || _tile$bboxPolygon === void 0 ? void 0 : _tile$bboxPolygon.bbox) || [0, 0, 10, -10];
-
   var _bbox = (0, _slicedToArray2.default)(bbox, 4),
-      _bbox$ = _bbox[0],
-      minLng = _bbox$ === void 0 ? 0 : _bbox$,
-      _bbox$2 = _bbox[1],
-      minLat = _bbox$2 === void 0 ? 0 : _bbox$2,
-      _bbox$3 = _bbox[2],
-      maxLng = _bbox$3 === void 0 ? 10 : _bbox$3,
-      _bbox$4 = _bbox[3],
-      maxLat = _bbox$4 === void 0 ? -10 : _bbox$4;
-
+    _bbox$ = _bbox[0],
+    minLng = _bbox$ === void 0 ? 0 : _bbox$,
+    _bbox$2 = _bbox[1],
+    minLat = _bbox$2 === void 0 ? 0 : _bbox$2,
+    _bbox$3 = _bbox[2],
+    maxLng = _bbox$3 === void 0 ? 10 : _bbox$3,
+    _bbox$4 = _bbox[3],
+    maxLat = _bbox$4 === void 0 ? -10 : _bbox$4;
   var tileXY = mapService.lngLatToContainer([minLng, minLat]);
   var tileMaxXY = mapService.lngLatToContainer([maxLng, maxLat]);
   var tilePixelWidth = tileMaxXY.x - tileXY.x;
   var tilePixelHeight = tileXY.y - tileMaxXY.y;
-  var pos = [(x - tileXY.x) / tilePixelWidth, // x
+  var pos = [(x - tileXY.x) / tilePixelWidth,
+  // x
   (y - tileMaxXY.y) / tilePixelHeight // y
   ];
+
   var tileWidth = (tile === null || tile === void 0 ? void 0 : (_tile$data = tile.data) === null || _tile$data === void 0 ? void 0 : _tile$data.width) || 1;
   var tileHeight = (tile === null || tile === void 0 ? void 0 : (_tile$data2 = tile.data) === null || _tile$data2 === void 0 ? void 0 : _tile$data2.height) || 1;
   var indexX = Math.floor(pos[0] * tileWidth);
@@ -42,24 +37,19 @@ function readRasterValue(tile, mapService, x, y) {
   var data = tile === null || tile === void 0 ? void 0 : (_tile$data3 = tile.data) === null || _tile$data3 === void 0 ? void 0 : _tile$data3.data[index];
   return data;
 }
-
 function readPixel(x, y, rendererService) {
   var readPixels = rendererService.readPixels,
-      getContainer = rendererService.getContainer;
+    getContainer = rendererService.getContainer;
   var xInDevicePixel = x * _l7Utils.DOM.DPR;
   var yInDevicePixel = y * _l7Utils.DOM.DPR;
-
   var _getContainerSize = getContainerSize(getContainer()),
-      width = _getContainerSize.width,
-      height = _getContainerSize.height;
-
+    width = _getContainerSize.width,
+    height = _getContainerSize.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;
   }
-
   var pickedColors = readPixels({
     x: Math.floor(xInDevicePixel),
     // 视口坐标系原点在左上，而 WebGL 在左下，需要翻转 Y 轴
@@ -70,7 +60,6 @@ function readPixel(x, y, rendererService) {
   });
   return pickedColors;
 }
-
 function getContainerSize(container) {
   if (container.getContext) {
     return {

package/lib/tile/interaction/utils.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -12,11 +11,8 @@ exports.setFeatureSelect = setFeatureSelect;
 exports.setHighlight = setHighlight;
 exports.setPickState = setPickState;
 exports.setSelect = setSelect;
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _l7Utils = require("@antv/l7-utils");
-
 function clearPickState(layers) {
   layers.filter(function (layer) {
     return layer.inited && layer.isVisible();
@@ -27,7 +23,6 @@ function clearPickState(layers) {
     layer.setCurrentSelectedId(null);
   });
 }
-
 function setSelect(layers, pickedColors, renderList) {
   var selectedId = (0, _l7Utils.decodePickingColor)(pickedColors);
   var pickColor;
@@ -38,12 +33,11 @@ function setSelect(layers, pickedColors, renderList) {
       pickColor = pickedColors;
     } else {
       selectFeature(layer, new Uint8Array([0, 0, 0, 0])); // toggle select
-
       layer.setCurrentSelectedId(null);
       pickColor = null;
     }
-  }); // unselect normal layer
-
+  });
+  // unselect normal layer
   renderList.filter(function (layer) {
     return layer.inited && layer.isVisible() && layer.needPick('click');
   }).filter(function (layer) {
@@ -54,12 +48,12 @@ function setSelect(layers, pickedColors, renderList) {
   });
   return pickColor;
 }
-
 function setHighlight(layers, pickedColors) {
   var pickId = (0, _l7Utils.decodePickingColor)(pickedColors);
   layers.filter(function (layer) {
     return layer.inited && layer.isVisible();
-  }) // @ts-ignore
+  })
+  // @ts-ignore
   .filter(function (layer) {
     return layer.getPickID() !== pickId;
   }).map(function (layer) {
@@ -68,14 +62,12 @@ function setHighlight(layers, pickedColors) {
     layer.hooks.beforeHighlight.call(pickedColors);
   });
 }
-
 function setPickState(layers, pickColors) {
   if (pickColors.select) {
     layers.map(function (layer) {
       selectFeature(layer, pickColors.select);
     });
   }
-
   if (pickColors.active) {
     layers.filter(function (layer) {
       return layer.inited && layer.isVisible();
@@ -84,17 +76,14 @@ function setPickState(layers, pickColors) {
     });
   }
 }
-
 function selectFeature(layer, pickedColors) {
   // @ts-ignore
   var _pickedColors = (0, _slicedToArray2.default)(pickedColors, 3),
-      r = _pickedColors[0],
-      g = _pickedColors[1],
-      b = _pickedColors[2];
-
+    r = _pickedColors[0],
+    g = _pickedColors[1],
+    b = _pickedColors[2];
   layer.hooks.beforeSelect.call([r, g, b]);
 }
-
 function setFeatureSelect(color, layers) {
   var id = (0, _l7Utils.decodePickingColor)(color);
   layers.map(function (layer) {
@@ -102,7 +91,6 @@ function setFeatureSelect(color, layers) {
     layer.setCurrentSelectedId(id);
   });
 }
-
 function setFeatureActive(color, layers) {
   var id = (0, _l7Utils.decodePickingColor)(color);
   layers.map(function (layer) {