Merge pull request #31 from wmo-raf/dev

Refactor getting weather icons as a function

Author: erick-otenyo

forecastmanager/constants.py

@@ -1,4 +1,3 @@
-from django.templatetags.static import static
 from django.utils.translation import gettext_lazy as _
 
 # extracted from https://nrkno.github.io/yr-weather-symbols/
@@ -198,12 +197,6 @@
 
 WEATHER_CONDITIONS_AS_DICT = {condition['id']: condition for condition in WEATHER_CONDITIONS}
 
-WEATHER_CONDITION_ICONS = [
-    {"value": condition["id"], **condition,
-     'icon_url': static("forecastmanager/weathericons/{0}.png".format(condition["id"]))} for condition in
-    WEATHER_CONDITIONS
-]
-
 WEATHER_PARAMETERS_ICON_LIST = [
     "direction",
     "droplet-degree",

forecastmanager/utils.py

@@ -0,0 +1,13 @@
+from django.templatetags.static import static
+
+from .constants import WEATHER_CONDITIONS
+
+
+def get_weather_condition_icons():
+    icons = [
+        {"value": condition["id"], **condition,
+         'icon_url': static("forecastmanager/weathericons/{0}.png".format(condition["id"]))} for condition in
+        WEATHER_CONDITIONS
+    ]
+
+    return icons

forecastmanager/views.py

@@ -12,10 +12,10 @@
 from wagtail.api.v2.utils import get_full_url
 
 from forecastmanager.models import City, Forecast
-from .constants import WEATHER_CONDITION_ICONS
 from .forecast_settings import ForecastSetting
 from .forms import CityLoaderForm
 from .serializers import CitySerializer, ForecastSerializer
+from .utils import get_weather_condition_icons
 
 
 class ReadOnly(BasePermission):
@@ -132,7 +132,7 @@ def forecast_settings(request):
 
 
 def weather_icons(request):
-    options = WEATHER_CONDITION_ICONS
+    options = get_weather_condition_icons()
     icons = [{"id": icon["id"], "name": icon["name"], "url": get_full_url(request, icon["icon_url"])} for icon in
              options]
     return JsonResponse(icons, safe=False)

forecastmanager/widgets.py

@@ -6,7 +6,8 @@
 from wagtail.utils.widgets import WidgetWithScript
 from wagtail.widget_adapters import WidgetAdapter
 
-from forecastmanager.constants import WEATHER_CONDITION_ICONS, WEATHER_PARAMETER_CHOICES
+from .constants import WEATHER_PARAMETER_CHOICES
+from .utils import get_weather_condition_icons
 
 
 class WeatherSymbolChooserWidget(WidgetWithScript, widgets.TextInput):
@@ -27,7 +28,7 @@ def get_context(self, name, value, attrs):
         return context
 
     def render_js_init(self, id_, name, value):
-        options = WEATHER_CONDITION_ICONS
+        options = get_weather_condition_icons()
         return "$(document).ready(() => new WeatherSymbolChooserWidget({0},{1}));".format(json.dumps(id_),
                                                                                           json.dumps(options))
 

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = forecastmanager
-version = 0.5.3
+version = 0.5.4
 description = Integration of Weather City Forecasts Manager in Wagtail Projects.
 long_description = file:README.md
 long_description_content_type = text/markdown