Replace weather images with emojis. (#2502)

* Remove weather images in favor of weather emojis * fix bad copy pasta of emojis * rename CSS class to `weather-boost`
RocketMap · Mar 3, 2018 · 3c4d785 · 3c4d785
1 parent 089ba62
commit 3c4d785
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 14 deletions.
diff --git a/static/images/weather/weather_clear_day.png b/static/images/weather/weather_clear_day.png
diff --git a/static/images/weather/weather_clear_night.png b/static/images/weather/weather_clear_night.png
diff --git a/static/images/weather/weather_cloudy.png b/static/images/weather/weather_cloudy.png
diff --git a/static/images/weather/weather_fog.png b/static/images/weather/weather_fog.png
diff --git a/static/images/weather/weather_partly_cloudy_day.png b/static/images/weather/weather_partly_cloudy_day.png
diff --git a/static/images/weather/weather_partly_cloudy_night.png b/static/images/weather/weather_partly_cloudy_night.png
diff --git a/static/images/weather/weather_rain.png b/static/images/weather/weather_rain.png
diff --git a/static/images/weather/weather_snow.png b/static/images/weather/weather_snow.png
diff --git a/static/images/weather/weather_windy.png b/static/images/weather/weather_windy.png
diff --git a/static/js/map.js b/static/js/map.js
@@ -92,16 +92,7 @@ const excludedRaritiesList = [
   ['common', 'uncommon', 'rare', 'very rare', 'ultra rare']
 ]
 
-const weatherTypes = ['none', 'clear', 'rain', 'partly_cloudy', 'cloudy', 'windy', 'snow', 'fog']
-
-function weatherImage(weatherCondition, timeOfDay) {
-    var weatherType = weatherTypes[weatherCondition]
-    if (timeOfDay && ((weatherCondition === 1) || (weatherCondition === 3))) {
-        return `weather_${weatherType}_${timeOfDay}.png`
-    } else {
-        return `weather_${weatherType}.png`
-    }
-}
+const weatherEmojis = [ '', '☀️', '☔️', '⛅', '☁️', '💨', '⛄️', '🌁' ]
 
 /*
  text place holders:
@@ -569,17 +560,14 @@ function pokemonLabel(item) {
     var cpMultiplier = item['cp_multiplier']
     var weatherBoostedCondition = item['weather_boosted_condition']
     var weatherDisplay = ''
-    var currentDate = new Date()
-    var currentHour = currentDate.getHours()
-    var timeOfDay = (currentHour >= 6 && currentHour < 19) ? 'day' : 'night'
     const showStats = Store.get('showPokemonStats')
 
     $.each(types, function (index, type) {
         typesDisplay += getTypeSpan(type)
     })
 
     if (weatherBoostedCondition) {
-        weatherDisplay = `<img src='static/images/weather/${weatherImage(weatherBoostedCondition, timeOfDay)}' style="width: 24px; vertical-align: middle;">`
+        weatherDisplay = `<span class="pokemon weather-boost">${weatherEmojis[weatherBoostedCondition]}</span>`
     }
 
     var details = ''

diff --git a/static/sass/layout/_pokemon.scss b/static/sass/layout/_pokemon.scss
@@ -37,6 +37,11 @@
     font-size: 11px;
   }
 
+  &.weather-boost {
+    font-size: 16px;
+    vertical-align: middle;
+  }
+
   &.disappear {
     font-size: 14px;
     font-weight: 900;