@mapcatch/util 1.0.15 → 2.0.0

package/src/gl-operations/reglCommands/multiLayers.js

@@ -1,23 +1,23 @@
-import vertSingle from '../shaders/vertex/single.js';
-import vertDouble from '../shaders/vertex/double.js';
-import vertMulti3 from '../shaders/vertex/multi3.js';
-import vertMulti4 from '../shaders/vertex/multi4.js';
-import vertMulti5 from '../shaders/vertex/multi5.js';
-import vertMulti6 from '../shaders/vertex/multi6.js';
+import vertSingle from '../shaders/vertex/single.js'
+import vertDouble from '../shaders/vertex/double.js'
+import vertMulti3 from '../shaders/vertex/multi3.js'
+import vertMulti4 from '../shaders/vertex/multi4.js'
+import vertMulti5 from '../shaders/vertex/multi5.js'
+import vertMulti6 from '../shaders/vertex/multi6.js'
 
-import fragMulti1Calc from '../shaders/fragment/multiAnalyze1Calc.js';
-import fragMulti2Calc from '../shaders/fragment/multiAnalyze2Calc.js';
-import fragMulti3Calc from '../shaders/fragment/multiAnalyze3Calc.js';
-import fragMulti4Calc from '../shaders/fragment/multiAnalyze4Calc.js';
-import fragMulti5Calc from '../shaders/fragment/multiAnalyze5Calc.js';
-import fragMulti6Calc from '../shaders/fragment/multiAnalyze6Calc.js';
-import fragDiffCalc from '../shaders/fragment/diffCalc.js';
-import fragDrawResult from '../shaders/fragment/drawResult.js';
+import fragMulti1Calc from '../shaders/fragment/multiAnalyze1Calc.js'
+import fragMulti2Calc from '../shaders/fragment/multiAnalyze2Calc.js'
+import fragMulti3Calc from '../shaders/fragment/multiAnalyze3Calc.js'
+import fragMulti4Calc from '../shaders/fragment/multiAnalyze4Calc.js'
+import fragMulti5Calc from '../shaders/fragment/multiAnalyze5Calc.js'
+import fragMulti6Calc from '../shaders/fragment/multiAnalyze6Calc.js'
+import fragDiffCalc from '../shaders/fragment/diffCalc.js'
+import fragDrawResult from '../shaders/fragment/drawResult.js'
 
-import * as util from '../util';
+import * as util from '../util'
 
 
-export function createCalcTileMultiAnalyze1Command(
+export function createCalcTileMultiAnalyze1Command (
   regl,
   commonConfig
 ) {
@@ -33,17 +33,17 @@ export function createCalcTileMultiAnalyze1Command(
       filterLowA: (_, { filterLowA }) => filterLowA,
       filterHighA: (_, { filterHighA }) => filterHighA,
       multiplierA: (_, { multiplierA }) => multiplierA,
-      textureA: (_, { textureA }) => textureA,
+      textureA: (_, { textureA }) => textureA
     },
     attributes: {
       ...commonConfig.attributes,
-      texCoord: (_, { textureBoundsA }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsA),
+      texCoord: (_, { textureBoundsA }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsA)
     },
-    framebuffer: regl.prop("fbo"),
-  });
+    framebuffer: regl.prop('fbo')
+  })
 }
 
-export function createCalcTileMultiAnalyze2Command(
+export function createCalcTileMultiAnalyze2Command (
   regl,
   commonConfig
 ) {
@@ -63,18 +63,18 @@ export function createCalcTileMultiAnalyze2Command(
       multiplierA: (_, { multiplierA }) => multiplierA,
       multiplierB: (_, { multiplierB }) => multiplierB,
       textureA: (_, { textureA }) => textureA,
-      textureB: (_, { textureB }) => textureB,
+      textureB: (_, { textureB }) => textureB
     },
     attributes: {
       ...commonConfig.attributes,
       texCoordA: (_, { textureBoundsA }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsA),
-      texCoordB: (_, { textureBoundsB }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsB),
+      texCoordB: (_, { textureBoundsB }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsB)
     },
-    framebuffer: regl.prop("fbo"),
-  });
+    framebuffer: regl.prop('fbo')
+  })
 }
 
