From ecfc6fd31e343356fb1fbc3eb2cc2097c0282057 Mon Sep 17 00:00:00 2001
From: Felix Roos <roos@entrecode.de>
Date: Fri, 22 Apr 2022 22:52:11 +0200
Subject: [PATCH] simplify

---
 packages/core/pattern.mjs | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/packages/core/pattern.mjs b/packages/core/pattern.mjs
index a62dc092..e4180a90 100644
--- a/packages/core/pattern.mjs
+++ b/packages/core/pattern.mjs
@@ -724,27 +724,17 @@ export class Pattern {
 
   reset(pat) {
     pat = reify(pat);
-    return new Pattern((state) => {
-      const hps = pat
+    return new Pattern((state) =>
+      pat
         .query(state)
         .map((event) => {
-          const haps = this.query(new State(new TimeSpan(event.part.begin.sub(event.whole.begin), event.duration))).map(
-            (hap) =>
-              hap
-                .withSpan((s) => {
-                  s = s.withTime((t) => t.add(event.whole.begin));
-                  // s = s.intersection(state.span) || s;
-                  return s;
-                })
-                .setContext(hap.combineContext(event)),
+          const resetSpan = new TimeSpan(event.part.begin.sub(event.whole.begin), event.duration);
+          return this.query(new State(resetSpan)).map((hap) =>
+            hap.withSpan((s) => s.withTime((t) => t.add(event.whole.begin))).setContext(hap.combineContext(event)),
           );
-          //console.log('haps',haps.map(h=>h.show()))
-          return haps;
         })
-        .flat();
-      //console.log('hps',hps.map(h=>h.show()))
-      return hps;
-    });
+        .flat(),
+    );
   }
 }