nakarte

commit 4dd4ef24c2679a271bc5e009bd96e02f5f3cebf3
parent 1c4d35526faf62bc588d7d1dd2baad057b785400
Author: Sergey Orlov <wladimirych@gmail.com>
Date:   Tue,  4 Aug 2020 23:12:20 +0200

search, coordinates: allow capital russian letters in hemispheres

Diffstat:
M
src/lib/leaflet.control.search/providers/coordinates.js
 | 
8
++++----
M
test/test_search_coordinates.js
 | 
3
+++

2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/lib/leaflet.control.search/providers/coordinates.js b/src/lib/leaflet.control.search/providers/coordinates.js
@@ -374,10 +374,10 @@ class CoordinatesProvider {
         // Manually added: "oO" (lat), "оО" (rus)
         // eslint-disable-next-line max-len, no-control-regex, no-misleading-character-class
         symbols: /[OoОо\u0000-\u002b\u002f\u003a-\u0040\u005b-\u0060\u007b-\u00bf\u00d7\u00f7\u01bb\u01c0-\u01cc\u0294\u02b9-\u036f\u0375\u03f6\u0482-\u0489\u0559-\u055f\u0589-\u109f\u10fb\u10fc\u1100-\u139f\u1400-\u1c7f\u1cc0-\u1cff\u1d2f-\u1d6a\u1dc0-\u1dff\u1f88-\u1f8f\u1f98-\u1f9f\u1fa8-\u1faf\u1fbc-\u1fc1\u1fcc-\u1fcf\u1ffc-\u2131\u213a-\u214d\u214f-\u2182\u2185-\u2bff\u2ce5-\u2cea\u2cef-\u2cf1\u2cf9-\u2cff\u2d30-\ua63f\ua66e-\ua67f\ua69e-\ua721\ua788-\ua78a\ua78f\ua7f7-\ua7f9\ua7fb-\uab2f\uab5b-\uab5f\uabc0-\uffff]/gu,
-        northernHemishphere: /[Nn]|с *ш?/gu,
-        southernHemishphere: /[Ss]|ю *ш?/gu,
-        westernHemishphere: /[Ww]|з *д?/gu,
-        easternHemishphere: /[EeЕе]|в *д?/gu, // second Ее is cyrillic
+        northernHemishphere: /[Nn]|[СсCc] *[Шш]?/gu,
+        southernHemishphere: /[Ss]|[Юю] *[Шш]?/gu,
+        westernHemishphere: /[Ww]|[Зз] *[Дд]?/gu,
+        easternHemishphere: /[EeЕе]|[ВвB] *[Дд]?/gu, // second Ее is cyrillic
     };
 
     static parsers = [CoordinatesDMS, CoordinatesDM, CoordinatesD, CoordinatesDSigned];
diff --git a/test/test_search_coordinates.js b/test/test_search_coordinates.js
@@ -48,6 +48,9 @@ suite('CoordinatesProvider - parse good coordinates');
     ['55.93382 ю ш 36.93604 з д', ['S 55.93382° W 36.93604°']],
     ['55.93382 ю. ш. 36.93604 з. д.', ['S 55.93382° W 36.93604°']],
     ['55.93382 с.ш. 36.93604 в.д.', ['N 55.93382° E 36.93604°']],
+    [`43°20'13"С, 42°27'24"В`, ['N 43°20′13″ E 42°27′24″']],
+    [`43°20'13"N, 42°27'24"В`, ['N 43°20′13″ E 42°27′24″']],
+    ["57°57'11.65''C|33°16'8.37''В", ['N 57°57′11.65″ E 33°16′8.37″']],
 
     // margin values
     ['0 0', ['0° 0°']],