@sswroom/sswr 1.6.20 → 1.6.22

package/map.d.ts

@@ -134,37 +134,47 @@ declare class GeometryOptions
 	fillOpacity?: number;
 }
 
-export class MapControl
+declare class MarkerInfo
+{
+}
+
+export abstract class MapControl
 {
 	constructor();
-	createLayer(layer: map.LayerInfo, options?: LayerOptions): any;
-	createMarkerLayer(name: string, options?: LayerOptions): any;
-	createGeometryLayer(name: string, options?: LayerOptions): any;
-	addLayer(layer: any): void;
-	addKMLFeature(feature: kml.Feature): void;
-	uninit(): void;
-	zoomIn(): void;
-	zoomOut(): void;
-	zoomScale(scale: number): void;
-	panTo(pos: math.Coord2D): void;
-	panZoomScale(pos: math.Coord2D, scale: number): void;
-	zoomToExtent(extent: math.RectArea): void;
-	handleMouseLClick(clickFunc: (mapPos: math.Coord2D, scnPos: math.Coord2D)=>void): void;
-	handleMouseMove(moveFunc: (mapPos: math.Coord2D)=>void): void;
-	handlePosChange(posFunc: (mapPos: math.Coord2D)=>void): void;
-	map2ScnPos(mapPos: math.Coord2D): math.Coord2D;
-	scn2MapPos(scnPos: math.Coord2D): math.Coord2D;
-
-	createMarker(mapPos: math.Coord2D, imgURL: string, imgWidth: number, imgHeight: number, options?: MarkerOptions): any;
-	layerAddMarker(markerLayer: any, marker: any): void;
-	layerRemoveMarker(markerLayer: any, marker: any): void;
-	layerClearMarkers(markerLayer: any): void;
-	markerIsOver(marker: any, scnPos: math.Coord2D): boolean;
-
-	createGeometry(geom: geometry.Vector2D, options: GeometryOptions): any;
-	layerAddGeometry(geometryLayer: any, geom: any): void;
-	layerRemoveGeometry(geometryLayer: any, geom: any): void;
-	layerClearGeometries(geometryLayer: any): void;
+	abstract getDiv(): HTMLDivElement;
+	abstract sizeUpdated(): void;
+	abstract createLayer(layer: map.LayerInfo, options?: LayerOptions): any;
+	abstract createMarkerLayer(name: string, options?: LayerOptions): any;
+	abstract createGeometryLayer(name: string, options?: LayerOptions): any;
+	abstract addLayer(layer: any): void;
+	abstract addKML(feature: kml.Feature | kml.KMLFile): void;
+	abstract uninit(): void;
+	abstract zoomIn(): void;
+	abstract zoomOut(): void;
+	abstract zoomScale(scale: number): void;
+	abstract panTo(pos: math.Coord2D): void;
+	abstract panZoomScale(pos: math.Coord2D, scale: number): void;
+	abstract zoomToExtent(extent: math.RectArea): void;
+	abstract handleMouseLClick(clickFunc: (mapPos: math.Coord2D, scnPos: math.Coord2D)=>void): void;
+	abstract handleMouseMove(moveFunc: (mapPos: math.Coord2D)=>void): void;
+	abstract handlePosChange(posFunc: (mapPos: math.Coord2D)=>void): void;
+	abstract map2ScnPos(mapPos: math.Coord2D): math.Coord2D;
+	abstract scn2MapPos(scnPos: math.Coord2D): math.Coord2D;
+
+	abstract createMarker(mapPos: math.Coord2D, imgURL: string, imgWidth: number, imgHeight: number, options?: MarkerOptions): MarkerInfo;
+	abstract layerAddMarker(markerLayer: any, marker: MarkerInfo): void;
+	abstract layerRemoveMarker(markerLayer: any, marker: MarkerInfo): void;
+	abstract layerClearMarkers(markerLayer: any): void;
+	abstract layerMoveMarker(markerLayer: any, marker: MarkerInfo, mapPos: math.Coord2D): MarkerInfo;
+	abstract markerUpdateIcon(markerLayer: any, marker: MarkerInfo, url: string): MarkerInfo;
+	abstract markerIsOver(marker: MarkerInfo, scnPos: math.Coord2D): boolean;
+	abstract markerShowPopup(marker: MarkerInfo, content: string, w?: number, h?: number): void;
+	abstract hidePopup();
+
+	abstract createGeometry(geom: geometry.Vector2D, options: GeometryOptions): any;
+	abstract layerAddGeometry(geometryLayer: any, geom: any): void;
+	abstract layerRemoveGeometry(geometryLayer: any, geom: any): void;
+	abstract layerClearGeometries(geometryLayer: any): void;
 }
 
 declare class OWSSpatialReference

