Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Speed up data processing for the data layer #43

Merged
merged 2 commits into from
Jan 5, 2025
Merged

Speed up data processing for the data layer #43

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d9a1a7
Speed up data processing for the data layer
deevroman Jan 5, 2025
d72b634
update tests
deevroman Jan 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 21 additions & 19 deletions leaflet-osm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,25 @@ L.OSM.DataLayer = L.FeatureGroup.extend({
ways = L.OSM.getWays(xml, nodes),
relations = L.OSM.getRelations(xml, nodes, ways);

var wayNodes = {}
for (var i = 0; i < ways.length; i++) {
var way = ways[i];
for (var j = 0; j < way.nodes.length; j++) {
wayNodes[way.nodes[j].id] = true
}
}

var relationNodes = {}
for (var i = 0; i < relations.length; i++){
var relation = relations[i];
for (var j = 0; j < relation.members.length; j++) {
relationNodes[relation.members[j].id] = true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this check that the member is actually a node? I realise the old code wasn't but that seems like it was a pre-existing bug?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the old and new code, this check is not necessary, since all members are not nodes are deleted https://github.com/deevroman/leaflet-osm/blob/d72b63467a891895877f8b121f7a9822ca7dcdf4/leaflet-osm.js#L309-L312

}
}

for (var node_id in nodes) {
var node = nodes[node_id];
if (this.interestingNode(node, ways, relations)) {
if (this.interestingNode(node, wayNodes, relationNodes)) {
features.push(node);
}
}
Expand All @@ -176,23 +192,9 @@ L.OSM.DataLayer = L.FeatureGroup.extend({
return false;
},

interestingNode: function (node, ways, relations) {
var used = false;

for (var i = 0; i < ways.length; i++) {
if (ways[i].nodes.indexOf(node) >= 0) {
used = true;
break;
}
}

if (!used) {
return true;
}

for (var i = 0; i < relations.length; i++) {
if (relations[i].members.indexOf(node) >= 0)
return true;
interestingNode: function (node, wayNodes, relationNodes) {
if (!wayNodes[node.id] || relationNodes[node.id]) {
return true
}

for (var key in node.tags) {
Expand Down Expand Up @@ -309,7 +311,7 @@ L.Util.extend(L.OSM, {
else // relation-way and relation-relation membership not implemented
rel_object.members[j] = null;
}

rel_object.members = rel_object.members.filter(i => i !== null && i !== undefined)
result.push(rel_object);
}

Expand Down