@antv/l7-layers 2.21.0 → 2.21.2

package/lib/canvas/models/canvas.js

@@ -5,184 +5,145 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CanvasModel = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
+var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 var _interface = require("../../core/interface");
 var _constants = require("./constants");
-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; } }
-var CanvasModel = exports.CanvasModel = /*#__PURE__*/function (_BaseModel) {
-  (0, _inherits2.default)(CanvasModel, _BaseModel);
-  var _super = _createSuper(CanvasModel);
-  function CanvasModel() {
-    var _this;
-    (0, _classCallCheck2.default)(this, CanvasModel);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "canvas", null);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "initCanvas", function () {
+class CanvasModel extends _BaseModel.default {
+  constructor(...args) {
+    super(...args);
+    (0, _defineProperty2.default)(this, "canvas", null);
+    (0, _defineProperty2.default)(this, "ctx", void 0);
+    (0, _defineProperty2.default)(this, "ctxType", void 0);
+    (0, _defineProperty2.default)(this, "viewportSize", void 0);
+    (0, _defineProperty2.default)(this, "initCanvas", () => {
       var _this$mapService$getC, _this$mapService$getC2, _this$mapService, _this$mapService$getM, _this$mapService2;
-      var _this$layerConfig = _this.layerConfig,
-        zIndex = _this$layerConfig.zIndex,
-        getContext = _this$layerConfig.getContext;
-      var canvas = document.createElement('canvas');
-      var modelType = _this.layer.getModelType();
-      _this.canvas = canvas;
+      const {
+        zIndex,
+        getContext
+      } = this.layerConfig;
+      const canvas = document.createElement('canvas');
+      const modelType = this.layer.getModelType();
+      this.canvas = canvas;
       canvas.classList.add('l7-canvas-layer');
       canvas.style.position = 'absolute';
       canvas.style.top = '0';
       canvas.style.left = '0';
       canvas.style.zIndex = String(zIndex);
-      _this.resetCanvasSize();
-      var container = (_this$mapService$getC = (_this$mapService$getC2 = (_this$mapService = _this.mapService).getCanvasOverlays) === null || _this$mapService$getC2 === void 0 ? void 0 : _this$mapService$getC2.call(_this$mapService)) !== null && _this$mapService$getC !== void 0 ? _this$mapService$getC : (_this$mapService$getM = (_this$mapService2 = _this.mapService).getMapCanvasContainer) === null || _this$mapService$getM === void 0 ? void 0 : _this$mapService$getM.call(_this$mapService2);
+      this.resetCanvasSize();
+      const container = (_this$mapService$getC = (_this$mapService$getC2 = (_this$mapService = this.mapService).getCanvasOverlays) === null || _this$mapService$getC2 === void 0 ? void 0 : _this$mapService$getC2.call(_this$mapService)) !== null && _this$mapService$getC !== void 0 ? _this$mapService$getC : (_this$mapService$getM = (_this$mapService2 = this.mapService).getMapCanvasContainer) === null || _this$mapService$getM === void 0 ? void 0 : _this$mapService$getM.call(_this$mapService2);
       container === null || container === void 0 || container.appendChild(canvas);
-      _this.ctx = getContext ? getContext(canvas) : canvas.getContext(_constants.CanvasContextTypeMap[modelType]);
-      if (!_this.ctx) {
+      this.ctx = getContext ? getContext(canvas) : canvas.getContext(_constants.CanvasContextTypeMap[modelType]);
+      if (!this.ctx) {
         console.error('Failed to get rendering context for canvas');
       }
-      _this.bindListeners();
+      this.bindListeners();
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "resetViewportSize", function () {
-      var _this$rendererService = _this.rendererService.getViewportSize(),
-        viewWidth = _this$rendererService.width,
-        viewHeight = _this$rendererService.height;
-      _this.viewportSize = [viewWidth, viewHeight];
+    (0, _defineProperty2.default)(this, "resetViewportSize", () => {
+      const {
+        width: viewWidth,
+        height: viewHeight
+      } = this.rendererService.getViewportSize();
+      this.viewportSize = [viewWidth, viewHeight];
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "resetCanvasSize", function () {
-      var canvas = _this.canvas;
+    (0, _defineProperty2.default)(this, "resetCanvasSize", () => {
+      const canvas = this.canvas;
       if (!canvas) {
         return;
       }
-      _this.resetViewportSize();
-      var _this$mapService$getS = _this.mapService.getSize(),
-        _this$mapService$getS2 = (0, _slicedToArray2.default)(_this$mapService$getS, 2),
-        width = _this$mapService$getS2[0],
-        height = _this$mapService$getS2[1];
-      var _this$viewportSize = (0, _slicedToArray2.default)(_this.viewportSize, 2),
-        viewWidth = _this$viewportSize[0],
-        viewHeight = _this$viewportSize[1];
+      this.resetViewportSize();
+      const [width, height] = this.mapService.getSize();
+      const [viewWidth, viewHeight] = this.viewportSize;
       canvas.width = viewWidth;
       canvas.height = viewHeight;
       canvas.style.width = width + 'px';
       canvas.style.height = height + 'px';
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderCanvas", function () {
+    (0, _defineProperty2.default)(this, "renderCanvas", () => {
       var _ref;
-      if (!_this.canvas) {
-        _this.initCanvas();
+      if (!this.canvas) {
+        this.initCanvas();
       }
-      var _this$layerConfig2 = _this.layerConfig,
-        draw = _this$layerConfig2.draw,
-        drawingOnCanvas = _this$layerConfig2.drawingOnCanvas;
-      var _this$viewportSize2 = (0, _slicedToArray2.default)(_this.viewportSize, 2),
-        width = _this$viewportSize2[0],
-        height = _this$viewportSize2[1];
-      var bounds = _this.mapService.getBounds();
+      const {
+        draw,
+        drawingOnCanvas
+      } = this.layerConfig;
+      const [width, height] = this.viewportSize;
+      const bounds = this.mapService.getBounds();
       (_ref = draw !== null && draw !== void 0 ? draw : drawingOnCanvas) === null || _ref === void 0 || _ref({
-        canvas: _this.canvas,
-        ctx: _this.ctx,
+        canvas: this.canvas,
+        ctx: this.ctx,
         container: {
-          width: width,
-          height: height,
-          bounds: bounds
+          width,
+          height,
+          bounds
         },
         size: [width, height],
         utils: {
-          lngLatToContainer: _this.lngLatToContainer
+          lngLatToContainer: this.lngLatToContainer
         },
-        mapService: _this.mapService
+        mapService: this.mapService
       });
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "removeCanvas", function () {
-      if (_this.canvas) {
+    (0, _defineProperty2.default)(this, "removeCanvas", () => {
+      if (this.canvas) {
         var _this$canvas$parentEl;
-        (_this$canvas$parentEl = _this.canvas.parentElement) === null || _this$canvas$parentEl === void 0 || _this$canvas$parentEl.removeChild(_this.canvas);
-        _this.canvas = null;
+        (_this$canvas$parentEl = this.canvas.parentElement) === null || _this$canvas$parentEl === void 0 || _this$canvas$parentEl.removeChild(this.canvas);
+        this.canvas = null;
       }
-      _this.unbindListeners();
+      this.unbindListeners();
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onMapResize", function () {
-      requestAnimationFrame(function () {
-        _this.resetCanvasSize();
-        _this.renderCanvas();
+    (0, _defineProperty2.default)(this, "onMapResize", () => {
+      requestAnimationFrame(() => {
+        this.resetCanvasSize();
+        this.renderCanvas();
       });
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "lngLatToContainer", function (lngLat) {
-      var _this$mapService$lngL = _this.mapService.lngLatToContainer(lngLat),
-        x = _this$mapService$lngL.x,
-        y = _this$mapService$lngL.y;
+    (0, _defineProperty2.default)(this, "lngLatToContainer", lngLat => {
+      const {
+        x,
+        y
+      } = this.mapService.lngLatToContainer(lngLat);
       return {
         x: x * window.devicePixelRatio,
         y: y * window.devicePixelRatio
       };
     });
-    return _this;
   }
-  (0, _createClass2.default)(CanvasModel, [{
-    key: "layerConfig",
-    get: function get() {
-      return this.layer.getLayerConfig();
-    }
-  }, {
-    key: "initModels",
-    value: function () {
-      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              this.renderCanvas();
-              return _context.abrupt("return", []);
-            case 2:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-      return initModels;
-    }()
-  }, {
-    key: "bindListeners",
-    value: function bindListeners() {
-      this.mapService.on('resize', this.onMapResize);
-      var _this$layerConfig3 = this.layerConfig,
-        trigger = _this$layerConfig3.trigger,
-        update = _this$layerConfig3.update;
-      if (update === _interface.CanvasUpdateType.ALWAYS || trigger === 'change') {
-        this.mapService.on('mapchange', this.renderCanvas);
-      } else {
-        this.mapService.on('zoomstart', this.removeCanvas);
-        this.mapService.on('zoomend', this.renderCanvas);
-        this.mapService.on('movestart', this.removeCanvas);
-        this.mapService.on('moveend', this.renderCanvas);
-      }
-    }
-  }, {
-    key: "unbindListeners",
-    value: function unbindListeners() {
-      this.mapService.off('resize', this.onMapResize);
-      this.mapService.off('mapchange', this.renderCanvas);
-      this.mapService.off('zoomstart', this.removeCanvas);
-      this.mapService.off('zoomend', this.renderCanvas);
-      this.mapService.off('movestart', this.removeCanvas);
-      this.mapService.off('moveend', this.renderCanvas);
+  get layerConfig() {
+    return this.layer.getLayerConfig();
+  }
+  initModels() {
+    var _this = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      _this.renderCanvas();
+      return [];
+    })();
+  }
+  bindListeners() {
+    this.mapService.on('resize', this.onMapResize);
+    const {
+      trigger,
+      update
+    } = this.layerConfig;
+    if (update === _interface.CanvasUpdateType.ALWAYS || trigger === 'change') {
+      this.mapService.on('mapchange', this.renderCanvas);
+    } else {
+      this.mapService.on('zoomstart', this.removeCanvas);
+      this.mapService.on('zoomend', this.renderCanvas);
+      this.mapService.on('movestart', this.removeCanvas);
+      this.mapService.on('moveend', this.renderCanvas);
     }
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {}
-  }]);
-  return CanvasModel;
-}(_BaseModel2.default);
+  }
+  unbindListeners() {
+    this.mapService.off('resize', this.onMapResize);
+    this.mapService.off('mapchange', this.renderCanvas);
+    this.mapService.off('zoomstart', this.removeCanvas);
+    this.mapService.off('zoomend', this.renderCanvas);
+    this.mapService.off('movestart', this.removeCanvas);
+    this.mapService.off('moveend', this.renderCanvas);
+  }
+  registerBuiltinAttributes() {}
+}
+exports.CanvasModel = CanvasModel;

package/lib/canvas/models/constants.d.ts

@@ -0,0 +1,2 @@
+export type CanvasModelType = 'canvas2d' | 'webgl' | 'webgl2' | 'webgpu';
+export declare const CanvasContextTypeMap: Record<CanvasModelType, string>;

package/lib/canvas/models/constants.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CanvasContextTypeMap = void 0;
-var CanvasContextTypeMap = exports.CanvasContextTypeMap = {
+const CanvasContextTypeMap = exports.CanvasContextTypeMap = {
   canvas2d: '2d',
   webgl: 'webgl',
   webgl2: 'webgl2',

package/lib/canvas/models/index.d.ts

@@ -0,0 +1,2 @@
+export * from './canvas';
+export * from './constants';

package/lib/canvas/models/index.js

@@ -9,7 +9,7 @@ Object.keys(_canvas).forEach(function (key) {
   if (key in exports && exports[key] === _canvas[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
-    get: function get() {
+    get: function () {
       return _canvas[key];
     }
   });
@@ -20,7 +20,7 @@ Object.keys(_constants).forEach(function (key) {
   if (key in exports && exports[key] === _constants[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
-    get: function get() {
+    get: function () {
       return _constants[key];
     }
   });

package/lib/citybuliding/building.d.ts

@@ -0,0 +1,7 @@
+import BaseLayer from '../core/BaseLayer';
+export default class CityBuildingLayer extends BaseLayer {
+    type: string;
+    buildModels(): Promise<void>;
+    setLight(t: number): void;
+    getModelType(): string;
+}

package/lib/citybuliding/building.js

@@ -5,65 +5,29 @@ 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 _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
+var _BaseLayer = _interopRequireDefault(require("../core/BaseLayer"));
 var _build = _interopRequireDefault(require("./models/build"));
-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; } }
-var CityBuildingLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
-  (0, _inherits2.default)(CityBuildingLayer, _BaseLayer);
-  var _super = _createSuper(CityBuildingLayer);
-  function CityBuildingLayer() {
-    var _this;
-    (0, _classCallCheck2.default)(this, CityBuildingLayer);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", 'CityBuildingLayer');
-    return _this;
+class CityBuildingLayer extends _BaseLayer.default {
+  constructor(...args) {
+    super(...args);
+    (0, _defineProperty2.default)(this, "type", 'CityBuildingLayer');
   }
-  (0, _createClass2.default)(CityBuildingLayer, [{
-    key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              this.layerModel = new _build.default(this);
-              _context.next = 3;
-              return this.initLayerModels();
-            case 3:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-      return buildModels;
-    }()
-  }, {
-    key: "setLight",
-    value: function setLight(t) {
-      this.updateLayerConfig({
-        time: t
-      });
-    }
-  }, {
-    key: "getModelType",
-    value: function getModelType() {
-      return 'citybuilding';
-    }
-  }]);
-  return CityBuildingLayer;
-}(_BaseLayer2.default);
+  buildModels() {
+    var _this = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      _this.layerModel = new _build.default(_this);
+      yield _this.initLayerModels();
+    })();
+  }
+  setLight(t) {
+    this.updateLayerConfig({
+      time: t
+    });
+  }
+  getModelType() {
+    return 'citybuilding';
+  }
+}
+exports.default = CityBuildingLayer;

package/lib/citybuliding/models/build.d.ts

@@ -0,0 +1,17 @@
+import type { IModel } from '@antv/l7-core';
+import BaseModel from '../../core/BaseModel';
+export default class CityBuildModel extends BaseModel {
+    private cityCenter;
+    private cityMinSize;
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
+    };
+    calCityGeo(): void;
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
+    protected registerBuiltinAttributes(): void;
+}