package/olayer2.d.ts

@@ -29,6 +29,8 @@ export class Olayer2Map extends map.MapControl
 	posFunc: (lat: number, lon: number)=>void;
 
 	constructor(mapId: string);
+	getDiv(): HTMLDivElement;
+	sizeUpdated(): void;
 	createLayer(layer: map.LayerInfo, options?: map.LayerOptions): any;
 	createMarkerLayer(name: string, options?: map.LayerOptions): any;
 	createGeometryLayer(name: string, options?: map.LayerOptions): any;
@@ -47,11 +49,15 @@ export class Olayer2Map extends map.MapControl
 	map2ScnPos(mapPos: math.Coord2D): math.Coord2D;
 	scn2MapPos(scnPos: math.Coord2D): math.Coord2D;
 
-	createMarker(mapPos: math.Coord2D, imgURL: string, imgWidth: number, imgHeight: number, options?: map.MarkerOptions): any;
-	layerAddMarker(markerLayer: any, marker: any): void;
-	layerRemoveMarker(markerLayer: any, marker: any): void;
+	createMarker(mapPos: math.Coord2D, imgURL: string, imgWidth: number, imgHeight: number, options?: map.MarkerOptions): map.MarkerInfo;
+	layerAddMarker(markerLayer: any, marker: map.MarkerInfo): void;
+	layerRemoveMarker(markerLayer: any, marker: map.MarkerInfo): void;
 	layerClearMarkers(markerLayer: any): void;
-	markerIsOver(marker: any, scnPos: math.Coord2D): boolean;
+	layerMoveMarker(markerLayer: any, marker: MarkerInfo, mapPos: math.Coord2D): MarkerInfo;
+	markerUpdateIcon(markerLayer: any, marker: MarkerInfo, url: string): MarkerInfo;
+	markerIsOver(marker: map.MarkerInfo, scnPos: math.Coord2D): boolean;
+	markerShowPopup(marker: MarkerInfo, content: string, w?: number, h?: number): void;
+	hidePopup();
 
 	createGeometry(geom: geometry.Vector2D, options: map.GeometryOptions): any;
 	layerAddGeometry(geometryLayer: any, geom: any): void;

package/olayer2.js

@@ -235,6 +235,7 @@ export class Olayer2Map extends map.MapControl
 		this.initY = 22.4;
 		this.initLev = 12;
 		this.mapId = mapId;
+		this.currMarkerPopup = null;
 		let dom = document.getElementById(mapId);
 		if (dom)
 		{
@@ -288,6 +289,16 @@ export class Olayer2Map extends map.MapControl
 		this.currMarkerPopupObj = null;
 	}
 
+	getDiv()
+	{
+		return web.getDivElement(this.mapId);
+	}
+
+	sizeUpdated()
+	{
+		this.map.updateSize();
+	}
+
 	/**
 	 * @param {map.LayerInfo} layer
 	 * @param {object} options
@@ -374,6 +385,9 @@ export class Olayer2Map extends map.MapControl
 		}
 	}
 
+	/**
+	 * @param {kml.KMLFile | kml.Feature} feature
+	 */
 	addKML(feature)
 	{
 		createFromKML(feature, {map: this.map, objProjection: this.mapProjection, mapProjection: this.map.getProjectionObject()}).then((layer)=>{this.addLayer(layer);});
@@ -496,17 +510,82 @@ export class Olayer2Map extends map.MapControl
 		markerLayer.clearMarkers();
 	}
 
