From 9ea712a819c2930b22619fd7bf4764bcda04fbdc Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Mon, 27 Nov 2017 03:37:33 -0500
Subject: [PATCH] fix the images used for various flags

---
 _data/emoji.json | 52 ++++++++++++++++++++++++------------------------
 update.rb        |  2 --
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/_data/emoji.json b/_data/emoji.json
index 4d6ffb2..2cd4324 100644
--- a/_data/emoji.json
+++ b/_data/emoji.json
@@ -2133,7 +2133,7 @@
     "alt_names": [
       "flag-de"
     ],
-    "file": "1f1e9"
+    "file": "1f1e9-1f1ea"
   },
   {
     "name": "deciduous_tree",
@@ -3022,7 +3022,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1e6"
+    "file": "1f1e6-1f1e8"
   },
   {
     "name": "flag-ad",
@@ -3141,7 +3141,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1e7"
+    "file": "1f1e7-1f1e6"
   },
   {
     "name": "flag-bb",
@@ -3288,7 +3288,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1e8"
+    "file": "1f1e8-1f1e6"
   },
   {
     "name": "flag-cc",
@@ -3463,7 +3463,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1ea"
+    "file": "1f1ea-1f1e6"
   },
   {
     "name": "flag-ec",
@@ -3526,7 +3526,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1eb"
+    "file": "1f1eb-1f1ee"
   },
   {
     "name": "flag-fj",
@@ -3561,7 +3561,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1ec"
+    "file": "1f1ec-1f1e6"
   },
   {
     "name": "flag-gd",
@@ -3687,7 +3687,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1ed"
+    "file": "1f1ed-1f1f0"
   },
   {
     "name": "flag-hm",
@@ -3729,7 +3729,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1ee"
+    "file": "1f1ee-1f1e8"
   },
   {
     "name": "flag-id",
@@ -3799,7 +3799,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1ef"
+    "file": "1f1ef-1f1ea"
   },
   {
     "name": "flag-jm",
@@ -3820,7 +3820,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1f0"
+    "file": "1f1f0-1f1ea"
   },
   {
     "name": "flag-kg",
@@ -3890,7 +3890,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1f1"
+    "file": "1f1f1-1f1e6"
   },
   {
     "name": "flag-lb",
@@ -3967,7 +3967,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1f2"
+    "file": "1f1f2-1f1e6"
   },
   {
     "name": "flag-mc",
@@ -4128,7 +4128,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1f3"
+    "file": "1f1f3-1f1e6"
   },
   {
     "name": "flag-nc",
@@ -4212,14 +4212,14 @@
     "alt_names": [
 
     ],
-    "file": "1f1f4"
+    "file": "1f1f4-1f1f2"
   },
   {
     "name": "flag-pa",
     "alt_names": [
 
     ],
-    "file": "1f1f5"
+    "file": "1f1f5-1f1e6"
   },
   {
     "name": "flag-pe",
@@ -4317,14 +4317,14 @@
     "alt_names": [
 
     ],
-    "file": "1f1f6"
+    "file": "1f1f6-1f1e6"
   },
   {
     "name": "flag-re",
     "alt_names": [
 
     ],
-    "file": "1f1f7"
+    "file": "1f1f7-1f1ea"
   },
   {
     "name": "flag-ro",
@@ -4352,7 +4352,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1f8"
+    "file": "1f1f8-1f1e6"
   },
   {
     "name": "flag-sb",
@@ -4506,7 +4506,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1f9"
+    "file": "1f1f9-1f1e6"
   },
   {
     "name": "flag-tc",
@@ -4625,7 +4625,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1fa"
+    "file": "1f1fa-1f1e6"
   },
   {
     "name": "flag-ug",
@@ -4667,7 +4667,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1fb"
+    "file": "1f1fb-1f1e6"
   },
   {
     "name": "flag-vc",
@@ -4723,7 +4723,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1fc"
+    "file": "1f1fc-1f1eb"
   },
   {
     "name": "flag-ws",
@@ -4737,14 +4737,14 @@
     "alt_names": [
 
     ],
-    "file": "1f1fd"
+    "file": "1f1fd-1f1f0"
   },
   {
     "name": "flag-ye",
     "alt_names": [
 
     ],
-    "file": "1f1fe"
+    "file": "1f1fe-1f1ea"
   },
   {
     "name": "flag-yt",
@@ -4758,7 +4758,7 @@
     "alt_names": [
 
     ],
-    "file": "1f1ff"
+    "file": "1f1ff-1f1e6"
   },
   {
     "name": "flag-zm",
diff --git a/update.rb b/update.rb
index 164892a..406f33c 100644
--- a/update.rb
+++ b/update.rb
@@ -73,8 +73,6 @@
 end
 
 end_emoji.compact!
-# since `uniq!` takes the first match, pre-sort by the simplest filename variant
-end_emoji.sort_by! { |e| e[:file] }
 end_emoji.uniq! { |e| e[:name] }
 end_emoji.sort_by! { |e| e[:name] }