jbrowse-plugin-gwas 2.0.1 → 2.0.4

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v2.0.2
+
+- Misc optimizations
+
 # v2.0.0
 
 - Add clickable features

package/dist/LinearManhattanRenderer/LinearManhattanRenderer.js

@@ -26,10 +26,16 @@ export default function rendererFactory(pluginManager) {
             const opts = { ...scaleOpts, range: [0, height] };
             const width = (region.end - region.start) / bpPerPx;
             const rbush = new RBush();
+            const defaultColor = readConfObject(config, 'color');
             const scale = getScale(opts);
             const toY = (n) => height - scale(n) + YSCALEBAR_LABEL_OFFSET;
             let start = performance.now();
             checkStopToken(stopToken);
+            let lastRenderedBlobX = 0;
+            let lastRenderedBlobY = 0;
+            if (!config.color.isCallback) {
+                ctx.fillStyle = defaultColor;
+            }
             for (const feature of features.values()) {
                 if (performance.now() - start > 200) {
                     checkStopToken(stopToken);
@@ -37,18 +43,26 @@ export default function rendererFactory(pluginManager) {
                 }
                 const [leftPx] = featureSpanPx(feature, region, bpPerPx);
                 const score = feature.get('score');
-                ctx.fillStyle = readConfObject(config, 'color', { feature });
-                ctx.beginPath();
                 const y = toY(score);
-                ctx.arc(leftPx, y, 2, 0, 2 * Math.PI);
-                rbush.insert({
-                    minX: leftPx,
-                    minY: y,
-                    maxX: leftPx + 4,
-                    maxY: y + 4,
-                    feature: feature.toJSON(),
-                });
-                ctx.fill();
+                if (Math.abs(leftPx - lastRenderedBlobX) > 1 ||
+                    Math.abs(y - lastRenderedBlobY) > 1) {
+                    if (config.color.isCallback) {
+                        ctx.fillStyle = readConfObject(config, 'color', { feature });
+                    }
+                    ctx.beginPath();
+                    ctx.moveTo(leftPx, y);
+                    ctx.arc(leftPx, y, 2, 0, 2 * Math.PI);
+                    ctx.fill();
+                    lastRenderedBlobY = y;
+                    lastRenderedBlobX = leftPx;
+                    rbush.insert({
+                        minX: leftPx,
+                        minY: y,
+                        maxX: leftPx + 4,
+                        maxY: y + 4,
+                        feature: feature.toJSON(),
+                    });
+                }
             }
             if (displayCrossHatches) {
                 ctx.lineWidth = 1;

package/dist/LinearManhattanRenderer/LinearManhattanRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"LinearManhattanRenderer.js","sourceRoot":"","sources":["../../src/LinearManhattanRenderer/LinearManhattanRenderer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LinearManhattanRenderer.js","sourceRoot":"","sources":["../../src/LinearManhattanRenderer/LinearManhattanRenderer.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -2,5 +2,6 @@ import Plugin from '@jbrowse/core/Plugin';
 import type PluginManager from '@jbrowse/core/PluginManager';
 export default class GWASPlugin extends Plugin {
     name: string;
+    version: string;
     install(pluginManager: PluginManager): void;
 }

package/dist/index.js

@@ -1,10 +1,12 @@
 import Plugin from '@jbrowse/core/Plugin';
 import LinearManhattanDisplayF from './LinearManhattanDisplay';
 import LinearManhattanRendererF from './LinearManhattanRenderer';
+import { version } from './version';
 export default class GWASPlugin extends Plugin {
     constructor() {
         super(...arguments);
         this.name = 'GWASPlugin';
+        this.version = version;
     }
     install(pluginManager) {
         LinearManhattanDisplayF(pluginManager);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,sBAAsB,CAAA;AAEzC,OAAO,uBAAuB,MAAM,0BAA0B,CAAA;AAC9D,OAAO,wBAAwB,MAAM,2BAA2B,CAAA;AAIhE,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,MAAM;IAA9C;;QACE,SAAI,GAAG,YAAY,CAAA;IAMrB,CAAC;IAJC,OAAO,CAAC,aAA4B;QAClC,uBAAuB,CAAC,aAAa,CAAC,CAAA;QACtC,wBAAwB,CAAC,aAAa,CAAC,CAAA;IACzC,CAAC;CACF"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,sBAAsB,CAAA;AAEzC,OAAO,uBAAuB,MAAM,0BAA0B,CAAA;AAC9D,OAAO,wBAAwB,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAInC,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,MAAM;IAA9C;;QACE,SAAI,GAAG,YAAY,CAAA;QACnB,YAAO,GAAG,OAAO,CAAA;IAMnB,CAAC;IAJC,OAAO,CAAC,aAA4B;QAClC,uBAAuB,CAAC,aAAa,CAAC,CAAA;QACtC,wBAAwB,CAAC,aAAa,CAAC,CAAA;IACzC,CAAC;CACF"}