Merge branch 'renderer'

fuzhenn · fuzhenn · commit d8119bccbf89 · 2025-03-03T17:39:34.000+08:00
diff --git a/packages/maptalks/src/core/util/draw.ts b/packages/maptalks/src/core/util/draw.ts
@@ -3,8 +3,7 @@ import PointExtent from '../../geo/PointExtent';
 import { isGradient } from './style';
 import { isNumber } from './common';
 import Canvas from '../Canvas';
-import { ResourceCache } from '../../renderer/layer/CanvasRenderer'
-import { BBOX } from './bbox';
+import { ResourceCache } from '../../renderer/layer/LayerAbstractRenderer'
 
 export function drawImageMarker(ctx: CanvasRenderingContext2D, image, point, symbol) {
     let w = symbol && symbol['markerWidth'];
@@ -23,7 +22,7 @@ export function getImage(resources: ResourceCache, url: string) {
     return img || null;
 }
 
-export function drawVectorMarker(ctx: CanvasRenderingContext2D, point, symbol, resources: ResourceCache, bbox?: BBOX) {
+export function drawVectorMarker(ctx: CanvasRenderingContext2D, point, symbol, resources: ResourceCache) {
     const strokeAndFill = translateMarkerLineAndFill(symbol);
     const style = symbol,
         markerType = style['markerType'].toLowerCase(),
@@ -45,8 +44,7 @@ export function drawVectorMarker(ctx: CanvasRenderingContext2D, point, symbol, r
 
     const width = style['markerWidth'],
         height = style['markerHeight'],
-        lineWidth = style['markerLineWidth'] || 0,
-        hLineWidth = lineWidth / 2;
+        hLineWidth = style['markerLineWidth'] / 2;
     if (markerType === 'ellipse') {
         //ellipse default
         Canvas.ellipse(ctx, point, width / 2, height / 2, height / 2, lineOpacity, fillOpacity);
@@ -87,14 +85,6 @@ export function drawVectorMarker(ctx: CanvasRenderingContext2D, point, symbol, r
     } else {
         throw new Error('unsupported markerType: ' + markerType);
     }
-    if (bbox) {
-        //record marker bbox if need
-        const { x, y } = point;
-        bbox[0] = x - width / 2 - lineWidth;
-        bbox[1] = y - height / 2 - lineWidth;
-        bbox[2] = x + width / 2 + lineWidth;
-        bbox[3] = y + height / 2 + lineWidth;
-    }
     return ctx.canvas;
 }
 
diff --git a/packages/maptalks/src/core/util/marker.ts b/packages/maptalks/src/core/util/marker.ts
@@ -6,7 +6,7 @@ import Point from '../../geo/Point';
 import PointExtent from '../../geo/PointExtent';
 import Size from '../../geo/Size';
 import { type MarkerType } from './draw'
-import { ResourceCache } from '../../renderer/layer/CanvasRenderer'
+import { ResourceCache } from '../../renderer/layer/LayerAbstractRenderer'
 
 export const DEFAULT_MARKER_SYMBOLS = {
     markerWidth: 10,
diff --git a/packages/maptalks/src/geometry/ext/Geometry.Drag.ts b/packages/maptalks/src/geometry/ext/Geometry.Drag.ts
@@ -6,7 +6,7 @@ import Handler from '../../handler/Handler';
 import Geometry from '../Geometry';
 import DragHandler from '../../handler/Drag';
 import { ConnectorLine } from '../ConnectorLine';
-import { ResourceCache } from '../../renderer/layer/CanvasRenderer';
+import { ResourceCache } from '../../renderer/layer/LayerAbstractRenderer';
 import Point from '../../geo/Point';
 import Coordinate from '../../geo/Coordinate';
 
diff --git a/packages/maptalks/src/layer/ImageLayer.ts b/packages/maptalks/src/layer/ImageLayer.ts
@@ -4,7 +4,7 @@ import Browser from '../core/Browser';
 import Point from '../geo/Point';
 import ImageGLRenderable from '../renderer/layer/ImageGLRenderable';
 import CanvasRenderer from '../renderer/layer/CanvasRenderer';
-import { ResourceCache } from '../renderer/layer/CanvasRenderer';
+import { ResourceCache } from '../renderer/layer/LayerAbstractRenderer';
 import Extent from '../geo/Extent';
 import Layer, { LayerOptionsType } from './Layer';
 import { PointExtent } from '../geo';
diff --git a/packages/maptalks/src/renderer/edit/EditHandle.ts b/packages/maptalks/src/renderer/edit/EditHandle.ts
@@ -1,7 +1,7 @@
 import Eventable from '../../core/Eventable';
 import Class from '../../core/Class';
 import Point, { type PointJson } from '../../geo/Point';
-import { ResourceCache } from '../layer/CanvasRenderer';
+import { ResourceCache } from '../layer/LayerAbstractRenderer';
 import { drawVectorMarker } from '../../core/util/draw';
 import { isNil } from '../../core/util/';
 import { getSymbolHash } from '../../core/util';
diff --git a/packages/maptalks/src/renderer/geometry/CollectionPainter.ts b/packages/maptalks/src/renderer/geometry/CollectionPainter.ts
@@ -3,7 +3,7 @@ import PointExtent from '../../geo/PointExtent';
 import { BBOX, getDefaultBBOX, resetBBOX, setBBOX, validateBBOX } from '../../core/util/bbox';
 import Painter from './Painter';
 import Extent from '../../geo/Extent';
-import { ResourceCache } from '../layer/CanvasRenderer';
+import { ResourceCache } from '../layer/LayerAbstractRenderer';
 import { Geometries } from '../../geometry'
 
 const TEMP_EXTENT = new PointExtent();
diff --git a/packages/maptalks/src/renderer/geometry/Painter.ts b/packages/maptalks/src/renderer/geometry/Painter.ts
@@ -11,7 +11,7 @@ import { BBOX, getDefaultBBOX, resetBBOX, setBBOX, validateBBOX } from '../../co
 import Map from '../../map/Map'
 import { DebugSymbolizer } from './symbolizers';
 import Extent from '../../geo/Extent';
-import { ResourceCache } from '../layer/CanvasRenderer';
+import { ResourceCache } from '../layer/LayerAbstractRenderer';
 import type { WithUndef } from '../../types/typings';
 import { Geometries } from '../../geometry'
 
diff --git a/packages/maptalks/src/renderer/geometry/symbolizers/CanvasSymbolizer.ts b/packages/maptalks/src/renderer/geometry/symbolizers/CanvasSymbolizer.ts
@@ -2,7 +2,7 @@ import { isArrayHasData, isNumber } from '../../../core/util';
 import { loadGeoSymbol, isFunctionDefinition, interpolated, } from '../../../core/mapbox';
 import Symbolizer from './Symbolizer';
 import Canvas from '../../../core/Canvas';
-import { ResourceCache } from '../../layer/CanvasRenderer';
+import { ResourceCache } from '../../layer/LayerAbstractRenderer';
 
 /**
  *所有基于 HTML5 Canvas2D 的symbolizer类
diff --git a/packages/maptalks/src/renderer/geometry/symbolizers/ImageMarkerSymbolizer.ts b/packages/maptalks/src/renderer/geometry/symbolizers/ImageMarkerSymbolizer.ts
@@ -8,7 +8,7 @@ import Canvas from '../../../core/Canvas';
 import PointSymbolizer from './PointSymbolizer';
 import { Geometry } from '../../../geometry';
 import Painter from '../Painter';
-import { ResourceCache } from '../../layer/CanvasRenderer';
+import { ResourceCache } from '../../layer/LayerAbstractRenderer';
 const TEMP_SIZE = new Size(1, 1);
 const TEMP_EXTENT = new PointExtent();
 
diff --git a/packages/maptalks/src/renderer/geometry/symbolizers/VectorMarkerSymbolizer.ts b/packages/maptalks/src/renderer/geometry/symbolizers/VectorMarkerSymbolizer.ts
@@ -12,13 +12,11 @@ import { getDefaultVAlign, getDefaultHAlign, DEFAULT_MARKER_SYMBOLS } from '../.
 import { Geometry } from '../../../geometry';
 import Painter from '../Painter';
 import { Extent } from '../../../geo';
-import { ResourceCache } from '../../layer/CanvasRenderer';
-import { getDefaultBBOX, resetBBOX } from '../../../core/util/bbox';
+import { ResourceCache } from '../../layer/LayerAbstractRenderer';
 
 const MARKER_SIZE: [number, number] = [0, 0];
 const TEMP_EXTENT = new PointExtent();
 const DEFAULT_ANCHOR = new Point(0, 0);
-const TEMP_BBOX = getDefaultBBOX();
 
 export default class VectorMarkerSymbolizer extends PointSymbolizer {
     //@internal
@@ -68,16 +66,14 @@ export default class VectorMarkerSymbolizer extends PointSymbolizer {
             this.geometry.getLayer().getMask() === this.geometry ||
             this._dynamic ||
             this.geometry.getLayer().options['cacheVectorOnCanvas'] === false) {
-            //动态样式或者不缓存,function-type style, or not cache vector on canvas
-            this._drawMarkersWithDynamic(ctx, cookedPoints, resources);
+            this._drawMarkers(ctx, cookedPoints, resources);
         } else {
             this._drawMarkersWithCache(ctx, cookedPoints, resources);
         }
     }
 
-    //rename to _drawMarkersWithDynamic
     //@internal
-    _drawMarkersWithDynamic(ctx: CanvasRenderingContext2D, cookedPoints: any[], resources: ResourceCache) {
+    _drawMarkers(ctx: CanvasRenderingContext2D, cookedPoints: any[], resources: ResourceCache) {
         for (let i = cookedPoints.length - 1; i >= 0; i--) {
             let point = cookedPoints[i];
             const size = calVectorMarkerSize(MARKER_SIZE, this.style);
@@ -94,17 +90,13 @@ export default class VectorMarkerSymbolizer extends PointSymbolizer {
                 this.rotations.push(rad);
             }
 
-            const bbox = this._drawVectorMarker(ctx, point, resources);
+            this._drawVectorMarker(ctx, point, resources);
             if (origin) {
                 ctx.restore();
                 this._setBBOX(ctx, extent.xmin, extent.ymin, extent.xmax, extent.ymax);
             } else {
-                if (bbox) {
-                    this._setBBOX(ctx, bbox[0], bbox[1], bbox[2], bbox[3]);
-                } else {
-                    const { x, y } = point;
-                    this._setBBOX(ctx, x, y, x + width, y + height);
-                }
+                const { x, y } = point;
+                this._setBBOX(ctx, x, y, x + width, y + height);
             }
         }
     }
@@ -211,21 +203,15 @@ export default class VectorMarkerSymbolizer extends PointSymbolizer {
 
     //@internal
     _drawVectorMarker(ctx: CanvasRenderingContext2D, point: Point, resources: ResourceCache) {
-        resetBBOX(TEMP_BBOX);
-        drawVectorMarker(ctx, point, this.style, resources, TEMP_BBOX);
-        return TEMP_BBOX;
+        drawVectorMarker(ctx, point, this.style, resources);
     }
 
     getFixedExtent(): PointExtent {
-        // const isDynamic = this.isDynamicSize();
-        // const w = this.style.markerWidth;
-        // const h = this.style.markerHeight;
-        // this._fixedExtent = this._fixedExtent || new PointExtent();
-        // return getVectorMarkerFixedExtent(this._fixedExtent, this.style, isDynamic ? [128, 128 * (w === 0 ? 1 : h / w)] : null);
-
+        const isDynamic = this.isDynamicSize();
+        const w = this.style.markerWidth;
+        const h = this.style.markerHeight;
         this._fixedExtent = this._fixedExtent || new PointExtent();
-        return getVectorMarkerFixedExtent(this._fixedExtent, this.style, null);
-
+        return getVectorMarkerFixedExtent(this._fixedExtent, this.style, isDynamic ? [128, 128 * (w === 0 ? 1 : h / w)] : null);
     }
 
     translate(): any {
diff --git a/packages/maptalks/src/renderer/geometry/symbolizers/VectorPathMarkerSymbolizer.ts b/packages/maptalks/src/renderer/geometry/symbolizers/VectorPathMarkerSymbolizer.ts
@@ -3,7 +3,7 @@ import Browser from '../../../core/Browser';
 import { getMarkerPathBase64 } from '../../../core/util/resource';
 import ImageMarkerSymbolizer from './ImageMarkerSymbolizer';
 import { isPathSymbol } from '../../../core/util/marker';
-import { ResourceCache } from '../../layer/CanvasRenderer';
+import { ResourceCache } from '../../layer/LayerAbstractRenderer';
 // import { ResourceProxy } from '../../../core/ResourceProxy';
 
 export default class VectorPathMarkerSymbolizer extends ImageMarkerSymbolizer {
diff --git a/packages/maptalks/src/renderer/index.ts b/packages/maptalks/src/renderer/index.ts
@@ -1,16 +1,16 @@
 /** @namespace renderer */
 
-export { ResourceCache } from './layer/CanvasRenderer';
+export { ResourceCache } from './layer/LayerAbstractRenderer';
 export { default as CanvasRenderer } from './layer/CanvasRenderer';
-export { default as LayerGLRenderer } from './layer/LayerGLRenderer';
+export { default as LayerAbstractRenderer } from './layer/LayerAbstractRenderer';
 export { default as ImageGLRenderable } from './layer/ImageGLRenderable';
 
 export * from './layer/tilelayer';
 export * from './layer/vectorlayer';
 export * from './layer/canvaslayer';
 export { default as MapRenderer } from './map/MapRenderer';
 export { default as MapCanvasRenderer } from './map/MapCanvasRenderer';
-export { default as MapGLAbstractRenderer } from './map/MapGLAbstractRenderer';
+export { default as MapAbstractRenderer } from './map/MapAbstractRenderer';
 
 export { default as Renderable } from './Renderable';
 
diff --git a/packages/maptalks/src/renderer/layer/CanvasRenderer.ts b/packages/maptalks/src/renderer/layer/CanvasRenderer.ts
diff --git a/packages/maptalks/src/renderer/layer/LayerAbstractRenderer.ts b/packages/maptalks/src/renderer/layer/LayerAbstractRenderer.ts
diff --git a/packages/maptalks/src/renderer/layer/tilelayer/TileLayerRendererable.ts b/packages/maptalks/src/renderer/layer/tilelayer/TileLayerRendererable.ts
diff --git a/packages/maptalks/src/renderer/layer/vectorlayer/OverlayLayerCanvasRenderer.ts b/packages/maptalks/src/renderer/layer/vectorlayer/OverlayLayerCanvasRenderer.ts
diff --git a/packages/maptalks/src/renderer/map/MapAbstractRenderer.ts b/packages/maptalks/src/renderer/map/MapAbstractRenderer.ts
diff --git a/packages/maptalks/src/renderer/map/MapCanvasRenderer.ts b/packages/maptalks/src/renderer/map/MapCanvasRenderer.ts
