@sswroom/sswr 1.6.3 → 1.6.4

package/Changelog

@@ -1,3 +1,16 @@
+1.6.4
+-Support geometry.Polyline
+-Fixed geometry.Polygon.insideOrTouch
+-Fixed geometry.MultiGeometry.insideOrTouch
+-leaflet.createFromKML support group in group
+-parser.parseKMLContainer hide Schema message
+-Added data.Timestamp.toDate()
+-Added data.Weekday enum
+-Added data.DateTimeUtil.ticks2Weekday()
+-Added data.LocalDate.getWeekday()
+-Added data.StringMap and data.NumberMap interface type
+-Fixed math.GeoJSON.parseGeometry
+
 1.6.3
 -Added hash.MD5
 -Support web.Dialog in frameset

package/data.d.ts

@@ -1,3 +1,22 @@
+export enum Weekday
+{
+	Sunday,
+	Monday,
+	Tuesday,
+	Wednesday,
+	Thursday,
+	Friday,
+	Saturday
+}
+
+interface StringMap<Type> {
+	[key: string]: Type;
+}
+
+interface NumberMap<Type> {
+	[key: number]: Type;
+}
+
 export function isArray(o: any): boolean;
 export function isObject(o: any): boolean;
 export function toObjectString(o: any, lev: number): string;
@@ -53,6 +72,7 @@ export class DateTimeUtil
 	static secs2TimeValue(secs: bigint, tzQhr?: number): TimeValue;
 	static totalDays2DateValue(totalDays: number, d: DateValue): void;
 	static instant2TimeValue(secs: bigint, nanosec: number, tzQhr?: number): TimeValue;
+	static ticks2Weekday(ticks: number, tzQhr: number): Weekday;
 	static toString(tval: TimeValue, pattern: string): string;
 	static string2TimeValue(dateStr: string, tzQhr?: number): TimeValue;
 	static isYearLeap(year: number): boolean;
@@ -98,6 +118,7 @@ export class LocalDate
 	toString(pattern: string | null): string;
 	compareTo(obj: Date): number;
 	isNull(): boolean;
+	getWeekday(): Weekday;
 	static today(): LocalDate;
 	static fromStr(s: string): LocalDate | null;
 }