-export function createCalcTileMultiAnalyze3Command(
+export function createCalcTileMultiAnalyze3Command (
   regl,
   commonConfig
 ) {
@@ -98,19 +98,19 @@ export function createCalcTileMultiAnalyze3Command(
       multiplierC: (_, { multiplierC }) => multiplierC,
       textureA: (_, { textureA }) => textureA,
       textureB: (_, { textureB }) => textureB,
-      textureC: (_, { textureC }) => textureC,
+      textureC: (_, { textureC }) => textureC
     },
     attributes: {
       ...commonConfig.attributes,
       texCoordA: (_, { textureBoundsA }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsA),
       texCoordB: (_, { textureBoundsB }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsB),
-      texCoordC: (_, { textureBoundsC }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsC),
+      texCoordC: (_, { textureBoundsC }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsC)
     },
-    framebuffer: regl.prop("fbo"),
-  });
+    framebuffer: regl.prop('fbo')
+  })
 }
 
-export function createCalcTileMultiAnalyze4Command(
+export function createCalcTileMultiAnalyze4Command (
   regl,
   commonConfig
 ) {
@@ -138,20 +138,20 @@ export function createCalcTileMultiAnalyze4Command(
       textureA: (_, { textureA }) => textureA,
       textureB: (_, { textureB }) => textureB,
       textureC: (_, { textureC }) => textureC,
-      textureD: (_, { textureD }) => textureD,
+      textureD: (_, { textureD }) => textureD
     },
     attributes: {
       ...commonConfig.attributes,
       texCoordA: (_, { textureBoundsA }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsA),
       texCoordB: (_, { textureBoundsB }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsB),
       texCoordC: (_, { textureBoundsC }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsC),
-      texCoordD: (_, { textureBoundsD }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsD),
+      texCoordD: (_, { textureBoundsD }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsD)
     },
-    framebuffer: regl.prop("fbo"),
-  });
+    framebuffer: regl.prop('fbo')
+  })
 }
 
-export function createCalcTileMultiAnalyze5Command(
+export function createCalcTileMultiAnalyze5Command (
   regl,
   commonConfig
 ) {
@@ -183,7 +183,7 @@ export function createCalcTileMultiAnalyze5Command(
       textureB: (_, { textureB }) => textureB,
       textureC: (_, { textureC }) => textureC,
       textureD: (_, { textureD }) => textureD,
-      textureE: (_, { textureE }) => textureE,
+      textureE: (_, { textureE }) => textureE
     },
     attributes: {
       ...commonConfig.attributes,
@@ -191,13 +191,13 @@ export function createCalcTileMultiAnalyze5Command(
       texCoordB: (_, { textureBoundsB }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsB),
       texCoordC: (_, { textureBoundsC }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsC),
       texCoordD: (_, { textureBoundsD }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsD),
-      texCoordE: (_, { textureBoundsE }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsE),
+      texCoordE: (_, { textureBoundsE }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsE)
     },
-    framebuffer: regl.prop("fbo"),
-  });
+    framebuffer: regl.prop('fbo')
+  })
 }
 
-export function createCalcTileMultiAnalyze6Command(
+export function createCalcTileMultiAnalyze6Command (
   regl,
   commonConfig
 ) {
@@ -233,7 +233,7 @@ export function createCalcTileMultiAnalyze6Command(
       textureC: (_, { textureC }) => textureC,
       textureD: (_, { textureD }) => textureD,
       textureE: (_, { textureE }) => textureE,
-      textureF: (_, { textureF }) => textureF,
+      textureF: (_, { textureF }) => textureF
     },
     attributes: {
       ...commonConfig.attributes,
@@ -244,11 +244,11 @@ export function createCalcTileMultiAnalyze6Command(
       texCoordE: (_, { textureBoundsE }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsE),
       texCoordF: (_, { textureBoundsF }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsF)
     },
-    framebuffer: regl.prop("fbo"),
-  });
+    framebuffer: regl.prop('fbo')
+  })
 }
 
-export function createCalcTileDiffCommand(
+export function createCalcTileDiffCommand (
   regl,
   commonConfig
 ) {
@@ -262,21 +262,21 @@ export function createCalcTileDiffCommand(
     uniforms: {
       ...commonConfig.uniforms,
       textureA: (_, { textureA }) => textureA,
-      textureB: (_, { textureB }) => textureB,
+      textureB: (_, { textureB }) => textureB
     },
     attributes: {
       ...commonConfig.attributes,
       texCoordA: (_, { textureBoundsA }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsA),
-      texCoordB: (_, { textureBoundsB }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsB),
+      texCoordB: (_, { textureBoundsB }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsB)
     },
-    framebuffer: regl.prop("fbo"),
-  });
+    framebuffer: regl.prop('fbo')
+  })
 }
 
