Change the way restrictions are applied

routes/weather.js

@@ -283,9 +283,14 @@ exports.getWeather = function( req, res ) {
 				return;
 			}
 
+			var scale = calculateWeatherScale( adjustmentMethod, adjustmentOptions, weather );
+
+			if ( checkWeatherRestriction( req.params[0], weather ) ) {
+				scale = 0;
+			}
+
 			var data = {
-					scale:		calculateWeatherScale( adjustmentMethod, adjustmentOptions, weather ),
+					scale:		scale,
-					restrict:	checkWeatherRestriction( req.params[0], weather ) ? 1 : 0,
 					tz:			getTimezone( weather.timezone ),
 					sunrise:	weather.sunrise,
 					sunset:		weather.sunset,
@@ -297,7 +302,6 @@ exports.getWeather = function( req, res ) {
 				res.json( data );
 			} else {
 				res.send(	"&scale="		+	data.scale +
-							"&restrict="	+	data.restrict +
 							"&tz="			+	data.tz +
 							"&sunrise="		+	data.sunrise +
 							"&sunset="		+	data.sunset +

test/expected.json

@@ -2,7 +2,6 @@
 	"WSI": {
 		"01002": {
 			"scale": 83,
-			"restrict": 0,
 			"tz": 32,
 			"sunrise": 324,
 			"sunset": 1226,
@@ -12,7 +11,6 @@
 	"WU": {
 		"01002": {
 			"scale": 61,
-			"restrict": 0,
 			"tz": 32,
 			"sunrise": 324,
 			"sunset": 1228,
@@ -22,7 +20,6 @@
 	"noWeather": {
 		"01002": {
 			"scale": -1,
-			"restrict": 0,
 			"tz": 32,
 			"sunrise": 324,
 			"sunset": 1226,