diff options
| author | mdankov <mdankov@users.noreply.github.com> | 2022-07-25 07:27:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-25 06:27:42 +0200 |
| commit | 0338c1f696e01cd89c26ea7854cfc110c283f069 (patch) | |
| tree | 072b94a2afddb8e8c91445802f80429471351d83 | |
| parent | 0eb1e22770a741e3e0600a7467fefce100606538 (diff) | |
| download | navit-0338c1f696e01cd89c26ea7854cfc110c283f069.tar.gz | |
fix:maptool:skip changeset elements and their tags in the osm xml file. (#1193)
Deny <tag k=... v=..> processing before first <node> element is read.
Let maptool silently skip <boundary> and <changeset> elements
| -rw-r--r-- | navit/maptool/osm_xml.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/navit/maptool/osm_xml.c b/navit/maptool/osm_xml.c index 9fe3ac093..66971bc71 100644 --- a/navit/maptool/osm_xml.c +++ b/navit/maptool/osm_xml.c @@ -172,6 +172,7 @@ int map_collect_data_osm(FILE *in, struct maptool_osm *osm) { int size=BUFFER_SIZE; char buffer[BUFFER_SIZE]; char *p; + int process_tags=0; sig_alrm(0); if (!fgets(buffer, size, in) || !xml_declaration_in_line(buffer)) { fprintf(stderr,"FATAL: First line does not start with XML declaration;\n" @@ -188,11 +189,17 @@ int map_collect_data_osm(FILE *in, struct maptool_osm *osm) { } if (!strncmp(p, "<osm ",5)) { } else if (!strncmp(p, "<bound ",7)) { + } else if (!strncmp(p, "<boundary ",10)) { + } else if (!strncmp(p, "<changeset ",11)) { + } else if (!strncmp(p, "</changeset>",12)) { } else if (!strncmp(p, "<node ",6)) { if (!parse_node(p)) fprintf(stderr,"WARNING: failed to parse %s\n", buffer); processed_nodes++; + process_tags=1; } else if (!strncmp(p, "<tag ",5)) { + if (!process_tags) + continue; if (!parse_tag(p)) fprintf(stderr,"WARNING: failed to parse %s\n", buffer); } else if (!strncmp(p, "<way ",5)) { |