RocketMap · michikrug · Feb 15, 2018 · Feb 15, 2018 · Feb 15, 2018 · Feb 15, 2018
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -66,6 +66,8 @@
     "updatePokemonLabels": true,
 
     "getPokemonRarity": true,
-    "updatePokemonRarities": true
+    "updatePokemonRarities": true,
+
+    "WebFont": true
   }
 }
diff --git a/.gitignore b/.gitignore
@@ -17,8 +17,6 @@ src/
 _build
 _build_html
 beehive.*
-static/images/raid/*.png
-!static/images/raid/*_unknown.png
 static/icons-sprite.png
 static/icons-large-sprite.png
 static/icons/*.png

diff --git a/static/images/gym/Instinct_1.png b/static/images/gym/Instinct_1.png
diff --git a/static/images/gym/Instinct_1_1.png b/static/images/gym/Instinct_1_1.png
diff --git a/static/images/gym/Instinct_1_2.png b/static/images/gym/Instinct_1_2.png
diff --git a/static/images/gym/Instinct_1_3.png b/static/images/gym/Instinct_1_3.png
diff --git a/static/images/gym/Instinct_1_4.png b/static/images/gym/Instinct_1_4.png
diff --git a/static/images/gym/Instinct_1_5.png b/static/images/gym/Instinct_1_5.png
diff --git a/static/images/gym/Instinct_2.png b/static/images/gym/Instinct_2.png
diff --git a/static/images/gym/Instinct_2_1.png b/static/images/gym/Instinct_2_1.png
diff --git a/static/images/gym/Instinct_2_2.png b/static/images/gym/Instinct_2_2.png
diff --git a/static/images/gym/Instinct_2_3.png b/static/images/gym/Instinct_2_3.png
diff --git a/static/images/gym/Instinct_2_4.png b/static/images/gym/Instinct_2_4.png
diff --git a/static/images/gym/Instinct_2_5.png b/static/images/gym/Instinct_2_5.png
diff --git a/static/images/gym/Instinct_3.png b/static/images/gym/Instinct_3.png
diff --git a/static/images/gym/Instinct_3_1.png b/static/images/gym/Instinct_3_1.png
diff --git a/static/images/gym/Instinct_3_2.png b/static/images/gym/Instinct_3_2.png
diff --git a/static/images/gym/Instinct_3_3.png b/static/images/gym/Instinct_3_3.png
diff --git a/static/images/gym/Instinct_3_4.png b/static/images/gym/Instinct_3_4.png
diff --git a/static/images/gym/Instinct_3_5.png b/static/images/gym/Instinct_3_5.png
diff --git a/static/images/gym/Instinct_4.png b/static/images/gym/Instinct_4.png
diff --git a/static/images/gym/Instinct_4_1.png b/static/images/gym/Instinct_4_1.png
diff --git a/static/images/gym/Instinct_4_2.png b/static/images/gym/Instinct_4_2.png
diff --git a/static/images/gym/Instinct_4_3.png b/static/images/gym/Instinct_4_3.png
diff --git a/static/images/gym/Instinct_4_4.png b/static/images/gym/Instinct_4_4.png
diff --git a/static/images/gym/Instinct_4_5.png b/static/images/gym/Instinct_4_5.png
diff --git a/static/images/gym/Instinct_5.png b/static/images/gym/Instinct_5.png
diff --git a/static/images/gym/Instinct_5_1.png b/static/images/gym/Instinct_5_1.png
diff --git a/static/images/gym/Instinct_5_2.png b/static/images/gym/Instinct_5_2.png
diff --git a/static/images/gym/Instinct_5_3.png b/static/images/gym/Instinct_5_3.png
diff --git a/static/images/gym/Instinct_5_4.png b/static/images/gym/Instinct_5_4.png
diff --git a/static/images/gym/Instinct_5_5.png b/static/images/gym/Instinct_5_5.png
diff --git a/static/images/gym/Instinct_6.png b/static/images/gym/Instinct_6.png
diff --git a/static/images/gym/Instinct_6_1.png b/static/images/gym/Instinct_6_1.png
diff --git a/static/images/gym/Instinct_6_2.png b/static/images/gym/Instinct_6_2.png
diff --git a/static/images/gym/Instinct_6_3.png b/static/images/gym/Instinct_6_3.png
diff --git a/static/images/gym/Instinct_6_4.png b/static/images/gym/Instinct_6_4.png
diff --git a/static/images/gym/Instinct_6_5.png b/static/images/gym/Instinct_6_5.png
diff --git a/static/images/gym/Mystic_1.png b/static/images/gym/Mystic_1.png
diff --git a/static/images/gym/Mystic_1_1.png b/static/images/gym/Mystic_1_1.png
diff --git a/static/images/gym/Mystic_1_2.png b/static/images/gym/Mystic_1_2.png
diff --git a/static/images/gym/Mystic_1_3.png b/static/images/gym/Mystic_1_3.png
diff --git a/static/images/gym/Mystic_1_4.png b/static/images/gym/Mystic_1_4.png
diff --git a/static/images/gym/Mystic_1_5.png b/static/images/gym/Mystic_1_5.png
diff --git a/static/images/gym/Mystic_2.png b/static/images/gym/Mystic_2.png
diff --git a/static/images/gym/Mystic_2_1.png b/static/images/gym/Mystic_2_1.png
diff --git a/static/images/gym/Mystic_2_2.png b/static/images/gym/Mystic_2_2.png
diff --git a/static/images/gym/Mystic_2_3.png b/static/images/gym/Mystic_2_3.png
diff --git a/static/images/gym/Mystic_2_4.png b/static/images/gym/Mystic_2_4.png
diff --git a/static/images/gym/Mystic_2_5.png b/static/images/gym/Mystic_2_5.png
diff --git a/static/images/gym/Mystic_3.png b/static/images/gym/Mystic_3.png
diff --git a/static/images/gym/Mystic_3_1.png b/static/images/gym/Mystic_3_1.png
diff --git a/static/images/gym/Mystic_3_2.png b/static/images/gym/Mystic_3_2.png
diff --git a/static/images/gym/Mystic_3_3.png b/static/images/gym/Mystic_3_3.png
diff --git a/static/images/gym/Mystic_3_4.png b/static/images/gym/Mystic_3_4.png
diff --git a/static/images/gym/Mystic_3_5.png b/static/images/gym/Mystic_3_5.png
diff --git a/static/images/gym/Mystic_4.png b/static/images/gym/Mystic_4.png
diff --git a/static/images/gym/Mystic_4_1.png b/static/images/gym/Mystic_4_1.png
diff --git a/static/images/gym/Mystic_4_2.png b/static/images/gym/Mystic_4_2.png
diff --git a/static/images/gym/Mystic_4_3.png b/static/images/gym/Mystic_4_3.png
diff --git a/static/images/gym/Mystic_4_4.png b/static/images/gym/Mystic_4_4.png
diff --git a/static/images/gym/Mystic_4_5.png b/static/images/gym/Mystic_4_5.png
diff --git a/static/images/gym/Mystic_5.png b/static/images/gym/Mystic_5.png
diff --git a/static/images/gym/Mystic_5_1.png b/static/images/gym/Mystic_5_1.png
diff --git a/static/images/gym/Mystic_5_2.png b/static/images/gym/Mystic_5_2.png
diff --git a/static/images/gym/Mystic_5_3.png b/static/images/gym/Mystic_5_3.png
diff --git a/static/images/gym/Mystic_5_4.png b/static/images/gym/Mystic_5_4.png
diff --git a/static/images/gym/Mystic_5_5.png b/static/images/gym/Mystic_5_5.png
diff --git a/static/images/gym/Mystic_6.png b/static/images/gym/Mystic_6.png
diff --git a/static/images/gym/Mystic_6_1.png b/static/images/gym/Mystic_6_1.png
diff --git a/static/images/gym/Mystic_6_2.png b/static/images/gym/Mystic_6_2.png
diff --git a/static/images/gym/Mystic_6_3.png b/static/images/gym/Mystic_6_3.png
diff --git a/static/images/gym/Mystic_6_4.png b/static/images/gym/Mystic_6_4.png
diff --git a/static/images/gym/Mystic_6_5.png b/static/images/gym/Mystic_6_5.png
diff --git a/static/images/gym/Uncontested_0.png b/static/images/gym/Uncontested_0.png
diff --git a/static/images/gym/Uncontested_0_1.png b/static/images/gym/Uncontested_0_1.png
diff --git a/static/images/gym/Uncontested_0_2.png b/static/images/gym/Uncontested_0_2.png
diff --git a/static/images/gym/Uncontested_0_3.png b/static/images/gym/Uncontested_0_3.png
diff --git a/static/images/gym/Uncontested_0_4.png b/static/images/gym/Uncontested_0_4.png
diff --git a/static/images/gym/Uncontested_0_5.png b/static/images/gym/Uncontested_0_5.png
diff --git a/static/images/gym/Valor_1.png b/static/images/gym/Valor_1.png
diff --git a/static/images/gym/Valor_1_1.png b/static/images/gym/Valor_1_1.png
diff --git a/static/images/gym/Valor_1_2.png b/static/images/gym/Valor_1_2.png
diff --git a/static/images/gym/Valor_1_3.png b/static/images/gym/Valor_1_3.png
diff --git a/static/images/gym/Valor_1_4.png b/static/images/gym/Valor_1_4.png
diff --git a/static/images/gym/Valor_1_5.png b/static/images/gym/Valor_1_5.png
diff --git a/static/images/gym/Valor_2.png b/static/images/gym/Valor_2.png
diff --git a/static/images/gym/Valor_2_1.png b/static/images/gym/Valor_2_1.png
diff --git a/static/images/gym/Valor_2_2.png b/static/images/gym/Valor_2_2.png
diff --git a/static/images/gym/Valor_2_3.png b/static/images/gym/Valor_2_3.png
diff --git a/static/images/gym/Valor_2_4.png b/static/images/gym/Valor_2_4.png
diff --git a/static/images/gym/Valor_2_5.png b/static/images/gym/Valor_2_5.png
diff --git a/static/images/gym/Valor_3.png b/static/images/gym/Valor_3.png
diff --git a/static/images/gym/Valor_3_1.png b/static/images/gym/Valor_3_1.png
diff --git a/static/images/gym/Valor_3_2.png b/static/images/gym/Valor_3_2.png
diff --git a/static/images/gym/Valor_3_3.png b/static/images/gym/Valor_3_3.png
diff --git a/static/images/gym/Valor_3_4.png b/static/images/gym/Valor_3_4.png
diff --git a/static/images/gym/Valor_3_5.png b/static/images/gym/Valor_3_5.png
diff --git a/static/images/gym/Valor_4.png b/static/images/gym/Valor_4.png
diff --git a/static/images/gym/Valor_4_1.png b/static/images/gym/Valor_4_1.png
diff --git a/static/images/gym/Valor_4_2.png b/static/images/gym/Valor_4_2.png
diff --git a/static/images/gym/Valor_4_3.png b/static/images/gym/Valor_4_3.png
diff --git a/static/images/gym/Valor_4_4.png b/static/images/gym/Valor_4_4.png
diff --git a/static/images/gym/Valor_4_5.png b/static/images/gym/Valor_4_5.png
diff --git a/static/images/gym/Valor_5.png b/static/images/gym/Valor_5.png
diff --git a/static/images/gym/Valor_5_1.png b/static/images/gym/Valor_5_1.png
diff --git a/static/images/gym/Valor_5_2.png b/static/images/gym/Valor_5_2.png
diff --git a/static/images/gym/Valor_5_3.png b/static/images/gym/Valor_5_3.png
diff --git a/static/images/gym/Valor_5_4.png b/static/images/gym/Valor_5_4.png
diff --git a/static/images/gym/Valor_5_5.png b/static/images/gym/Valor_5_5.png
diff --git a/static/images/gym/Valor_6.png b/static/images/gym/Valor_6.png
diff --git a/static/images/gym/Valor_6_1.png b/static/images/gym/Valor_6_1.png
diff --git a/static/images/gym/Valor_6_2.png b/static/images/gym/Valor_6_2.png
diff --git a/static/images/gym/Valor_6_3.png b/static/images/gym/Valor_6_3.png
diff --git a/static/images/gym/Valor_6_4.png b/static/images/gym/Valor_6_4.png
diff --git a/static/images/gym/Valor_6_5.png b/static/images/gym/Valor_6_5.png
diff --git a/static/images/raid/Egg_1.png b/static/images/raid/Egg_1.png
diff --git a/static/images/raid/Egg_1s.png b/static/images/raid/Egg_1s.png
diff --git a/static/images/raid/Egg_2.png b/static/images/raid/Egg_2.png
diff --git a/static/images/raid/Egg_2s.png b/static/images/raid/Egg_2s.png
diff --git a/static/images/raid/Egg_3.png b/static/images/raid/Egg_3.png
diff --git a/static/images/raid/Egg_3s.png b/static/images/raid/Egg_3s.png
diff --git a/static/images/raid/Instinct_1_unknown.png b/static/images/raid/Instinct_1_unknown.png
diff --git a/static/images/raid/Instinct_2_unknown.png b/static/images/raid/Instinct_2_unknown.png
diff --git a/static/images/raid/Instinct_3_unknown.png b/static/images/raid/Instinct_3_unknown.png
diff --git a/static/images/raid/Instinct_4_unknown.png b/static/images/raid/Instinct_4_unknown.png
diff --git a/static/images/raid/Instinct_5_unknown.png b/static/images/raid/Instinct_5_unknown.png
diff --git a/static/images/raid/Mystic_1_unknown.png b/static/images/raid/Mystic_1_unknown.png
diff --git a/static/images/raid/Mystic_2_unknown.png b/static/images/raid/Mystic_2_unknown.png
diff --git a/static/images/raid/Mystic_3_unknown.png b/static/images/raid/Mystic_3_unknown.png
diff --git a/static/images/raid/Mystic_4_unknown.png b/static/images/raid/Mystic_4_unknown.png
diff --git a/static/images/raid/Mystic_5_unknown.png b/static/images/raid/Mystic_5_unknown.png
diff --git a/static/images/raid/Uncontested_1_unknown.png b/static/images/raid/Uncontested_1_unknown.png
diff --git a/static/images/raid/Uncontested_2_unknown.png b/static/images/raid/Uncontested_2_unknown.png
diff --git a/static/images/raid/Uncontested_3_unknown.png b/static/images/raid/Uncontested_3_unknown.png
diff --git a/static/images/raid/Uncontested_4_unknown.png b/static/images/raid/Uncontested_4_unknown.png
diff --git a/static/images/raid/Uncontested_5_unknown.png b/static/images/raid/Uncontested_5_unknown.png
diff --git a/static/images/raid/Valor_1_unknown.png b/static/images/raid/Valor_1_unknown.png
diff --git a/static/images/raid/Valor_2_unknown.png b/static/images/raid/Valor_2_unknown.png
diff --git a/static/images/raid/Valor_3_unknown.png b/static/images/raid/Valor_3_unknown.png
diff --git a/static/images/raid/Valor_4_unknown.png b/static/images/raid/Valor_4_unknown.png
diff --git a/static/images/raid/Valor_5_unknown.png b/static/images/raid/Valor_5_unknown.png
diff --git a/static/js/map.common.js b/static/js/map.common.js
@@ -1065,6 +1065,14 @@ var StoreOptions = {
     'isSearchMarkerMovable': {
         default: false,
         type: StoreTypes.Boolean
+    },
+    'cacheGymImages': {
+        default: true,
+        type: StoreTypes.Boolean
+    },
+    'gymImageCache': {
+        default: {},
+        type: StoreTypes.JSON
     }
 }
 
@@ -1078,21 +1086,27 @@ var Store = {
     },
     get: function (key) {
         var option = this.getOption(key)
-        var optionType = option.type
+        if (option.value !== undefined) {
+            return option.value
+        }
         var rawValue = localStorage[key]
         if (rawValue === null || rawValue === undefined) {
             return option.default
         }
-        var value = optionType.parse(rawValue)
+        var value = option.type.parse(rawValue)
+        option.value = value
         return value
     },
     set: function (key, value) {
         var option = this.getOption(key)
         var optionType = option.type || StoreTypes.String
         var rawValue = optionType.stringify(value)
         localStorage[key] = rawValue
+        option.value = value
     },
     reset: function (key) {
+        var option = this.getOption(key)
+        delete option.value
         localStorage.removeItem(key)
     }
 }