Merge pull request #42 from count023/wunderground-url-scheme-change

Wunderground url scheme change

Author: squix78

.gitignore

@@ -4,3 +4,8 @@
 .DS_Store
 
 examples/.DS_Store
+
+.metadata
+.project
+RemoteSystemsTempFiles
+

WundergroundClient.cpp

@@ -38,6 +38,13 @@ void WundergroundClient::updateConditions(String apiKey, String language, String
   doUpdate("/api/" + apiKey + "/conditions/lang:" + language + "/q/" + country + "/" + city + ".json");
 }
 
+// wunderground change the API URL scheme:
+// http://api.wunderground.com/api/<API-KEY>/conditions/lang:de/q/zmw:00000.215.10348.json
+void WundergroundClient::updateConditions(String apiKey, String language, String zmwCode) {
+  isForecast = false;
+  doUpdate("/api/" + apiKey + "/conditions/lang:" + language + "/q/zmw:" + zmwCode + ".json");
+}
+
 void WundergroundClient::updateForecast(String apiKey, String language, String country, String city) {
   isForecast = true;
   doUpdate("/api/" + apiKey + "/forecast10day/lang:" + language + "/q/" + country + "/" + city + ".json");

WundergroundClient.h

@@ -71,6 +71,7 @@ class WundergroundClient: public JsonListener {
   public:
     WundergroundClient(boolean isMetric);
     void updateConditions(String apiKey, String language, String country, String city);
+    void updateConditions(String apiKey, String language, String zmwCode);
     void updateForecast(String apiKey, String language, String country, String city);
     void updateAstronomy(String apiKey, String language, String country, String city);
     // JJG added

examples/WundergroundClientPlainDemo/WundergroundClientPlainDemo.ino

@@ -0,0 +1,128 @@
+/**The MIT License (MIT)
+
+Copyright (c) 2016 by Count023 -> https://github.com/count023
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+*/
+
+#include <Arduino.h>
+
+#include <ESP8266WiFi.h>
+#include <JsonListener.h>
+#include "WundergroundClient.h"
+
+/**
+ * Wunderground Settings
+ */
+const String  WUNDERGRROUND_API_KEY = "<YOUR-WUNDERGROUND-API-KEY>";
+const boolean IS_METRIC = true;
+// to retrieve the ZMW-Code use
+// 		http://api.wunderground.com/api/<API-KEY>/conditions/q/<COUNTRY-CODE>/<CITY-NAME>.json
+// for example and grab for the zmw ...
+const String  WUNDERGROUND_ZMW_CODE = "00000.215.10348"; // Braunschweig-Flughafen -> EDVE 
+const String  WUNDERGRROUND_LANGUAGE = "DL";
+
+// initiate the WundergoundClient
+WundergroundClient wunderground(IS_METRIC);
+
+
+/**
+ * WiFi Settings
+ */
+const char* ESP_HOST_NAME = "esp-" + ESP.getFlashChipId();
+const char* WIFI_SSID     = "<YOUR-WIFI-SSID>";
+const char* WIFI_PASSWORD = "<YOUR-WIFI-PASSWORD>";
+
+// initiate the WifiClient
+WiFiClient wifiClient;
+
+
+
+/**
+ * Helping funtions
+ */
+void connectWifi() {
+  WiFi.hostname(ESP_HOST_NAME);
+  WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
+  delay(20);
+  Serial.print("Connecting to ");
+  Serial.println(WIFI_SSID);
+  while (WiFi.status() != WL_CONNECTED) {
+    delay(500);
+    Serial.print(".");
+  }
+  Serial.println("");
+  Serial.println("WiFi connected!");
+  Serial.println();
+}
+
+
+/**
+ * SETUP
+ */
+void setup() {
+
+  Serial.begin(115200);
+
+  connectWifi();
+
+}
+
+
+/**
+ * LOOP
+ */
+void loop() {
+
+  if ((millis() % (60 * 1000)) == 0) { // just call once a minute @see: https://www.wunderground.com/weather/api/d/pricing.html
+    Serial.println();
+    Serial.println("\n\nNext Loop-Step: " + String(millis()) + ":");
+
+    wunderground.updateConditions(WUNDERGRROUND_API_KEY, WUNDERGRROUND_LANGUAGE, WUNDERGROUND_ZMW_CODE);
+
+    Serial.println("wundergroundHours: " + wunderground.getHours());
+    Serial.println("wundergroundMinutes: " + wunderground.getMinutes());
+    Serial.println("wundergroundSeconds: " + wunderground.getSeconds());
+    Serial.println("wundergroundDate: " + wunderground.getDate());
+
+    Serial.println("wundergroundMoonPctIlum: " + wunderground.getMoonPctIlum());
+    Serial.println("wundergroundMoonAge: " + wunderground.getMoonAge());
+    Serial.println("wundergroundMoonPhase: " + wunderground.getMoonPhase());
+    Serial.println("wundergroundSunriseTime: " + wunderground.getSunriseTime());
+    Serial.println("wundergroundSunsetTime: " + wunderground.getSunsetTime());
+    Serial.println("wundergroundMoonriseTime: " + wunderground.getMoonriseTime());
+    Serial.println("wundergroundMoonsetTime: " + wunderground.getMoonsetTime());
+    Serial.println("wundergroundWindSpeed: " + wunderground.getWindSpeed());
+    Serial.println("wundergroundWindDir: " + wunderground.getWindDir());
+
+    Serial.println("wundergroundCurrentTemp: " + wunderground.getCurrentTemp());
+    Serial.println("wundergroundTodayIcon: " + wunderground.getTodayIcon());
+    Serial.println("wundergroundTodayIconText: " + wunderground.getTodayIconText());
+    Serial.println("wundergroundMeteoconIcon: " + wunderground.getMeteoconIcon(wunderground.getTodayIconText()));
+    Serial.println("wundergroundWeatherText: " + wunderground.getWeatherText());
+    Serial.println("wundergroundHumidity: " + wunderground.getHumidity());
+    Serial.println("wundergroundPressure: " + wunderground.getPressure());
+    Serial.println("wundergroundDewPoint: " + wunderground.getDewPoint());
+    Serial.println("wundergroundPrecipitationToday: " + wunderground.getPrecipitationToday());
+
+    Serial.println();
+    Serial.println("---------------------------------------------------/\n");
+  }
+}