@sswroom/sswr 1.6.5 → 1.6.7

package/Changelog

@@ -1,3 +1,12 @@
+1.6.7
+-Fixed text.isEmailAddress
+
+1.6.6
+-Enhance Email Address checking
+-Added Macau 2009 Grid
+-Added map.LayerInfo minX, minY, maxX, maxY
+-Leaflet support createLayer with bounds
+
 1.6.5
 -Fixed some bugs
 -Support cert.keyTypeGetOID

package/leaflet.js

@@ -41,6 +41,8 @@ export function createLayer(layer, options)
 			lyrOpts.minZoom = layer.minZoom;
 		if (layer.maxZoom)
 			lyrOpts.maxZoom = layer.maxZoom;
+		if (layer.minX != null && layer.minY != null && layer.maxX != null && layer.maxY != null)
+			lyrOpts.bounds = L.latLngBounds(L.latLng(layer.minY, layer.minX), L.latLng(layer.maxY, layer.maxX));
 		lyrOpts.maxNativeZoom = lyrOpts.maxZoom;
 		lyrOpts.maxZoom = 25;
 		return L.tileLayer(layer.url, lyrOpts);

package/map.d.ts

@@ -45,6 +45,10 @@ declare class LayerInfo
 	format?: string;
 	minZoom?: number;
 	maxZoom?: number;
+	minX?: number;
+	minY?: number;
+	maxX?: number;
+	maxY?: number;
 }
 
 declare class GeoJSON
@@ -56,7 +60,7 @@ declare class GeoJSON
 declare class Geometry
 {
 	type: GeometryType;
-	coordinates?: any[];
+	coordinates?: number[]|number[][]|number[][][]|number[][][][];
 	geometries?: Geometry[];
 }
 

package/math.js

@@ -1316,6 +1316,8 @@ export class CoordinateSystemManager
 			return this.srCreateGeogCSysData(srid, 6326, "WGS 84");
 		case 4611:
 			return this.srCreateGeogCSysData(srid, 6611, "Hong Kong 1980");
+		case 8428:
+			return this.srCreateGeogCSysData(srid, 1207, "Macau_2009");
 		default:
 			console.log("Unsupported Geog SRID: "+srid);
 			return null;
@@ -1335,6 +1337,8 @@ export class CoordinateSystemManager
 		case 3857:
 		case 900913:
 			return this.srCreateProjCSysData(srid, 4326, CoordinateSystemType.Mercator1SPProjected, "WGS 84 / Pseudo-Mercator", 0, 0, 0, 0, 1);
+		case 8432:
+			return this.srCreateProjCSysData(srid, 8428, CoordinateSystemType.MercatorProjected, "Macau Grid", 20000.00, 20000.00, 113.53646944444444444444444444444, 22.21239722222222222222222222222222, 1);
 		default:
 			console.log("Unsupported Proj SRID: "+srid);
 			return null;
@@ -1349,11 +1353,13 @@ export class CoordinateSystemManager
 		{
 		case 2326:
 		case 3857:
+		case 8432:
 		case 102140:
 		case 900913:
 			return this.srCreateProjCSys(srid);
 		case 4326:
 		case 4611:
+		case 8428:
 			return this.srCreateGeogCSys(srid);
 		default:
 			console.log("Unsupported SRID: "+srid);
@@ -1368,6 +1374,8 @@ export class CoordinateSystemManager
 	{
 		switch (srid)
 		{
+		case 1207:
+			return new DatumData(1207, CoordinateSystemManager.srGetSpheroid(7022), "Macao_1920", -2361554.788, 5417536.177, 2391608.926, -202.865, -303.990, -155.873, -34.079, 76.126, 32.660, 6.096, unit.Angle.Unit.ARCSECOND);
 		case 6326:
 			return new DatumData(6326, CoordinateSystemManager.srGetSpheroid(7030), "WGS_1984", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, unit.Angle.Unit.RADIAN);
 		case 6600:

package/package.json

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

package/text.js

@@ -320,6 +320,13 @@ export function isEmailAddress(s)
 		if (charIsAlphaNumeric(s, i) || c == '-')
 		{
 
+		}
+		else if (c == '_')
+		{
+			if (atPos != -1)
+			{
+				return false;
+			}
 		}
 		else if (c == '.')
 		{