@sswroom/sswr 1.6.14 → 1.6.16

package/leaflet.js

@@ -179,7 +179,7 @@ export function createFromGeometry(geom, options)
 		{
 			if (options.name)
 				opt.title = options.name;
-			if (options.icon && options.icon.iconUrl)
+			if (options.icon && options.icon.options.iconUrl)
 				opt.icon = options.icon;
 		}
 		return L.marker(L.latLng(geom.coordinates[1], geom.coordinates[0]), opt);

package/map.d.ts

@@ -1,4 +1,4 @@
-import { Timestamp } from "./data";
+import * as data from "./data";
 import * as geometry from "./geometry";
 import * as kml from "./kml";
 import * as map from "./map";
@@ -82,22 +82,26 @@ export function getLayerData(svcUrl: string, onResultFunc: Function, layerName:
 
 declare class GPSRecord
 {
-	t: number;
+	recTime: number;
 	lat: number;
 	lon: number;
-	a: number;
-	s: number;
-	d: number;
-	v: boolean;
-	sate: number;
+	altitude: number;
+	speed: number;
+	heading: number;
+	valid: boolean;
+	sateUsed: number;
 }
 
-export class GPSTrack
+export class GPSTrack extends data.ParsedObject
 {
 	recs: GPSRecord[];
-	constructor(recs: GPSRecord[]);
+
+	constructor(recs: GPSRecord[], sourceName?: string);
+	addPosition(pos: GeolocationPosition);
+	getTrackCnt(): number;
+	getTrack(index: number): GPSRecord[]|null;
 	createLineString(): geometry.LineString;
-	getPosByTime(ts: Timestamp): math.Vector3;
+	getPosByTime(ts: data.Timestamp): math.Vector3;
 	getPosByTicks(ticks: number): math.Vector3;
 }
 

package/map.js

@@ -1,3 +1,4 @@
+import * as data from "./data.js";
 import * as geometry from "./geometry.js";
 import * as math from "./math.js";
 import * as web from "./web.js";
@@ -46,6 +47,9 @@ export function calcDistance(srid, geom, x, y)
 	return csys.calcSurfaceDistance(x, y, pt.x, pt.y, unit.Distance.Unit.METER);
 }
 
+/**
+ * @param {string} svcUrl
+ */
 export function getLayers(svcUrl, onResultFunc)
 {
 	web.loadJSON(svcUrl + '/getlayers', onResultFunc);
@@ -56,13 +60,49 @@ export function getLayerData(svcUrl, onResultFunc, layerName, dataFormat)
 	web.loadJSON(svcUrl + '/getlayerdata?name='+encodeURIComponent(layerName)+"&fmt="+encodeURIComponent(dataFormat), onResultFunc);
 }
 
