Merge pull request #3 from JohnnyTheTank/5-day-forecast

bump to new version (v0.6.0)
JohnnyTheTank · Sep 25, 2016 · 74be4ea · 74be4ea
2 parents 6adafb8 + 3ae1316
commit 74be4ea
Show file tree

Hide file tree

Showing 7 changed files with 185 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Author: Jonathan Hornung ([JohnnyTheTank](https://github.com/JohnnyTheTank))
     1. `bower install --save angular-openweathermap-api-factory`
     2. `npm install --save angular-openweathermap-api-factory`
     3. download [angular-openweathermap-api-factory.zip](https://github.com/JohnnyTheTank/angular-openweathermap-api-factory/zipball/master)
-2. Add `jtt_openweathermap` to your application's module dependencies.
+2. Add **`jtt_openweathermap`** to your application's module dependencies.
 3. Include dependencies in your HTML.
     1. When using bower:
     ```html
@@ -28,9 +28,11 @@ Author: Jonathan Hornung ([JohnnyTheTank](https://github.com/JohnnyTheTank))
 4. Use the factory `openweathermapFactory`
 
 
-### factory methods
+## factory methods
 
-#### weather from city by name
+### current weather
+
+#### current weather from city by name
 ```js
 // docs: http://openweathermap.org/current#name
 openweathermapFactory.getWeatherFromCitySearchByName({
@@ -46,7 +48,7 @@ openweathermapFactory.getWeatherFromCitySearchByName({
 });
 ```
 
-#### weather from city by id
+#### current weather from city by id
 ```js
 // docs: http://openweathermap.org/current#cityid
 openweathermapFactory.getWeatherFromCityById({
@@ -61,7 +63,7 @@ openweathermapFactory.getWeatherFromCityById({
 });
 ```
 
-#### weather from group of cities by id
+#### current weather from group of cities by id
 ```js
 // docs: http://openweathermap.org/current#severalid
 openweathermapFactory.getWeatherFromGroupOfCitiesById({
@@ -76,7 +78,7 @@ openweathermapFactory.getWeatherFromGroupOfCitiesById({
 });
 ```
 
-#### weather from location by coordinates
+#### current weather from location by coordinates
 ```js
 // docs: http://openweathermap.org/current#geo
 openweathermapFactory.getWeatherFromLocationByCoordinates({
@@ -92,7 +94,7 @@ openweathermapFactory.getWeatherFromLocationByCoordinates({
 });
 ```
 
-#### weather from location by zipcode
+#### current weather from location by zipcode
 ```js
 // docs: http://openweathermap.org/current#zip
 openweathermapFactory.getWeatherFromLocationByCoordinates({
@@ -107,6 +109,56 @@ openweathermapFactory.getWeatherFromLocationByCoordinates({
 });
 ```
 
+### 5-day-forecast
+
+#### 5-day-forecast from city by name
+```js
+// docs: http://openweathermap.org/forecast5#name5
+openweathermapFactory.cityForecast5SearchByName({
+    q:"<CITY_NAME>,<COUNTRY_CODE>", //city name and country code divided by comma, use ISO 3166 country codes eg "London,uk"
+    lang:"<LANGUAGE>", // (optional) http://openweathermap.org/current#multi
+    units:"<UNITS>", // (optinal) http://openweathermap.org/current#data
+    type:"<TYPE>", // (optional) 'like' = close result, 'accurate' = accurate result
+    appid:"<APP_ID>"
+}).then(function(_data){
+    //on success
+}).catch(function (_data) {
+    //on error
+});
+```
+
+#### 5-day-forecast from city by id
+```js
+// docs: http://openweathermap.org/forecast5#cityid5
+openweathermapFactory.getForecast5FromCityById({
+    id:"<CITY_ID>", //List of city ID can be downloaded here http://bulk.openweathermap.org/sample/city.list.json.gz
+    lang:"<LANGUAGE>", // (optional) http://openweathermap.org/current#multi
+    units:"<UNITS>", // (optinal) http://openweathermap.org/current#data
+    appid:"<APP_ID>"
+}).then(function(_data){
+    //on success
+}).catch(function (_data) {
+    //on error
+});
+```
+
+#### 5-day-forecast from location by coordinates
+```js
+// docs: http://openweathermap.org/forecast5#geo5
+openweathermapFactory.getForecast5FromLocationByCoordinates({
+    lat:"<LAT>",
+    lon:"<LONG>",
+    lang:"<LANGUAGE>", // (optional) http://openweathermap.org/current#multi
+    units:"<UNITS>", // (optinal) http://openweathermap.org/current#data
+    appid:"<APP_ID>"
+}).then(function(_data){
+    //on success
+}).catch(function (_data) {
+    //on error
+});
+```
+
+
 ## OpenWeatherMap JSON API
 * docs: http://openweathermap.org/api
 

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "angular-openweathermap-api-factory",
   "description": "angularjs factory for openweathermap json rest api requests",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "main": "dist/angular-openweathermap-api-factory.js",
   "authors": [
     "Jonathan Hornung"

diff --git a/demo/js/app.js b/demo/js/app.js
@@ -39,4 +39,26 @@ app.controller('controller', ['$scope', 'openweathermapFactory', function($scope
         console.info("weather from location by zipcode", _data);
     });
 
+    openweathermapFactory.getForecast5FromCitySearchByName({
+        q:"munich",
+        appid:_appid
+    }).then(function(_data){
+        console.info("5 day forecast from city by name", _data);
+    });
+
+    openweathermapFactory.getForecast5FromCityById({
+        id:"3220838",
+        appid:_appid
+    }).then(function(_data){
+        console.info("5 day forecast from city by id", _data);
+    });
+
+    openweathermapFactory.getForecast5FromLocationByCoordinates({
+        lat:"48.1",
+        lon:"11.63",
+        appid:_appid
+    }).then(function(_data){
+        console.info("5 day forecast from location by coordinates", _data);
+    });
+
 }]);
diff --git a/dist/angular-openweathermap-api-factory.js b/dist/angular-openweathermap-api-factory.js
@@ -1,6 +1,6 @@
 /**
     @name: angular-openweathermap-api-factory 
-    @version: 0.5.0 (25-02-2016) 
+    @version: 0.6.0 (25-09-2016) 
     @author: Jonathan Hornung 
     @url: https://github.com/JohnnyTheTank/angular-openweathermap-api-factory#readme 
     @license: MIT
@@ -57,6 +57,33 @@ angular.module("jtt_openweathermap", [])
             });
         };
 
+        openweathermapFactory.getForecast5FromCitySearchByName = function (_params) {
+            var searchData = openweathermapSearchDataService.getNew("cityForecast5SearchByName", _params);
+            return $http({
+                method: 'GET',
+                url: searchData.url,
+                params: searchData.object,
+            });
+        };
+
+        openweathermapFactory.getForecast5FromCityById = function (_params) {
+            var searchData = openweathermapSearchDataService.getNew("cityForecast5ById", _params);
+            return $http({
+                method: 'GET',
+                url: searchData.url,
+                params: searchData.object,
+            });
+        };
+
+        openweathermapFactory.getForecast5FromLocationByCoordinates = function (_params) {
+            var searchData = openweathermapSearchDataService.getNew("locationForecast5ByCoordinates", _params);
+            return $http({
+                method: 'GET',
+                url: searchData.url,
+                params: searchData.object,
+            });
+        };
+
         return openweathermapFactory;
     }])
     .service('openweathermapSearchDataService', function () {
@@ -117,7 +144,28 @@ angular.module("jtt_openweathermap", [])
                     ]);
                     openweathermapSearchData.url = this.getApiBaseUrl() + "weather";
                     break;
+
+                case "cityForecast5SearchByName":
+                    openweathermapSearchData = this.fillDataInObjectByList(openweathermapSearchData, _params, [
+                        'q', 'lang', 'type', "units",
+                    ]);
+                    openweathermapSearchData.url = this.getApiBaseUrl() + "forecast";
+                    break;
+
+                case "cityForecast5ById":
+                    openweathermapSearchData = this.fillDataInObjectByList(openweathermapSearchData, _params, [
+                        'id', 'lang', "units",
+                    ]);
+                    openweathermapSearchData.url = this.getApiBaseUrl() + "forecast";
+                    break;
+
+                case "locationForecast5ByCoordinates":
+                    openweathermapSearchData = this.fillDataInObjectByList(openweathermapSearchData, _params, [
+                        'lat', 'lon', 'lang', "units",
+                    ]);
+                    openweathermapSearchData.url = this.getApiBaseUrl() + "forecast";
+                    break;
             }
             return openweathermapSearchData;
         };
-    });
+    });
diff --git a/dist/angular-openweathermap-api-factory.min.js b/dist/angular-openweathermap-api-factory.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-openweathermap-api-factory",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "angularjs factory for openweathermap json rest api requests",
   "main": "dist/angular-openweathermap-api-factory.js",
   "scripts": {

diff --git a/src/angular-openweathermap-api-factory.js b/src/angular-openweathermap-api-factory.js
@@ -50,6 +50,33 @@ angular.module("jtt_openweathermap", [])
             });
         };
 
+        openweathermapFactory.getForecast5FromCitySearchByName = function (_params) {
+            var searchData = openweathermapSearchDataService.getNew("cityForecast5SearchByName", _params);
+            return $http({
+                method: 'GET',
+                url: searchData.url,
+                params: searchData.object,
+            });
+        };
+
+        openweathermapFactory.getForecast5FromCityById = function (_params) {
+            var searchData = openweathermapSearchDataService.getNew("cityForecast5ById", _params);
+            return $http({
+                method: 'GET',
+                url: searchData.url,
+                params: searchData.object,
+            });
+        };
+
+        openweathermapFactory.getForecast5FromLocationByCoordinates = function (_params) {
+            var searchData = openweathermapSearchDataService.getNew("locationForecast5ByCoordinates", _params);
+            return $http({
+                method: 'GET',
+                url: searchData.url,
+                params: searchData.object,
+            });
+        };
+
         return openweathermapFactory;
     }])
     .service('openweathermapSearchDataService', function () {
@@ -110,7 +137,29 @@ angular.module("jtt_openweathermap", [])
                     ]);
                     openweathermapSearchData.url = this.getApiBaseUrl() + "weather";
                     break;
+
+                case "cityForecast5SearchByName":
+                    openweathermapSearchData = this.fillDataInObjectByList(openweathermapSearchData, _params, [
+                        'q', 'lang', 'type', "units",
+                    ]);
+                    openweathermapSearchData.url = this.getApiBaseUrl() + "forecast";
+                    break;
+
+                case "cityForecast5ById":
+                    openweathermapSearchData = this.fillDataInObjectByList(openweathermapSearchData, _params, [
+                        'id', 'lang', "units",
+                    ]);
+                    openweathermapSearchData.url = this.getApiBaseUrl() + "forecast";
+                    break;
+
+                case "locationForecast5ByCoordinates":
+                    openweathermapSearchData = this.fillDataInObjectByList(openweathermapSearchData, _params, [
+                        'lat', 'lon', 'lang', "units",
+                    ]);
+                    openweathermapSearchData.url = this.getApiBaseUrl() + "forecast";
+                    break;
+
             }
             return openweathermapSearchData;
         };
-    });
+    });