[ios, osx] Corrected quarter wind abbreviations

3 files changed, 97 insertions, 97 deletions

diff --git a/platform/darwin/src/MGLCompassDirectionFormatter.m b/platform/darwin/src/MGLCompassDirectionFormatter.m
index abf0db2da1..8a4118ba55 100644
--- a/platform/darwin/src/MGLCompassDirectionFormatter.m
+++ b/platform/darwin/src/MGLCompassDirectionFormatter.m
@@ -21,78 +21,78 @@
     dispatch_once(&onceToken, ^{
         shortStrings = @[
             NSLocalizedStringWithDefaultValue(@"COMPASS_N_SHORT", @"Foundation", nil, @"N", @"North, short"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_NxE_SHORT", @"Foundation", nil, @"N×E", @"North by east, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NbE_SHORT", @"Foundation", nil, @"NbE", @"North by east, short"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_NNE_SHORT", @"Foundation", nil, @"NNE", @"North-northeast, short"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_NExN_SHORT", @"Foundation", nil, @"NE×N", @"Northeast by north, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NEbN_SHORT", @"Foundation", nil, @"NEbN", @"Northeast by north, short"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_NE_SHORT", @"Foundation", nil, @"NE", @"Northeast, short"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_NExE_SHORT", @"Foundation", nil, @"NE×E", @"Northeast by east, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NEbE_SHORT", @"Foundation", nil, @"NEbE", @"Northeast by east, short"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_ENE_SHORT", @"Foundation", nil, @"ENE", @"East-northeast, short"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_ExN_SHORT", @"Foundation", nil, @"E×N", @"East by north, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_EbN_SHORT", @"Foundation", nil, @"EbN", @"East by north, short"),
             
             NSLocalizedStringWithDefaultValue(@"COMPASS_E_SHORT", @"Foundation", nil, @"E", @"East, short"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_ExS_SHORT", @"Foundation", nil, @"E×S", @"East by south, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_EbS_SHORT", @"Foundation", nil, @"EbS", @"East by south, short"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_ESE_SHORT", @"Foundation", nil, @"ESE", @"East-southeast, short"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_SExE_SHORT", @"Foundation", nil, @"SE×E", @"Southeast by east, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SEbE_SHORT", @"Foundation", nil, @"SEbE", @"Southeast by east, short"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_SE_SHORT", @"Foundation", nil, @"SE", @"Southeast, short"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_SExS_SHORT", @"Foundation", nil, @"SE×S", @"Southeast by south, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SEbS_SHORT", @"Foundation", nil, @"SEbS", @"Southeast by south, short"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_SSE_SHORT", @"Foundation", nil, @"SSE", @"South-southeast, short"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_SxE_SHORT", @"Foundation", nil, @"S×E", @"South by east, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SbE_SHORT", @"Foundation", nil, @"SbE", @"South by east, short"),
             
             NSLocalizedStringWithDefaultValue(@"COMPASS_S_SHORT", @"Foundation", nil, @"S", @"South, short"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_SxW_SHORT", @"Foundation", nil, @"S×W", @"South by west, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SbW_SHORT", @"Foundation", nil, @"SbW", @"South by west, short"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_SSW_SHORT", @"Foundation", nil, @"SSW", @"South-southwest, short"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_SWxS_SHORT", @"Foundation", nil, @"SW×S", @"Southwest by south, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SWbS_SHORT", @"Foundation", nil, @"SWbS", @"Southwest by south, short"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_SW_SHORT", @"Foundation", nil, @"SW", @"Southwest, short"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_SWxW_SHORT", @"Foundation", nil, @"SW×W", @"Southwest by west, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SWbW_SHORT", @"Foundation", nil, @"SWbW", @"Southwest by west, short"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_WSW_SHORT", @"Foundation", nil, @"WSW", @"West-southwest, short"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_WxS_SHORT", @"Foundation", nil, @"W×S", @"West by south, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_WbS_SHORT", @"Foundation", nil, @"WbS", @"West by south, short"),
             
             NSLocalizedStringWithDefaultValue(@"COMPASS_W_SHORT", @"Foundation", nil, @"W", @"West, short"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_WxN_SHORT", @"Foundation", nil, @"W×N", @"West by north, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_WbN_SHORT", @"Foundation", nil, @"WbN", @"West by north, short"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_WNW_SHORT", @"Foundation", nil, @"WNW", @"West-northwest, short"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_NWxW_SHORT", @"Foundation", nil, @"NW×W", @"Northwest by west, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NWbW_SHORT", @"Foundation", nil, @"NWbW", @"Northwest by west, short"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_NW_SHORT", @"Foundation", nil, @"NW", @"Northwest, short"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_NWxN_SHORT", @"Foundation", nil, @"NW×N", @"Northwest by north, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NWbN_SHORT", @"Foundation", nil, @"NWbN", @"Northwest by north, short"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_NNW_SHORT", @"Foundation", nil, @"NNW", @"North-northwest, short"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_NxW_SHORT", @"Foundation", nil, @"N×W", @"North by west, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NbW_SHORT", @"Foundation", nil, @"NbW", @"North by west, short"),
         ];
         
         longStrings = @[
             NSLocalizedStringWithDefaultValue(@"COMPASS_N_LONG", @"Foundation", nil, @"north", @"North, long"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_NxE_LONG", @"Foundation", nil, @"north by east", @"North by east, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NbE_LONG", @"Foundation", nil, @"north by east", @"North by east, long"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_NNE_LONG", @"Foundation", nil, @"north-northeast", @"North-northeast, long"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_NExN_LONG", @"Foundation", nil, @"northeast by north", @"Northeast by north, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NEbN_LONG", @"Foundation", nil, @"northeast by north", @"Northeast by north, long"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_NE_LONG", @"Foundation", nil, @"northeast", @"Northeast, long"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_NExE_LONG", @"Foundation", nil, @"northeast by east", @"Northeast by east, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NEbE_LONG", @"Foundation", nil, @"northeast by east", @"Northeast by east, long"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_ENE_LONG", @"Foundation", nil, @"east-northeast", @"East-northeast, long"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_ExN_LONG", @"Foundation", nil, @"east by north", @"East by north, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_EbN_LONG", @"Foundation", nil, @"east by north", @"East by north, long"),
             
             NSLocalizedStringWithDefaultValue(@"COMPASS_E_LONG", @"Foundation", nil, @"east", @"East, long"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_ExS_LONG", @"Foundation", nil, @"east by south", @"East by south, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_EbS_LONG", @"Foundation", nil, @"east by south", @"East by south, long"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_ESE_LONG", @"Foundation", nil, @"east-southeast", @"East-southeast, long"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_SExE_LONG", @"Foundation", nil, @"southeast by east", @"Southeast by east, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SEbE_LONG", @"Foundation", nil, @"southeast by east", @"Southeast by east, long"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_SE_LONG", @"Foundation", nil, @"southeast", @"Southeast, long"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_SExS_LONG", @"Foundation", nil, @"southeast by south", @"Southeast by south, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SEbS_LONG", @"Foundation", nil, @"southeast by south", @"Southeast by south, long"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_SSE_LONG", @"Foundation", nil, @"south-southeast", @"South-southeast, long"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_SxE_LONG", @"Foundation", nil, @"south by east", @"South by east, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SbE_LONG", @"Foundation", nil, @"south by east", @"South by east, long"),
             
             NSLocalizedStringWithDefaultValue(@"COMPASS_S_LONG", @"Foundation", nil, @"south", @"South, long"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_SxW_LONG", @"Foundation", nil, @"south by west", @"South by west, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SbW_LONG", @"Foundation", nil, @"south by west", @"South by west, long"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_SSW_LONG", @"Foundation", nil, @"south-southwest", @"South-southwest, long"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_SWxS_LONG", @"Foundation", nil, @"southwest by south", @"Southwest by south, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SWbS_LONG", @"Foundation", nil, @"southwest by south", @"Southwest by south, long"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_SW_LONG", @"Foundation", nil, @"southwest", @"Southwest, long"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_SWxW_LONG", @"Foundation", nil, @"southwest by west", @"Southwest by west, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SWbW_LONG", @"Foundation", nil, @"southwest by west", @"Southwest by west, long"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_WSW_LONG", @"Foundation", nil, @"west-southwest", @"West-southwest, long"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_WxS_LONG", @"Foundation", nil, @"west by south", @"West by south, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_WbS_LONG", @"Foundation", nil, @"west by south", @"West by south, long"),
             
             NSLocalizedStringWithDefaultValue(@"COMPASS_W_LONG", @"Foundation", nil, @"west", @"West, long"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_WxN_LONG", @"Foundation", nil, @"west by north", @"West by north, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_WbN_LONG", @"Foundation", nil, @"west by north", @"West by north, long"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_WNW_LONG", @"Foundation", nil, @"west-northwest", @"West-northwest, long"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_NWxW_LONG", @"Foundation", nil, @"northwest by west", @"Northwest by west, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NWbW_LONG", @"Foundation", nil, @"northwest by west", @"Northwest by west, long"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_NW_LONG", @"Foundation", nil, @"northwest", @"Northwest, long"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_NWxN_LONG", @"Foundation", nil, @"northwest by north", @"Northwest by north, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NWbN_LONG", @"Foundation", nil, @"northwest by north", @"Northwest by north, long"),
             NSLocalizedStringWithDefaultValue(@"COMPASS_NNW_LONG", @"Foundation", nil, @"north-northwest", @"North-northwest, long"),
-            NSLocalizedStringWithDefaultValue(@"COMPASS_NxW_LONG", @"Foundation", nil, @"north by west", @"North by west, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NbW_LONG", @"Foundation", nil, @"north by west", @"North by west, long"),
         ];
         
         NSAssert(shortStrings.count == longStrings.count, @"Long and short compass direction string arrays must have the same size.");
diff --git a/platform/darwin/test/MGLCompassDirectionFormatterTests.m b/platform/darwin/test/MGLCompassDirectionFormatterTests.m
index c2a6f69c47..08b0b92f0b 100644
--- a/platform/darwin/test/MGLCompassDirectionFormatterTests.m
+++ b/platform/darwin/test/MGLCompassDirectionFormatterTests.m
@@ -35,7 +35,7 @@
     XCTAssertEqualObjects(@"north", [longFormatter stringFromDirection:direction]);
     
     direction = 10;
-    XCTAssertEqualObjects(@"N×E", [shortFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"NbE", [shortFormatter stringFromDirection:direction]);
     XCTAssertEqualObjects(@"north by east", [mediumFormatter stringFromDirection:direction]);
     XCTAssertEqualObjects(@"north by east", [longFormatter stringFromDirection:direction]);
     
diff --git a/platform/ios/resources/Base.lproj/Foundation.strings b/platform/ios/resources/Base.lproj/Foundation.strings
index f76ac949d7..9d63dfa697 100644
--- a/platform/ios/resources/Base.lproj/Foundation.strings
+++ b/platform/ios/resources/Base.lproj/Foundation.strings
@@ -13,6 +13,18 @@
 /* East, short */
 "COMPASS_E_SHORT" = "E";
 
+/* East by north, long */
+"COMPASS_EbN_LONG" = "east by north";
+
+/* East by north, short */
+"COMPASS_EbN_SHORT" = "EbN";
+
+/* East by south, long */
+"COMPASS_EbS_LONG" = "east by south";
+
+/* East by south, short */
+"COMPASS_EbS_SHORT" = "EbS";
+
 /* East-northeast, long */
 "COMPASS_ENE_LONG" = "east-northeast";
 
@@ -25,24 +37,24 @@
 /* East-southeast, short */
 "COMPASS_ESE_SHORT" = "ESE";
 
-/* East by north, long */
-"COMPASS_ExN_LONG" = "east by north";
-
-/* East by north, short */
-"COMPASS_ExN_SHORT" = "E×N";
-
-/* East by south, long */
-"COMPASS_ExS_LONG" = "east by south";
-
-/* East by south, short */
-"COMPASS_ExS_SHORT" = "E×S";
-
 /* North, long */
 "COMPASS_N_LONG" = "north";
 
 /* North, short */
 "COMPASS_N_SHORT" = "N";
 
+/* North by east, long */
+"COMPASS_NbE_LONG" = "north by east";
+
+/* North by east, short */
+"COMPASS_NbE_SHORT" = "NbE";
+
+/* North by west, long */
+"COMPASS_NbW_LONG" = "north by west";
+
+/* North by west, short */
+"COMPASS_NbW_SHORT" = "NbW";
+
 /* Northeast, long */
 "COMPASS_NE_LONG" = "northeast";
 
@@ -50,16 +62,16 @@
 "COMPASS_NE_SHORT" = "NE";
 
 /* Northeast by east, long */
-"COMPASS_NExE_LONG" = "northeast by east";
+"COMPASS_NEbE_LONG" = "northeast by east";
 
 /* Northeast by east, short */
-"COMPASS_NExE_SHORT" = "NE×E";
+"COMPASS_NEbE_SHORT" = "NEbE";
 
 /* Northeast by north, long */
-"COMPASS_NExN_LONG" = "northeast by north";
+"COMPASS_NEbN_LONG" = "northeast by north";
 
 /* Northeast by north, short */
-"COMPASS_NExN_SHORT" = "NE×N";
+"COMPASS_NEbN_SHORT" = "NEbN";
 
 /* North-northeast, long */
 "COMPASS_NNE_LONG" = "north-northeast";
@@ -80,28 +92,16 @@
 "COMPASS_NW_SHORT" = "NW";
 
 /* Northwest by north, long */
-"COMPASS_NWxN_LONG" = "northwest by north";
+"COMPASS_NWbN_LONG" = "northwest by north";
 
 /* Northwest by north, short */
-"COMPASS_NWxN_SHORT" = "NW×N";
+"COMPASS_NWbN_SHORT" = "NWbN";
 
 /* Northwest by west, long */
-"COMPASS_NWxW_LONG" = "northwest by west";
+"COMPASS_NWbW_LONG" = "northwest by west";
 
 /* Northwest by west, short */
-"COMPASS_NWxW_SHORT" = "NW×W";
-
-/* North by east, long */
-"COMPASS_NxE_LONG" = "north by east";
-
-/* North by east, short */
-"COMPASS_NxE_SHORT" = "N×E";
-
-/* North by west, long */
-"COMPASS_NxW_LONG" = "north by west";
-
-/* North by west, short */
-"COMPASS_NxW_SHORT" = "N×W";
+"COMPASS_NWbW_SHORT" = "NWbW";
 
 /* South, long */
 "COMPASS_S_LONG" = "south";
@@ -109,6 +109,18 @@
 /* South, short */
 "COMPASS_S_SHORT" = "S";
 
+/* South by east, long */
+"COMPASS_SbE_LONG" = "south by east";
+
+/* South by east, short */
+"COMPASS_SbE_SHORT" = "SbE";
+
+/* South by west, long */
+"COMPASS_SbW_LONG" = "south by west";
+
+/* South by west, short */
+"COMPASS_SbW_SHORT" = "SbW";
+
 /* Southeast, long */
 "COMPASS_SE_LONG" = "southeast";
 
@@ -116,16 +128,16 @@
 "COMPASS_SE_SHORT" = "SE";
 
 /* Southeast by east, long */
-"COMPASS_SExE_LONG" = "southeast by east";
+"COMPASS_SEbE_LONG" = "southeast by east";
 
 /* Southeast by east, short */
-"COMPASS_SExE_SHORT" = "SE×E";
+"COMPASS_SEbE_SHORT" = "SEbE";
 
 /* Southeast by south, long */
-"COMPASS_SExS_LONG" = "southeast by south";
+"COMPASS_SEbS_LONG" = "southeast by south";
 
 /* Southeast by south, short */
-"COMPASS_SExS_SHORT" = "SE×S";
+"COMPASS_SEbS_SHORT" = "SEbS";
 
 /* South-southeast, long */
 "COMPASS_SSE_LONG" = "south-southeast";
@@ -146,28 +158,16 @@
 "COMPASS_SW_SHORT" = "SW";
 
 /* Southwest by south, long */
-"COMPASS_SWxS_LONG" = "southwest by south";
+"COMPASS_SWbS_LONG" = "southwest by south";
 
 /* Southwest by south, short */
-"COMPASS_SWxS_SHORT" = "SW×S";
+"COMPASS_SWbS_SHORT" = "SWbS";
 
 /* Southwest by west, long */
-"COMPASS_SWxW_LONG" = "southwest by west";
+"COMPASS_SWbW_LONG" = "southwest by west";
 
 /* Southwest by west, short */
-"COMPASS_SWxW_SHORT" = "SW×W";
-
-/* South by east, long */
-"COMPASS_SxE_LONG" = "south by east";
-
-/* South by east, short */
-"COMPASS_SxE_SHORT" = "S×E";
-
-/* South by west, long */
-"COMPASS_SxW_LONG" = "south by west";
-
-/* South by west, short */
-"COMPASS_SxW_SHORT" = "S×W";
+"COMPASS_SWbW_SHORT" = "SWbW";
 
 /* West, long */
 "COMPASS_W_LONG" = "west";
@@ -175,6 +175,18 @@
 /* West, short */
 "COMPASS_W_SHORT" = "W";
 
+/* West by north, long */
+"COMPASS_WbN_LONG" = "west by north";
+
+/* West by north, short */
+"COMPASS_WbN_SHORT" = "WbN";
+
+/* West by south, long */
+"COMPASS_WbS_LONG" = "west by south";
+
+/* West by south, short */
+"COMPASS_WbS_SHORT" = "WbS";
+
 /* West-northwest, long */
 "COMPASS_WNW_LONG" = "west-northwest";
 
@@ -187,18 +199,6 @@
 /* West-southwest, short */
 "COMPASS_WSW_SHORT" = "WSW";
 
-/* West by north, long */
-"COMPASS_WxN_LONG" = "west by north";
-
-/* West by north, short */
-"COMPASS_WxN_SHORT" = "W×N";
-
-/* West by south, long */
-"COMPASS_WxS_LONG" = "west by south";
-
-/* West by south, short */
-"COMPASS_WxS_SHORT" = "W×S";
-
 /* Degrees format, long */
 "COORD_DEG_LONG" = "%d degree(s)";