-export function createDrawResultCommand(
+export function createDrawResultCommand (
   regl,
   commonConfig,
-  fragMacros,
+  fragMacros
 ) {
   return regl({
     ...commonConfig,
@@ -291,11 +291,11 @@ export function createDrawResultCommand(
       sentinelLength: regl.prop('sentinelLength'),
       scaleColormap: regl.prop('scaleColormap'),
       sentinelColormap: regl.prop('sentinelColormap'),
-      texture: regl.prop("texture"),
+      texture: regl.prop('texture')
     },
     attributes: {
       ...commonConfig.attributes,
-      texCoord: [[0, 1], [1, 1], [0, 0], [1, 0]],
-    },
-  });
+      texCoord: [[0, 1], [1, 1], [0, 0], [1, 0]]
+    }
+  })
 }

package/src/gl-operations/reglCommands/transitions.js

@@ -1,21 +1,21 @@
-import vertSingle from '../shaders/vertex/single.js';
-import vertDouble from '../shaders/vertex/double.js';
+import vertSingle from '../shaders/vertex/single.js'
+import vertDouble from '../shaders/vertex/double.js'
 
-import fragInterpolateColor from '../shaders/fragment/interpolateColor.js';
-import fragInterpolateColorOnly from '../shaders/fragment/interpolateColorOnly.js';
-import fragInterpolateValue from '../shaders/fragment/interpolateValue.js';
+import fragInterpolateColor from '../shaders/fragment/interpolateColor.js'
+import fragInterpolateColorOnly from '../shaders/fragment/interpolateColorOnly.js'
+import fragInterpolateValue from '../shaders/fragment/interpolateValue.js'
 
-import * as util from '../util';
+import * as util from '../util'
 
 /**
  * The DrawCommand output by this function interpolates, for each pixel, between two values, one
  * from `textureA` and one from `textureB`. The same color scale / sentinel values are applied to
  * both.
  */
-export function createDrawTileInterpolateValueCommand(
+export function createDrawTileInterpolateValueCommand (
   regl,
   commonConfig,
-  fragMacros,
+  fragMacros
 ) {
   return regl({
     ...commonConfig,
@@ -29,14 +29,14 @@ export function createDrawTileInterpolateValueCommand(
       sentinelColormap: regl.prop('sentinelColormap'),
       textureA: (_, { textureA }) => textureA,
       textureB: (_, { textureB }) => textureB,
-      interpolationFraction: (_, { interpolationFraction }) => interpolationFraction,
+      interpolationFraction: (_, { interpolationFraction }) => interpolationFraction
     },
     attributes: {
       ...commonConfig.attributes,
       texCoordA: (_, { textureBoundsA }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsA),
-      texCoordB: (_, { textureBoundsB }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsB),
-    },
-  });
+      texCoordB: (_, { textureBoundsB }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsB)
+    }
+  })
 }
 
 /**
@@ -44,10 +44,10 @@ export function createDrawTileInterpolateValueCommand(
  * are colorized with one color scale / set of sentinel values, while pixels from `textureB` use a
  * different color scale / set of sentinel values.
  */
-export function createDrawTileInterpolateColorCommand(
+export function createDrawTileInterpolateColorCommand (
   regl,
   commonConfig,
-  fragMacros,
+  fragMacros
 ) {
   return regl({
     ...commonConfig,
@@ -65,24 +65,24 @@ export function createDrawTileInterpolateColorCommand(
       sentinelColormapB: regl.prop('sentinelColormapB'),
       textureA: (_, { textureA }) => textureA,
       textureB: (_, { textureB }) => textureB,
-      interpolationFraction: (_, { interpolationFraction }) => interpolationFraction,
+      interpolationFraction: (_, { interpolationFraction }) => interpolationFraction
     },
     attributes: {
       ...commonConfig.attributes,
       texCoordA: (_, { textureBoundsA }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsA),
-      texCoordB: (_, { textureBoundsB }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsB),
-    },
-  });
+      texCoordB: (_, { textureBoundsB }) => util.getTexCoordVerticesTriangleStripQuad(textureBoundsB)
+    }
+  })
 }
 
 /**
  * The behavior of this DrawCommand is similar to the one above, except that the pixel values
  * are the same. Only the colorscale changes.
  */
