@sswroom/sswr 1.6.8 → 1.6.9

package/Changelog

@@ -1,3 +1,8 @@
+1.6.9
+-Enhance web.getBrowserInfo
+-web.parseUserAgent support FxiOS (Firefox in iOS)
+-leaflet.toKMLFeature() change to empty name
+
 1.6.8
 -Added text.replaceAll
 -Added web.OSType

package/leaflet.js

@@ -406,7 +406,7 @@ export function toKMLFeature(layer, doc)
 	if (layer instanceof L.FeatureGroup)
 	{
 		let featureGroup = new kml.Folder();
-		featureGroup.setName("FeatureGroup");
+		featureGroup.setName("");
 		let i;
 		for (i in layer._layers)
 		{
@@ -419,7 +419,7 @@ export function toKMLFeature(layer, doc)
 	else if (layer instanceof L.Marker)
 	{
 		feature = new kml.Placemark(toPoint(layer));
-		feature.setName("Marker");
+		feature.setName("");
 //		console.log("Marker found", layer);
 		if (layer._popup && layer._popup._content)
 		{
@@ -460,7 +460,7 @@ export function toKMLFeature(layer, doc)
 	else if (layer instanceof L.Polyline)
 	{
 		feature = new kml.Placemark(toLineString(layer));
-		feature.setName("Polyline");
+		feature.setName("");
 		if (layer.options.color || layer.options.weight)
 		{
 			let lineStyle = new kml.LineStyle();

package/package.json

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

package/web.js

@@ -983,7 +983,27 @@ export async function getBrowserInfo()
 			ret.devName = data.model;
 		if (data.fullVersionList)
 		{
-			ret.browserVer = data.fullVersionList[data.fullVersionList.length - 1].version;
+			console.log(data.fullVersionList);
+			let i = 0;
+			while (i < data.fullVersionList.length)
+			{
+				if (ret.browser == BrowserType.Edge)
+				{
+					if (data.fullVersionList[i].brand == "Microsoft Edge")
+						ret.browserVer = data.fullVersionList[i].version;
+				}
+				else if (ret.browser == BrowserType.Chrome)
+				{
+					if (data.fullVersionList[i].brand == "Chrome" || data.fullVersionList[i].brand == "Chromium")
+						ret.browserVer = data.fullVersionList[i].version;
+				}
+				else if (ret.browser == BrowserType.Opera)
+				{
+					if (data.fullVersionList[i].brand == "Opera")
+						ret.browserVer = data.fullVersionList[i].version;
+				}
+				i++;
+			}
 		}
 	}
 	return ret;
@@ -1361,16 +1381,16 @@ export function parseUserAgent(userAgent)
 			ent.browser = BrowserType.GSA;
 			ent.browserVer = strs[i].substring(4);
 		}
-		else if ((ent.browser == BrowserType.Unknown || ent.browser == BrowserType.Safari) && strs[i].startsWith("OPT/"))
-			{
-				ent.browser = BrowserType.Opera;
-				ent.browserVer = strs[i].substring(4);
-			}
-			else if ((ent.browser == BrowserType.Unknown || ent.browser == BrowserType.Safari) && strs[i].startsWith("CriOS/"))
+		else if ((ent.browser == BrowserType.Unknown || ent.browser == BrowserType.Safari) && strs[i].startsWith("CriOS/"))
 		{
 			ent.browser = BrowserType.Chrome;
 			ent.browserVer = strs[i].substring(6);
 		}
+		else if ((ent.browser == BrowserType.Unknown || ent.browser == BrowserType.Safari) && strs[i].startsWith("FxiOS/"))
+		{
+			ent.browser = BrowserType.Firefox;
+			ent.browserVer = strs[i].substring(6);
+		}
 		else if (strs[i].startsWith("Chrome/"))
 		{
 			if (ent.browser == BrowserType.Unknown || ent.browser == BrowserType.Safari)
@@ -1398,6 +1418,16 @@ export function parseUserAgent(userAgent)
 			ent.browser = BrowserType.Edge;
 			ent.browserVer = strs[i].substring(7);
 		}
+		else if ((ent.browser == BrowserType.Unknown || ent.browser == BrowserType.Chrome) && strs[i].startsWith("OPT/"))
+		{
+			ent.browser = BrowserType.Opera;
+			ent.browserVer = strs[i].substring(4);
+		}
+		else if ((ent.browser == BrowserType.Unknown || ent.browser == BrowserType.Chrome) && strs[i].startsWith("OPR/"))
+		{
+			ent.browser = BrowserType.Opera;
+			ent.browserVer = strs[i].substring(4);
+		}
 		else if ((ent.browser == BrowserType.Unknown || ent.browser == BrowserType.Chrome) && strs[i].startsWith("HuaweiBrowser/"))
 		{
 			ent.browser = BrowserType.HuaweiBrowser;