1 files changed, 13 insertions, 11 deletions
diff --git a/diplomacy/web/src/gui/utils/map_data.js b/diplomacy/web/src/gui/utils/map_data.js
index 73d5338..1c48af0 100644
--- a/diplomacy/web/src/gui/utils/map_data.js
+++ b/diplomacy/web/src/gui/utils/map_data.js
@@ -83,16 +83,18 @@ export class MapData {
             abbr = abbr.substr(1, 3);
         if (!abbr)
             return null;
-        if (!this.provinces.hasOwnProperty(abbr)) {
-            const firstLetter = abbr[0];
-            if (firstLetter === firstLetter.toLowerCase()) {
-                abbr = abbr.toUpperCase();
-            } else {
-                abbr = abbr.toLowerCase();
-            }
-        }
-        if (!this.provinces.hasOwnProperty(abbr))
-            abbr = this.aliases[abbr];
-        return this.provinces[abbr];
+        if (this.provinces.hasOwnProperty(abbr))
+            return this.provinces[abbr];
+        if (this.provinces.hasOwnProperty(abbr.toUpperCase()))
+            return this.provinces[abbr.toUpperCase()];
+        if (this.provinces.hasOwnProperty(abbr.toLowerCase()))
+            return this.provinces[abbr.toLowerCase()];
+        if (this.aliases.hasOwnProperty(abbr))
+            return this.provinces[this.aliases[abbr]];
+        if (this.aliases.hasOwnProperty(abbr.toUpperCase()))
+            return this.provinces[this.aliases[abbr.toUpperCase()]];
+        if (this.aliases.hasOwnProperty(abbr.toLowerCase()))
+            return this.provinces[this.aliases[abbr.toLowerCase()]];
+        return null;
     }
 }