diff options
| author | Stefan Wildemann <metalstrolch@users.noreply.github.com> | 2021-09-06 11:04:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-06 11:04:23 +0200 |
| commit | 6879f0ad955f87f90414083795ea7da8621acf24 (patch) | |
| tree | 4713be987ae35a52e1919f5d76be38f168677894 | |
| parent | 1730a7152135990ef384ba1e9f712877b38e8ccc (diff) | |
| parent | e071fb187020c81d0cc0de190cb4b7c60e589ce8 (diff) | |
| download | navit-6879f0ad955f87f90414083795ea7da8621acf24.tar.gz | |
Merge branch 'trunk' into cancel_drawing_on_resize
| -rw-r--r-- | README.md | 11 | ||||
| -rw-r--r-- | navit/maptool/osm.c | 2 |
2 files changed, 7 insertions, 6 deletions
@@ -10,11 +10,12 @@ Navit on Linux based Carputer:  -<p> -<a href="https://play.google.com/store/apps/details?id=org.navitproject.navit"><img src="http://switzerland.tasis.com/uploaded/images2/appstore_button_google.png" height="100"/></a> - -<a href="https://f-droid.org/repository/browse/?fdfilter=navit&fdid=org.navitproject.navit"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Get_it_on_F-Droid.svg/200px-Get_it_on_F-Droid.svg.png" height="100"/></a> -</p> +[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" + alt="Get it on F-Droid" + height="130">](https://f-droid.org/packages/org.navitproject.navit/) +[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" + alt="Get it on Google Play" + height="130">](https://play.google.com/store/apps/details?id=org.navitproject.navit) Navit ===== diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c index fcfc46b36..aece0ea7e 100644 --- a/navit/maptool/osm.c +++ b/navit/maptool/osm.c @@ -1684,6 +1684,7 @@ static inline void osm_end_relation_multipolygon (struct maptool_osm * osm) { /*Don't write out multipolygons that will result in unknown types if -n is given. *So we don't process useless multipolygons. May save a lot of time. */ + tmp_item_bin->type = types[a]; if(filter_unknown(tmp_item_bin)) continue; /* no need to clone the item in memory. We just write it out multiple times */ @@ -1691,7 +1692,6 @@ static inline void osm_end_relation_multipolygon (struct maptool_osm * osm) { /*add duplicate tag if 2nd type. The tag stays for all subsequent writes */ item_bin_add_attr_int(tmp_item_bin, attr_duplicate, 1); } - tmp_item_bin->type = types[a]; item_bin_write(tmp_item_bin, osm->multipolygons); } } else { |