[Weather] Allow Forecastio to request units other than SI

bundles/binding/org.openhab.binding.weather/src/main/java/org/openhab/binding/weather/internal/common/LocationConfig.java

@@ -29,6 +29,7 @@ public class LocationConfig {
     private Integer updateInterval = DEFAULT_UPDATE_INTERVAL;
     private String locationId;
     private String name;
+    private String units = "si";
 
     /**
      * Returns the language.
@@ -142,6 +143,20 @@ public void setName(String name) {
         this.name = name;
     }
 
+    /**
+     * Returns the units of measurement.
+     */
+    public String getMeasurementUnits() {
+        return units;
+    }
+
+    /**
+     * Sets the units of measurement.
+     */
+    public void setMeasurementUnits(String u) {
+        units = u;
+    }
+
     /**
      * Returns true, if this config is valid.
      */

bundles/binding/org.openhab.binding.weather/src/main/java/org/openhab/binding/weather/internal/common/WeatherConfig.java

@@ -43,13 +43,15 @@
  * #weather:location.<locationId1>.woeid=      (required for Yahoo provider)
  * #weather:location.<locationId1>.language=
  * #weather:location.<locationId1>.updateInterval= (optional, defaults to 240)
+ * #weather:location.<locationId1>.units=      (optional; defaults to "si")
  *
  * #weather:location.<locationId2>.latitude=   (not required for Yahoo provider)
  * #weather:location.<locationId2>.longitude=  (not required for Yahoo provider)
  * #weather:location.<locationId2>.provider=
  * #weather:location.<locationId2>.woeid=      (required for Yahoo provider)
  * #weather:location.<locationId2>.language=
  * #weather:location.<locationId2>.updateInterval= (optional, defaults to 240)
+ * #weather:location.<locationId2>.units=      (optional; defaults to "si")
  * </pre>
  *
  * @author Gerhard Riegler
@@ -157,6 +159,8 @@ private void parseLocation(String key, String value) throws ConfigurationExcepti
             lc.setLanguage(value);
         } else if (StringUtils.equalsIgnoreCase(keyId, "name")) {
             lc.setName(value);
+        } else if (StringUtils.equalsIgnoreCase(keyId, "units")) {
+            lc.setMeasurementUnits(value.toLowerCase());
         } else {
             logger.debug("Unknown weather configuration setting '{}'. Check openhab.cfg.", key);
         }

bundles/binding/org.openhab.binding.weather/src/main/java/org/openhab/binding/weather/internal/provider/AbstractWeatherProvider.java

@@ -96,6 +96,9 @@ private String prepareUrl(String url, LocationConfig locationConfig) {
         if (locationConfig.getLongitude() != null) {
             url = StringUtils.replace(url, "[LONGITUDE]", locationConfig.getLongitude().toString());
         }
+        if (locationConfig.getMeasurementUnits() != null) {
+            url = StringUtils.replace(url, "[UNITS]", locationConfig.getMeasurementUnits());
+        }
         url = StringUtils.replace(url, "[LANGUAGE]", locationConfig.getLanguage());
         url = StringUtils.replace(url, "[WOEID]", locationConfig.getWoeid());
         return url;

bundles/binding/org.openhab.binding.weather/src/main/java/org/openhab/binding/weather/internal/provider/ForecastIoProvider.java

@@ -18,7 +18,7 @@
  * @since 1.6.0
  */
 public class ForecastIoProvider extends AbstractWeatherProvider {
-    private static final String URL = "https://api.darksky.net/forecast/[API_KEY]/[LATITUDE],[LONGITUDE]?units=si&lang=[LANGUAGE]&exclude=hourly,flags";
+    private static final String URL = "https://api.darksky.net/forecast/[API_KEY]/[LATITUDE],[LONGITUDE]?units=[UNITS]&lang=[LANGUAGE]&exclude=hourly,flags";
 
     public ForecastIoProvider() {
         super(new JsonWeatherParser());

distribution/openhabhome/configurations/openhab_default.cfg

@@ -2058,6 +2058,7 @@ tcp:refreshinterval=250
 #weather:location.<locationId1>.provider=
 #weather:location.<locationId1>.language=
 #weather:location.<locationId1>.updateInterval=
+#weather:location.<locationId1>.units=
 
 #weather:location.<locationId2>.name=
 #weather:location.<locationId2>.latitude=
@@ -2066,6 +2067,7 @@ tcp:refreshinterval=250
 #weather:location.<locationId2>.provider=
 #weather:location.<locationId2>.language=
 #weather:location.<locationId2>.updateInterval=
+#weather:location.<locationId2>.units=
 
 ################################### Zibase Binding #####################################
 #

features/openhab-addons-external/src/main/resources/conf/weather.cfg

@@ -16,6 +16,7 @@
 #location.<locationId1>.provider=
 #location.<locationId1>.language=
 #location.<locationId1>.updateInterval=
+#location.<locationId1>.units=
 
 #location.<locationId2>.name=
 #location.<locationId2>.latitude=   (not required for Yahoo provider)
@@ -24,3 +25,4 @@
 #location.<locationId2>.provider=
 #location.<locationId2>.language=
 #location.<locationId2>.updateInterval=
+#location.<locationId2>.units=