diff --git a/data/flags/norway/CMakeLists.txt b/data/flags/norway/CMakeLists.txt index deecebe..9743b83 100644 --- a/data/flags/norway/CMakeLists.txt +++ b/data/flags/norway/CMakeLists.txt @@ -1,25 +1,18 @@ ########### install files ############### install(FILES - akershus.png - aust-agder.png - buskerud.png - finnmark.png - hedmark.png - hordaland.png + agder.png + innlandet.png more_og_romsdal.png nordland.png - oppland.png oslo.png - ostfold.png rogaland.png - sogn_og_fjordane.png - telemark.png - troms.png + troms_og_finnmark.png trondelag.png - vest-agder.png - vestfold.png + vestfold_og_telemark.png + vestland.png + viken.png DESTINATION ${KDE_INSTALL_DATADIR}/kgeography/flags/norway) diff --git a/data/flags/norway/README b/data/flags/norway/README index 7302141..2a41107 100644 --- a/data/flags/norway/README +++ b/data/flags/norway/README @@ -1,9 +1,19 @@ -These ‘flags’ (really coat of arms) for the Norwegian -counties were downloaded from Wikipedia +The ‘flags’ (really coat of arms) for the pre-2020 +Norwegian counties were downloaded from Wikipedia https://no.wikipedia.org/wiki/Fylkesv%C3%A5pen_i_Norge on 2018-08-27. They were then converted to PNG files with a common height (200 pixels). +For the new counties (official from January 2020), +the coat of arms of Agder, Innlandet, Vestfold og Telemark, +Vestland and Viken have been taken from the official +graphic profiles of these counties. For Troms og Finnmark, +a (temporary) coat of arms have been created by merging the +(Wikipedia) images of the coat of arms for the two (pre-2020) +counties Troms and Finnmark. + Note that the images at Wikipedia have been improved over time, so the KGeography images should probably -also be updated in the future. +also be updated in the future. And the coat of arms +should be taken from official sources (instead of +from Wikipedia) if possible. diff --git a/data/flags/norway/agder.png b/data/flags/norway/agder.png new file mode 100644 index 0000000..118d5d3 Binary files /dev/null and b/data/flags/norway/agder.png differ diff --git a/data/flags/norway/akershus.png b/data/flags/norway/akershus.png deleted file mode 100644 index 90b105f..0000000 Binary files a/data/flags/norway/akershus.png and /dev/null differ diff --git a/data/flags/norway/aust-agder.png b/data/flags/norway/aust-agder.png deleted file mode 100644 index 2d0763e..0000000 Binary files a/data/flags/norway/aust-agder.png and /dev/null differ diff --git a/data/flags/norway/buskerud.png b/data/flags/norway/buskerud.png deleted file mode 100644 index b951420..0000000 Binary files a/data/flags/norway/buskerud.png and /dev/null differ diff --git a/data/flags/norway/finnmark.png b/data/flags/norway/finnmark.png deleted file mode 100644 index 0d6fd47..0000000 Binary files a/data/flags/norway/finnmark.png and /dev/null differ diff --git a/data/flags/norway/hedmark.png b/data/flags/norway/hedmark.png deleted file mode 100644 index b598a46..0000000 Binary files a/data/flags/norway/hedmark.png and /dev/null differ diff --git a/data/flags/norway/hordaland.png b/data/flags/norway/hordaland.png deleted file mode 100644 index 55cdcd6..0000000 Binary files a/data/flags/norway/hordaland.png and /dev/null differ diff --git a/data/flags/norway/innlandet.png b/data/flags/norway/innlandet.png new file mode 100644 index 0000000..f91cb79 Binary files /dev/null and b/data/flags/norway/innlandet.png differ diff --git a/data/flags/norway/oppland.png b/data/flags/norway/oppland.png deleted file mode 100644 index 826e59d..0000000 Binary files a/data/flags/norway/oppland.png and /dev/null differ diff --git a/data/flags/norway/ostfold.png b/data/flags/norway/ostfold.png deleted file mode 100644 index 9e675e1..0000000 Binary files a/data/flags/norway/ostfold.png and /dev/null differ diff --git a/data/flags/norway/sogn_og_fjordane.png b/data/flags/norway/sogn_og_fjordane.png deleted file mode 100644 index c95cb8e..0000000 Binary files a/data/flags/norway/sogn_og_fjordane.png and /dev/null differ diff --git a/data/flags/norway/telemark.png b/data/flags/norway/telemark.png deleted file mode 100644 index 25f077e..0000000 Binary files a/data/flags/norway/telemark.png and /dev/null differ diff --git a/data/flags/norway/troms.png b/data/flags/norway/troms.png deleted file mode 100644 index a147cc4..0000000 Binary files a/data/flags/norway/troms.png and /dev/null differ diff --git a/data/flags/norway/troms_og_finnmark.png b/data/flags/norway/troms_og_finnmark.png new file mode 100644 index 0000000..794a5ee Binary files /dev/null and b/data/flags/norway/troms_og_finnmark.png differ diff --git a/data/flags/norway/vest-agder.png b/data/flags/norway/vest-agder.png deleted file mode 100644 index 12e82be..0000000 Binary files a/data/flags/norway/vest-agder.png and /dev/null differ diff --git a/data/flags/norway/vestfold.png b/data/flags/norway/vestfold.png deleted file mode 100644 index c90bed8..0000000 Binary files a/data/flags/norway/vestfold.png and /dev/null differ diff --git a/data/flags/norway/vestfold_og_telemark.png b/data/flags/norway/vestfold_og_telemark.png new file mode 100644 index 0000000..745581c Binary files /dev/null and b/data/flags/norway/vestfold_og_telemark.png differ diff --git a/data/flags/norway/vestland.png b/data/flags/norway/vestland.png new file mode 100644 index 0000000..6d4b842 Binary files /dev/null and b/data/flags/norway/vestland.png differ diff --git a/data/flags/norway/viken.png b/data/flags/norway/viken.png new file mode 100644 index 0000000..1a90150 Binary files /dev/null and b/data/flags/norway/viken.png differ diff --git a/data/norway.kgm b/data/norway.kgm index ba6cc50..14475c8 100644 --- a/data/norway.kgm +++ b/data/norway.kgm @@ -1,205 +1,135 @@ norway.png Norway Counties Mikolaj Machowski / Karl Ove Hufthammer Frontier yes 0 0 0 Not Norway yes 220 220 220 - Finnmark - Vadsø - norway/finnmark.png - - 241 - 14 - 14 - - - - Troms - Tromsø - norway/troms.png + Troms og Finnmark + Tromsø/Vadsø + norway/troms_og_finnmark.png 14 41 241 Nordland Bodø norway/nordland.png 14 238 241 Trøndelag Steinkjer norway/trondelag.png 241 142 14 Møre og Romsdal Molde norway/more_og_romsdal.png 198 0 255 - Oppland - Lillehammer - norway/oppland.png - - 255 - 255 - 0 - - - - Hedmark - Hamar - norway/hedmark.png + Innlandet + Hamar/Lillehammer + norway/innlandet.png 241 14 137 - Sogn og Fjordane - Leikanger - norway/sogn_og_fjordane.png - - 149 - 137 - 130 - - - - Hordaland - Bergen - norway/hordaland.png + Vestland + Bergen/Leikanger + norway/vestland.png 45 95 47 Rogaland Stavanger norway/rogaland.png 255 79 79 - Vest-Agder - Kristiansand - norway/vest-agder.png - - 18 - 235 - 29 - - - - Aust-Agder - Arendal - norway/aust-agder.png + Agder + Kristiansand/Arendal + norway/agder.png 255 186 0 - Telemark - Skien - norway/telemark.png - - 189 - 217 - 215 - - - - Buskerud - Drammen - norway/buskerud.png + Viken + Oslo/Drammen/Sarpsborg/Moss + norway/viken.png 45 48 95 - Vestfold - Tønsberg - norway/vestfold.png + Vestfold og Telemark + Skien/Tønsberg + norway/vestfold_og_telemark.png 125 172 57 Oslo Oslo norway/oslo.png 168 223 255 - - Akershus - Oslo - norway/akershus.png - - 255 - 102 - 0 - - - - Østfold - Sarpsborg - norway/ostfold.png - - 219 - 185 - 228 - - diff --git a/data/norway.png b/data/norway.png index d835fde..5b46bc0 100644 Binary files a/data/norway.png and b/data/norway.png differ