diff --git a/src/gui/weather_deutschland_locations.h b/src/gui/weather_deutschland_locations.h
deleted file mode 100644
index e771e2ca9..000000000
--- a/src/gui/weather_deutschland_locations.h
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
-	Copyright (C) 2017,2018,2019 TangoCash
-
-	“Powered by Dark Sky” https://darksky.net/poweredby/
-
-	License: GPLv2
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation;
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef _WEATHER_DEUTSCHLAND_LOCATION_H_
-#define _WEATHER_DEUTSCHLAND_LOCATION_H_
-
-#include "weather_locations.h"
-
-// locations and coords taken from tuxwetter plugin
-const weather_loc WEATHER_DEUTSCHLAND_LOCATION_OPTIONS[] =
-{
-	{ "Aachen",			"50.77,6.13"	},
-	{ "Ahaus",			"52.07,7.00"	},
-	{ "Ahrensburg",			"53.06,10.25"	},
-	{ "Allendorf",			"51.28,7.95"	},
-	{ "Alsenz",			"49.72,7.82"	},
-	{ "Altenbruch",			"53.82,8.77"	},
-	{ "Amberg",			"49.44,11.86"	},
-	{ "Ansbach",			"49.30,10.58"	},
-	{ "Aschaffenburg",		"49.97,9.15"	},
-	{ "Augsburg",			"48.37,10.88"	},
-	{ "Aurich",			"53.47,7.48"	},
-	{ "Bad Hersfeld",		"50.870,9.702"	},
-	{ "Bad Tölz",			"47.77,11.57"	},
-	{ "Bamberg",			"50.87,9.70"	},
-	{ "Barweiler",			"50.35,6.98"	},
-	{ "Bayreuth",			"49.95,11.56"	},
-	{ "Bedburg",			"50.98,6.57"	},
-	{ "Bergen auf Rügen",		"54.42,13.44"	},
-	{ "Bergisch-Gladbach",		"49.94,11.57"	},
-	{ "Berlin",			"52.52,13.40"	},
-	{ "Bielefeld",			"52.03,8.53"	},
-	{ "Bitburg",			"49.96,6.52"	},
-	{ "Blexen",			"49.96,6.52"	},
-	{ "Bonn",			"50.73,7.09"	},
-	{ "Bottrop",			"51.52,6.94"	},
-	{ "Brandenburg",		"52.41,12.53"	},
-	{ "Braunschweig",		"52.26,10.52"	},
-	{ "Bremen",			"53.07,8.80"	},
-	{ "Bremerhaven",		"53.53,8.58"	},
-	{ "Brüggen",			"51.03,6.33"	},
-	{ "Brunsbüttel",		"53.89,9.13"	},
-	{ "Bückeburg",			"52.25,9.05"	},
-	{ "Büttgen",			"51.19,6.60"	},
-	{ "Celle",			"52.25,9.05"	},
-	{ "Chemnitz",			"50.82,12.92"	},
-	{ "Cloppenburg",		"50.82,12.92"	},
-	{ "Coburg",			"50.26,10.96"	},
-	{ "Cottbus",			"51.75,14.33"	},
-	{ "Cuxhaven",			"53.85,8.68"	},
-	{ "Dachau",			"48.26,11.43"	},
-	{ "Darmstadt",			"49.87,8.65"	},
-	{ "Deggendorf",			"48.84,12.95"	},
-	{ "Delmenhorst",		"53.05,8.63"	},
-	{ "Dessau",			"51.82,12.24"	},
-	{ "Detmold",			"51.93,8.86"	},
-	{ "Döbeln",			"51.12,13.11"	},
-	{ "Donaueschingen",		"47.95,8.49"	},
-	{ "Dortmund",			"51.51,7.46"	},
-	{ "Dresden",			"51.05,13.73"	},
-	{ "Duhnen",			"53.88,8.64"	},
-	{ "Duisburg",			"51.43,6.76"	},
-	{ "Düsseldorf",			"51.22,6.77"	},
-	{ "Ebersberg",			"48.07,11.96"	},
-	{ "Eberswalde",			"52.837,13.788"	},
-	{ "Eckernförde",		"54.469,9.838"	},
-	{ "Eggenfelden",		"48.40,12.75"	},
-	{ "Eichstätt",			"48.89,11.18"	},
-	{ "Elmshorn",			"53.75,9.66"	},
-	{ "Emden",			"53.35,7.20"	},
-	{ "Erding",			"48.31,11.91"	},
-	{ "Erfurt",			"50.98,11.02"	},
-	{ "Erkrath",			"51.22,6.91"	},
-	{ "Erlangen",			"49.58,11.01"	},
-	{ "Eschlkam",			"49.29,12.91"	},
-	{ "Eschwege",			"51.18,10.03"	},
-	{ "Essen",			"51.45,7.01"	},
-	{ "Esslingen",			"48.74,9.32"	},
-	{ "Euskirchen",			"50.65,6.78"	},
-	{ "Eutin",			"54.13,10.60"	},
-	{ "Falkensee",			"52.56,13.07"	},
-	{ "Feucht",			"49.37,11.21"	},
-	{ "Flensburg",			"54.79,9.44"	},
-	{ "Frankfurt am Main",		"50.11,8.68"	},
-	{ "Frankfurt an der Oder",	"52.350,14.550"	},
-	{ "Freiburg",			"47.99,7.84"	},
-	{ "Freigericht",		"50.142,9.166"	},
-	{ "Freising",			"48.40,11.74"	},
-	{ "Freudenstadt",		"48.46,8.41"	},
-	{ "Freyung",			"48.80,13.54"	},
-	{ "Friedrichshafen",		"47.66,9.48"	},
-	{ "Friesoythe",			"53.02,7.85"	},
-	{ "Fritzlar",			"51.13,9.27"	},
-	{ "Fulda",			"50.55,9.68"	},
-	{ "Fürstenfeldbruck",		"48.17,11.24"	},
-	{ "Fürth",			"49.47,10.98"	},
-	{ "Garmisch-Partenkirchen",	"47.49,11.10"	},
-	{ "Geilenkirchen",		"50.97,6.12"	},
-	{ "Gelnhausen",			"50.20,9.19"	},
-	{ "Gelsenkirchen",		"51.52,7.09"	},
-	{ "Gera",			"50.89,12.08"	},
-	{ "Geretsried",			"47.86,11.49"	},
-	{ "Germersheim",		"49.21,8.37"	},
-	{ "Gettorf",			"54.41,9.98"	},
-	{ "Gießen",			"50.58,8.68"	},
-	{ "Glauchau",			"50.82,12.55"	},
-	{ "Göppingen",			"48.71,9.65"	},
-	{ "Görlitz",			"51.15,14.97"	},
-	{ "Göttingen",			"51.54,9.92"	},
-	{ "Grafenau",			"48.86,13.39"	},
-	{ "Grafenwöhr",			"49.71,11.91"	},
-	{ "Greifswald",			"54.09,13.39"	},
-	{ "Grünberg",			"50.59,8.96"	},
-	{ "Gütersloh",			"51.90,8.39"	},
-	{ "Hagen",			"51.37,7.46"	},
-	{ "Hahn",			"49.96,7.27"	},
-	{ "Halle (Saale)",		"51.497,11.969"	},
-	{ "Halle (Westfalen)",		"52.06,8.36"	},
-	{ "Hamburg",			"53.55,9.99"	},
-	{ "Hamm",			"51.67,7.82"	},
-	{ "Hanau",			"50.13,8.93"	},
-	{ "Hannover",			"52.38,9.73"	},
-	{ "Harrislee",			"54.80,9.39"	},
-	{ "Heidelberg",			"49.40,8.67"	},
-	{ "Heilbronn",			"49.14,9.21"	},
-	{ "Helgoland",			"54.18,7.89"	},
-	{ "Hennigsdorf",		"52.63,13.20"	},
-	{ "Herne",			"51.54,7.20"	},
-	{ "Hilden",			"51.17,6.93"	},
-	{ "Hildesheim",			"52.15,9.96"	},
-	{ "Hinte",			"53.41,7.20"	},
-	{ "Hochheim",			"50.01,8.36"	},
-	{ "Hockenheimring",		"49.33,8.57"	},
-	{ "Hof",			"50.31,11.91"	},
-	{ "Holzkirchen",		"47.88,11.70"	},
-	{ "Hosten",			"49.89,6.62"	},
-	{ "Hürth",			"50.88,6.89"	},
-	{ "Husby",			"54.50,9.48"	},
-	{ "Husum",			"54.48,9.06"	},
-	{ "Idar-Oberstein",		"49.71,7.31"	},
-	{ "Ingolstadt",			"48.77,11.43"	},
-	{ "Iserlohn",			"51.38,7.70"	},
-	{ "Itzehoe",			"53.93,9.51"	},
-	{ "Jever",			"53.57,7.90"	},
-	{ "Jülich",			"50.92,6.36"	},
-	{ "Kall",			"50.54,6.56"	},
-	{ "Karlsruhe",			"49.01,8.40"	},
-	{ "Kassel",			"51.31,9.48"	},
-	{ "Kaufbeuren",			"47.88,10.63"	},
-	{ "Kempten",			"47.73,10.32"	},
-	{ "Kiel",			"54.32,10.12"	},
-	{ "Kitzingen",			"49.73,10.15"	},
-	{ "Koblenz",			"50.36,7.59"	},
-	{ "Köln",			"50.94,6.96"	},
-	{ "Konstanz",			"47.68,9.17"	},
-	{ "Krefeld",			"51.34,6.59"	},
-	{ "Kronshagen",			"54.34,10.09"	},
-	{ "Krumbach",			"48.25,10.37"	},
-	{ "Laarbruch",			"51.60,6.15"	},
-	{ "Lahr",			"48.33,7.87"	},
-	{ "Landshut",			"48.54,12.15"	},
-	{ "Langenhagen",		"52.45,9.74"	},
-	{ "Lausitzring",		"51.54,13.89"	},
-	{ "Lechfeld",			"48.19,10.86"	},
-	{ "Leck",			"54.77,8.98"	},
-	{ "Leer",			"53.24,7.47"	},
-	{ "Leipzig",			"51.34,12.37"	},
-	{ "Leverkusen",			"51.05,7.02"	},
-	{ "Lindenberg",			"47.60,9.89"	},
-	{ "List",			"55.02,8.43"	},
-	{ "Lübeck",			"53.87,10.69"	},
-	{ "Lüchow",			"52.97,11.15"	},
-	{ "Luckenwalde",		"52.09,13.16"	},
-	{ "Ludwigsburg",		"48.89,9.20"	},
-	{ "Ludwigshafen",		"49.48,8.45"	},
-	{ "Lüneburg",			"53.25,10.41"	},
-	{ "Magdeburg",			"52.12,11.63"	},
-	{ "Mainz",			"49.99,8.25"	},
-	{ "Mannheim",			"49.49,8.47"	},
-	{ "Marburg",			"50.80,8.77"	},
-	{ "Marienfelde",		"52.42,13.37"	},
-	{ "Marktbreit",			"49.67,10.15"	},
-	{ "Meiningen",			"50.57,10.42"	},
-	{ "Memmingen",			"47.98,10.18"	},
-	{ "Meppen",			"52.70,7.30"	},
-	{ "Merzig",			"49.45,6.64"	},
-	{ "Minden",			"52.30,8.89"	},
-	{ "Mönchengladbach",		"51.18,6.44"	},
-	{ "Mühldorf",			"48.25,12.52"	},
-	{ "München",			"48.14,11.58"	},
-	{ "Münster",			"51.96,7.63"	},
-	{ "Murnau",			"47.68,11.20"	},
-	{ "Mylau",			"50.62,12.26"	},
-	{ "Naumburg (Saale)",		"51.15,11.82"	},
-	{ "Neuberg",			"48.11,12.12"	},
-	{ "Neubrandenburg",		"53.57,13.28"	},
-	{ "Neumarkt",			"49.28,11.47"	},
-	{ "Neumünster",			"54.07,9.98"	},
-	{ "Neunkirchen",		"49.35,7.19"	},
-	{ "Neuruppin",			"52.92,12.80"	},
-	{ "Neuss",			"51.20,6.69"	},
-	{ "Neuwied",			"50.44,7.47"	},
-	{ "Niendorf (Ostsee)",		"53.99,10.83"	},
-	{ "Norden",			"53.60,7.20"	},
-	{ "Nordenham",			"53.50,8.49"	},
-	{ "Norderney",			"53.71,7.16"	},
-	{ "Nordhausen",			"51.50,10"	},
-	{ "Nordhausen",			"51.50,10"	},
-	{ "Nordheide",			"53.12,8.46"	},
-	{ "Nordhorn",			"52.43,7.07"	},
-	{ "Nördlingen",			"48.85,10.49"	},
-	{ "Nürburgring",		"50.34,6.95"	},
-	{ "Oberhausen",			"51.50,6.86"	},
-	{ "Oberpfaffenhofen",		"48.07,11.26"	},
-	{ "Oberstdorf",			"47.41,10.28"	},
-	{ "Ochsenfurt",			"49.66,10.07"	},
-	{ "Oeversee",			"54.70,9.43"	},
-	{ "Offenbach",			"50.10,8.78"	},
-	{ "Oldenburg",			"53.14,8.21"	},
-	{ "Oldersum",			"53.33,7.34"	},
-	{ "Oranienburg",		"52.75,13.24"	},
-	{ "Osnabrück",			"52.28,8.05"	},
-	{ "Otterndorf",			"53.81,8.90"	},
-	{ "Paderborn",			"51.72,8.76"	},
-	{ "Passau",			"48.57,13"	},
-	{ "Peine",			"52.32,10.24"	},
-	{ "Pfaffenhofen",		"48.52,11.50"	},
-	{ "Pfarrkirchen",		"48.42,12.94"	},
-	{ "Pforzheim",			"48.89,8.69"	},
-	{ "Pinneberg",			"53.65,9.79"	},
-	{ "Pirmasens",			"49.20,7.60"	},
-	{ "Plauen",			"50.50,12.14"	},
-	{ "Pocking",			"48.40,13.32"	},
-	{ "Potsdam",			"52.39,13.06"	},
-	{ "Prenzlau",			"53.32,13.86"	},
-	{ "Quickborn",			"53.73,9.91"	},
-	{ "Rastede",			"53.24,8.20"	},
-	{ "Recklinghausen",		"51.61,7.20"	},
-	{ "Regensburg",			"49.01,12.10"	},
-	{ "Remscheid",			"51.18,7.19"	},
-	{ "Rendsburg",			"54.31,9.66"	},
-	{ "Rennerod",			"50.61,8.07"	},
-	{ "Rosenheim",			"47.86,12.12"	},
-	{ "Rostock",			"54.09,12.10"	},
-	{ "Rüsselsheim",		"50.00,8.42"	},
-	{ "Saarbrücken",		"49.230,7.000"	},
-	{ "Sahlenburg",			"53.870,8.630"	},
-	{ "Salzgitter",			"52.080,10.330"	},
-	{ "Salzwedel",			"52.850,11.150"	},
-	{ "Schiffdorf",			"53.530,8.650"	},
-	{ "Schleswig",			"54.520,9.550"	},
-	{ "Schrobenhausen",		"48.550,11.270"	},
-	{ "Schwabach",			"49.330,11.030"	},
-	{ "Schwäbisch Hall",		"49.110,9.730"	},
-	{ "Schweinfurt",		"50.050,10.230"	},
-	{ "Schwerin",			"53.630,11.380"	},
-	{ "Siegburg",			"50.800,7.200"	},
-	{ "Siegen",			"50.870,8.030"	},
-	{ "Solingen",			"51.180,7.080"	},
-	{ "Starnberg",			"48.000,11.350"	},
-	{ "Straubing",			"48.880,12.570"	},
-	{ "Stuttgart",			"48.770,9.180"	},
-	{ "Sulingen",			"52.680,8.800"	},
-	{ "Sylt",			"54.880,8.350"	},
-	{ "Tönning",			"54.320,8.950"	},
-	{ "Traunstein",			"47.87,12.62"	},
-	{ "Travemünde",			"53.970,10.870"	},
-	{ "Trier",			"49.750,6.630"	},
-	{ "Tübingen",			"48.530,9.050"	},
-	{ "Ulm",			"48.400,10.000"	},
-	{ "Varel",			"53.18,9.49"	},
-	{ "Veitsbronn",			"49.520,10.880"	},
-	{ "Villingen-Schwenningen",	"48.070,8.450"	},
-	{ "Vilsbiburg",			"48.450,12.350"	},
-	{ "Vilshofen",			"49.23,12.04"	},
-	{ "Waldkirchen/Bayr.-Wald",	"48.730,13.600"	},
-	{ "Wallsbüll",			"54.580,9.000"	},
-	{ "Warnemünde",			"54.170,12.080"	},
-	{ "Weiden",			"49.680,12.160"	},
-	{ "Weimar",			"50.980,11.320"	},
-	{ "Weißenburg/Bayern",		"49.030,10.980"	},
-	{ "Wernigerode",		"51.830,10.780"	},
-	{ "Westerland/Sylt",		"54.900,8.300"	},
-	{ "Westerstede",		"53.250,7.930"	},
-	{ "Wetzlar",			"50.550,8.500"	},
-	{ "Wiesbaden",			"50.080,8.250"	},
-	{ "Wilhelmshaven",		"53.520,8.130"	},
-	{ "Wittenberge",		"53.000,11.750"	},
-	{ "Wittingen",			"52.730,10.720"	},
-	{ "Wolfsburg",			"52.430,10.800"	},
-	{ "Worms",			"49.61,8.31"	},
-	{ "Wuppertal",			"51.270,7.180"	},
-	{ "Würzburg",			"49.790,9.940"	},
-	{ "Zeven",			"53.300,9.280"	},
-	{ "Zirndorf",			"49.450,10.950"	},
-	{ "Zwickau",			"50.720,12.500"	}
-};
-
-#define WEATHER_DEUTSCHLAND_LOCATION_OPTION_COUNT (sizeof(WEATHER_DEUTSCHLAND_LOCATION_OPTIONS)/sizeof(weather_loc))
-
-#endif
diff --git a/src/gui/weather_locations.h b/src/gui/weather_locations.h
index e2c8c1896..5f4c3660e 100644
--- a/src/gui/weather_locations.h
+++ b/src/gui/weather_locations.h
@@ -1,8 +1,6 @@
 /*
 	Copyright (C) 2017, 2018, 2019 TangoCash
 
-	“Powered by Dark Sky” https://darksky.net/poweredby/
-
 	License: GPLv2
 
 	This program is free software; you can redistribute it and/or modify
@@ -27,4 +25,296 @@ struct weather_loc
 	const std::string value;
 };
 
+// locations and coords taken from tuxwetter plugin
+const weather_loc WEATHER_LOCATION_OPTIONS[] =
+{
+	{ "Aachen",			"50.77,6.13"	},
+	{ "Ahaus",			"52.07,7.00"	},
+	{ "Ahrensburg",			"53.06,10.25"	},
+	{ "Allendorf",			"51.28,7.95"	},
+	{ "Alsenz",			"49.72,7.82"	},
+	{ "Altenbruch",			"53.82,8.77"	},
+	{ "Amberg",			"49.44,11.86"	},
+	{ "Ansbach",			"49.30,10.58"	},
+	{ "Aschaffenburg",		"49.97,9.15"	},
+	{ "Augsburg",			"48.37,10.88"	},
+	{ "Aurich",			"53.47,7.48"	},
+	{ "Bad Hersfeld",		"50.870,9.702"	},
+	{ "Bad Tölz",			"47.77,11.57"	},
+	{ "Bamberg",			"50.87,9.70"	},
+	{ "Barweiler",			"50.35,6.98"	},
+	{ "Bayreuth",			"49.95,11.56"	},
+	{ "Bedburg",			"50.98,6.57"	},
+	{ "Bergen auf Rügen",		"54.42,13.44"	},
+	{ "Bergisch-Gladbach",		"49.94,11.57"	},
+	{ "Berlin",			"52.52,13.40"	},
+	{ "Bielefeld",			"52.03,8.53"	},
+	{ "Bitburg",			"49.96,6.52"	},
+	{ "Blexen",			"49.96,6.52"	},
+	{ "Bonn",			"50.73,7.09"	},
+	{ "Bottrop",			"51.52,6.94"	},
+	{ "Brandenburg",		"52.41,12.53"	},
+	{ "Braunschweig",		"52.26,10.52"	},
+	{ "Bremen",			"53.07,8.80"	},
+	{ "Bremerhaven",		"53.53,8.58"	},
+	{ "Brüggen",			"51.03,6.33"	},
+	{ "Brunsbüttel",		"53.89,9.13"	},
+	{ "Bückeburg",			"52.25,9.05"	},
+	{ "Büttgen",			"51.19,6.60"	},
+	{ "Celle",			"52.25,9.05"	},
+	{ "Chemnitz",			"50.82,12.92"	},
+	{ "Cloppenburg",		"50.82,12.92"	},
+	{ "Coburg",			"50.26,10.96"	},
+	{ "Cottbus",			"51.75,14.33"	},
+	{ "Cuxhaven",			"53.85,8.68"	},
+	{ "Dachau",			"48.26,11.43"	},
+	{ "Darmstadt",			"49.87,8.65"	},
+	{ "Deggendorf",			"48.84,12.95"	},
+	{ "Delmenhorst",		"53.05,8.63"	},
+	{ "Dessau",			"51.82,12.24"	},
+	{ "Detmold",			"51.93,8.86"	},
+	{ "Döbeln",			"51.12,13.11"	},
+	{ "Donaueschingen",		"47.95,8.49"	},
+	{ "Dortmund",			"51.51,7.46"	},
+	{ "Dresden",			"51.05,13.73"	},
+	{ "Duhnen",			"53.88,8.64"	},
+	{ "Duisburg",			"51.43,6.76"	},
+	{ "Düsseldorf",			"51.22,6.77"	},
+	{ "Ebersberg",			"48.07,11.96"	},
+	{ "Eberswalde",			"52.837,13.788"	},
+	{ "Eckernförde",		"54.469,9.838"	},
+	{ "Eggenfelden",		"48.40,12.75"	},
+	{ "Eichstätt",			"48.89,11.18"	},
+	{ "Elmshorn",			"53.75,9.66"	},
+	{ "Emden",			"53.35,7.20"	},
+	{ "Erding",			"48.31,11.91"	},
+	{ "Erfurt",			"50.98,11.02"	},
+	{ "Erkrath",			"51.22,6.91"	},
+	{ "Erlangen",			"49.58,11.01"	},
+	{ "Eschlkam",			"49.29,12.91"	},
+	{ "Eschwege",			"51.18,10.03"	},
+	{ "Essen",			"51.45,7.01"	},
+	{ "Esslingen",			"48.74,9.32"	},
+	{ "Euskirchen",			"50.65,6.78"	},
+	{ "Eutin",			"54.13,10.60"	},
+	{ "Falkensee",			"52.56,13.07"	},
+	{ "Feucht",			"49.37,11.21"	},
+	{ "Flensburg",			"54.79,9.44"	},
+	{ "Frankfurt am Main",		"50.11,8.68"	},
+	{ "Frankfurt an der Oder",	"52.350,14.550"	},
+	{ "Freiburg",			"47.99,7.84"	},
+	{ "Freigericht",		"50.142,9.166"	},
+	{ "Freising",			"48.40,11.74"	},
+	{ "Freudenstadt",		"48.46,8.41"	},
+	{ "Freyung",			"48.80,13.54"	},
+	{ "Friedrichshafen",		"47.66,9.48"	},
+	{ "Friesoythe",			"53.02,7.85"	},
+	{ "Fritzlar",			"51.13,9.27"	},
+	{ "Fulda",			"50.55,9.68"	},
+	{ "Fürstenfeldbruck",		"48.17,11.24"	},
+	{ "Fürth",			"49.47,10.98"	},
+	{ "Garmisch-Partenkirchen",	"47.49,11.10"	},
+	{ "Geilenkirchen",		"50.97,6.12"	},
+	{ "Gelnhausen",			"50.20,9.19"	},
+	{ "Gelsenkirchen",		"51.52,7.09"	},
+	{ "Gera",			"50.89,12.08"	},
+	{ "Geretsried",			"47.86,11.49"	},
+	{ "Germersheim",		"49.21,8.37"	},
+	{ "Gettorf",			"54.41,9.98"	},
+	{ "Gießen",			"50.58,8.68"	},
+	{ "Glauchau",			"50.82,12.55"	},
+	{ "Göppingen",			"48.71,9.65"	},
+	{ "Görlitz",			"51.15,14.97"	},
+	{ "Göttingen",			"51.54,9.92"	},
+	{ "Grafenau",			"48.86,13.39"	},
+	{ "Grafenwöhr",			"49.71,11.91"	},
+	{ "Greifswald",			"54.09,13.39"	},
+	{ "Grünberg",			"50.59,8.96"	},
+	{ "Gütersloh",			"51.90,8.39"	},
+	{ "Hagen",			"51.37,7.46"	},
+	{ "Hahn",			"49.96,7.27"	},
+	{ "Halle (Saale)",		"51.497,11.969"	},
+	{ "Halle (Westfalen)",		"52.06,8.36"	},
+	{ "Hamburg",			"53.55,9.99"	},
+	{ "Hamm",			"51.67,7.82"	},
+	{ "Hanau",			"50.13,8.93"	},
+	{ "Hannover",			"52.38,9.73"	},
+	{ "Harrislee",			"54.80,9.39"	},
+	{ "Heidelberg",			"49.40,8.67"	},
+	{ "Heilbronn",			"49.14,9.21"	},
+	{ "Helgoland",			"54.18,7.89"	},
+	{ "Hennigsdorf",		"52.63,13.20"	},
+	{ "Herne",			"51.54,7.20"	},
+	{ "Hilden",			"51.17,6.93"	},
+	{ "Hildesheim",			"52.15,9.96"	},
+	{ "Hinte",			"53.41,7.20"	},
+	{ "Hochheim",			"50.01,8.36"	},
+	{ "Hockenheimring",		"49.33,8.57"	},
+	{ "Hof",			"50.31,11.91"	},
+	{ "Holzkirchen",		"47.88,11.70"	},
+	{ "Hosten",			"49.89,6.62"	},
+	{ "Hürth",			"50.88,6.89"	},
+	{ "Husby",			"54.50,9.48"	},
+	{ "Husum",			"54.48,9.06"	},
+	{ "Idar-Oberstein",		"49.71,7.31"	},
+	{ "Ingolstadt",			"48.77,11.43"	},
+	{ "Iserlohn",			"51.38,7.70"	},
+	{ "Itzehoe",			"53.93,9.51"	},
+	{ "Jever",			"53.57,7.90"	},
+	{ "Jülich",			"50.92,6.36"	},
+	{ "Kall",			"50.54,6.56"	},
+	{ "Karlsruhe",			"49.01,8.40"	},
+	{ "Kassel",			"51.31,9.48"	},
+	{ "Kaufbeuren",			"47.88,10.63"	},
+	{ "Kempten",			"47.73,10.32"	},
+	{ "Kiel",			"54.32,10.12"	},
+	{ "Kitzingen",			"49.73,10.15"	},
+	{ "Koblenz",			"50.36,7.59"	},
+	{ "Köln",			"50.94,6.96"	},
+	{ "Konstanz",			"47.68,9.17"	},
+	{ "Krefeld",			"51.34,6.59"	},
+	{ "Kronshagen",			"54.34,10.09"	},
+	{ "Krumbach",			"48.25,10.37"	},
+	{ "Laarbruch",			"51.60,6.15"	},
+	{ "Lahr",			"48.33,7.87"	},
+	{ "Landshut",			"48.54,12.15"	},
+	{ "Langenhagen",		"52.45,9.74"	},
+	{ "Lausitzring",		"51.54,13.89"	},
+	{ "Lechfeld",			"48.19,10.86"	},
+	{ "Leck",			"54.77,8.98"	},
+	{ "Leer",			"53.24,7.47"	},
+	{ "Leipzig",			"51.34,12.37"	},
+	{ "Leverkusen",			"51.05,7.02"	},
+	{ "Lindenberg",			"47.60,9.89"	},
+	{ "List",			"55.02,8.43"	},
+	{ "Lübeck",			"53.87,10.69"	},
+	{ "Lüchow",			"52.97,11.15"	},
+	{ "Luckenwalde",		"52.09,13.16"	},
+	{ "Ludwigsburg",		"48.89,9.20"	},
+	{ "Ludwigshafen",		"49.48,8.45"	},
+	{ "Lüneburg",			"53.25,10.41"	},
+	{ "Magdeburg",			"52.12,11.63"	},
+	{ "Mainz",			"49.99,8.25"	},
+	{ "Mannheim",			"49.49,8.47"	},
+	{ "Marburg",			"50.80,8.77"	},
+	{ "Marienfelde",		"52.42,13.37"	},
+	{ "Marktbreit",			"49.67,10.15"	},
+	{ "Meiningen",			"50.57,10.42"	},
+	{ "Memmingen",			"47.98,10.18"	},
+	{ "Meppen",			"52.70,7.30"	},
+	{ "Merzig",			"49.45,6.64"	},
+	{ "Minden",			"52.30,8.89"	},
+	{ "Mönchengladbach",		"51.18,6.44"	},
+	{ "Mühldorf",			"48.25,12.52"	},
+	{ "München",			"48.14,11.58"	},
+	{ "Münster",			"51.96,7.63"	},
+	{ "Murnau",			"47.68,11.20"	},
+	{ "Mylau",			"50.62,12.26"	},
+	{ "Naumburg (Saale)",		"51.15,11.82"	},
+	{ "Neuberg",			"48.11,12.12"	},
+	{ "Neubrandenburg",		"53.57,13.28"	},
+	{ "Neumarkt",			"49.28,11.47"	},
+	{ "Neumünster",			"54.07,9.98"	},
+	{ "Neunkirchen",		"49.35,7.19"	},
+	{ "Neuruppin",			"52.92,12.80"	},
+	{ "Neuss",			"51.20,6.69"	},
+	{ "Neuwied",			"50.44,7.47"	},
+	{ "Niendorf (Ostsee)",		"53.99,10.83"	},
+	{ "Norden",			"53.60,7.20"	},
+	{ "Nordenham",			"53.50,8.49"	},
+	{ "Norderney",			"53.71,7.16"	},
+	{ "Nordhausen",			"51.50,10"	},
+	{ "Nordhausen",			"51.50,10"	},
+	{ "Nordheide",			"53.12,8.46"	},
+	{ "Nordhorn",			"52.43,7.07"	},
+	{ "Nördlingen",			"48.85,10.49"	},
+	{ "Nürburgring",		"50.34,6.95"	},
+	{ "Oberhausen",			"51.50,6.86"	},
+	{ "Oberpfaffenhofen",		"48.07,11.26"	},
+	{ "Oberstdorf",			"47.41,10.28"	},
+	{ "Ochsenfurt",			"49.66,10.07"	},
+	{ "Oeversee",			"54.70,9.43"	},
+	{ "Offenbach",			"50.10,8.78"	},
+	{ "Oldenburg",			"53.14,8.21"	},
+	{ "Oldersum",			"53.33,7.34"	},
+	{ "Oranienburg",		"52.75,13.24"	},
+	{ "Osnabrück",			"52.28,8.05"	},
+	{ "Otterndorf",			"53.81,8.90"	},
+	{ "Paderborn",			"51.72,8.76"	},
+	{ "Passau",			"48.57,13"	},
+	{ "Peine",			"52.32,10.24"	},
+	{ "Pfaffenhofen",		"48.52,11.50"	},
+	{ "Pfarrkirchen",		"48.42,12.94"	},
+	{ "Pforzheim",			"48.89,8.69"	},
+	{ "Pinneberg",			"53.65,9.79"	},
+	{ "Pirmasens",			"49.20,7.60"	},
+	{ "Plauen",			"50.50,12.14"	},
+	{ "Pocking",			"48.40,13.32"	},
+	{ "Potsdam",			"52.39,13.06"	},
+	{ "Prenzlau",			"53.32,13.86"	},
+	{ "Quickborn",			"53.73,9.91"	},
+	{ "Rastede",			"53.24,8.20"	},
+	{ "Recklinghausen",		"51.61,7.20"	},
+	{ "Regensburg",			"49.01,12.10"	},
+	{ "Remscheid",			"51.18,7.19"	},
+	{ "Rendsburg",			"54.31,9.66"	},
+	{ "Rennerod",			"50.61,8.07"	},
+	{ "Rosenheim",			"47.86,12.12"	},
+	{ "Rostock",			"54.09,12.10"	},
+	{ "Rüsselsheim",		"50.00,8.42"	},
+	{ "Saarbrücken",		"49.230,7.000"	},
+	{ "Sahlenburg",			"53.870,8.630"	},
+	{ "Salzgitter",			"52.080,10.330"	},
+	{ "Salzwedel",			"52.850,11.150"	},
+	{ "Schiffdorf",			"53.530,8.650"	},
+	{ "Schleswig",			"54.520,9.550"	},
+	{ "Schrobenhausen",		"48.550,11.270"	},
+	{ "Schwabach",			"49.330,11.030"	},
+	{ "Schwäbisch Hall",		"49.110,9.730"	},
+	{ "Schweinfurt",		"50.050,10.230"	},
+	{ "Schwerin",			"53.630,11.380"	},
+	{ "Siegburg",			"50.800,7.200"	},
+	{ "Siegen",			"50.870,8.030"	},
+	{ "Solingen",			"51.180,7.080"	},
+	{ "Starnberg",			"48.000,11.350"	},
+	{ "Straubing",			"48.880,12.570"	},
+	{ "Stuttgart",			"48.770,9.180"	},
+	{ "Sulingen",			"52.680,8.800"	},
+	{ "Sylt",			"54.880,8.350"	},
+	{ "Tönning",			"54.320,8.950"	},
+	{ "Traunstein",			"47.87,12.62"	},
+	{ "Travemünde",			"53.970,10.870"	},
+	{ "Trier",			"49.750,6.630"	},
+	{ "Tübingen",			"48.530,9.050"	},
+	{ "Ulm",			"48.400,10.000"	},
+	{ "Varel",			"53.18,9.49"	},
+	{ "Veitsbronn",			"49.520,10.880"	},
+	{ "Villingen-Schwenningen",	"48.070,8.450"	},
+	{ "Vilsbiburg",			"48.450,12.350"	},
+	{ "Vilshofen",			"49.23,12.04"	},
+	{ "Waldkirchen/Bayr.-Wald",	"48.730,13.600"	},
+	{ "Wallsbüll",			"54.580,9.000"	},
+	{ "Warnemünde",			"54.170,12.080"	},
+	{ "Weiden",			"49.680,12.160"	},
+	{ "Weimar",			"50.980,11.320"	},
+	{ "Weißenburg/Bayern",		"49.030,10.980"	},
+	{ "Wernigerode",		"51.830,10.780"	},
+	{ "Westerland/Sylt",		"54.900,8.300"	},
+	{ "Westerstede",		"53.250,7.930"	},
+	{ "Wetzlar",			"50.550,8.500"	},
+	{ "Wiesbaden",			"50.080,8.250"	},
+	{ "Wilhelmshaven",		"53.520,8.130"	},
+	{ "Wittenberge",		"53.000,11.750"	},
+	{ "Wittingen",			"52.730,10.720"	},
+	{ "Wolfsburg",			"52.430,10.800"	},
+	{ "Worms",			"49.61,8.31"	},
+	{ "Wuppertal",			"51.270,7.180"	},
+	{ "Würzburg",			"49.790,9.940"	},
+	{ "Zeven",			"53.300,9.280"	},
+	{ "Zirndorf",			"49.450,10.950"	},
+	{ "Zwickau",			"50.720,12.500"	}
+};
+
+#define WEATHER_LOCATION_OPTION_COUNT (sizeof(WEATHER_LOCATION_OPTIONS)/sizeof(weather_loc))
+
 #endif
diff --git a/src/gui/weather_norway_locations.h b/src/gui/weather_norway_locations.h
deleted file mode 100644
index 1ec86431e..000000000
--- a/src/gui/weather_norway_locations.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
-	Copyright (C) 2017,2018,2019 TangoCash
-
-	“Powered by Dark Sky” https://darksky.net/poweredby/
-
-	License: GPLv2
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation;
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef _WEATHER_NORWAY_LOCATION_H_
-#define _WEATHER_NORWAY_LOCATION_H_
-
-#include "weather_locations.h"
-
-// locations and coords taken from http://www.tageo.com
-const weather_loc WEATHER_NORWAY_LOCATION_OPTIONS[] =
-{
-	{ "Agotnes",			"60.410,5.020"	},
-	{ "Akrehamn-vedavagen",		"59.260,5.200"	},
-	{ "Alesund",			"62.480,6.200"	},
-	{ "Algard-figgjo",		"58.770,5.850"	},
-	{ "Alta",			"69.980,23.270"	},
-	{ "Al",				"60.640,8.560"	},
-	{ "Amot-geithus",		"59.900,9.900"	},
-	{ "Andalsnes",			"52.570,7.720"	},
-	{ "Andebu",			"59.330,10.080"	},
-	{ "Andenes",			"69.320,16.110"	},
-	{ "Aneby",			"60.080,10.870"	},
-	{ "Ardalstangen",		"61.240,7.700"	},
-	{ "Arendal",			"58.460,8.760"	},
-	{ "Arnes",			"60.130,11.470"	},
-	{ "Aroysund",			"59.180,10.460"	},
-	{ "Asgardstrand",		"59.350,10.460"	},
-	{ "Askim",			"59.580,11.160"	},
-	{ "Askoy",			"60.400,5.180"	},
-	{ "As",				"59.670,10.780"	},
-	{ "Aulifeltet",			"60.030,11.400"	},
-	{ "Aursmoen",			"59.920,11.430"	},
-	{ "Batsfjord",			"70.630,29.730"	},
-	{ "Bergen",			"60.380,5.340"	},
-	{ "Biri",			"60.970,10.500"	},
-	{ "Birkeland",			"58.330,8.230"	},
-	{ "Bjerkvik",			"68.560,17.520"	},
-	{ "Bjervamoen",			"59.320,9.130"	},
-	{ "Bjorkelangen",		"59.880,11.570"	},
-	{ "Bjornevatn",			"69.670,29.980"	},
-	{ "Blakstad",			"59.820,10.470"	},
-	{ "Bodo",			"67.290,14.370"	},
-	{ "Borkenes",			"68.780,16.180"	},
-	{ "Bo",				"59.420,9.060"	},
-	{ "Brandbu-jaren",		"60.430,10.470"	},
-	{ "Brattvag",			"62.600,6.450"	},
-	{ "Brekstad",			"63.680,9.680"	},
-	{ "Bronnoysund",		"65.470,12.220"	},
-	{ "Brumunddal",			"60.890,10.930"	},
-	{ "Bryne",			"58.730,5.650"	},
-	{ "Buvika-ilhaugen",		"63.250,10.070"	},
-	{ "Dokka",			"60.830,10.080"	},
-	{ "Dombas",			"62.080,9.130"	},
-	{ "Drammen",			"59.750,10.200"	},
-	{ "Drobak",			"59.670,10.650"	},
-	{ "Egersund",			"58.460,6.010"	},
-	{ "Eidsvoll",			"60.340,11.270"	},
-	{ "Eike",			"59.400,5.360"	},
-	{ "Elnesvagen",			"62.860,7.150"	},
-	{ "Elverum",			"60.890,11.540"	},
-	{ "Espeland",			"60.380,5.470"	},
-	{ "Evje",			"68.270,13.730"	},
-	{ "Fagernes",			"60.990,9.250"	},
-	{ "Fagerstrand",		"59.730,10.590"	},
-	{ "Fanahammeren",		"60.260,5.340"	},
-	{ "Farsund",			"58.090,6.780"	},
-	{ "Fauske",			"67.250,15.400"	},
-	{ "Fetsund",			"59.930,11.170"	},
-	{ "Fevik",			"58.380,8.700"	},
-	{ "Finnsnes",			"69.230,17.980"	},
-	{ "Fitjar",			"59.920,5.320"	},
-	{ "Flateby",			"59.830,11.170"	},
-	{ "Flekkefjord",		"58.310,6.680"	},
-	{ "Flisa",			"60.620,12.030"	},
-	{ "Floro",			"61.600,5.030"	},
-	{ "Fordesfjorden",		"59.420,5.400"	},
-	{ "Forde",			"61.460,5.870"	},
-	{ "Fosnavag-leinstrand",	"62.350,5.650"	},
-	{ "Fredrikstad-sarpsborg",	"59.240,10.940"	},
-	{ "Frekhaug",			"60.520,5.250"	},
-	{ "Geilo",			"60.520,8.200"	},
-	{ "Gjovik",			"60.790,10.650"	},
-	{ "Gjusvik",			"58.200,8.030"	},
-	{ "Glomfjord",			"66.820,13.970"	},
-	{ "Gol",			"60.700,8.950"	},
-	{ "Gran-ringstad",		"60.370,10.570"	},
-	{ "Granrudmoen",		"61.280,10.440"	},
-	{ "Gravdal",			"68.120,13.500"	},
-	{ "Grimstad",			"58.350,8.600"	},
-	{ "Gronlund",			"60.080,11.100"	},
-	{ "Gronvoll",			"60.120,10.940"	},
-	{ "Grua",			"60.270,10.670"	},
-	{ "Gullhaug",			"59.500,10.250"	},
-	{ "Hagavik",			"60.180,5.430"	},
-	{ "Halden",			"59.130,11.370"	},
-	{ "Hamar",			"60.810,11.080"	},
-	{ "Hammerfest",			"70.680,23.710"	},
-	{ "Hareid",			"62.370,6.030"	},
-	{ "Harestua",			"60.100,10.720"	},
-	{ "Harstad",			"68.810,16.520"	},
-	{ "Haugesund",			"59.420,5.270"	},
-	{ "Hauge",			"58.350,6.280"	},
-	{ "Hauknes",			"66.280,14.070"	},
-	{ "Helgeroa-nevlunghamn",	"59.000,9.850"	},
-	{ "Hermannsverk-leikanger",	"61.190,6.780"	},
-	{ "Herre",			"59.100,9.570"	},
-	{ "Hesseng",			"69.680,29.990"	},
-	{ "Holmestrand",		"59.500,10.310"	},
-	{ "Hommelvik",			"63.420,10.800"	},
-	{ "Hommersak",			"58.930,5.850"	},
-	{ "Honefoss",			"60.190,10.230"	},
-	{ "Honningsvag",		"70.980,25.980"	},
-	{ "Horten",			"59.420,10.470"	},
-	{ "Hov",			"60.710,10.360"	},
-	{ "Hoyanger",			"61.220,6.080"	},
-	{ "Husnes",			"59.870,5.770"	},
-	{ "Hylkje",			"60.510,5.350"	},
-	{ "Indre arna",			"60.420,5.480"	},
-	{ "Innbygda",			"61.320,12.270"	},
-	{ "Jessheim",			"60.150,11.180"	},
-	{ "Jevnaker",			"60.260,10.400"	},
-	{ "Jorpeland",			"59.020,6.050"	},
-	{ "Jorstadmoen-faberg",		"61.170,10.420"	},
-	{ "Kabelvag",			"68.210,14.480"	},
-	{ "Kapp",			"60.710,10.860"	},
-	{ "Karasjok",			"69.450,25.500"	},
-	{ "Karlshus",			"59.350,10.870"	},
-	{ "Kautokeino",			"68.980,23.130"	},
-	{ "Kirkenaer",			"60.470,12.050"	},
-	{ "Kirkenes",			"69.730,30.030"	},
-	{ "Kjenner",			"59.790,10.280"	},
-	{ "Klaebu",			"64.080,11.730"	},
-	{ "Kleppe-verdalen",		"58.780,5.640"	},
-	{ "Klofta",			"60.070,11.150"	},
-	{ "Knarrevik-straume",		"60.370,5.160"	},
-	{ "Knarvik",			"60.540,5.290"	},
-	{ "Kolvereid",			"64.850,11.600"	},
-	{ "Kongsberg",			"59.670,9.630"	},
-	{ "Kongsvinger",		"60.200,11.990"	},
-	{ "Kopervik",			"59.290,5.310"	},
-	{ "Koppang",			"61.570,11.070"	},
-	{ "Kragero",			"58.870,9.400"	},
-	{ "Kristiansand",		"58.150,7.990"	},
-	{ "Kristiansund",		"63.120,7.760"	},
-	{ "Kvernaland",			"58.790,5.730"	},
-	{ "Kyrksaeterora",		"63.280,9.100"	},
-	{ "Lakselv",			"70.050,24.930"	},
-	{ "Larkollen",			"59.330,10.670"	},
-	{ "Larvik",			"59.070,9.990"	},
-	{ "Lauve-viksjord",		"59.070,10.150"	},
-	{ "Leirvik",			"59.800,5.490"	},
-	{ "Leknes",			"68.160,13.600"	},
-	{ "Lervik",			"59.270,10.760"	},
-	{ "Levanger",			"63.750,11.320"	},
-	{ "Lierbyen",			"59.830,10.250"	},
-	{ "Liknes",			"58.320,58.320"	},
-	{ "Lillehammer",		"61.120,10.470"	},
-	{ "Lillesand",			"58.250,8.390"	},
-	{ "Lodingen",			"68.420,15.960"	},
-	{ "Loding",			"67.300,14.750"	},
-	{ "Lopsmarka",			"67.320,14.450"	},
-	{ "Lostad",			"60.110,10.930"	},
-	{ "Loten",			"60.810,11.330"	},
-	{ "Lyefjell",			"58.750,5.750"	},
-	{ "Lyngdal",			"58.150,7.100"	},
-	{ "Maloy",			"61.930,5.110"	},
-	{ "Malvik",			"63.430,10.680"	},
-	{ "Mandal",			"58.030,7.440"	},
-	{ "Maura",			"60.260,11.040"	},
-	{ "Melbu",			"68.510,14.800"	},
-	{ "Melhus",			"63.300,10.290"	},
-	{ "Melsomvik",			"59.230,10.340"	},
-	{ "Moelv",			"60.930,10.700"	},
-	{ "Moi",			"58.460,6.540"	},
-	{ "Molde",			"62.740,7.180"	},
-	{ "Mosjoen",			"65.840,13.220"	},
-	{ "Moss",			"59.430,10.680"	},
-	{ "Mo i rana",			"66.330,14.170" },
-	{ "Myre",			"69.110,15.960"	},
-	{ "Mysen",			"59.560,11.330"	},
-	{ "Naerbo",			"58.670,5.650"	},
-	{ "Namsos",			"64.480,11.520"	},
-	{ "Narvik",			"68.450,17.420"	},
-	{ "Nesbyen",			"60.580,9.110"	},
-	{ "Nesna",			"66.210,13.030"	},
-	{ "Nesoddtangen",		"59.860,10.670"	},
-	{ "Nodeland",			"58.160,7.840"	},
-	{ "Nordfjordeid",		"61.900,6.000"	},
-	{ "Nordstrand",			"62.510,6.050"	},
-	{ "Norheimsund",		"60.370,6.140"	},
-	{ "Notodden",			"59.570,9.260"	},
-	{ "Odda",			"60.070,6.540"	},
-	{ "Oppdal",			"62.600,9.660"	},
-	{ "Orje",			"59.480,11.670"	},
-	{ "Orkanger-fannrem",		"63.300,9.860"	},
-	{ "Ornes",			"66.870,13.700"	},
-	{ "Orsta",			"62.210,6.140"	},
-	{ "Oslo",			"59.910,10.750"	},
-	{ "Osoyro",			"60.190,5.450"	},
-	{ "Otta",			"61.780,9.520"	},
-	{ "Ovre ardal",			"61.320,7.810"	},
-	{ "Oystese",			"60.400,6.210"	},
-	{ "Porsgrunn-skien",		"59.150,9.660"	},
-	{ "Raholt",			"60.270,11.180"	},
-	{ "Rakkestad",			"59.420,11.360"	},
-	{ "Raufoss",			"60.730,10.630"	},
-	{ "Rena",			"61.150,11.330"	},
-	{ "Rensvik",			"63.100,7.820"	},
-	{ "Revetal-bergsasen",		"59.360,10.280"	},
-	{ "Ringebu",			"61.550,10.110"	},
-	{ "Risor",			"58.730,9.220"	},
-	{ "Rjukan",			"59.880,8.560"	},
-	{ "Roa-lunner",			"60.300,10.620" },
-	{ "Rognan",			"67.100,15.390"	},
-	{ "Roros",			"62.580,11.380"	},
-	{ "Rorvik",			"64.870,11.240"	},
-	{ "Rotnes",			"60.050,10.880"	},
-	{ "Royken",			"59.750,10.380"	},
-	{ "Ryggebyen",			"59.390,10.720"	},
-	{ "Rypefjord",			"70.630,23.670"	},
-	{ "Saetre",			"59.680,10.520"	},
-	{ "Sagvag",			"59.780,5.380"	},
-	{ "Sandane",			"61.780,6.220"	},
-	{ "Sandefjord",			"59.140,10.210"	},
-	{ "Sande",			"59.590,10.210"	},
-	{ "Sandnessjoen",		"66.020,12.630"	},
-	{ "Sauda",			"59.650,6.340"	},
-	{ "Selvik",			"59.570,10.270"	},
-	{ "Sem",			"59.290,10.300"	},
-	{ "Setermoen",			"68.890,18.330"	},
-	{ "Siggerud",			"59.810,10.880"	},
-	{ "Silsand",			"69.230,17.930"	},
-	{ "Skalevik",			"58.080,8.010"	},
-	{ "Skarnes",			"60.250,11.700"	},
-	{ "Skei-surnadalsora",		"62.970,8.650"	},
-	{ "Skiptvet",			"59.460,11.180"	},
-	{ "Ski",			"59.720,10.830"	},
-	{ "Skjeberg",			"59.220,11.200"	},
-	{ "Skjervoy",			"70.050,21.000"	},
-	{ "Skjonhaug",			"59.640,11.310"	},
-	{ "Skodje",			"62.510,6.670"	},
-	{ "Skogn",			"63.710,11.230"	},
-	{ "Skoppum",			"59.380,10.420"	},
-	{ "Skotterud",			"59.980,12.130"	},
-	{ "Skreia",			"60.650,10.940"	},
-	{ "Skudeneshamn",		"59.160,5.250"	},
-	{ "Skulestadmoen",		"60.690,6.450"	},
-	{ "Softeland",			"60.250,5.430"	},
-	{ "Sogndalsfjora",		"60.250,5.440"	},
-	{ "Sogne",			"58.100,7.780"	},
-	{ "Son-store",			"4700,59.520"	},
-	{ "Sorreisa",			"69.150,18.120"	},
-	{ "Sortland",			"68.710,15.380"	},
-	{ "Sorumsand",			"59.990,11.260"	},
-	{ "Spetalen",			"60.180,11.900"	},
-	{ "Spydeberg",			"59.620,11.090"	},
-	{ "Stange",			"60.730,11.220"	},
-	{ "Stavanger",			"58.970,5.710"	},
-	{ "Stavern",			"59.000,10.030"	},
-	{ "Steinkjer",			"64.020,11.480"	},
-	{ "Steinsasen",			"60.090,10.270"	},
-	{ "Stjordalshalsen",		"63.480,10.940"	},
-	{ "Stokke",			"59.230,10.310"	},
-	{ "Stokmarknes",		"68.560,14.910"	},
-	{ "Storen",			"63.040,10.260"	},
-	{ "Storslett",			"69.770,21.070"	},
-	{ "Stranda",			"62.320,6.930"	},
-	{ "Stryn",			"61.920,6.780"	},
-	{ "Sunde-valen",		"59.850,5.710"	},
-	{ "Sunndalsora",		"62.680,8.580"	},
-	{ "Svelvik",			"59.620,10.410"	},
-	{ "Svolvaer",			"68.260,14.550"	},
-	{ "Svortland",			"59.770,5.120"	},
-	{ "Sykkylven",			"62.400,6.590"	},
-	{ "Tananger",			"58.940,5.600"	},
-	{ "Tau",			"59.080,5.920"	},
-	{ "Teigebyen",			"60.230,11.000"	},
-	{ "Tjome",			"59.130,10.390"	},
-	{ "Tofte",			"59.570,10.610"	},
-	{ "Togrenda",			"59.740,10.750"	},
-	{ "Tomter",			"59.670,11.010"	},
-	{ "Tonsberg",			"59.270,10.420"	},
-	{ "Tranby",			"59.790,10.280"	},
-	{ "Tromso",			"69.660,18.940"	},
-	{ "Trondheim",			"63.440,10.400"	},
-	{ "Tvedestrand",		"58.620,8.930"	},
-	{ "Tveit",			"58.260,8.130"	},
-	{ "Tynset",			"62.280,10.770"	},
-	{ "Ulefoss",			"59.280,9.260"	},
-	{ "Ulsteinvik",			"62.340,5.870"	},
-	{ "Vadfoss-helle",		"58.900,9.360"	},
-	{ "Vadso",			"70.090,29.740"	},
-	{ "Vagamo",			"61.880,9.110"	},
-	{ "Vang",			"60.210,10.330"	},
-	{ "Vanse",			"58.100,6.690"	},
-	{ "Vardo",			"70.390,31.060"	},
-	{ "Varhaug",			"58.630,5.650"	},
-	{ "Vatne",			"62.560,6.620"	},
-	{ "Vear",			"59.250,10.360"	},
-	{ "Vennesla",			"58.260,7.960"	},
-	{ "Verdalsora",			"63.800,11.490"	},
-	{ "Vestby",			"59.600,10.740"	},
-	{ "Vestfossen",			"58.750,9.870"	},
-	{ "Vestnes",			"62.620,7.080"	},
-	{ "Vigrestad",			"58.580,5.680"	},
-	{ "Vikersund",			"59.990,10.010"	},
-	{ "Vinstra",			"61.600,9.750"	},
-	{ "Volda",			"62.150,6.070"	},
-	{ "Vossevangen",		"60.640,6.430"	},
-	{ "Ytre arna",			"60.470,5.430"	},
-	{ "Ytre enebakk",		"59.730,11.060"	}
-};
-
-#define WEATHER_NORWAY_LOCATION_OPTION_COUNT (sizeof(WEATHER_NORWAY_LOCATION_OPTIONS)/sizeof(weather_loc))
-
-#endif