-export class GPSTrack
+export class GPSTrack extends data.ParsedObject
 {
-	constructor(recs)
+	/**
+	 * @param {{recTime: number;lat: number;lon: number;altitude: number;speed: number;heading: number;valid: boolean;sateUsed: number;}[]} recs
+	 * @param {string|undefined} sourceName
+	 */
+	constructor(recs, sourceName)
 	{
+		super(sourceName||"Untitled.gpx", "GPSTrack");
 		this.recs = recs;
 	}
 
+	/**
+	 * @param {GeolocationPosition} pos
+	 */
+	addPosition(pos)
+	{
+		this.recs.push({
+			recTime: pos.timestamp,
+			lat: pos.coords.latitude,
+			lon: pos.coords.longitude,
+			altitude: pos.coords.altitude || 0,
+			heading: pos.coords.heading||0,
+			speed: (pos.coords.speed || 0) * 3.6 / 1.852,
+			valid: true,
+			sateUsed: -1});
+	}
+
+	getTrackCnt()
+	{
+		return 1;
+	}
+
+	/**
+	 * @param {number} index
+	 */
+	getTrack(index)
+	{
+		if (index == 0)
+			return this.recs;
+		return null;
+	}
+
 	createLineString()
 	{
 		let coordinates = new Array();
@@ -70,20 +110,26 @@ export class GPSTrack
 		let j = this.recs.length;
 		while (i < j)
 		{
-			coordinates.push([this.recs[i].lon, this.recs[i].lat, this.recs[i].a]);
+			coordinates.push([this.recs[i].lon, this.recs[i].lat, this.recs[i].altitude]);
 			i++;
 		}
 		return new geometry.LineString(4326, coordinates);
 	}
 
+	/**
+	 * @param {data.Timestamp} ts
+	 */
 	getPosByTime(ts)
 	{
 		return this.getPosByTicks(ts.toTicks());
 	}
 
+	/**
+	 * @param {number} ticks
+	 */
 	getPosByTicks(ticks)
 	{
-		if (ticks >= this.recs[0].t && ticks <= this.recs[this.recs.length - 1].t)
+		if (ticks >= this.recs[0].recTime && ticks <= this.recs[this.recs.length - 1].recTime)
 		{
 			let i = 0;
 			let j = this.recs.length - 1;
@@ -92,7 +138,7 @@ export class GPSTrack
 			while (i <= j)
 			{
 				k = (i + j) >> 1;
-				l = this.recs[k].t;
+				l = this.recs[k].recTime;
 				if (ticks > l)
 				{
 					i = k + 1;
@@ -103,17 +149,17 @@ export class GPSTrack
 				}
 				else
 				{
-					return new math.Vector3(this.recs[k].lon, this.recs[k].lat, this.recs[k].a);
+					return new math.Vector3(this.recs[k].lon, this.recs[k].lat, this.recs[k].altitude);
 				}
 			}
 			let tDiff;
 			let rec1 = this.recs[i - 1];
 			let rec2 = this.recs[i];
-			tDiff = rec2.t - rec1.t;
+			tDiff = rec2.recTime - rec1.recTime;
 			return new math.Vector3(
-				(rec1.lon * (rec2.t - ticks) + rec2.lon * (ticks - rec1.t)) / tDiff,
-				(rec1.lat * (rec2.t - ticks) + rec2.lat * (ticks - rec1.t)) / tDiff,
-				(rec1.a * (rec2.t - ticks) + rec2.a * (ticks - rec1.t)) / tDiff);
+				(rec1.lon * (rec2.recTime - ticks) + rec2.lon * (ticks - rec1.recTime)) / tDiff,
+				(rec1.lat * (rec2.recTime - ticks) + rec2.lat * (ticks - rec1.recTime)) / tDiff,
+				(rec1.altitude * (rec2.recTime - ticks) + rec2.altitude * (ticks - rec1.recTime)) / tDiff);
 		}
 		return new math.Vector3(0, 0, 0);
 	}
