Do not overwrite place abbrev with variant place name

Juris-M · Oct 13, 2020 · 5b1f264 · 5b1f264
1 parent e95bdd8
commit 5b1f264
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/scripts/lib/descriptiveToCompact.js b/scripts/lib/descriptiveToCompact.js
@@ -65,11 +65,15 @@ const processJurisAbbrevs = (opts, jurisID, jurisDesc) => {
 			}
 			var allcapsJurisdictionKey = jKey.toUpperCase();
 			ret.xdata.default.place[allcapsJurisdictionKey] = jObj.name;
+			var setAbbrev = false;
 			if (jObj.abbrev) {
+				setAbbrev = true;
 				ret.xdata.default.place[allcapsJurisdictionKey] = jObj.abbrev;
 			}
 			if (jObj.variants && jObj.variants[lang]) {
-				ret.xdata.default.place[allcapsJurisdictionKey] = jObj.variants[lang].name;
+				if (!setAbbrev) {
+					ret.xdata.default.place[allcapsJurisdictionKey] = jObj.variants[lang].name;
+				}
 				if (jObj.variants[lang].abbrev) {
 					ret.xdata.default.place[allcapsJurisdictionKey] = jObj.variants[lang].abbrev;
 				}