@sswroom/sswr 1.5.4 → 1.5.5

package/package.json

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

package/parser.d.ts

@@ -1,4 +1,5 @@
 import * as kml from "./kml";
+import * as media from "./media";
 
 export function parseXML(txt: string): kml.Feature | kml.NetworkLinkControl | null;
-export function parseFile(file: File): Promise<kml.Feature | kml.NetworkLinkControl | null>;
+export function parseFile(file: File | Response): Promise<kml.Feature | kml.NetworkLinkControl | media.StaticImage | null>;

package/parser.js

@@ -1,5 +1,7 @@
+import * as data from "./data.js";
 import * as geometry from "./geometry.js";
 import * as kml from "./kml.js";
+import * as media from "./media.js";
 import * as text from "./text.js";
 import * as web from "./web.js";
 
@@ -275,6 +277,46 @@ function parseKMLContainer(container, kmlNode, doc)
 		case "visibility":
 			container.setVisibility(node.textContent == "1");
 			break;
+		case "atom:author":
+			for (subNode of node.childNodes)
+			{
+				switch (subNode.nodeName)
+				{
+				case "#text":
+					{
+						let txt = subNode.textContent.trim();
+						if (txt.length > 0)
+						{
+							if (container.author)
+								container.setAuthor(container.author + " " + txt);
+							else
+								container.setAuthor(txt);
+						}						
+					}
+					break;
+				case "atom:name":
+					container.setAuthorName(subNode.textContent);
+					break;
+				default:
+					console.log("Unknown node in kml atom:author: "+subNode.nodeName, subNode);
+					break;
+				}
+			}
+			break;
+		case "atom:link":
+			for (subNode of node.attributes)
+			{
+				switch (subNode.name)
+				{
+				case "href":
+					container.setLink(subNode.value);
+					break;
+				default:
+					console.log("Unknown attribute in kml atom:link: "+subNode.nodeName, subNode);
+					break;
+				}
+			}
+			break;
 		case "Style":
 			break;
 		case "StyleMap":
@@ -285,6 +327,11 @@ function parseKMLContainer(container, kmlNode, doc)
 			if (feature)
 				container.addFeature(feature);
 			break;
+		case "NetworkLink":
+			feature = parseKMLNetworkLink(node, doc || container);
+			if (feature)
+				container.addFeature(feature);
+			break;
 		case "LookAt":
 			container.setLookAt(parseKMLLookAt(node));
 			break;
@@ -574,6 +621,98 @@ function parseKMLGeometry(kmlNode)
 	return null;
 }
 
+function parseKMLNetworkLink(kmlNode, doc)
+{
+	let name;
+	let description;
+	let open;
+	let refreshVisibility;
+	let flyToView;
+	let linkHref;
+	let refreshMode;
+	let refreshInterval;
+	let viewRefreshMode;
+
+	let feature;
+	let node;
+	let subNode;
+	for (node of kmlNode.childNodes)
+	{
+		switch (node.nodeName)
+		{
+		case "#text":
+			break;
+		case "name":
+			name = node.textContent;
+			break;
+		case "description":
+			description = node.textContent.trim();
+			break;
+		case "open":
+			open = (node.textContent == "1");
+			break;
+		case "refreshVisibility":
+			refreshVisibility = (node.textContent == "1");
+			break;
+		case "flyToView":
+			flyToView = (node.textContent == "1");
+			break;
+		case "Link":
+			for (subNode of node.childNodes)
+			{
+				switch (subNode.nodeName)
+				{
+				case "#comment":
+					break;
+				case "#text":
+					break;
+				case "href":
+					linkHref = subNode.textContent;
+					break;
+				case "refreshMode":
+					refreshMode = subNode.textContent;
+					break;
+				case "refreshInterval":
+					refreshInterval = subNode.textContent;
+					break;
+				case "viewRefreshMode":
+					viewRefreshMode = subNode.textContent;
+					break;
+				default:
+					console.log("Unknown node in kml NetworkLink.Link", subNode);
+					break;
+				}
+			}
+			break;
+		default:
+			console.log("Unknown node in kml NetworkLink", node);
+			break;
+		}
+	}
+	if (linkHref)
+	{
+		feature = new kml.NetworkLink(linkHref);
+		if (name)
+			feature.setName(name);
+		if (description)
+			feature.setDescription(description);
+		if (open != null)
+			feature.setOpen(open);
+		if (refreshVisibility != null)
+			feature.setRefreshVisibility(refreshVisibility);
+		if (flyToView != null)
+			feature.setFlyToView(flyToView);
+		if (refreshMode)
+			feature.setRefreshMode(refreshMode);
+		if (refreshInterval)
+			feature.setRefreshInterval(Number.parseFloat(refreshInterval));
+		if (viewRefreshMode)
+			feature.setViewRefreshMode(viewRefreshMode);
+		return feature;
+	}
+	return null;
+}
+
 function parseKMLLookAt(kmlNode)
 {
 	let longitude;
@@ -654,6 +793,159 @@ function parseKMLNode(kmlNode, doc)
 	}
 }
 
