diff options
| author | mvglasow <michael@vonglasow.com> | 2019-01-08 20:19:42 +0100 |
|---|---|---|
| committer | jkoan <jkoan@users.noreply.github.com> | 2019-01-08 20:19:42 +0100 |
| commit | 7059f7c9d52881448b0d626f2ecb7e4bb8980cd2 (patch) | |
| tree | 4110b9859455a7c50a4981c21e20fcf8f2fe6927 /navit/maptool | |
| parent | 3fafe67dc0f89375a2fa72ab6456e36fddb8e57c (diff) | |
| download | navit-7059f7c9d52881448b0d626f2ecb7e4bb8980cd2.tar.gz | |
Move Android build to separate script (#727)
* Add:circleci:Install dependencies before the first build step
Signed-off-by: mvglasow <michael -at- vonglasow.com>
* Refactor:core:Make style check happy
Signed-off-by: mvglasow <michael -at- vonglasow.com>
* Refactor:core:Make style check happy
Signed-off-by: mvglasow <michael -at- vonglasow.com>
* Fix:circleci:ninja-build is a build dependency
Signed-off-by: mvglasow <michael -at- vonglasow.com>
* Add:circleci:Install Android cmake instead of ninja-build
Signed-off-by: mvglasow <michael -at- vonglasow.com>
* Refactor:circleci:Move Android build to external script
Signed-off-by: mvglasow <michael -at- vonglasow.com>
* Fix:circleci:Fix globbing errors
Signed-off-by: mvglasow <michael -at- vonglasow.com>
Diffstat (limited to 'navit/maptool')
| -rw-r--r-- | navit/maptool/boundaries.c | 3 | ||||
| -rw-r--r-- | navit/maptool/osm.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/navit/maptool/boundaries.c b/navit/maptool/boundaries.c index e7dc90123..2f64d092c 100644 --- a/navit/maptool/boundaries.c +++ b/navit/maptool/boundaries.c @@ -131,7 +131,8 @@ static GList *process_boundaries_setup(FILE *boundaries, struct relations *relat relations_add_relation_member_entry(relations, relations_func, boundary, (gpointer)role, rel_member_way, osm_id); } if(member_type==rel_member_relation) { - if (!g_strcmp0(rolestr,"outer") || !g_strcmp0(rolestr,"exclave") || !g_strcmp0(rolestr,"inner") || !g_strcmp0(rolestr,"enclave")) + if (!g_strcmp0(rolestr,"outer") || !g_strcmp0(rolestr,"exclave") || !g_strcmp0(rolestr,"inner") + || !g_strcmp0(rolestr,"enclave")) has_subrelations++; } } diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c index e36234775..f640c8674 100644 --- a/navit/maptool/osm.c +++ b/navit/maptool/osm.c @@ -1619,7 +1619,8 @@ void osm_end_relation(struct maptool_osm *osm) { } else type=type_none; - if ((!g_strcmp0(relation_type, "multipolygon") || !g_strcmp0(relation_type, "boundary")) && (boundary || type!=type_none)) { + if ((!g_strcmp0(relation_type, "multipolygon") || !g_strcmp0(relation_type, "boundary")) + && (boundary || type!=type_none)) { item_bin_write(tmp_item_bin, osm->boundaries); } |