Skip to content

Commit b958024

Browse files
committed
Add wind data complication
1 parent b8a40aa commit b958024

3 files changed

Lines changed: 13 additions & 4 deletions

File tree

resources/settings/settings.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
<listEntry value="21">@Strings.countdown</listEntry>
111111
<listEntry value="25">@Strings.weather</listEntry>
112112
<listEntry value="26">@Strings.ampm</listEntry>
113+
<listEntry value="28">@Strings.wind</listEntry>
113114
</settingConfig>
114115
</setting>
115116
<setting propertyKey="@Properties.comp2h" title="@Strings.comp2h">
@@ -141,6 +142,7 @@
141142
<listEntry value="21">@Strings.countdown</listEntry>
142143
<listEntry value="25">@Strings.weather</listEntry>
143144
<listEntry value="26">@Strings.ampm</listEntry>
145+
<listEntry value="28">@Strings.wind</listEntry>
144146
</settingConfig>
145147
</setting>
146148
<setting propertyKey="@Properties.comp4h" title="@Strings.comp4h">
@@ -172,6 +174,7 @@
172174
<listEntry value="21">@Strings.countdown</listEntry>
173175
<listEntry value="25">@Strings.weather</listEntry>
174176
<listEntry value="26">@Strings.ampm</listEntry>
177+
<listEntry value="28">@Strings.wind</listEntry>
175178
</settingConfig>
176179
</setting>
177180
<setting propertyKey="@Properties.comp6h" title="@Strings.comp6h">
@@ -203,6 +206,7 @@
203206
<listEntry value="21">@Strings.countdown</listEntry>
204207
<listEntry value="25">@Strings.weather</listEntry>
205208
<listEntry value="26">@Strings.ampm</listEntry>
209+
<listEntry value="28">@Strings.wind</listEntry>
206210
</settingConfig>
207211
</setting>
208212
<setting propertyKey="@Properties.comp8h" title="@Strings.comp8h">
@@ -234,6 +238,7 @@
234238
<listEntry value="21">@Strings.countdown</listEntry>
235239
<listEntry value="25">@Strings.weather</listEntry>
236240
<listEntry value="26">@Strings.ampm</listEntry>
241+
<listEntry value="28">@Strings.wind</listEntry>
237242
</settingConfig>
238243
</setting>
239244
<setting propertyKey="@Properties.comp10h" title="@Strings.comp10h">
@@ -265,6 +270,7 @@
265270
<listEntry value="21">@Strings.countdown</listEntry>
266271
<listEntry value="25">@Strings.weather</listEntry>
267272
<listEntry value="26">@Strings.ampm</listEntry>
273+
<listEntry value="28">@Strings.wind</listEntry>
268274
</settingConfig>
269275
</setting>
270276
<setting propertyKey="@Properties.compbart" title="@Strings.compbart">
@@ -297,6 +303,7 @@
297303
<listEntry value="25">@Strings.weather</listEntry>
298304
<listEntry value="26">@Strings.ampm</listEntry>
299305
<listEntry value="27">@Strings.ctext</listEntry>
306+
<listEntry value="28">@Strings.wind</listEntry>
300307
</settingConfig>
301308
</setting>
302309
<setting propertyKey="@Properties.compbarb" title="@Strings.compbarb">
@@ -329,6 +336,7 @@
329336
<listEntry value="25">@Strings.weather</listEntry>
330337
<listEntry value="26">@Strings.ampm</listEntry>
331338
<listEntry value="27">@Strings.ctext</listEntry>
339+
<listEntry value="28">@Strings.wind</listEntry>
332340
</settingConfig>
333341
</setting>
334342

resources/strings/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
<string id="weather">Weather</string>
7979
<string id="ampm">AM/PM indicator</string>
8080
<string id="ctext">Custom text</string>
81+
<string id="wind">Wind (Kmph or Mph)</string>
8182

8283
<string id="date_format">Date format</string>
8384
<string id="datef1">ddd d (TUE 2)</string>

source/datafield/DataFactory.mc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,15 +197,15 @@ class WindField extends BaseDataField {
197197
var weather_data = App.getApp().getProperty("OpenWeatherMapCurrent");
198198
if (weather_data != null) {
199199
var settings = Sys.getDeviceSettings();
200-
var speed = weather_data["wind_speed"]*3.6;
200+
var speed = weather_data["wind_speed"]*3.6; // kph
201201
var direct = weather_data["wind_direct"];
202202
var directLabel = wind_direction_mapper[(direct / 22.5).toNumber() - 1];
203-
var unit = "kph";
203+
var unit = "k";
204204
if (settings.distanceUnits == System.UNIT_STATUTE) {
205205
speed *= 0.621371;
206-
unit = "mph";
206+
unit = "m";
207207
}
208-
return directLabel + " " + direct.format("%0.1f") + unit;
208+
return directLabel + " " + speed.format("%0.1f") + unit;
209209
}
210210
return "--";
211211
}

0 commit comments

Comments
 (0)