+async function parseJpg(reader)
+{
+	if (!(reader instanceof data.ByteReader))
+		return null;
+	if (reader.getLength() < 2)
+		return null;
+	if (reader.readUInt8(0) != 0xff || reader.readUInt8(1) != 0xd8)
+		return null;
+	let ofst = 2;
+	let ret = false;
+	let j;
+	let exif;
+	while (true)
+	{
+		if (ofst + 4 > reader.getLength())
+		{
+			ret = false;
+			break;
+		}
+		if (reader.readUInt8(ofst + 0) != 0xff)
+		{
+			ret = false;
+			break;
+		}
+		if (reader.readUInt8(ofst + 1) == 0xdb)
+		{
+			ret = true;
+			break;
+		}
+
+		j = ((reader.readUInt8(ofst + 2) << 8) | reader.readUInt8(ofst + 3)) - 2;
+		if (reader.readUInt8(ofst + 1) == 0xe1)
+		{
+			let t = reader.readUTF8Z(ofst + 4, 14);
+			if (t == "Exif")
+			{
+				let lsb;
+				if (reader.readUTF8(ofst + 10, 2) == "II")
+				{
+					lsb = true;
+				}
+				else if (reader.readUTF8(ofst + 10, 2) == "MM")
+				{
+					lsb = false;
+				}
+				else
+				{
+					console.log("JPG Exif unknown byte order", reader.readUTF8(ofst + 10, 2));
+					ret = false;
+					break;
+				}
+				if (reader.readUInt16(ofst + 12, lsb) != 42)
+				{
+					console.log("JPG Exif not 42", reader.readUInt16(ofst + 12, lsb));
+					ret = false;
+					break;
+				}
+				if (reader.readUInt32(ofst + 14, lsb) != 8)
+				{
+					console.log("JPG Exif not 8", reader.readUInt32(ofst + 14, lsb));
+					ret = false;
+					break;
+				}
+				exif = media.EXIFData.parseIFD(reader, ofst + 18, lsb, null, ofst + 10);
+				if (exif == null)
+				{
+					console.log("Error in parsing EXIF");
+				}
+				ofst += j + 4;
+			}
+			else if (t == "FLIR")
+			{
+/*				if (buff[4] == 0 && buff[5] == 1)
+				{
+					if (flirMstm == 0 && buff[6] == 0)
+					{
+						flirMaxSegm = buff[7];
+						NEW_CLASS(flirMstm, IO::MemoryStream());
+						flirCurrSegm = buff[6];
+						Data::ByteBuffer tagBuff(j);
+						fd->GetRealData(ofst + 4, j, tagBuff);
+						flirMstm->Write(&tagBuff[8], j - 8);
+					}
+					else if (flirMstm && buff[6] == (flirCurrSegm + 1))
+					{
+						flirCurrSegm = (UInt8)(flirCurrSegm + 1);
+						Data::ByteBuffer tagBuff(j);
+						fd->GetRealData(ofst + 4, j, tagBuff);
+						flirMstm->Write(&tagBuff[8], j - 8);
+					}
+				}*/
+				ofst += j + 4;
+			}
+			else
+			{
+				console.log("Unknown type for e1", t);
+				ofst += j + 4;
+			}
+		}
+		else if (reader.readUInt8(ofst + 1) == 0xe2)
+		{
+			let t = reader.readUTF8Z(ofst + 4);
+			if (t == "ICC_PROFILE")
+			{
+				let iccBuff = reader.getArrayBuffer(ofst + 4 + 14, j - 14);
+				/*
+				NotNullPtr<Media::ICCProfile> icc;
+				if (Media::ICCProfile::Parse(tagBuff.SubArray(14, j - 14)).SetTo(icc))
+				{
+					icc->SetToColorProfile(img->info.color);
+					icc.Delete();
+				}*/
+				console.log("ICC Profile found");
+			}
+			else
+			{
+				console.log("Unknown type for e2", t);
+			}
+			ofst += j + 4;
+		}
+		else
+		{
+			ofst += j + 4;
+		}
+	}
+	if (ret)
+	{
+		let buff = reader.getArrayBuffer();
+		let b = new Blob([buff], {type: "image/jpeg"});
+		let img = await media.loadImageFromBlob(b);
+		let simg = new media.StaticImage(img);
+		if (exif)
+			simg.setExif(exif);
+		return simg;
+	}
+	return null;
+}
+
+async function parseWebp(reader)
+{
+	if (!(reader instanceof data.ByteReader))
+		return null;
+	if (reader.getLength() < 20)
+		return null;
+	if (reader.readUInt32(0, true) != 0x46464952 || reader.readUInt32(8, true) != 0x50424557 || reader.readUInt32(4, true) + 8 != reader.getLength())
+		return null;
+	let buff = reader.getArrayBuffer();
+	let b = new Blob([buff], {type: "image/webp"});
+	let img = await media.loadImageFromBlob(b);
+	let simg = new media.StaticImage(img);
+	return simg;
+}
+
 export function parseXML(txt)
 {
 	let parser = new DOMParser();
@@ -700,6 +992,10 @@ export async function parseFile(file)
 	}
 	else
 	{
+		let view = new data.ByteReader(await file.arrayBuffer());
+		let obj;
+		if (obj = await parseJpg(view)) return obj;
+		if (obj = await parseWebp(view)) return obj;
 		console.log("Unsupported file type", t);
 		return null;
 	}

