@sswroom/sswr 1.6.10 → 1.6.11

package/olayer2.js

@@ -6,6 +6,7 @@ import * as math from "./math.js";
 import * as osm from "./osm.js";
 import * as text from "./text.js";
 import * as web from "./web.js";
+import * as OpenLayers from "./dummy/olayer2.js";
 
 export function toPointArray(numArr, options)
 {
@@ -55,6 +56,7 @@ export async function createFromKML(feature, options)
 	}
 	else if (feature instanceof kml.Placemark)
 	{
+		/** @type {{objProjection?: OpenLayers.Projection, mapProjection?: OpenLayers.Projection, name?: string, iconUrl?: string, iconOffset?: OpenLayers.Pixel, strokeColor?: string, strokeWidth?: number, stroke?: boolean, fillColor?: string, fill?: boolean}} */
 		let opt = {objProjection: options.objProjection, mapProjection: options.mapProjection};
 		if (feature.name)
 			opt.name = feature.name;
@@ -148,6 +150,11 @@ export async function createFromKML(feature, options)
 	}
 }
 
+/**
+ * @param {geometry.Vector2D} geom
+ * @param {{ objProjection?: OpenLayers.Projection; mapProjection?: OpenLayers.Projection; iconUrl?: string; iconOffset?: OpenLayers.Pixel; } | null} options
+ * @returns {Promise<OpenLayers.Geometry|OpenLayers.Marker|null>}
+ */
 export async function createFromGeometry(geom, options)
 {
 	if (options == null)
@@ -158,6 +165,11 @@ export async function createFromGeometry(geom, options)
 	if (geom instanceof geometry.Point)
 	{
 		let icon;
+		let lonLat = new OpenLayers.LonLat(geom.coordinates[0], geom.coordinates[1]);
+		if (options.objProjection && options.mapProjection)
+		{
+			lonLat = lonLat.transform(options.objProjection, options.mapProjection);
+		}
 		if (options.iconUrl && options.iconOffset)
 		{
 			let size = await web.getImageInfo(options.iconUrl);
@@ -167,11 +179,10 @@ export async function createFromGeometry(geom, options)
 				return null;
 			}
 			icon = new OpenLayers.Icon(options.iconUrl, new OpenLayers.Size(size.width, size.height), options.iconOffset);
-			return new OpenLayers.Marker(new OpenLayers.LonLat(geom.coordinates[0], geom.coordinates[1]).transform(options.objProjection, options.mapProjection), icon);
+			return new OpenLayers.Marker(lonLat, icon);
 		}
 		else
 		{
-			let lonLat = new OpenLayers.LonLat(geom.coordinates[0], geom.coordinates[1]).transform(options.objProjection, options.mapProjection);
 			return new OpenLayers.Geometry.Point(lonLat.lon, lonLat.lat);
 		}
 	}
@@ -189,7 +200,9 @@ export async function createFromGeometry(geom, options)
 		let i;
 		for (i in geom.geometries)
 		{
-			lrList.push(await createFromGeometry(geom.geometries[i], options));
+			let lr = await createFromGeometry(geom.geometries[i], options);
+			if (lr instanceof OpenLayers.Geometry.LinearRing)
+				lrList.push(lr);
 		}
 		return new OpenLayers.Geometry.Polygon(lrList);
 	}
@@ -199,7 +212,9 @@ export async function createFromGeometry(geom, options)
 		let i;
 		for (i in geom.geometries)
 		{
-			pgList.push(await createFromGeometry(geom.geometries[i], options));
+			let pg = await createFromGeometry(geom.geometries[i], options);
+			if (pg instanceof OpenLayers.Geometry.Polygon)
+				pgList.push(pg);
 		}
 		return new OpenLayers.Geometry.MultiPolygon(pgList);
 	}
@@ -221,8 +236,11 @@ export class Olayer2Map extends map.MapControl
 		this.initLev = 12;
 		this.mapId = mapId;
 		let dom = document.getElementById(mapId);
