flatten graphic header

Author: netbymatt

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.3.0
+## Breaking Changes
+- Flatten graphic header to an array of packets and omit page and length values
+
 # v0.2.0
 ## Breaking Changes
 - Parsers no longer return delimeters, block lengths, or IDs as these are internally evaluated and checked during the parsing process

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nexrad-level-3-data",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Parsing of NEXRAD level 3 data files",
   "main": "src/index.js",
   "scripts": {

src/headers/graphic.js

@@ -11,36 +11,30 @@ const parse = (raf) => {
 	if (blockLength < 1 || blockLength > 65535) throw new Error(`Invalid block length ${blockLength}`);
 	if ((blockLength + raf.getPos() - 8) > raf.getLength()) throw new Error(`Block length ${blockLength} overruns file length for block id: ${blockId}`);
 
-	const result = {
-		numberPages: raf.readShort(),
-		pages: [],
-	};
+	const numberPages = raf.readShort();
 
-	if (result.numberPages < 1 || result.numberPages > 48 - 1) throw new Error(`Invalid graphic number of pages: ${result.numberPages}`);
+	const packets = [];
+
+	if (numberPages < 1 || numberPages > 48 - 1) throw new Error(`Invalid graphic number of pages: ${numberPages}`);
 
 	// read each page
-	for (let pageNum = 0; pageNum < result.numberPages; pageNum += 1) {
-		const page = {
-			number: raf.readShort(),
-			length: raf.readShort(),
-			packets: [],
-		};
+	for (let pageNum = 0; pageNum < numberPages; pageNum += 1) {
+		const pageNumber = raf.readShort();
+		const pageLength = raf.readShort();
 
 		// calculate end byte
-		const endByte = raf.getPos() + page.length;
+		const endByte = raf.getPos() + pageLength;
 
 		// test page number
-		if (pageNum + 1 !== page.number) throw new Error(`Invalid page number: ${page.number}`);
+		if (pageNum + 1 !== pageNumber) throw new Error(`Invalid page number: ${pageNumber}`);
 
 		// loop through all packets
 		while (raf.getPos() < endByte) {
-			page.packets.push(parser(raf));
+			packets.push(parser(raf));
 		}
-
-		result.pages.push(page);
 	}
 
-	return result;
+	return packets;
 };
 
 //