package/text.d.ts

@@ -23,6 +23,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 getEncList(): TextBinEnc[];
 
 export class TextBinEnc

package/text.js

@@ -220,6 +220,33 @@ export function toHex32(v)
 	return "0".repeat(8 - s.length)+s;
 }
 
+export function u8Arr2Hex(buff, byteSep, rowSep)
+{
+	let rows = [];
+	let thisRow = [];
+	let i = 1;
+	let j = buff.length;
+	if (j == 0)
+		return "";
+	if (byteSep == null)
+		byteSep = "";
+	thisRow.push(toHex8(buff[0]));
+	while (i < j)
+	{
+		if ((i & 15) == 0)
+		{
+			rows.push(thisRow.join(byteSep));
+			thisRow = [];
+		}
+		thisRow.push(toHex8(buff[i]));
+		i++;
+	}
+	rows.push(thisRow.join(byteSep));
+	if (rowSep == null)
+		rowSep = byteSep;
+	return rows.join(rowSep);
+}
+
 export function getEncList()
 {
 	let ret = [];

package/web.d.ts

@@ -16,13 +16,14 @@ export function getRequestURLBase(): string;
 export function getParameterByName(name: string): string | null;
 export function loadJSON(url: string, onResultFunc: Function): void;
 export function buildTable(o: object | object[]): string;
-export function openData(data: string, contentType: string, fileName?: string): void;
+export function openData(data: string | Blob, contentType: string, fileName?: string): void;
 export function parseCSSColor(c: string): Color;
 export function handleFileDrop(ele: HTMLElement, hdlr: (file: File)=>void): void;
 export function appendUrl(targetUrl: string, docUrl: string): string;
 export function mimeFromFileName(fileName: string): string;
 export function mimeFromExt(ext: string): string;
 export function getImageInfo(url: string): Promise<ImageInfo|null>;
+export function propertiesToHTML(prop: object): string;
 
 declare class DialogButton
 {

package/web.js

@@ -95,6 +95,18 @@ export function openData(data, contentType, fileName)
 			ele.setAttribute('download', fileName);
 		ele.style.display = 'none';
 
+		document.body.appendChild(ele);
+		ele.click();
+		document.body.removeChild(ele);
+	}
+	else if (data instanceof Blob)
+	{
+		let ele = document.createElement("a");
+		ele.setAttribute('href', URL.createObjectURL(data));
+		if (fileName)
+			ele.setAttribute('download', fileName);
+		ele.style.display = 'none';
+
 		document.body.appendChild(ele);
 		ele.click();
 		document.body.removeChild(ele);
@@ -709,6 +721,27 @@ export function getImageInfo(url)
     });
 }
 
+export function propertiesToHTML(prop)
+{
+	let ret = ["<ul>"];
+	let i;
+	for (i in prop)
+	{
+		ret.push("<li><b>"+text.toHTMLText(i)+": </b>");
+		if (typeof prop[i] == "object")
+		{
+			ret.push(propertiesToHTML(prop[i]));
+		}
+		else
+		{
+			ret.push(text.toHTMLText(""+prop[i]));
+		}
+		ret.push("</li>");
+	}
+	ret.push("</ul>");
+	return ret.join("");
+}
+
 export class Dialog
 {
 	constructor(content, options)
@@ -739,10 +772,10 @@ export class Dialog
 		darkColor.style.display = "flex";
 		darkColor.style.alignItems = "center";
 		darkColor.style.justifyContent = "center";
-		if (document.body.children.length > 0)
-			document.body.insertBefore(darkColor, document.body.children[0]);
+		if (top.document.body.children.length > 0)
+			top.document.body.insertBefore(darkColor, top.document.body.children[0]);
 		else
-			document.body.appendChild(darkColor);
+			top.document.body.appendChild(darkColor);
 		this.darkColor = darkColor;
 		let dialog = document.createElement("div");
 		dialog.style.backgroundColor = "#ffffff";
@@ -818,7 +851,7 @@ export class Dialog
 	{
 		if (this.darkColor)
 		{
-			document.body.removeChild(this.darkColor);
+			top.document.body.removeChild(this.darkColor);
 			this.darkColor = null;
 		}
 	}