@@ -134,6 +155,9 @@ export class TimeInstant
 }
 
 export class Timestamp {
+	inst: TimeInstant;
+	tzQhr: number;
+
 	constructor(inst: TimeInstant, tzQhr?: number);
 	static fromTicks(ticks: number | number, tzQhr?: number): Timestamp;
 	static fromStr(str: string, defTzQhr?: number): Timestamp | null;
@@ -167,6 +191,7 @@ export class Timestamp {
 	diffMS(ts: Timestamp): number;
 	diffSecDbl(ts: Timestamp): number;
 	diff(ts: Timestamp): number;
+	toDate(): LocalDate;
 	toTicks(): number;
 	toDotNetTicks(): number;
 	toUnixTimestamp(): number;

package/data.js

@@ -1,5 +1,15 @@
 import * as text from "./text.js";
 
+export const Weekday = {
+	Sunday: 0,
+	Monday: 1,
+	Tuesday: 2,
+	Wednesday: 3,
+	Thursday: 4,
+	Friday: 5,
+	Saturday: 6
+}
+
 export function isArray(o)
 {
 	return o != null && o.constructor === Array;
@@ -824,6 +834,19 @@ export class DateTimeUtil
 		return t;
 	}
 
+	static ticks2Weekday(ticks, tzQhr)
+	{
+		let days = ((ticks + tzQhr * 900000) / 86400000 + 4);
+		if (days >= 0)
+		{
+			return (days % 7);
+		}
+		else
+		{
+			return ((days % 7) + 7);
+		}
+	}
+
 	static toString(tval, pattern)
 	{
 		let output = new Array();
@@ -1798,6 +1821,11 @@ export class LocalDate
 		return this.dateVal == LocalDate.DATE_NULL;
 	}
 
+	getWeekday()
+	{
+		return DateTimeUtil.ticks2Weekday(this.dateVal * 86400000, 0);
+	}
+
 	static today()
 	{
 		let d = new Date();
@@ -2220,6 +2248,11 @@ export class Timestamp
 		return this.inst.diff(ts.inst);
 	}
 
+	toDate()
+	{
+		return new LocalDate(Math.floor(Number((this.inst.sec + BigInt(this.tzQhr * 900)) / 86400n)));
+	}
+
 	toTicks()
 	{
 		return this.inst.toTicks();

package/geometry.d.ts

@@ -85,11 +85,17 @@ export class MultiGeometry<VecType> extends Vector2D
 export class Polygon extends MultiGeometry<LinearRing>
 {
 	constructor(srid: number, coordinates: number[][][]);
+	insideOrTouch(coord: math.Coord2D): boolean;
 }
 
 export class MultiPolygon extends MultiGeometry<Polygon>
 {
-	constructor(srid: number, coordinates: number[][][][]);
+	constructor(srid: number, coordinates?: number[][][][]);
+}
+
+export class Polyline extends MultiGeometry<LineString>
+{
+	constructor(srid: number, coordinates?: number[][][]);
 }
 
 export class GeometryCollection extends MultiGeometry<Vector2D>

package/geometry.js

@@ -370,10 +370,10 @@ export class MultiGeometry extends Vector2D
 
 	insideOrTouch(coord)
 	{
-		let i = this.coordinates.length;
+		let i = this.geometries.length;
 		while (i-- > 0)
 		{
-			if (this.coordinates[i].insideOrTouch(coord))
+			if (this.geometries[i].insideOrTouch(coord))
 			{
 				return true;
 			}
@@ -420,11 +420,11 @@ export class Polygon extends MultiGeometry
 
 	insideOrTouch(coord)
 	{
-		let i = this.coordinates.length;
+		let i = this.geometries.length;
 		let inside = false;
 		while (i-- > 0)
 		{
-			if (this.coordinates[i].insideOrTouch(coord))
+			if (this.geometries[i].insideOrTouch(coord))
 			{
 				inside = !inside;
 			}
@@ -450,6 +450,23 @@ export class MultiPolygon extends MultiGeometry
 	}
 }
 
+export class Polyline extends MultiGeometry
+{
+	constructor(srid, coordinates)
+	{
+		super(srid);
+		this.type = VectorType.Polyline;
+		let i;
+		if (coordinates)
+		{
+			for (i in coordinates)
+			{
+				this.geometries.push(new LineString(srid, coordinates[i]));
+			}
+		}
+	}
+}
+
 export class GeometryCollection extends MultiGeometry
 {
 	constructor(srid)

package/leaflet.js

@@ -69,12 +69,27 @@ export function createFromKML(feature, options)
 	if (feature instanceof kml.Container)
 	{
 		let i;
-		let layers = L.featureGroup();
+		let layers = [];
+		let lyr;
+		let hasGroup = false;
+		let hasFeature = false;
 		for (i in feature.features)
 		{
-			createFromKML(feature.features[i], options).addTo(layers);
+			lyr = createFromKML(feature.features[i], options);
+			layers.push(lyr);
+			if ((lyr instanceof L.FeatureGroup) || (lyr instanceof L.LayerGroup))
+				hasGroup = true;
+			else
+				hasFeature = true;
+		}
+		if (hasGroup)
+		{
+			return L.layerGroup(layers);
+		}
+		else
+		{
+			return L.featureGroup(layers);
 		}
-		return layers;
 	}
 	else if (feature instanceof kml.Placemark)
 	{
@@ -162,7 +177,7 @@ export function createFromGeometry(geom, options)
 		{
 			if (options.name)
 				opt.title = options.name;
-			if (options.icon)
+			if (options.icon && options.icon.iconUrl)
 				opt.icon = options.icon;
 		}
 		return L.marker(L.latLng(geom.coordinates[1], geom.coordinates[0]), opt);
@@ -190,6 +205,35 @@ export function createFromGeometry(geom, options)
 		}
 		return L.polyline(pts, opt);
 	}
+	else if (geom instanceof geometry.Polyline)
+	{
+		let opt = {};
+		let i;
+		let j;
+		let ptsArr = [];
+		if (options.lineColor)
+			opt.color = options.lineColor;
+		if (options.lineWidth)
+			opt.weight = options.lineWidth;
+		for (i in geom.geometries)
+		{
+			let pts = [];
+			for (j in geom.geometries[i].coordinates)
+			{
+				let latLng = L.latLng(geom.geometries[i].coordinates[j][1], geom.geometries[i].coordinates[j][0]);
+				if (latLng)
+				{
+					pts.push(latLng);
+				}
+				else
+				{
+					console.log("Error in Polyline", geom.geometries[i].coordinates[j]);
+				}
+			}
+			ptsArr.push(pts);
+		}
+		return L.polyline(ptsArr, opt);
+	}
 	else if (geom instanceof geometry.LinearRing)
 	{
 		let opt = {};

package/math.d.ts

@@ -5,7 +5,7 @@ export function roundToFloat(n: number, decimalPoints: number): number;
 export function roundToStr(n: number, decimalPoints: number): string;
 export class GeoJSON
 {
-	static parseGeometry(srid: null, geom: object): geometry.Vector2D | null;
+	static parseGeometry(srid: number, geom: object): geometry.Vector2D | null;
 }
 
 export class Coord2D

package/math.js

@@ -1,3 +1,4 @@
+import * as geometry from "./geometry.js";
 import * as unit from "./unit.js";
 
 export function roundToFloat(n, decimalPoints)

package/package.json

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

package/parser.js

@@ -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;
@@ -605,6 +607,15 @@ function parseKMLGeometry(kmlNode)
 				}
 				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)
+				{
+					geom.geometries.push(geomList[i]);
+				}
+				return geom; 
+			}
 			else
 			{
 				geom = new geometry.GeometryCollection(4326);