@sswroom/sswr 1.6.3 → 1.6.5

package/media.d.ts

@@ -98,7 +98,7 @@ export class EXIFData
 	parseMakerNote(buff: ArrayBuffer): EXIFData | null;
 
 	static getEXIFName(exifMaker: EXIFMaker, id: number, subId: number): string;
-	static parseIFD(reader: data.ByteReader, ofst: number, lsb: boolean, nextOfst: object, readBase: number, maker?: EXIFMaker): EXIFData | null;
+	static parseIFD(reader: data.ByteReader, ofst: number, lsb: boolean, nextOfst: object | null, readBase: number | null, maker?: EXIFMaker): EXIFData | null;
 }
 
 export class StaticImage extends data.ParsedObject

package/media.js

@@ -1359,7 +1359,7 @@ export class EXIFData
 	getPhotoDate()
 	{
 		let item;
-		if (this.exifMaker == EM_STANDARD)
+		if (this.exifMaker == EXIFMaker.Standard)
 		{
 			if ((item = this.exifMap[36867]))
 			{
@@ -1386,7 +1386,7 @@ export class EXIFData
 			}
 			if ((item = this.exifMap[306]))
 			{
-				if (item.type == ET_STRING)
+				if (item.type == EXIFType.STRING)
 				{
 					return data.Timestamp.fromStr(item.data, data.DateTimeUtil.getLocalTzQhr());
 				}
@@ -1605,7 +1605,7 @@ export class EXIFData
 			{
 				return null;
 			}
-			ret.lat = va;
+			ret.lat = val;
 		}
 		else
 		{
@@ -1715,7 +1715,7 @@ export class EXIFData
 				{
 					hh = item1.data[0];
 					mm = item1.data[2];
-					val = item1.data[4] / item.data[5];
+					val = item1.data[4] / item1.data[5];
 					ss = Math.floor(val);
 					ms = (val - ss);
 				}
@@ -1933,6 +1933,14 @@ export class EXIFData
 		return name || ("Tag "+subId);
 	}
 
+	/**
+	 * @param {data.ByteReader} reader
+	 * @param {number} ofst
+	 * @param {boolean} lsb
+	 * @param {object | null} nextOfst
+	 * @param {number | null} readBase
+	 * @param {string | null | undefined} [maker]
+	 */
 	static parseIFD(reader, ofst, lsb, nextOfst, readBase, maker)
 	{
 		if (!(reader instanceof data.ByteReader))
@@ -2165,7 +2173,7 @@ export class EXIFData
 			case 8:
 				if (fcnt <= 2)
 				{
-					exif.addInt16(tag, reader.readInt16Arr(ifdOfst + 8, fcnt));
+					exif.addInt16(tag, reader.readInt16Arr(ifdOfst + 8, lsb, fcnt));
 				}
 				else
 				{
@@ -2175,7 +2183,7 @@ export class EXIFData
 			case 9:
 				if (fcnt == 1)
 				{
-					exif.addInt32(tag, reader.readInt32Arr(ifdOfst + 8, fcnt));
+					exif.addInt32(tag, reader.readInt32Arr(ifdOfst + 8, lsb, fcnt));
 				}
 				else
 				{
@@ -2190,7 +2198,6 @@ export class EXIFData
 				break;
 			default:
 				console.log("EXIFData.parseIFD: Unsupported field type: "+ftype+", tag = "+tag);
-				j = 0;
 				break;
 			}
 	
@@ -2243,8 +2250,12 @@ export class StaticImage extends data.ParsedObject
 		canvas.width = this.img.naturalWidth;
 		canvas.height = this.img.naturalHeight;
 		let ctx = canvas.getContext("2d");
-		ctx.drawImage(this.img, 0, 0, this.img.naturalWidth, this.img.naturalHeight);
-		return canvas;
+		if (ctx)
+		{
+			ctx.drawImage(this.img, 0, 0, this.img.naturalWidth, this.img.naturalHeight);
+			return canvas;
+		}
+		throw new Error("Error in creating canvas");
 	}
 
 	exportJPG(quality)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sswroom/sswr",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "description": "Libraries made by sswroom",
   "main": "sswr.js",
   "scripts": {

package/parser.js

@@ -149,7 +149,7 @@ function parseKMLStyle(node)
 					break;
 				}
 			}
-			style.setLineStyle(innerStyle);
+			style.setLabelStyle(innerStyle);
 			break;
 		case "PolyStyle":
 			innerStyle = new kml.PolyStyle();
@@ -342,6 +342,8 @@ function parseKMLContainer(container, kmlNode, doc)
 			break;
 		case "#text":
 			break;
+		case "Schema":
+			break;
 		default:
 			console.log("Unknown node in kml container: "+node.nodeName, node);
 			break;
@@ -549,7 +551,7 @@ function parseKMLGeometry(kmlNode)
 						break;
 					case "LinearRing":
 						geom = parseKMLGeometry(subNode2);
-						if (geom)
+						if (geom && (geom instanceof geometry.LinearRing))
 							geomList.push(geom);
 						break;
 					default:
@@ -601,7 +603,22 @@ function parseKMLGeometry(kmlNode)
 				geom = new geometry.MultiPolygon(4326);
 				for (i in geomList)
 				{
-					geom.geometries.push(geomList[i]);
+					let g = geomList[i];
+					if (g instanceof geometry.Polygon)
+					{
+						geom.geometries.push(g);
+					}
+				}
+				return geom; 
+			}
+			else if (geomList[0] instanceof geometry.LineString && (geomList.length == 1 || geomList[1] instanceof geometry.LineString))
+			{
+				geom = new geometry.Polyline(4326);
+				for (i in geomList)
+				{
+					let g = geomList[i];
+					if (g instanceof geometry.LineString)
+						geom.geometries.push(g);
 				}
 				return geom; 
 			}
@@ -1140,14 +1157,18 @@ function parseX509(reader, fileName, mime)
 		}
 		else if (files.length > 1)
 		{
-			let fileList = new cert.X509FileList(fileName, files[0]);
-			let i = 1;
-			while (i < files.length)
+			let f = files[0];
+			if (f instanceof cert.X509Cert)
 			{
-				fileList.addFile(files[i]);
-				i++;
+				let fileList = new cert.X509FileList(fileName, f);
+				let i = 1;
+				while (i < files.length)
+				{
+					fileList.addFile(files[i]);
+					i++;
+				}
+				return fileList;
 			}
-			return fileList;
 		}
 		console.log("Unsupported file", fileName, mime);
 	}

