New decluttering implementation

2020-09-20 23:36:27 +02:00
parent 7a5e0db59f
commit 8e862766fc
22 changed files with 784 additions and 330 deletions
@@ -102,6 +102,10 @@ class CompositeMapRenderer extends MapRenderer {
    const viewState = frameState.viewState;

    this.children_.length = 0;
+    /**
+     * @type {Array<import("../layer/BaseVector.js").default>}
+     */
+    const declutterLayers = [];
    let previousElement = null;
    for (let i = 0, ii = layerStatesArray.length; i < ii; ++i) {
      const layerState = layerStatesArray[i];
@@ -123,8 +127,13 @@ class CompositeMapRenderer extends MapRenderer {
        this.children_.push(element);
        previousElement = element;
      }
+      if ('getDeclutter' in layer) {
+        declutterLayers.push(layer);
+      }
+    }
+    for (let i = declutterLayers.length - 1; i >= 0; --i) {
+      declutterLayers[i].renderDeclutter(frameState);
    }
-    super.renderFrame(frameState);

    replaceChildren(this.element_, this.children_);