+	/**
+	 * @param {OpenLayers.Layer.Markers} markerLayer
+	 * @param {OpenLayers.Marker} marker
+	 * @param {math.Coord2D} mapPos
+	 */
+	layerMoveMarker(markerLayer, marker, mapPos)
+	{
+		let newIcon = new OpenLayers.Icon(marker.icon.url, marker.icon.size, marker.icon.offset);
+		if (marker.icon.imageDiv.style.zIndex)
+		{
+			newIcon.imageDiv.style.zIndex = marker.icon.imageDiv.style.zIndex;
+		}
+		let newMarker = new OpenLayers.Marker(new OpenLayers.LonLat(mapPos.x, mapPos.y).transform(this.mapProjection, this.map.getProjectionObject()), newIcon);
+		markerLayer.removeMarker(marker);
+		markerLayer.addMarker(newMarker);
+		marker.destroy();
+		return newMarker;
+	}
+
+	/**
+	 * @param {OpenLayers.Layer.Markers} markerLayer
+	 * @param {OpenLayers.Marker} marker
+	 * @param {string} url
+	 */
+	markerUpdateIcon(markerLayer, marker, url)
+	{
+		let newIcon = new OpenLayers.Icon(url, marker.icon.size, marker.icon.offset);
+		if (marker.icon.imageDiv.style.zIndex)
+		{
+			newIcon.imageDiv.style.zIndex = marker.icon.imageDiv.style.zIndex;
+		}
+		let newMarker = new OpenLayers.Marker(marker.lonlat, newIcon);
+		markerLayer.removeMarker(marker);
+		markerLayer.addMarker(newMarker);
+		marker.destroy();
+		return newMarker;
+	}
+	
 	markerIsOver(marker, scnPos)
 	{
 		let icon = marker.icon;
-		//alert("x="+x+", y="+y+", px.x="+icon.px.x+", px.y="+icon.px.y+", offset.x="+icon.offset.x+", offset.y="+icon.offset.y+", size.w="+icon.size.w+", size.h="+icon.size.h+", debug="+(icon.px.x + icon.px.offset.x + icon.size.w));
-		if ((scnPos.x < icon.px.x + icon.offset.x) || (scnPos.y < icon.px.y + icon.offset.y))
+		let ofst = marker.map.layerContainerOriginPx;
+		let ofstX = ofst.x + icon.offset.x;
+		let ofstY = ofst.y + icon.offset.y;
+		if (icon.px == null)
+			return false;
+		if ((scnPos.x < icon.px.x + ofstX) || (scnPos.y < icon.px.y + ofstY))
 			return false;
-		if ((icon.px.x + icon.offset.x + icon.size.w <= scnPos.x) || (icon.px.y + icon.offset.y + icon.size.h <= scnPos.y))
+		if ((icon.px.x + ofstX + icon.size.w <= scnPos.x) || (icon.px.y + ofstY + icon.size.h <= scnPos.y))
 			return false;
 		return true;
 	}
 
