@sswroom/sswr 1.5.0 → 1.5.2

package/geometry.d.ts

@@ -87,3 +87,8 @@ export class MultiPolygon extends MultiGeometry<Polygon>
 {
 	constructor(srid: number, coordinates: number[][][][]);
 }
+
+export class GeometryCollection extends MultiGeometry<Vector2D>
+{
+	constructor(srid: number);
+}

package/geometry.js

@@ -65,22 +65,22 @@ export class LineString extends Vector2D
 
 	calBoundaryPoint(coord)
 	{
-		var l;
-		var points;
+		let l;
+		let points;
 	
-		var calBase;
-		var calDiffX;
-		var calDiffY;
-		var calSqDiffX;
-		var calSqDiffY;
-		var calPtX;
-		var calPtY;
-		var calPtOutX = 0;
-		var calPtOutY = 0;
-		var calD;
-		var dist = 0x7fffffff;
-		var x = coord.x;
-		var y = coord.y;
+		let calBase;
+		let calDiffX;
+		let calDiffY;
+		let calSqDiffX;
+		let calSqDiffY;
+		let calPtX;
+		let calPtY;
+		let calPtOutX = 0;
+		let calPtOutY = 0;
+		let calD;
+		let dist = 0x7fffffff;
+		let x = coord.x;
+		let y = coord.y;
 	
 		points = this.coordinates;
 		l = points.length - 1;
@@ -171,7 +171,7 @@ export class LineString extends Vector2D
 				calPtOutY = points[l][1];
 			}
 		}
-		var ret = new Object();
+		let ret = new Object();
 		ret.x = calPtOutX;
 		ret.y = calPtOutY;
 		ret.dist = Math.sqrt(dist);