package/text.d.ts

@@ -24,7 +24,7 @@ export function arrayToNumbers(arr: string[]): number[];
 export function toHex8(v: number): string;
 export function toHex16(v: number): string;
 export function toHex32(v: number): string;
-export function u8Arr2Hex(buff: Uint8Array, byteSep: string, rowSep: string): string;
+export function u8Arr2Hex(buff: Uint8Array, byteSep: string | null, rowSep: string | null): string;
 export function splitLines(txt: string): string[];
 export function isEmailAddress(s: string): boolean;
 export function toUTF32Length(s: string): number;

package/text.js

@@ -916,7 +916,7 @@ export class Base64Enc extends TextBinEnc
 		let i = 0;
 		let j = str.length;
 		let b = 0;
-		let b2;
+		let b2 = 0;
 		let c;
 		let code;
 		while (i < j)
@@ -1182,7 +1182,7 @@ export class CPPTextBinEnc extends TextBinEnc
 			}
 			else if ((b & 0xfe) == 0xfc)
 			{
-				code = (UInt32)(((b & 0x1) << 30) | ((arr[i + 1] & 0x3f) << 24) | ((arr[i + 2] & 0x3f) << 18) | ((arr[i + 3] & 0x3f) << 12) | ((arr[i + 4] & 0x3f) << 6) | (arr[i + 5] & 0x3f));
+				code = (((b & 0x1) << 30) | ((arr[i + 1] & 0x3f) << 24) | ((arr[i + 2] & 0x3f) << 18) | ((arr[i + 3] & 0x3f) << 12) | ((arr[i + 4] & 0x3f) << 6) | (arr[i + 5] & 0x3f));
 				if (code >= 0x10000)
 				{
 					ret.push(String.fromCharCode(((code - 0x10000) >> 10) + 0xd800, (code & 0x3ff) + 0xdc00));