-		dom.style.minWidth = '1px';
-		dom.style.minHeight = '1px';
+		if (dom)
+		{
+			dom.style.minWidth = '1px';
+			dom.style.minHeight = '1px';
+		}
 		this.mapProjection = new OpenLayers.Projection("EPSG:4326");
 		this.map = new OpenLayers.Map(this.mapId, {
 			eventListeners: {
@@ -270,6 +288,10 @@ export class Olayer2Map extends map.MapControl
 		this.currMarkerPopupObj = null;
 	}
 
+	/**
+	 * @param {map.LayerInfo} layer
+	 * @param {object} options
+	 */
 	createLayer(layer, options)
 	{
 		if (layer.type == map.WebMapType.OSMTile)
@@ -548,7 +570,7 @@ export class Olayer2Map extends map.MapControl
 					let pos = new OpenLayers.LonLat(lr.coordinates[j][0], lr.coordinates[j][1]).transform(this.mapProjection, this.map.getProjectionObject());
 					points.push(new OpenLayers.Geometry.Point(pos.lon, pos.lat));
 				}
-				lrArr.push(new OpenLayers.Geometry.LineString(points));
+				lrArr.push(new OpenLayers.Geometry.LinearRing(points));
 			}
 			return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Polygon(lrArr), null, opt);
 		}
@@ -571,7 +593,7 @@ export class Olayer2Map extends map.MapControl
 						let pos = new OpenLayers.LonLat(lr.coordinates[k][0], lr.coordinates[k][1]).transform(this.mapProjection, this.map.getProjectionObject());
 						points.push(new OpenLayers.Geometry.Point(pos.lon, pos.lat));
 					}
-					lrArr.push(new OpenLayers.Geometry.LineString(points));
+					lrArr.push(new OpenLayers.Geometry.LinearRing(points));
 				}
 				pgArr.push(new OpenLayers.Geometry.Polygon(lrArr));
 			}
@@ -674,7 +696,7 @@ export class Olayer2Map extends map.MapControl
 			let polyStyle = null;
 			if (layer.style)
 			{
-				if (layer.style.stroke)
+				if (layer.style.stroke && layer.style.strokeColor)
 				{
 					let c = web.parseCSSColor(layer.style.strokeColor);
 					lineStyle = new kml.LineStyle();
@@ -682,7 +704,7 @@ export class Olayer2Map extends map.MapControl
 					if (layer.style.strokeWidth)
 						lineStyle.setWidth(layer.style.strokeWidth)
 				}
-				if (layer.style.fill)
+				if (layer.style.fill && layer.style.fillColor)
 				{
 					let c = web.parseCSSColor(layer.style.fillColor);
 					if (layer.style.fillOpacity)

package/package.json

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

package/text.d.ts

@@ -35,6 +35,8 @@ export function charIsUpperCase(s: string, index: number): boolean;
 export function charIsLowerCase(s: string, index: number): boolean;
 export function replaceAll(s: string, replaceFrom: string, replaceTo: string): string;
 export function getEncList(): TextBinEnc[];
+export function b64Enc(s: string, cs?: Base64Charset): string;
+export function b64Dec(b64Str: string): string;
 
 export class TextBinEnc
 {

package/text.js

@@ -577,6 +577,29 @@ export function getEncList()
 	return ret;
 }
 
+/**
+ * @param {string} s
+ * @param {number|undefined} cs
+ * @returns {string}
+ */
+export function b64Enc(s, cs)
+{
+	let b64 = new Base64Enc(cs, false);
+	let enc = new TextEncoder();
+	return b64.encodeBin(enc.encode(s));
+}
+
+/**
+ * @param {string} b64Str
+ * @returns {string}
+ */
+export function b64Dec(b64Str)
+{
+	let b64 = new Base64Enc();
+	let dec = new TextDecoder();
+	return dec.decode(b64.decodeBin(b64Str));
+}
+
 export class TextBinEnc
 {
 	constructor(name)