Chinese characters 1

OpenGIS · May 5, 2024 · 7ae9557 · 7ae9557
1 parent 9fc5fa1
commit 7ae9557
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 23 deletions.
diff --git a/dist/js/waymark-js.js b/dist/js/waymark-js.js
@@ -7834,21 +7834,32 @@ function Waymark_Map() {
 			.join("");
 	};
 
-	this.make_key = function (str) {
-		if (!str) {
-			return str;
+	this.make_key = function (str_in) {
+		if (!str_in) {
+			return str_in;
 		}
 
 		//No cyrillic
-		str = this.transliterate(str);
+		str_out = this.transliterate(str_in);
 
 		//No underscores
-		str = str.replace(/[^a-z0-9+]+/gi, "");
+		str_out = str_out.replace(/[^a-z0-9+]+/gi, "");
 
 		//Lower
-		str = str.toLowerCase();
+		str_out = str_out.toLowerCase();
+
+		// Check for empty str_out
+		if (!str_out) {
+			// Convert to hex
+			str_out = str_in
+				.split("")
+				.map(function (char) {
+					return char.charCodeAt(0).toString(16);
+				})
+				.join("");
+		}
 
-		return str;
+		return str_out;
 	};
 
 	this.get_feature_overlay_type = function (feature) {

diff --git a/dist/js/waymark-js.min.js b/dist/js/waymark-js.min.js
diff --git a/docs/public/dist/latest/js/waymark-js.js b/docs/public/dist/latest/js/waymark-js.js
@@ -7834,21 +7834,32 @@ function Waymark_Map() {
 			.join("");
 	};
 
-	this.make_key = function (str) {
-		if (!str) {
-			return str;
+	this.make_key = function (str_in) {
+		if (!str_in) {
+			return str_in;
 		}
 
 		//No cyrillic
-		str = this.transliterate(str);
+		str_out = this.transliterate(str_in);
 
 		//No underscores
-		str = str.replace(/[^a-z0-9+]+/gi, "");
+		str_out = str_out.replace(/[^a-z0-9+]+/gi, "");
 
 		//Lower
-		str = str.toLowerCase();
+		str_out = str_out.toLowerCase();
+
+		// Check for empty str_out
+		if (!str_out) {
+			// Convert to hex
+			str_out = str_in
+				.split("")
+				.map(function (char) {
+					return char.charCodeAt(0).toString(16);
+				})
+				.join("");
+		}
 
-		return str;
+		return str_out;
 	};
 
 	this.get_feature_overlay_type = function (feature) {

diff --git a/docs/public/dist/latest/js/waymark-js.min.js b/docs/public/dist/latest/js/waymark-js.min.js
diff --git a/src/js/Waymark_Map.js b/src/js/Waymark_Map.js
@@ -444,21 +444,32 @@ function Waymark_Map() {
 			.join("");
 	};
 
-	this.make_key = function (str) {
-		if (!str) {
-			return str;
+	this.make_key = function (str_in) {
+		if (!str_in) {
+			return str_in;
 		}
 
 		//No cyrillic
-		str = this.transliterate(str);
+		str_out = this.transliterate(str_in);
 
 		//No underscores
-		str = str.replace(/[^a-z0-9+]+/gi, "");
+		str_out = str_out.replace(/[^a-z0-9+]+/gi, "");
 
 		//Lower
-		str = str.toLowerCase();
+		str_out = str_out.toLowerCase();
+
+		// Check for empty str_out
+		if (!str_out) {
+			// Convert to hex
+			str_out = str_in
+				.split("")
+				.map(function (char) {
+					return char.charCodeAt(0).toString(16);
+				})
+				.join("");
+		}
 
-		return str;
+		return str_out;
 	};
 
 	this.get_feature_overlay_type = function (feature) {