@sswroom/sswr 1.6.3 → 1.6.5

package/geometry.js

@@ -28,6 +28,9 @@ export const VectorType = {
 }
 
 export class Vector2D {
+	/**
+	 * @param {number} srid
+	 */
 	constructor(srid)
 	{
 		this.srid = srid;
@@ -36,18 +39,37 @@ export class Vector2D {
 
 export class Point extends Vector2D
 {
+	/**
+	 * @param {number} srid
+	 * @param {math.Vector3 | math.Coord2D | number[]} coordinates
+	 */
 	constructor(srid, coordinates)
 	{
 		super(srid);
 		this.type = VectorType.Point;
-		if (coordinates instanceof math.Coord2D)
-			this.coordinates = [coordinates.x, coordinates.y];
-		else if (coordinates instanceof math.Vector3)
+		if (coordinates instanceof math.Vector3)
 			this.coordinates = [coordinates.x, coordinates.y, coordinates.z];
+		else if (coordinates instanceof math.Coord2D)
+			this.coordinates = [coordinates.x, coordinates.y];
 		else
 			this.coordinates = coordinates;
 	}
 
+
+	/**
+	 * @param {math.Coord2D} coord
+	 */
+	calBoundaryPoint(coord)
+	{
+		let xdiff = coord.x - this.coordinates[0];
+		let ydiff = coord.y - this.coordinates[1];
+		let dist = Math.sqrt(xdiff * xdiff + ydiff * ydiff);
+		return {x:this.coordinates[0], y:this.coordinates[1], dist:dist};
+	}
+
+	/**
+	 * @param {math.Coord2D} coord
+	 */
 	insideOrTouch(coord)
 	{
 		return this.coordinates[0] == coord.x && this.coordinates[1] == coord.y;
@@ -61,6 +83,10 @@ export class Point extends Vector2D
 
 export class LineString extends Vector2D
 {
+	/**
+	 * @param {number} srid
+	 * @param {number[][]} coordinates
+	 */
 	constructor(srid, coordinates)
 	{
 		super(srid);
@@ -68,6 +94,9 @@ export class LineString extends Vector2D
 		this.coordinates = coordinates;
 	}
 
+	/**
+	 * @param {math.Coord2D} coord
+	 */
 	calBoundaryPoint(coord)
 	{
 		let l;
@@ -176,13 +205,16 @@ export class LineString extends Vector2D
 				calPtOutY = points[l][1];
 			}
 		}
-		let ret = new Object();
-		ret.x = calPtOutX;
-		ret.y = calPtOutY;
-		ret.dist = Math.sqrt(dist);
-		return ret;
+		return {
+			x: calPtOutX,
+			y: calPtOutY,
+			dist: Math.sqrt(dist)
+		};
 	}
 
+	/**
+	 * @param {math.Coord2D} coord
+	 */
 	insideOrTouch(coord)
 	{
 		let thisX;
@@ -246,12 +278,19 @@ export class LineString extends Vector2D
 
 export class LinearRing extends LineString
 {
+	/**
+	 * @param {number} srid
+	 * @param {number[][]} coordinates
+	 */
 	constructor(srid, coordinates)
 	{
 		super(srid, coordinates);
 		this.type = VectorType.LinearRing;
 	}
 
+	/**
+	 * @param {math.Coord2D} coord
+	 */
 	insideOrTouch(coord)
 	{
 		let thisX;
@@ -327,6 +366,13 @@ export class LinearRing extends LineString
 		return new Polygon(this.srid, [this.coordinates]);
 	}
 
+	/**
+	 * @param {number} srid
+	 * @param {math.Coord2D} center
+	 * @param {number} radiusX
+	 * @param {number} radiusY
+	 * @param {number} nPoints
+	 */
 	static createFromCircle(srid, center, radiusX, radiusY, nPoints)
 	{
 		let pos = [];
@@ -346,20 +392,26 @@ export class LinearRing extends LineString
 
 export class MultiGeometry extends Vector2D
 {
+	/**
+	 * @param {number} srid
+	 */
 	constructor(srid)
 	{
 		super(srid);
 		this.geometries = new Array();
 	}
 
+	/**
+	 * @param {math.Coord2D} coord
+	 */
 	calBoundaryPoint(coord)
 	{
 		let minObj = null;
 		let thisObj;
-		let i = this.coordinates.length;
+		let i = this.geometries.length;
 		while (i-- > 0)
 		{
-			thisObj = this.coordinates[i].calBoundaryPoint(coord);
+			thisObj = this.geometries[i].calBoundaryPoint(coord);
 			if (minObj == null || minObj.dist > thisObj.dist)
 			{
 				minObj = thisObj;
@@ -368,12 +420,15 @@ export class MultiGeometry extends Vector2D
 		return minObj;
 	}
 
+	/**
+	 * @param {math.Coord2D} coord
+	 */
 	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;
 			}
@@ -407,24 +462,34 @@ export class MultiGeometry extends Vector2D
 
 export class Polygon extends MultiGeometry
 {
+	/**
+	 * @param {number} srid
+	 * @param {number[][][] | undefined} coordinates
+	 */
 	constructor(srid, coordinates)
 	{
 		super(srid);
 		this.type = VectorType.Polygon;
-		let i;
-		for (i in coordinates)
+		if (coordinates)
 		{
-			this.geometries.push(new LinearRing(srid, coordinates[i]));
+			let i;
+			for (i in coordinates)
+			{
+				this.geometries.push(new LinearRing(srid, coordinates[i]));
+			}
 		}
 	}
 
+	/**
+	 * @param {math.Coord2D} coord
+	 */
 	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;
 			}
@@ -435,6 +500,10 @@ export class Polygon extends MultiGeometry
 
 export class MultiPolygon extends MultiGeometry
 {
+	/**
+	 * @param {number} srid
+	 * @param {number[][][][]} coordinates
+	 */
 	constructor(srid, coordinates)
 	{
 		super(srid);
@@ -450,8 +519,32 @@ export class MultiPolygon extends MultiGeometry
 	}
 }
 
+export class Polyline extends MultiGeometry
+{
+	/**
+	 * @param {number} srid
+	 * @param {number[][][]} coordinates
+	 */
+	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
 {
+	/**
+	 * @param {number} srid
+	 */
 	constructor(srid)
 	{
 		super(srid);

package/hash.js

@@ -39,7 +39,10 @@ export class SHA1 extends Hash
 	constructor()
 	{
 		super();
-		this.clear();
+		this.messageLength        = 0n;
+		this.messageBlockIndex    = 0;
+		this.intermediateHash = [0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0];
+		this.messageBlock = new Array(64);
 	}
 
 	getName()
@@ -274,7 +277,9 @@ export class MD5 extends Hash
 	{
 		super();
 		this.buff = new Array(64);
-		this.clear();
+		this.msgLeng = 0n;
+		this.h = [0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476];
+		this.buffSize = 0;
 	}
 
 	getName()

package/kml.d.ts

@@ -270,7 +270,7 @@ export class Container extends Feature
 	addFeature(feature: Feature): void;
 	addStyle(style: Style): void;
 	addStyleMap(styleMap: StyleMap): void;
-	getOrNewStyle(iconStyle: IconStyle, labelStyle: LabelStyle, lineStyle: LineStyle, polyStyle: PolyStyle, balloonStyle: BalloonStyle, listStyle: ListStyle): Style;
+	getOrNewStyle(iconStyle: IconStyle | null, labelStyle: LabelStyle | null, lineStyle: LineStyle | null, polyStyle: PolyStyle | null, balloonStyle: BalloonStyle | null, listStyle: ListStyle | null): Style;
 	getStyleById(id: string): Style | StyleMap | null;
 	getBounds(): math.RectArea | null;
 	getUsedNS(ns: object): void;

package/kml.js

@@ -107,6 +107,8 @@ export class ColorStyle extends Element
 	constructor()
 	{
 		super();
+		this.color = null;
+		this.randomColor = null;
 	}
 
 	setRandomColor(randomColor)
@@ -352,7 +354,7 @@ export class PolyStyle extends ColorStyle
 		strs.push("\t".repeat(level)+"<PolyStyle>");
 		this.appendInnerXML(strs, level + 1);
 		if (this.outline != null)
-			strs.push("\t".repeat(level + 1)+"<outline>"+(this.labelVisibility?"1":"0")+"</outline>");
+			strs.push("\t".repeat(level + 1)+"<outline>"+(this.outline?"1":"0")+"</outline>");
 		strs.push("\t".repeat(level)+"</PolyStyle>");
 	}
 
@@ -373,6 +375,22 @@ export class BalloonStyle extends Element
 	constructor()
 	{
 		super();
+		/**
+		 * @type {string | null}
+		 */
+		this.bgColor = null;
+		/**
+		 * @type {string | null}
+		 */
+		this.textColor = null;
+		/**
+		 * @type {string | null}
+		 */
+		this.text = null;
+		/**
+		 * @type {string | null}
+		 */
+		this.displayMode = null;
 	}
 
 	getUsedNS(ns)
@@ -382,7 +400,7 @@ export class BalloonStyle extends Element
 	appendOuterXML(strs, level)
 	{
 		strs.push("\t".repeat(level)+"<BalloonStyle>");
-		this.appendInnerXML(strs, level + 1);
+		//this.appendInnerXML(strs, level + 1);
 		if (this.bgColor)
 			strs.push("\t".repeat(level + 1)+"<bgColor>"+this.bgColor+"</bgColor>");
 		if (this.textColor)
@@ -415,6 +433,14 @@ export class ListStyle extends Element
 	constructor()
 	{
 		super();
+		/**
+		 * @type {string | null}
+		 */
+		this.listItemType = null;
+		/**
+		 * @type {string | null}
+		 */
+		this.bgColor = null;
 	}
 
 	getUsedNS(ns)
@@ -424,7 +450,7 @@ export class ListStyle extends Element
 	appendOuterXML(strs, level)
 	{
 		strs.push("\t".repeat(level)+"<ListStyle>");
-		this.appendInnerXML(strs, level + 1);
+		//this.appendInnerXML(strs, level + 1);
 		if (this.listItemType)
 			strs.push("\t".repeat(level + 1)+"<listItemType>"+text.toXMLText(this.listItemType)+"</listItemType>");
 		if (this.bgColor)
@@ -446,6 +472,9 @@ export class ListStyle extends Element
 
 export class StyleSelector extends Element
 {
+	/**
+	 * @param {string} id
+	 */
 	constructor(id)
 	{
 		super();
@@ -455,6 +484,9 @@ export class StyleSelector extends Element
 
 export class Style extends StyleSelector
 {
+	/**
+	 * @param {string} id
+	 */
 	constructor(id)
 	{
 		super(id);
@@ -508,6 +540,14 @@ export class Style extends StyleSelector
 		}
 	}
 
+	/**
+	 * @param {IconStyle | null} iconStyle
+	 * @param {LabelStyle | null} labelStyle
+	 * @param {LineStyle | null} lineStyle
+	 * @param {PolyStyle | null} polyStyle
+	 * @param {BalloonStyle | null} balloonStyle
+	 * @param {ListStyle | null} listStyle
+	 */
 	isStyle(iconStyle, labelStyle, lineStyle, polyStyle, balloonStyle, listStyle)
 	{
 		if (iconStyle == null)
@@ -1058,7 +1098,8 @@ export class Placemark extends Feature
 				if (subGeom != true)
 					strs.push("\t".repeat(level + 1)+"<tessellate>1</tessellate>");
 			}
-			for (i in vec.geometries)
+			i = 0;
+			while (i < vec.geometries.length)
 			{
 				if (i == 0)
 				{
@@ -1072,6 +1113,7 @@ export class Placemark extends Feature
 					this.appendGeometry(strs, level + 2, vec.geometries[i], true);
 					strs.push("\t".repeat(level + 1)+"</innerBoundaryIs>");
 				}
+				i++;
 			}
 			strs.push("\t".repeat(level)+"</Polygon>");
 		}

package/leaflet.d.ts

@@ -20,8 +20,8 @@ export function fromLatLng(latLng: L.LatLng): math.Coord2D;
 export function fromLatLngBounds(b: L.LatLngBounds): math.RectArea;
 export function toLatLngBounds(rect: math.RectArea): L.LatLngBounds;
 
-export function createLayer(layer: map.LayerInfo, options: object): L.Layer;
-export function createFromKML(feature: kml.Feature | kml.KMLFile, options: KMLFeatureOptions): L.Layer;
+export function createLayer(layer: map.LayerInfo, options?: object): L.Layer;
+export function createFromKML(feature: kml.Feature | kml.KMLFile, options?: KMLFeatureOptions): L.Layer;
 export function createFromGeometry(geom: geometry.Vector2D, options: GeometryOptions): L.Layer;
 export function createKMLLookAt(map: L.Map): kml.LookAt;
 export function toKMLFeature(layer: L.Layer, doc?: kml.Document): kml.Feature | null;

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/map.js

@@ -31,10 +31,18 @@ export const GeometryType = {
 	GeometryCollection: "GeometryCollection"
 };
 
+/**
+ * @param {number} srid
+ * @param {geometry.Vector2D} geom
+ * @param {number} x
+ * @param {number} y
+ */
 export function calcDistance(srid, geom, x, y)
 {
 	let pt = geom.calBoundaryPoint(new math.Coord2D(x, y));
 	let csys = math.CoordinateSystemManager.srCreateCsys(srid);
+	if (csys == null)
+		throw new Error("srid "+srid+" is not supported");
 	return csys.calcSurfaceDistance(x, y, pt.x, pt.y, unit.Distance.Unit.METER);
 }
 
@@ -116,6 +124,8 @@ export class GeolocationFilter
 	constructor(minSecs, minDistMeter)
 	{
 		this.csys = math.CoordinateSystemManager.srCreateCsys(4326);
+		if (this.csys == null)
+			throw new Error();
 		this.minSecs = minSecs;
 		this.minDistMeter = minDistMeter;
 	}
@@ -166,6 +176,7 @@ export class WMS
 			let resp = await fetch(this.url + "?SERVICE=WMS&REQUEST=GetCapabilities");
 			let parser = new DOMParser();
 			let contentType = resp.headers.get("Content-Type") || "text/xml";
+			// @ts-ignore
 			let doc = parser.parseFromString(await resp.text(), contentType);
 			let node = doc.childNodes[0];
 			if (node.nodeName == "WMS_Capabilities" || node.nodeName == "WMT_MS_Capabilities")

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