Begin phasing out manual team logo submission

* Remove all logos of teams that already have official FIRST avatars. * Default to using FIRST avatar instead of manually submitted avatars. * Update README to explain the removal of manual avatar submission. Progress towards #197
FIRSTMap · Sep 8, 2019 · d6ed7d6 · d6ed7d6
1 parent dcd10d1
commit d6ed7d6
Show file tree

Hide file tree

Showing 155 changed files with 9 additions and 174 deletions.
diff --git a/README.md b/README.md
@@ -3,17 +3,8 @@
 
 ![Screenshot of FIRSTMap](meta/screenshot.png)
 
-# Customizing Team Icon
-To modify the image used for your team's marker:
-
-1. Fork the repository.
-2. Add an image, titled `{team_number}.png`, where `{team_number}` is your team number, to the `/logos` folder. The image should have a maximum width or height of 40 pixels.
-3. Open `data/custom_icons.json` and add your team number to the icons array within the file.
-4. Push these changes to your fork of FIRSTMap.
-5. Open a pull-request with the main FIRSTMap repository to merge your fork back to the origin.
-6. Enjoy your custom marker image!
-
-Note that you may wish to simply submit a team avatar to FIRST. As FIRST has rolled out the avatar system, it's now preferable to specify your team's logo that way. Manual input of icons to FIRSTMap is gradually being deprecated.
+# Custom Team Icons
+Custom team icons are updated periodically from the FIRST avatar system. The old system of manually submitting icons to FIRSTMap is being phased out in favor of this approach.
 
 # Customizing Team Position
 1. Fork the repository.

diff --git a/data/custom_icons.json b/data/custom_icons.json
@@ -1,196 +1,39 @@
 [
-    16,
-    171,
-    236,
-    330,
-    457,
-    525,
-    548,
-    967,
-    1058,
-    1108,
-    1360,
-    1418,
-    1452,
-    1540,
-    1741,
-    1982,
-    2158,
-    2370,
-    2403,
-    2412,
-    2501,
-    2626,
-    2713,
     2827,
-    2851,
-    2855,
-    2848,
-    3015,
-    3223,
     3680,
-    3928,
-    3946,
-    4150,
-    4188,
-    4201,
-    4646,
-    4909,
     4924,
-    5041,
-    5113,
-    5115,
-    5431,
     5482,
-    5587,
-    5837,
-    5881,
-    6164,
     6412,
-    6419,
     6467,
-    6630,
-    7308,
 
-    4,
-    25,
-    33,
-    34,
-    41,
-    66,
-    67,
-    68,
-    69,
-    71,
-    74,
-    133,
-    171,
-    199,
-    228,
-    303,
-    316,
-    321,
-    401,
     418,
-    509,
     527,
-    540,
-    619,
     640,
-    701,
-    830,
-    836,
-    967,
-    968,
-    1024,
-    1262,
-    1277,
     1288,
-    1334,
-    1389,
     1422,
-    1425,
-    1502,
-    1712,
-    1730,
     1768,
-    1778,
-    1923,
-    1939,
-    1967,
-    1977,
-    2096,
-    2135,
     2335,
-    2363,
     2374,
     2408,
-    2410,
-    2451,
-    2506,
-    2529,
-    2605,
-    2626,
-    2630,
     2704,
-    2723,
     2805,
-    2823,
-    2846,
-    2853,
     2883,
-    2903,
-    2905,
     2916,
-    2945,
-    2984,
     2993,
-    3005,
-    3023,
-    3128,
-    3130,
-    3158,
-    3196,
     3260,
-    3322,
-    3459,
-    3489,
-    3572,
-    3735,
-    3756,
-    3770,
     3824,
-    3847,
-    3946,
-    4003,
-    4085,
-    4121,
-    4159,
-    4180,
-    4207,
-    4213,
     4248,
-    4276,
-    4308,
-    4458,
-    4468,
-    4481,
-    4499,
-    4586,
     4622,
-    4646,
-    4678,
-    4828,
-    4930,
-    4961,
-    4990,
-    5030,
     5099,
-    5232,
     5410,
     5412,
-    5477,
-    5494,
     5502,
     5514,
     5526,
-    5528,
-    5553,
     5582,
     5625,
-    5667,
-    5700,
-    5818,
-    5822,
     5877,
-    5924,
     5966,
     5973,
-    5990,
-    6063,
-    6064,
-    6325,
-    6331,
-    5243,
-    6945
+    6063
 ]
