CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-15 21:48:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use a transient to memoize preset.match

Browse Source 
This slightly speeds up some things, including label rendering
This commit is contained in:
Bryan Housel
2018-11-10 00:05:53 -05:00
parent 558dc03185
commit 05a5563a41
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/presets/index.js
+30 -28
View File
@@ -35,42 +35,44 @@ export function presetIndex() {
};
all.match = function(entity, resolver) {
var geometry = entity.geometry(resolver);
var address;
return resolver.transient(entity, 'presetMatch', function() {
var geometry = entity.geometry(resolver);
var address;
// Treat entities on addr:interpolation lines as points, not vertices - #3241
if (geometry === 'vertex' && entity.isOnAddressLine(resolver)) {
geometry = 'point';
}
var geometryMatches = _index[geometry];
var best = -1;
var match;
for (var k in entity.tags) {
// If any part of an address is present,
// allow fallback to "Address" preset - #4353
if (k.match(/^addr:/) !== null && geometryMatches['addr:*']) {
address = geometryMatches['addr:*'][0];
// Treat entities on addr:interpolation lines as points, not vertices - #3241
if (geometry === 'vertex' && entity.isOnAddressLine(resolver)) {
geometry = 'point';
}
var keyMatches = geometryMatches[k];
if (!keyMatches) continue;
var geometryMatches = _index[geometry];
var best = -1;
var match;
for (var i = 0; i < keyMatches.length; i++) {
var score = keyMatches[i].matchScore(entity);
if (score > best) {
best = score;
match = keyMatches[i];
for (var k in entity.tags) {
// If any part of an address is present,
// allow fallback to "Address" preset - #4353
if (k.match(/^addr:/) !== null && geometryMatches['addr:*']) {
address = geometryMatches['addr:*'][0];
}
var keyMatches = geometryMatches[k];
if (!keyMatches) continue;
for (var i = 0; i < keyMatches.length; i++) {
var score = keyMatches[i].matchScore(entity);
if (score > best) {
best = score;
match = keyMatches[i];
}
}
}
}
if (address && (!match || match.isFallback())) {
match = address;
}
if (address && (!match || match.isFallback())) {
match = address;
}
return match || all.item(geometry);
return match || all.item(geometry);
});
};