diff options
| author | Stefan Wildemann <metalstrolch@users.noreply.github.com> | 2019-08-28 09:12:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-28 09:12:57 +0200 |
| commit | b7e97275e7dc35c90f2e18ecd73434f7c7c0d406 (patch) | |
| tree | c411063c38779dd50f5e8c546a481ce3cf5bb777 | |
| parent | c0d2391a2ab316bd056812f1556616b4a06d74c1 (diff) | |
| parent | bcc10a828e53153b5bda731f6fbb3f0f6fb4aec1 (diff) | |
| download | navit-b7e97275e7dc35c90f2e18ecd73434f7c7c0d406.tar.gz | |
Merge branch 'trunk' into multipolygon
| -rw-r--r-- | .circleci/config.yml | 2 | ||||
| -rw-r--r-- | navit/country.c | 1 | ||||
| -rw-r--r-- | navit/icons/country_XK.svgz | bin | 0 -> 4188 bytes | |||
| -rw-r--r-- | navit/maptool/osm.c | 1 |
4 files changed, 3 insertions, 1 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 9aabd4072..b4fef97e0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -61,7 +61,7 @@ jobs: command: mkdir ../rpmbuild - run: name: run build - command: ls -lah ../rpmbuild && docker run -e VERSION_ID=2.2.1.18 -v `pwd`/../rpmbuild:/home/nemo/rpmbuild:rw -v `pwd`:/home/nemo/navit hoehnp/sailfishos-platform-sdk:2.2.1.18-r1 /bin/bash -x /home/nemo/navit/contrib/sailfish/build_sailfish_ci.sh + command: ls -lah ../rpmbuild && docker run -e VERSION_ID=3.1.0.12 -v `pwd`/../rpmbuild:/home/nemo/rpmbuild:rw -v `pwd`:/home/nemo/navit hoehnp/sailfishos-platform-sdk:3.1.0.12 /bin/bash -x /home/nemo/navit/contrib/sailfish/build_sailfish_ci.sh - store_artifacts: name: Store rpm path: ../rpmbuild/RPMS/ diff --git a/navit/country.c b/navit/country.c index 23af61f81..962420366 100644 --- a/navit/country.c +++ b/navit/country.c @@ -284,6 +284,7 @@ static struct country country[]= { {548, "VAN", "VU", "VUT", /* 548 */ _n("Vanuatu")}, {876, NULL, "WF", "WLF", /* 876 */ _n("Wallis and Futuna")}, {882, "WS", "WS", "WSM", /* 882 */ _n("Samoa")}, + {412, "XK", "XK", "XXK", /* 412 */ _n("Kosovo")}, {887, "YAR", "YE", "YEM", /* 887 */ _n("Yemen")}, {175, NULL, "YT", "MYT", /* 175 */ _n("Mayotte")}, {710, "ZA", "ZA", "ZAF", /* 710 */ _n("South Africa") }, diff --git a/navit/icons/country_XK.svgz b/navit/icons/country_XK.svgz Binary files differnew file mode 100644 index 000000000..4718a5de9 --- /dev/null +++ b/navit/icons/country_XK.svgz diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c index 9fbc36251..6fd05674d 100644 --- a/navit/maptool/osm.c +++ b/navit/maptool/osm.c @@ -261,6 +261,7 @@ struct country_table { { 404,"Kenya"}, { 408,"Korea, Democratic People's Republic of"}, { 410,"Korea, Republic of"}, + { 412,"Kosovo,Kosova"}, { 414,"Kuwait"}, { 417,"Kyrgyzstan"}, { 418,"Lao People's Democratic Republic"}, |