+	markerShowPopup(marker, content, w, h)
+	{
+		let popup = new OpenLayers.Popup("marker", marker.lonlat, new OpenLayers.Size(w, h), content, false);
+		if (this.currMarkerPopup)
+		{
+			this.currMarkerPopup.hide();
+		}
+		this.currMarkerPopup = popup;
+		popup.autoSize = true;
+		this.map.addPopup(popup);
+		popup.show();
+	}
+
+	hidePopup()
+	{
+		if (this.currMarkerPopup)
+		{
+			this.currMarkerPopup.hide();
+			this.map.removePopup(this.currMarkerPopup);
+			this.currMarkerPopup = null;
+		}
+	}
+	
 	/**
 	 * @param {geometry.Vector2D} geom
 	 * @param {map.GeometryOptions} options

package/package.json

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

package/parser.js

@@ -980,6 +980,25 @@ async function parseJpg(reader, sourceName)
 	return null;
 }
 
+/**
+ * @param {data.ByteReader} reader
+ * @param {string} sourceName
+ */
+async function parsePng(reader, sourceName)
+{
+	if (!(reader instanceof data.ByteReader))
+		return null;
+	if (reader.getLength() < 20)
+		return null;
+	if (reader.readUInt32(0, false) != 0x89504e47 || reader.readUInt32(4, false) != 0x0d0a1a0a)
+		return null;
+	let buff = reader.getArrayBuffer();
+	let b = new Blob([buff], {type: "image/png"});
+	let img = await media.loadImageFromBlob(b);
+	let simg = new media.StaticImage(img, sourceName, "image/png");
+	return simg;
+}
+
 /**
  * @param {data.ByteReader} reader
  * @param {string} sourceName
@@ -1300,6 +1319,7 @@ export async function parseFile(file)
 	{
 		let view = new data.ByteReader(await file.arrayBuffer());
 		let obj;
+		if (obj = await parsePng(view, file.name)) return obj;
 		if (obj = await parseJpg(view, file.name)) return obj;
 		if (obj = await parseWebp(view, file.name)) return obj;
 		if (obj = parseX509(view, file.name, t)) return obj;

package/text.d.ts

@@ -56,6 +56,9 @@ export function replaceAll(s: string, replaceFrom: string, replaceTo: string): s
 export function getEncList(): TextBinEnc[];
 export function b64Enc(s: string, cs?: Base64Charset): string;
 export function b64Dec(b64Str: string): string;
+export function isDataURL(url: string): boolean;
+export function escapeXhtml(s: string): string;
+export function svgStringToDataURI(svg: string): string;
 
 export class TextBinEnc
 {

package/text.js

@@ -617,6 +617,30 @@ export function b64Dec(b64Str)
 	return dec.decode(b64.decodeBin(b64Str));
 }
 
+/**
+ * @param {string} url
+ */
+export function isDataURL(url)
+{
+	return url.startsWith("data:");
+}
+
+/**
+ * @param {string} s
+ */
+export function escapeXhtml(s)
+{
+	return s.replace(/#/g, '%23').replace(/\n/g, '%0A');
+}
+
+/**
+ * @param {string} svg
+ */
+export function svgStringToDataURI(svg)
+{
+	return 'data:image/svg+xml;charset=utf-8,' + svg;
+}
+
 export class TextBinEnc
 {
 	constructor(name)

package/web.d.ts

@@ -12,6 +12,14 @@ declare class ImageInfo
 	height: number;
 }
 
+declare class PrintOptions
+{
+	pageBorderTopHTML?: string;
+	pageBorderBottomHTML?: string;
+	overlayHTML?: string;
+	pageTitle?: string;
+}
+
 export enum OSType
 {
 	Unknown,
@@ -88,6 +96,12 @@ export enum BrowserType
 	MiBrowser
 }
 
+export enum PaperOrientation
+{
+	Landscape,
+	Portrait
+}
+
 declare class BrowserInfo
 {
 	os: OSType;
@@ -118,6 +132,10 @@ export function getDivElement(id: string): HTMLDivElement;
 export function getSpanElement(id: string): HTMLSpanElement;
 export function getCanvasElement(id: string): HTMLCanvasElement;
 export function getImgElement(id: string): HTMLImageElement;
+export function canvasToBlob(canvas: HTMLCanvasElement): Promise<Blob|null>;
+export function elementToSVGString(node: Element, width: string | number, height: string | number): string;
+export function genPrintWindowHTML(imgDataURL: string, orientation: PaperOrientation, paperSize?: string, options: PrintOptions): string;
+export function printImageData(imgDataURL: string, orientation: PaperOrientation, paperSize?: string, options: PrintOptions): void;
 export function getBrowserInfo(): Promise<BrowserInfo>;
 export function parseUserAgent(userAgent: string): BrowserInfo;
 

package/web.js

@@ -76,6 +76,11 @@ export const BrowserType = {
 	MiBrowser: "MiBrowser"
 }
 
+export const PaperOrientation = {
+	Landscape: "landscape",
+	Portrait: "portrait"
+}
+
 export function getRequestURLBase()
 {
 	let url = document.location.href;
@@ -1057,6 +1062,101 @@ export function getImgElement(id)
 	throw new Error("Element with id \""+id+"\" is not an img");
 }
 
+/**
+ * @param {HTMLCanvasElement} canvas
+ * @returns {Promise<Blob|null>}
+ */
+export async function canvasToBlob(canvas)
+{
+	if (canvas.toBlob)
+	{
+		return await new Promise(function (resolve) {
+			canvas.toBlob(resolve);
+		});
+	}
+	return data.dataURI2Blob(canvas.toDataURL());
+}
+
+/**
+ * @param {Element} node
+ * @param {string | number} width
+ * @param {string | number} height
+ */
+export function elementToSVGString(node, width, height)
+{
+	node.setAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
+	let xhtml = text.escapeXhtml(new XMLSerializer().serializeToString(node));
+	let foreignObject = '<foreignObject x="0" y="0" width="100%" height="100%">' + xhtml + '</foreignObject>';
+	return '<svg xmlns="http://www.w3.org/2000/svg" width="' + width + '" height="' + height + '">' + foreignObject + '</svg>';
+}
+
+/**
+ * @param {string} imgDataURL
+ * @param {string} orientation
+ * @param {string | null | undefined} paperSize
+ * @param {{ pageBorderTopHTML?: string; pageBorderBottomHTML?: string; overlayHTML?: string; pageTitle?: string; }} options
+ */
+export function genPrintWindowHTML(imgDataURL, orientation, paperSize, options)
+{
+	let strs =  new Array();
+	strs.push("<html><head>");
+	if (options.pageTitle)
+	{
+		strs.push("<title>"+text.toHTMLText(options.pageTitle)+"</title>");
+	}
+	strs.push(`<style>@media print {
+				img { max-width: 98%!important; max-height: 98%!important; }
+				@page { size: ` + (paperSize?paperSize:'')+' '+ orientation + `;}}
+			</style>
+			<script>function step1(){
+			setTimeout('step2()', 10);}
+			function step2(){window.print();window.close()}
+			</script></head><body onload='step1()' style="margin: 0px;">`);
+	if (options.pageBorderTopHTML || options.pageBorderBottomHTML)
+	{
+		strs.push("<table border=\"0\" width=\"100%\" height=\"100%\">");
+		if (options.pageBorderTopHTML)
+		{
+			strs.push("<tr><td>"+options.pageBorderTopHTML+"</td></tr>");
+		}
+		strs.push(`<tr><td>`);
+		if (options.overlayHTML)
+			strs.push(options.overlayHTML);
+		strs.push(`<img src="` + imgDataURL + `" style="display:block; margin:auto;"></td></tr>`);
+		if (options.pageBorderBottomHTML)
+		{
+			strs.push("<tr><td>"+options.pageBorderBottomHTML+"</td></tr>");
+		}
+		strs.push("</table>");
+	}
+	else
+	{
+		if (options.overlayHTML)
+			strs.push(options.overlayHTML);
+		strs.push(`<img src="` + imgDataURL + `" style="display:block; margin:auto;">`);
+	}
+	strs.push(`</body></html>`);
+	return strs.join("");
+}
+
+/**
+ * @param {string} imgDataURL
+ * @param {string} orientation
+ * @param {string | null | undefined} paperSize
+ * @param {{ pageBorderTopHTML?: string; pageBorderBottomHTML?: string; overlayHTML?: string }} options
+ */
+export function printImageData(imgDataURL, orientation, paperSize, options)
+{
+	let page = window.open("", "_blank", 'toolbar=no,status=no,menubar=no,scrollbars=no,resizable=no,left=10, top=10, width=600, height=800, visible=none');
+	if (page == null)
+		return false;
+	let pageContent = genPrintWindowHTML(imgDataURL, orientation, paperSize, options);
+	page.document.body.innerHTML = ''
+	page.document.write(pageContent);
+	page.document.close();  
+	return true;
+}
+
 /**
  * @returns {Promise<{os: String,osVer?:string,browser: String,browserVer?: string,devName?:string}>}
  */