fix: changed filtering oder and add cull for notes (#429)

Author: aiAdrian

src/app/services/ui/filter.service.ts

@@ -391,12 +391,10 @@ export class FilterService implements OnDestroy {
       trainrun.getLabelIds(),
     );
     return (
+      filterTrainrunSection &&
       this.isFilterTrainrunFrequencyEnabled(trainrun.getTrainrunFrequency()) &&
       this.isFilterTrainrunCategoryEnabled(trainrun.getTrainrunCategory()) &&
-      this.isFilterTrainrunTimeCategoryEnabled(
-        trainrun.getTrainrunTimeCategory(),
-      ) &&
-      filterTrainrunSection
+      this.isFilterTrainrunTimeCategoryEnabled(trainrun.getTrainrunTimeCategory())
     );
   }
 
@@ -868,14 +866,6 @@ export class FilterService implements OnDestroy {
           groupedLabelsFromEnvironment.filter(
             (value) => groupedLabelsAllMinusFilter.indexOf(value) !== -1,
           ).length === groupedLabelsAllMinusFilter.length;
-        console.log(
-          "groupedLabelsAllMinusFilter",
-          groupedLabelsAllMinusFilter,
-          "groupedLabelsFromEnvironment",
-          groupedLabelsFromEnvironment,
-          "doFiltering",
-          doFiltering,
-        );
       }
     });
     return doFiltering;

src/app/view/editor-main-view/data-views/notes.view.ts

@@ -128,7 +128,16 @@ export class NotesView {
   }
 
   displayNotes(inputNotes: Note[]) {
-    const notes = inputNotes.filter((n) => this.filterNotesToDisplay(n));
+    const notes = inputNotes.filter((n) =>
+      this.editorView.doCullCheckPositionsInViewport(
+        [
+          new Vec2D(n.getPositionX(), n.getPositionY()),
+          new Vec2D(n.getPositionX() + n.getWidth(), n.getPositionY()),
+          new Vec2D(n.getPositionX(), n.getPositionY() + n.getHeight()),
+          new Vec2D(n.getPositionX() + n.getWidth(), n.getPositionY() + n.getHeight())
+        ]) &&
+      this.filterNotesToDisplay(n)
+    );
 
     const group = this.notesGroup
       .selectAll(StaticDomTags.NOTE_ROOT_CONTAINER_DOM_REF)