Skip to content

Commit

Permalink
de-namespace full geometry content in output
Browse files Browse the repository at this point in the history
  • Loading branch information
tyrasd committed Aug 27, 2016
1 parent a46c5e0 commit 4307e08
Showing 1 changed file with 11 additions and 15 deletions.
26 changes: 11 additions & 15 deletions index.js
Expand Up @@ -544,24 +544,16 @@ osmtogeojson = function( data, options ) {
continue; // ignore relations without members (e.g. returned by an ids_only query)
}
for (var j=0;j<rel.members.length;j++) {
var m;
switch (rel.members[j].type) {
case "node":
m = nodeids[rel.members[j].ref];
break;
case "way":
m = wayids[rel.members[j].ref];
break;
case "relation":
m = relids[rel.members[j].ref];
break;
var m_type = rel.members[j].type;
var m_ref = rel.members[j].ref;
if (typeof m_ref !== "number") {
// de-namespace full geometry content
m_ref = m_ref.replace("_fullGeom", "");
}
if (!m) {
if (options.verbose) console.warn('Relation',rel.type+'/'+rel.id,'member',rel.members[j].type+'/'+rel.members[j].id,'ignored because it has an invalid type');
if (!relsmap[m_type]) {
if (options.verbose) console.warn('Relation',rel.type+'/'+rel.id,'member',m_type+'/'+m_ref,'ignored because it has an invalid type');
continue;
}
var m_type = rel.members[j].type;
var m_ref = rel.members[j].ref;
if (typeof relsmap[m_type][m_ref] === "undefined")
relsmap[m_type][m_ref] = [];
relsmap[m_type][m_ref].push({
Expand Down Expand Up @@ -852,6 +844,10 @@ osmtogeojson = function( data, options ) {
}
if (ways[i].is_multipolygon_outline)
continue; // ignore ways which are already rendered as (part of) a multipolygon
if (typeof ways[i].id !== "number") {
// remove full geometry namespace for output
ways[i].id = +ways[i].id.replace("_fullGeom", "");
}
ways[i].tainted = false;
ways[i].hidden = false;
var coords = new Array();
Expand Down

0 comments on commit 4307e08

Please sign in to comment.