-export function createDrawTileInterpolateColorOnlyCommand(
+export function createDrawTileInterpolateColorOnlyCommand (
   regl,
   commonConfig,
-  fragMacros,
+  fragMacros
 ) {
   return regl({
     ...commonConfig,
@@ -99,11 +99,11 @@ export function createDrawTileInterpolateColorOnlyCommand(
       scaleColormapB: regl.prop('scaleColormapB'),
       sentinelColormapB: regl.prop('sentinelColormapB'),
       texture: (_, { texture }) => texture,
-      interpolationFraction: (_, { interpolationFraction }) => interpolationFraction,
+      interpolationFraction: (_, { interpolationFraction }) => interpolationFraction
     },
     attributes: {
       ...commonConfig.attributes,
-      texCoord: (_, { textureBounds }) => util.getTexCoordVerticesTriangleStripQuad(textureBounds),
-    },
-  });
+      texCoord: (_, { textureBounds }) => util.getTexCoordVerticesTriangleStripQuad(textureBounds)
+    }
+  })
 }

package/src/gl-operations/reglCommands/util.js

@@ -1,71 +1,71 @@
-import vertSingle from '../shaders/vertex/single.js';
+import vertSingle from '../shaders/vertex/single.js'
 
-import fragConvertDem from '../shaders/fragment/convertDem.js';
+import fragConvertDem from '../shaders/fragment/convertDem.js'
 
-import * as util from '../util';
+import * as util from '../util'
 
-const littleEndian = util.machineIsLittleEndian();
+const littleEndian = util.machineIsLittleEndian()
 
 /**
  * The object generated by this function should be merged into the DrawConfig for each Regl
  * command in the application.
  */
-export function getCommonDrawConfiguration(
-	tileSize,
-	nodataValue,
+export function getCommonDrawConfiguration (
+  tileSize,
+  nodataValue
 ) {
-	return {
-	  uniforms: {
-		nodataValue,
-		littleEndian,
-		transformMatrix: ({ viewportWidth, viewportHeight }) => (
-		  util.getTransformMatrix(viewportWidth, viewportHeight)
-		),
-	  },
-	  attributes: {
-		position: (_, { canvasCoordinates }) => {
-		  const [left, top] = canvasCoordinates;
-		  const [right, bottom] = [left + tileSize, top + tileSize];
-		  return [
-			[left,  top   ],
-			[right, top   ],
-			[left,  bottom],
-			[right, bottom],
-		  ];
-		},
-	  },
-	  // We don't need the depth buffer for 2D drawing. Leaving it enabled (and failing to clear it
-	  // between draw calls) results in visual artifacts.
-	  depth: { enable: false },
-	  primitive: 'triangle strip',
-	  count: 4,
-	  viewport: (_, { canvasSize: [width, height] }) => ({ width, height }),
-	};
+  return {
+    uniforms: {
+      nodataValue,
+      littleEndian,
+      transformMatrix: ({ viewportWidth, viewportHeight }) => (
+        util.getTransformMatrix(viewportWidth, viewportHeight)
+      )
+    },
+    attributes: {
+      position: (_, { canvasCoordinates }) => {
+        const [left, top] = canvasCoordinates
+        const [right, bottom] = [left + tileSize, top + tileSize]
+        return [
+          [left, top ],
+          [right, top ],
+          [left, bottom],
+          [right, bottom]
+        ]
+      }
+    },
+    // We don't need the depth buffer for 2D drawing. Leaving it enabled (and failing to clear it
+    // between draw calls) results in visual artifacts.
+    depth: { enable: false },
+    primitive: 'triangle strip',
+    count: 4,
+    viewport: (_, { canvasSize: [width, height] }) => ({ width, height })
+  }
 }
 
 /**
  * The command output by this function converts a tile in DEM format
  * to float32 packed as rgba.
  */
-export function createConvertDemCommand(
-	regl,
-	commonConfig
+export function createConvertDemCommand (
+  regl,
+  commonConfig
 ) {
-	return regl({
-	  ...commonConfig,
-	  vert: vertSingle,
-	  frag: fragConvertDem,
-	  depth:  {
-		enable: false
-	  },
-	  uniforms: {
-		...commonConfig.uniforms,
-		texture: (_, { texture }) => texture,
-	  },
-	  attributes: {
-		...commonConfig.attributes,
-		texCoord: [[0, 1], [1, 1], [0, 0], [1, 0]],
-	  },
-	  framebuffer: regl.prop("fbo"),
-	});
+  return regl({
+    ...commonConfig,
+    vert: vertSingle,
+    frag: fragConvertDem,
+    depth:  {
+      enable: false
+    },
+    uniforms: {
+      ...commonConfig.uniforms,
+      texture: (_, { texture }) => texture
+    },
+    attributes: {
+      ...commonConfig.attributes,
+      texCoord: [[0, 1], [1, 1], [0, 0], [1, 0]]
+    },
+    framebuffer: regl.prop('fbo')
+  })
 }