@@ -180,13 +180,13 @@ export class LineString extends Vector2D
 
 	insideOrTouch(coord)
 	{
-		var thisX;
-		var thisY;
-		var lastX;
-		var lastY;
-		var j;
-		var l;
-		var tmpX;
+		let thisX;
+		let thisY;
+		let lastX;
+		let lastY;
+		let j;
+		let l;
+		let tmpX;
 	
 		l = this.coordinates.length;
 		lastX = this.coordinates[0][0];
@@ -238,17 +238,17 @@ export class LinearRing extends LineString
 
 	insideOrTouch(coord)
 	{
-		var thisX;
-		var thisY;
-		var lastX;
-		var lastY;
-		var j;
-		var l;
-		var leftCnt = 0;
-		var tmpX;
-		var points;
-		var x = coord.x;
-		var y = coord.y;
+		let thisX;
+		let thisY;
+		let lastX;
+		let lastY;
+		let j;
+		let l;
+		let leftCnt = 0;
+		let tmpX;
+		let points;
+		let x = coord.x;
+		let y = coord.y;
 	
 		points = this.coordinates;
 
@@ -301,8 +301,8 @@ export class LinearRing extends LineString
 
 	isClose()
 	{
-		var firstPoint = this.coordinates[0];
-		var lastPoint = this.coordinates[this.coordinates.length - 1];
+		let firstPoint = this.coordinates[0];
+		let lastPoint = this.coordinates[this.coordinates.length - 1];
 		return firstPoint[0] == lastPoint[0] && firstPoint[1] == lastPoint[1];
 	}
 
@@ -313,10 +313,10 @@ export class LinearRing extends LineString
 
 	static createFromCircle(srid, center, radiusX, radiusY, nPoints)
 	{
-		var pos = [];
-		var ratio = 2 * Math.PI / nPoints;
-		var i = 0;
-		var angle;
+		let pos = [];
+		let ratio = 2 * Math.PI / nPoints;
+		let i = 0;
+		let angle;
 		i = 0;
 		while (i <= nPoints)
 		{
@@ -338,9 +338,9 @@ export class MultiGeometry extends Vector2D
 
 	calBoundaryPoint(coord)
 	{
-		var minObj = null;
-		var thisObj;
-		var i = this.coordinates.length;
+		let minObj = null;
+		let thisObj;
+		let i = this.coordinates.length;
 		while (i-- > 0)
 		{
 			thisObj = this.coordinates[i].calBoundaryPoint(coord);
@@ -354,7 +354,7 @@ export class MultiGeometry extends Vector2D
 
 	insideOrTouch(coord)
 	{
-		var i = this.coordinates.length;
+		let i = this.coordinates.length;
 		while (i-- > 0)
 		{
 			if (this.coordinates[i].insideOrTouch(coord))
@@ -372,7 +372,7 @@ export class Polygon extends MultiGeometry
 	{
 		super(srid);
 		this.type = VectorType.Polygon;
-		var i;
+		let i;
 		for (i in coordinates)
 		{
 			this.geometries.push(new LinearRing(srid, coordinates[i]));
@@ -381,8 +381,8 @@ export class Polygon extends MultiGeometry
 
 	insideOrTouch(coord)
 	{
-		var i = this.coordinates.length;
-		var inside = false;
+		let i = this.coordinates.length;
+		let inside = false;
 		while (i-- > 0)
 		{
 			if (this.coordinates[i].insideOrTouch(coord))
@@ -400,10 +400,22 @@ export class MultiPolygon extends MultiGeometry
 	{
 		super(srid);
 		this.type = VectorType.MultiPolygon;
-		var i;
-		for (i in coordinates)
+		let i;
+		if (coordinates)
 		{
-			this.geometries.push(new Polygon(srid, coordinates[i]));
+			for (i in coordinates)
+			{
+				this.geometries.push(new Polygon(srid, coordinates[i]));
+			}
 		}
 	}
 }
+
+export class GeometryCollection extends MultiGeometry
+{
+	constructor(srid)
+	{
+		super(srid);
+		this.type = VectorType.GeometryCollection;
+	}
+}

package/hkoapi.js

@@ -17,7 +17,7 @@ export function getLayers()
 
 export async function getLocalWeatherForecast(lang)
 {
-	var resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/weather.php?dataType=flw&lang="+lang);
+	let resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/weather.php?dataType=flw&lang="+lang);
 	if (resp.ok)
 	{
 		return await resp.json();
@@ -27,7 +27,7 @@ export async function getLocalWeatherForecast(lang)
 
 export async function get9DayWeatherForecast(lang)
 {
-	var resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/weather.php?dataType=fnd&lang="+lang);
+	let resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/weather.php?dataType=fnd&lang="+lang);
 	if (resp.ok)
 	{
 		return await resp.json();
@@ -37,7 +37,7 @@ export async function get9DayWeatherForecast(lang)
 
 export async function getCurrentWeatherReport(lang)
 {
-	var resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/weather.php?dataType=rhrread&lang="+lang);
+	let resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/weather.php?dataType=rhrread&lang="+lang);
 	if (resp.ok)
 	{
 		return await resp.json();
@@ -47,7 +47,7 @@ export async function getCurrentWeatherReport(lang)
 
 export async function getWeatherWarningSummary(lang)
 {
-	var resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/weather.php?dataType=warnsum&lang="+lang);
+	let resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/weather.php?dataType=warnsum&lang="+lang);
 	if (resp.ok)
 	{
 		return await resp.json();
@@ -57,7 +57,7 @@ export async function getWeatherWarningSummary(lang)
 
 export async function getWeatherWarningInfo(lang)
 {
-	var resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/weather.php?dataType=warningInfo&lang="+lang);
+	let resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/weather.php?dataType=warningInfo&lang="+lang);
 	if (resp.ok)
 	{
 		return await resp.json();
@@ -67,7 +67,7 @@ export async function getWeatherWarningInfo(lang)
 
 export async function getSpecialWeatherTips(lang)
 {
-	var resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/weather.php?dataType=swt&lang="+lang);
+	let resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/weather.php?dataType=swt&lang="+lang);
 	if (resp.ok)
 	{
 		return await resp.json();
@@ -77,7 +77,7 @@ export async function getSpecialWeatherTips(lang)
 
 export async function getQuickEarthquakeMessages(lang)
 {
-	var resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/earthquake.php?dataType=qem&lang="+lang);
+	let resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/earthquake.php?dataType=qem&lang="+lang);
 	if (resp.ok)
 	{
 		return await resp.json();
@@ -87,7 +87,7 @@ export async function getQuickEarthquakeMessages(lang)
 
 export async function getLocallyFeltEarthTremorReport(lang)
 {
-	var resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/earthquake.php?dataType=feltearthquake&lang="+lang);
+	let resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/earthquake.php?dataType=feltearthquake&lang="+lang);
 	if (resp.ok)
 	{
 		return await resp.json();
@@ -97,7 +97,7 @@ export async function getLocallyFeltEarthTremorReport(lang)
 
 export async function getLunarDate(date)
 {
-	var resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/lunardate.php?date="+date.toString("yyyy-MM-dd"));
+	let resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/lunardate.php?date="+date.toString("yyyy-MM-dd"));
 	if (resp.ok)
 	{
 		return await resp.json();
@@ -107,7 +107,7 @@ export async function getLunarDate(date)
 
 export async function getHourlyRainfall(lang)
 {
-	var resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/hourlyRainfall.php?lang="+lang);
+	let resp = await fetch("https://data.weather.gov.hk/weatherAPI/opendata/hourlyRainfall.php?lang="+lang);
 	if (resp.ok)
 	{
 		return await resp.json();

package/kml.d.ts

@@ -1,5 +1,6 @@
 import * as data from "./data";
 import * as geometry from "./geometry";
+import * as web from "./web";
 
 export enum AltitudeMode
 {
@@ -139,8 +140,9 @@ export class LineStyle extends ColorStyle
 
 export class PolyStyle extends ColorStyle
 {
-
+	outline: boolean;
 	constructor();
+	setOutline(outline: boolean): void;
 	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 	equals(o: PolyStyle): boolean;
@@ -307,4 +309,5 @@ export class ScreenOverlay extends Feature
 }
 
 export function toString(item: Feature | NetworkLinkControl): string;
+export function toColor(color: string): web.Color;
 export function toCSSColor(color: string): string;

package/kml.js

@@ -123,7 +123,7 @@ export class ColorStyle extends Element
 
 	fromCSSColor(color)
 	{
-		var c = web.parseCSSColor(color);
+		let c = web.parseCSSColor(color);
 		this.fromARGB(c.a, c.r, c.g, c.b);
 	}
 
@@ -212,7 +212,7 @@ export class IconStyle extends ColorStyle
 
 	equals(o)
 	{
-		if (!o instanceof IconStyle)
+		if (!(o instanceof IconStyle))
 			return false;
 		if (!this.sameColor(o))
 			return false;
@@ -261,7 +261,7 @@ export class LabelStyle extends ColorStyle
 
 	equals(o)
 	{
-		if (!o instanceof LabelStyle)
+		if (!(o instanceof LabelStyle))
 			return false;
 		if (!this.sameColor(o))
 			return false;
@@ -307,7 +307,7 @@ export class LineStyle extends ColorStyle
 
 	equals(o)
 	{
-		if (!o instanceof LineStyle)
+		if (!(o instanceof LineStyle))
 			return false;
 		if (!this.sameColor(o))
 			return false;
@@ -324,6 +324,11 @@ export class PolyStyle extends ColorStyle
 		super();
 	}
 
+	setOutline(outline)
+	{
+		this.outline = outline;
+	}
+
 	getUsedNS(ns)
 	{
 	}
@@ -332,15 +337,19 @@ 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)+"</PolyStyle>");
 	}
 
 	equals(o)
 	{
-		if (!o instanceof PolyStyle)
+		if (!(o instanceof PolyStyle))
 			return false;
 		if (!this.sameColor(o))
 			return false;
+		if (this.outline != o.outline)
+			return false;
 		return true;
 	}
 };
@@ -373,7 +382,7 @@ export class BalloonStyle extends Element
 
 	equals(o)
 	{
-		if (!o instanceof BalloonStyle)
+		if (!(o instanceof BalloonStyle))
 			return false;
 		if (this.bgColor != o.bgColor)
 			return false;
@@ -411,7 +420,7 @@ export class ListStyle extends Element
 
 	equals(o)
 	{
-		if (!o instanceof ListStyle)
+		if (!(o instanceof ListStyle))
 			return false;
 		if (this.listItemType != o.listItemType)
 			return false;
@@ -742,13 +751,13 @@ export class Container extends Feature
 	{
 		if (this.styleList == null)
 			this.styleList = [];
-		var i;
+		let i;
 		for (i in this.styleList)
 		{
 			if (this.styleList[i].isStyle(iconStyle, labelStyle, lineStyle, polyStyle, balloonStyle, listStyle))
 				return this.styleList[i];
 		}
-		var style = new Style("style"+(this.styleList.length + 1));
+		let style = new Style("style"+(this.styleList.length + 1));
 		style.iconStyle = iconStyle;
 		style.labelStyle = labelStyle;
 		style.lineStyle = lineStyle;
@@ -761,7 +770,7 @@ export class Container extends Feature
 
 	getStyleById(id)
 	{
-		var i;
+		let i;
 		if (this.styleList)
 		{
 			for (i in this.styleList)
@@ -785,7 +794,7 @@ export class Container extends Feature
 	{
 		if (this.styleList)
 		{
-			var i;
+			let i;
 			for (i in this.styleList)
 			{
 				this.styleList[i].getUsedNS(ns);
@@ -795,7 +804,7 @@ export class Container extends Feature
 
 	appendOuterXML(strs, level)
 	{
-		var i;
+		let i;
 		strs.push("\t".repeat(level)+"<"+this.eleName+">");
 		this.appendInnerXML(strs, level + 1);
 		if (this.styleList)
@@ -865,7 +874,7 @@ export class Placemark extends Feature
 		{
 			if (subGeom)
 			{
-				var i;
+				let i;
 				strs.push("\t".repeat(level)+"<LinearRing>");
 				if (vec.coordinates[0].length >= 3)
 				{
@@ -893,13 +902,13 @@ export class Placemark extends Feature
 			}
 			else
 			{
-				var pg = vec.toPolygon();
+				let pg = vec.toPolygon();
 				this.appendGeometry(strs, level, pg, subGeom);
 			}
 		}
 		else if (vec instanceof geometry.LineString)
 		{
-			var i;
+			let i;
 			strs.push("\t".repeat(level)+"<LineString>");
 			if (vec.coordinates[0].length >= 3)
 			{
@@ -927,7 +936,7 @@ export class Placemark extends Feature
 		}
 		else if (vec instanceof geometry.Polygon)
 		{
-			var i;
+			let i;
 			strs.push("\t".repeat(level)+"<Polygon>");
 			if (vec.geometries[0].coordinates[0].length >= 3)
 			{
@@ -958,7 +967,7 @@ export class Placemark extends Feature
 		}
 		else if (vec instanceof geometry.MultiPolygon)
 		{
-			var i;
+			let i;
 			strs.push("\t".repeat(level)+"<MultiGeometry>");
 			for (i in vec.geometries)
 			{
@@ -986,9 +995,9 @@ export class Placemark extends Feature
 
 export function toString(item)
 {
-	var strs = [];
+	let strs = [];
 	strs.push("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>");
-	var namespaces = {};
+	let namespaces = {};
 	item.getUsedNS(namespaces);
 	strs.push("<kml xmlns=\"http://www.opengis.net/kml/2.2\">");
 	item.appendOuterXML(strs, 1);
@@ -996,14 +1005,34 @@ export function toString(item)
 	return strs.join("\r\n");
 }
 
+export function toColor(color)
+{
+	if (color.length != 8)
+		return null;
+
+	return {
+		a: Number.parseInt(color.substring(0, 2), 16) / 255,
+		b: Number.parseInt(color.substring(2, 4), 16) / 255,
+		g: Number.parseInt(color.substring(4, 6), 16) / 255,
+		r: Number.parseInt(color.substring(6, 8), 16) / 255
+	};
+}
+
 export function toCSSColor(color)
 {
 	if (color.length != 8)
 		return null;
 
-	var a = Number.parseInt(color.substring(0, 2), 16);
-	var b = Number.parseInt(color.substring(2, 4), 16);
-	var g = Number.parseInt(color.substring(4, 6), 16);
-	var r = Number.parseInt(color.substring(6, 8), 16);
-	return "rgba("+r+", "+g+", "+b+", "+(a / 255.0)+")";
+	let a = Number.parseInt(color.substring(0, 2), 16);
+	if (a == 255)
+	{
+		return "#"+color.substring(6, 8)+color.substring(4, 6)+color.substring(2, 4);
+	}
+	else
+	{
+		let b = Number.parseInt(color.substring(2, 4), 16);
+		let g = Number.parseInt(color.substring(4, 6), 16);
+		let r = Number.parseInt(color.substring(6, 8), 16);
+		return "rgba("+r+", "+g+", "+b+", "+(a / 255.0)+")";
+	}
 }