@@ -181,6 +227,7 @@ export class WMS
 			let node = doc.childNodes[0];
 			if (node.nodeName == "WMS_Capabilities" || node.nodeName == "WMT_MS_Capabilities")
 			{
+				// @ts-ignore
 				let attr = node.attributes.getNamedItem("version");
 				if (attr)
 				{

package/package.json

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

package/spreadsheet.d.ts

@@ -268,6 +268,26 @@ export enum PresetColor
 	YellowGreen
 }
 
+export enum FillType
+{
+	SolidFill
+}
+
+export enum MarkerStyle
+{
+	Circle,
+	Dash,
+	Diamond,
+	Dot,
+	None,
+	Picture,
+	Plus,
+	Square,
+	Star,
+	Triangle,
+	X
+}
+
 export class WorkbookFont
 {
 	private name: string|null;
@@ -391,6 +411,198 @@ export interface IStyleCtrl
 	findOrCreateStyle(tmpStyle: CellStyle): CellStyle;
 }
 
+export class OfficeColor
+{
+	private colorType: ColorType;
+	private color: number;
+
+	constructor(colorType: ColorType, color: number);
+
+	getColorType(): ColorType;
+	getPresetColor(): PresetColor;
+	getColorArgb(): number;
+
+	static newPreset(color: PresetColor): OfficeColor;
+	static newArgb(argb: number): OfficeColor;
+
+	static presetColorGetArgb(color: PresetColor): number;
+}
+
+export class OfficeFill
+{
+	private fillType: FillType;
+	private color: OfficeColor|null;
+
+	constructor(fillType: FillType, color: OfficeColor|null);
+
+	getFillType(): FillType;
+	getColor(): OfficeColor|null;
+
+	static newSolidFill(color: OfficeColor|null): OfficeFill;
+}
+
+export class OfficeLineStyle
+{
+	private fill: OfficeFill|null;
+
+	constructor(fill: OfficeFill|null);
+
+	getFillStyle(): OfficeFill|null;
+}
+
+export class OfficeShapeProp
+{
+	private fill: OfficeFill|null;
+	private lineStyle: OfficeLineStyle|null;
+
+	constructor(fill: OfficeFill|null, lineStyle: OfficeLineStyle|null);
+
+	getFill(): OfficeFill|null;
+	setFill(fill: OfficeFill|null): void;
+	getLineStyle(): OfficeLineStyle|null;
+	setLineStyle(lineStyle: OfficeLineStyle|null): void;
+}
+
+export class OfficeChartAxis
+{
+	private axisType: AxisType;
+	private axisPos: AxisPosition;
+	private title: string|null;
+	private shapeProp: OfficeShapeProp|null;
+	private majorGridProp: OfficeShapeProp|null;
+	private tickLblPos: TickLabelPosition;
+	private crosses: AxisCrosses;
+
+	constructor(axisType: AxisType, axisPos: AxisPosition);
+
+	getAxisType(): AxisType;
+	getAxisPos(): AxisPosition;
+	getTitle(): string|null;
+	setTitle(title: string|null): void;
+	getShapeProp(): OfficeShapeProp|null;
+	setShapeProp(shapeProp: OfficeShapeProp|null): void;
+	getMajorGridProp(): OfficeShapeProp|null;
+	setMajorGridProp(majorGridProp: OfficeShapeProp|null): void;
+	getTickLblPos(): TickLabelPosition;
+	setTickLblPos(tickLblPos: TickLabelPosition): void;
+	getCrosses(): AxisCrosses;
+	setCrosses(axisCrosses: AxisCrosses): void;
+}
+
+export class WorkbookDataSource
+{
+	private sheet: Worksheet;
+	private firstRow: number;
+	private lastRow: number;
+	private firstCol: number;
+	private lastCol: number;
+
+	constructor(sheet: Worksheet, firstRow: number, lastRow: number, firstCol: number, lastCol: number);
+
+	toCodeRange(): string;
+	getSheet(): Worksheet;
+	getFirstRow(): number;
+	getLastRow(): number;
+	getFirstCol(): number;
+	getLastCol(): number;
+}
+
+export class OfficeChartSeries
+{
+	private categoryData: WorkbookDataSource;
+	private valueData: WorkbookDataSource;
+	private title: string|null;
+	private smooth: boolean;
+	private shapeProp: OfficeShapeProp|null;
+	private markerSize: number;
+	private markerStyle: MarkerStyle;
+
+	constructor(categoryData: WorkbookDataSource, valueData: WorkbookDataSource);
+
+	getCategoryData(): WorkbookDataSource;
+	getValueData(): WorkbookDataSource;
+	getTitle(): string|null;
+	setTitle(title: string|null): void;
+	isSmooth(): boolean;
+	setSmooth(smooth: boolean): void;
+	getShapeProp(): OfficeShapeProp|null;
+	setShapeProp(shapeProp: OfficeShapeProp|null): void;
+	setLineStyle(lineStyle: OfficeLineStyle|null): void;
+	getMarkerSize(): number;
+	setMarkerSize(markerSize: number): void;
+	getMarkerStyle(): MarkerStyle;
+	setMarkerStyle(markerStyle: MarkerStyle): void;
+}
+
+class OfficeChart
+{
+	private static seriesColor: PresetColor[];
+
+	private xInch: number;
+	private yInch: number;
+	private wInch: number;
+	private hInch: number;
+	private titleText: string|null;
+	private shapeProp: OfficeShapeProp|null;
+	private legend: boolean;
+	private legendPos: LegendPos;
+	private legendOverlay: boolean;
+	private displayBlankAs: BlankAs;
+	private chartType: ChartType;
+	private categoryAxis: OfficeChartAxis|null;
+	private valueAxis: OfficeChartAxis|null;
+	private axes: OfficeChartAxis[];
+	private series: OfficeChartSeries[];
+
+	constructor(du: unit.Distance.Unit, x: number, y: number, w: number, h: number);
+	
+	getXInch(): number;
+	getYInch(): number;
+	getWInch(): number;
+	getHInch(): number;
+
+	setTitleText(titleText: string|null): void;
+	getTitleText(): string|null;
+
+	getShapeProp(): OfficeShapeProp|null;
+	setShapeProp(shapeProp: OfficeShapeProp|null): void;
+	addLegend(pos: LegendPos): void;
+	hasLegend(): boolean;
+	getLegendPos(): LegendPos;
+	isLegendOverlay(): boolean;
+	setDisplayBlankAs(displayBlankAs: BlankAs): void;
+	getDisplayBlankAs(): BlankAs;
+
+	initChart(chartType: ChartType, categoryAxis: OfficeChartAxis, valueAxis: OfficeChartAxis): void;
+	initLineChart(leftAxisName: string|null, bottomAxisName: string|null, bottomAxisType: AxisType): void;
+	getChartType(): ChartType;
+	createAxis(axisType: AxisType, axisPos: AxisPosition): OfficeChartAxis;
+	getAxisCount(): number;
+	getAxis(index: number): OfficeChartAxis|null;
+	getAxisIndex(axis: OfficeChartAxis): number;
+	getCategoryAxis(): OfficeChartAxis|null;
+	getValueAxis(): OfficeChartAxis|null;
+
+	addSeries(categoryData: WorkbookDataSource, valueData: WorkbookDataSource, name: string|null, showMarker: boolean): void;
+	getSeriesCount(): number;
+	getSeriesNoCheck(index: number): OfficeChartSeries;
+	getSeries(index: number): OfficeChartSeries|null;
+}
+
+declare class WorksheetDrawing
+{
+	anchorType: AnchorType;
+	posXInch: number;
+	posYInch: number;
+	widthInch: number;
+	heightInch: number;
+	row1: number;
+	col1: number;
+	row2: number;
+	col2: number;
+	chart: OfficeChart|null;
+}
+
 export class Worksheet
 {
 	private name: string;
@@ -478,10 +690,10 @@ export class Worksheet
 	getCellString(cell: CellData): string|null;
 
 	getDrawingCount(): number;
-//	getDrawing(index: number): WorksheetDrawing|null;
-//	getDrawingNoCheck(index: number): WorksheetDrawing;
-//	createDrawing(du: unit.Distance.Unit, x: number, y: number, w: number, h: number): WorksheetDrawing;
-//	createChart(du: unit.Distance.Unit, x: number, y: number, w: number, h: number, title: string|null): OfficeChart;
+	getDrawing(index: number): WorksheetDrawing|null;
+	getDrawingNoCheck(index: number): WorksheetDrawing;
+	createDrawing(du: unit.Distance.Unit, x: number, y: number, w: number, h: number): WorksheetDrawing;
+	createChart(du: unit.Distance.Unit, x: number, y: number, w: number, h: number, title: string|null): OfficeChart;
 }
 
 export class Workbook extends data.ParsedObject implements IStyleCtrl