diff --git a/logos/1024.png b/logos/1024.png
diff --git a/logos/1058.png b/logos/1058.png
diff --git a/logos/1108.png b/logos/1108.png
diff --git a/logos/1262.png b/logos/1262.png
diff --git a/logos/1277.png b/logos/1277.png
diff --git a/logos/133.png b/logos/133.png
diff --git a/logos/1334.png b/logos/1334.png
diff --git a/logos/1360.png b/logos/1360.png
diff --git a/logos/1389.png b/logos/1389.png
diff --git a/logos/1418.png b/logos/1418.png
diff --git a/logos/1425.png b/logos/1425.png
diff --git a/logos/1452.png b/logos/1452.png
diff --git a/logos/1502.png b/logos/1502.png
diff --git a/logos/1540.png b/logos/1540.png
diff --git a/logos/16.png b/logos/16.png
diff --git a/logos/171.png b/logos/171.png
diff --git a/logos/1712.png b/logos/1712.png
diff --git a/logos/1730.png b/logos/1730.png
diff --git a/logos/1741.png b/logos/1741.png
diff --git a/logos/1778.png b/logos/1778.png
diff --git a/logos/1923.png b/logos/1923.png
diff --git a/logos/1939.png b/logos/1939.png
diff --git a/logos/1967.png b/logos/1967.png
diff --git a/logos/1977.png b/logos/1977.png
diff --git a/logos/1982.png b/logos/1982.png
diff --git a/logos/199.png b/logos/199.png
diff --git a/logos/2096.png b/logos/2096.png
diff --git a/logos/2135.png b/logos/2135.png
diff --git a/logos/2158.png b/logos/2158.png
diff --git a/logos/228.png b/logos/228.png
diff --git a/logos/236.png b/logos/236.png
diff --git a/logos/2363.png b/logos/2363.png
diff --git a/logos/2370.png b/logos/2370.png
diff --git a/logos/2403.png b/logos/2403.png
diff --git a/logos/2410.png b/logos/2410.png
diff --git a/logos/2412.png b/logos/2412.png
diff --git a/logos/2451.png b/logos/2451.png
diff --git a/logos/25.png b/logos/25.png
diff --git a/logos/2501.png b/logos/2501.png
diff --git a/logos/2506.png b/logos/2506.png
diff --git a/logos/2529.png b/logos/2529.png
diff --git a/logos/2605.png b/logos/2605.png
diff --git a/logos/2626.png b/logos/2626.png
diff --git a/logos/2630.png b/logos/2630.png
diff --git a/logos/2713.png b/logos/2713.png
diff --git a/logos/2723.png b/logos/2723.png
diff --git a/logos/2823.png b/logos/2823.png
diff --git a/logos/2846.png b/logos/2846.png
diff --git a/logos/2848.png b/logos/2848.png
diff --git a/logos/2851.png b/logos/2851.png
diff --git a/logos/2853.png b/logos/2853.png
diff --git a/logos/2855.png b/logos/2855.png
diff --git a/logos/2903.png b/logos/2903.png
diff --git a/logos/2905.png b/logos/2905.png
diff --git a/logos/2945.png b/logos/2945.png
diff --git a/logos/2984.png b/logos/2984.png
diff --git a/logos/3005.png b/logos/3005.png
diff --git a/logos/3015.png b/logos/3015.png
diff --git a/logos/3023.png b/logos/3023.png
diff --git a/logos/303.png b/logos/303.png
diff --git a/logos/3128.png b/logos/3128.png
diff --git a/logos/3130.png b/logos/3130.png
diff --git a/logos/3158.png b/logos/3158.png
diff --git a/logos/316.png b/logos/316.png
diff --git a/logos/3196.png b/logos/3196.png
diff --git a/logos/321.png b/logos/321.png
diff --git a/logos/3223.png b/logos/3223.png
diff --git a/logos/33.png b/logos/33.png
diff --git a/logos/330.png b/logos/330.png
diff --git a/logos/3322.png b/logos/3322.png
diff --git a/logos/34.png b/logos/34.png
diff --git a/logos/3459.png b/logos/3459.png
diff --git a/logos/3489.png b/logos/3489.png
diff --git a/logos/3572.png b/logos/3572.png
diff --git a/logos/3735.png b/logos/3735.png
diff --git a/logos/3756.png b/logos/3756.png
diff --git a/logos/3770.png b/logos/3770.png
diff --git a/logos/3847.png b/logos/3847.png
diff --git a/logos/3928.png b/logos/3928.png
diff --git a/logos/3946.png b/logos/3946.png
diff --git a/logos/4.png b/logos/4.png
diff --git a/logos/4003.png b/logos/4003.png
diff --git a/logos/401.png b/logos/401.png
diff --git a/logos/4085.png b/logos/4085.png
diff --git a/logos/41.png b/logos/41.png
diff --git a/logos/4121.png b/logos/4121.png
diff --git a/logos/4150.png b/logos/4150.png
diff --git a/logos/4159.png b/logos/4159.png
diff --git a/logos/4180.png b/logos/4180.png
diff --git a/logos/4188.png b/logos/4188.png
diff --git a/logos/4201.png b/logos/4201.png
diff --git a/logos/4207.png b/logos/4207.png
diff --git a/logos/4213.png b/logos/4213.png
diff --git a/logos/4276.png b/logos/4276.png
diff --git a/logos/4308.png b/logos/4308.png
diff --git a/logos/4458.png b/logos/4458.png
diff --git a/logos/4468.png b/logos/4468.png
diff --git a/logos/4481.png b/logos/4481.png
diff --git a/logos/4499.png b/logos/4499.png
diff --git a/logos/457.png b/logos/457.png
diff --git a/logos/4586.png b/logos/4586.png
diff --git a/logos/4646.png b/logos/4646.png
diff --git a/logos/4678.png b/logos/4678.png
diff --git a/logos/4828.png b/logos/4828.png
diff --git a/logos/4909.png b/logos/4909.png
diff --git a/logos/4930.png b/logos/4930.png
diff --git a/logos/4961.png b/logos/4961.png
diff --git a/logos/4990.png b/logos/4990.png
diff --git a/logos/5030.png b/logos/5030.png
diff --git a/logos/5041.png b/logos/5041.png
diff --git a/logos/509.png b/logos/509.png
diff --git a/logos/5113.png b/logos/5113.png
diff --git a/logos/5115.png b/logos/5115.png
diff --git a/logos/5232.png b/logos/5232.png
diff --git a/logos/5243.png b/logos/5243.png
diff --git a/logos/525.png b/logos/525.png
diff --git a/logos/540.png b/logos/540.png
diff --git a/logos/5431.png b/logos/5431.png
diff --git a/logos/5477.png b/logos/5477.png
diff --git a/logos/548.png b/logos/548.png
diff --git a/logos/5494.png b/logos/5494.png
diff --git a/logos/5528.png b/logos/5528.png
diff --git a/logos/5553.png b/logos/5553.png
diff --git a/logos/5587.png b/logos/5587.png
diff --git a/logos/5667.png b/logos/5667.png
diff --git a/logos/5700.png b/logos/5700.png
diff --git a/logos/5818.png b/logos/5818.png
diff --git a/logos/5822.png b/logos/5822.png
diff --git a/logos/5837.png b/logos/5837.png
diff --git a/logos/5881.png b/logos/5881.png
diff --git a/logos/5924.png b/logos/5924.png
diff --git a/logos/5990.png b/logos/5990.png
diff --git a/logos/6064.png b/logos/6064.png
diff --git a/logos/6164.png b/logos/6164.png
diff --git a/logos/619.png b/logos/619.png
diff --git a/logos/6325.png b/logos/6325.png
diff --git a/logos/6331.png b/logos/6331.png
diff --git a/logos/6419.png b/logos/6419.png
diff --git a/logos/66.png b/logos/66.png
diff --git a/logos/6630.png b/logos/6630.png
diff --git a/logos/67.png b/logos/67.png
diff --git a/logos/68.png b/logos/68.png
diff --git a/logos/69.png b/logos/69.png
diff --git a/logos/6945.png b/logos/6945.png
diff --git a/logos/701.png b/logos/701.png
diff --git a/logos/71.png b/logos/71.png
diff --git a/logos/7308.png b/logos/7308.png
diff --git a/logos/74.png b/logos/74.png
diff --git a/logos/830.png b/logos/830.png
diff --git a/logos/836.png b/logos/836.png
diff --git a/logos/967.png b/logos/967.png
diff --git a/logos/968.png b/logos/968.png
diff --git a/scripts.js b/scripts.js
@@ -351,11 +351,8 @@ function createTeamMarker(team) { // Create a Team Marker on map
     var allow_logos = !(params.get('logos') == 'false'); // POST Argument forces Default
 
     if (allow_logos) {
-        if (icons.indexOf(team.team_number) !== -1) {
-            image = 'logos/' + team.team_number + '.png'; // Defined
-            scaledSize = new google.maps.Size(30, 30);
-            size = undefined;
-        } else if (avatars.locations[team.team_number]) {
+        // Prioritize FIRST avatars over manually submitted logos
+        if (avatars.locations[team.team_number]) {
             // Scale factor of 0.75 resizes a 40x40 image to a 30x30 image
             const SCALE_FACTOR = 0.75;
             // The size of each FIRST avatar (before scaling) is 40x40
@@ -376,6 +373,10 @@ function createTeamMarker(team) { // Create a Team Marker on map
             var originX = avatars.locations[team.team_number].x * SCALE_FACTOR;
             var originY = avatars.locations[team.team_number].y * SCALE_FACTOR;
             origin = new google.maps.Point(originX, originY);
+        } else if (icons.indexOf(team.team_number) !== -1) {
+            image = 'logos/' + team.team_number + '.png'; // Defined
+            scaledSize = new google.maps.Size(30, 30);
+            size = undefined;
         }
     }