change osmEntity.key() from a static method to a instance method

Author: k-yle

modules/core/history.js

@@ -457,7 +457,7 @@ export function coreHistory(context) {
                 Object.keys(i.graph.entities).forEach(function(id) {
                     var entity = i.graph.entities[id];
                     if (entity) {
-                        var key = osmEntity.key(entity);
+                        var key = entity.key();
                         allEntities[key] = entity;
                         modified.push(key);
                     } else {
@@ -523,8 +523,9 @@ export function coreHistory(context) {
             if (h.version === 2 || h.version === 3) {
                 var allEntities = {};
 
-                h.entities.forEach(function(entity) {
-                    allEntities[osmEntity.key(entity)] = osmEntity(entity);
+                h.entities.forEach(function(rawEntity) {
+                    const entity = osmEntity(rawEntity);
+                    allEntities[entity.key()] = entity;
                 });
 
                 if (h.version === 3) {

modules/osm/entity.js

@@ -20,12 +20,6 @@ export function osmEntity(attrs) {
 }
 
 
-// A function suitable for use as the second argument to d3.selection#data().
-osmEntity.key = function(entity) {
-    return entity.id + 'v' + (entity.v || 0);
-};
-
-
 osmEntity.prototype = {
 
     /** @type {Tags} */
@@ -89,6 +83,12 @@ osmEntity.prototype = {
     },
 
 
+    /** A function suitable for use as the second argument to d3.selection#data() */
+    key() {
+        return this.id + 'v' + (this.v || 0);
+    },
+
+
     isNew: function() {
         var osmId = osmIdManager.toOSM(this.id);
         return osmId.length === 0 || osmId[0] === '-';

modules/renderer/features.js

@@ -1,7 +1,6 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 
 import { prefs } from '../core/preferences';
-import { osmEntity } from '../osm';
 import { osmLanduseTags, osmLifecyclePrefixes } from '../osm/tags.js';
 import { utilRebind } from '../util/rebind';
 import { utilArrayGroupBy, utilArrayUnion, utilQsString, utilStringQs } from '../util';
@@ -394,7 +393,7 @@ export function rendererFeatures(context) {
 
 
     features.clearEntity = function(entity) {
-        delete _cache[osmEntity.key(entity)];
+        delete _cache[entity.key()];
         for (const key in _cache) {
             if (_cache[key].parents) {
                 for (const parent of _cache[key].parents) {
@@ -427,7 +426,7 @@ export function rendererFeatures(context) {
         if (geometry === 'vertex' ||
             (geometry === 'relation' && !relationShouldBeChecked(entity))) return {};
 
-        var ent = osmEntity.key(entity);
+        var ent = entity.key();
         if (!_cache[ent]) {
             _cache[ent] = {};
         }
@@ -456,7 +455,7 @@ export function rendererFeatures(context) {
                             // IMPORTANT:
                             // For this to work, getMatches must be called on relations before ways.
                             //
-                            var pkey = osmEntity.key(parents[0]);
+                            var pkey = parents[0].key();
                             if (_cache[pkey] && _cache[pkey].matches) {
                                 matches = Object.assign({}, _cache[pkey].matches);  // shallow copy
                                 continue;
@@ -480,7 +479,7 @@ export function rendererFeatures(context) {
     features.getParents = function(entity, resolver, geometry) {
         if (geometry === 'point') return [];
 
-        const ent = osmEntity.key(entity);
+        const ent = entity.key();
         if (!_cache[ent]) {
             _cache[ent] = {};
         }

modules/svg/areas.js

@@ -1,10 +1,9 @@
 import { deepEqual } from 'fast-equals';
 import { bisector as d3_bisector } from 'd3-array';
-
-import { osmEntity } from '../osm';
 import { svgPath, svgSegmentWay } from './helpers';
 import { svgTagClasses } from './tag_classes';
 import { svgTagPattern } from './tag_pattern';
+import { osmEntity } from '../osm';
 
 export function svgAreas(projection, context) {
 
@@ -118,7 +117,7 @@ export function svgAreas(projection, context) {
 
         var clipPaths = context.surface().selectAll('defs').selectAll('.clipPath-osm')
            .filter(filter)
-           .data(data.clip, osmEntity.key);
+           .data(data.clip, d => d.key());
 
         clipPaths.exit()
            .remove();
@@ -152,7 +151,10 @@ export function svgAreas(projection, context) {
         var paths = areagroup
             .selectAll('path')
             .filter(filter)
-            .data(function(layer) { return data[layer]; }, osmEntity.key);
+            .data(
+                layer => data[layer],
+                d => d instanceof osmEntity ? d.key() : d,
+            );
 
         paths.exit()
             .remove();

modules/svg/labels.js

@@ -9,7 +9,7 @@ import {
     geoScaleToZoom, geoVecInterp, geoVecLength
 } from '../geo';
 import { presetManager } from '../presets';
-import { osmEntity, osmIsInterestingTag } from '../osm';
+import { osmIsInterestingTag } from '../osm';
 import { utilDetect } from '../util/detect';
 import { utilArrayDifference, utilArrayUniq, utilDisplayName, utilDisplayNameForPath, utilEntitySelector } from '../util';
 
@@ -90,7 +90,7 @@ export function svgLabels(projection, context) {
     function drawLinePaths(selection, labels, filter, classes) {
         var paths = selection.selectAll('path:not(.debug)')
             .filter(d => filter(d.entity))
-            .data(labels, d => osmEntity.key(d.entity));
+            .data(labels, d => d.entity.key());
 
         // exit
         paths.exit()
@@ -110,7 +110,7 @@ export function svgLabels(projection, context) {
     function drawLineLabels(selection, labels, filter, classes) {
         var texts = selection.selectAll('text.' + classes)
             .filter(d => filter(d.entity))
-            .data(labels, d => osmEntity.key(d.entity));
+            .data(labels, d => d.entity.key());
 
         // exit
         texts.exit()
@@ -127,7 +127,7 @@ export function svgLabels(projection, context) {
         // update
         selection.selectAll('text.' + classes).selectAll('.textpath')
             .filter(d => filter(d.entity))
-            .data(labels, d => osmEntity.key(d.entity))
+            .data(labels, d => d.entity.key())
             .attr('startOffset', '50%')
             .attr('xlink:href', function(d) { return '#ideditor-labelpath-' + d.entity.id; })
             .text(d => d.name);
@@ -140,7 +140,7 @@ export function svgLabels(projection, context) {
         }
         var texts = selection.selectAll('text.' + classes)
             .filter(d => filter(d.entity))
-            .data(labels, d => osmEntity.key(d.entity));
+            .data(labels, d => d.entity.key());
 
         // exit
         texts.exit()
@@ -171,7 +171,7 @@ export function svgLabels(projection, context) {
     function drawAreaIcons(selection, labels, filter, classes) {
         var icons = selection.selectAll('use.' + classes)
             .filter(d => filter(d.entity))
-            .data(labels, d => osmEntity.key(d.entity));
+            .data(labels, d => d.entity.key());
 
         // exit
         icons.exit()

modules/svg/lines.js

@@ -6,9 +6,9 @@ import {
 } from './helpers';
 import { svgTagClasses } from './tag_classes';
 
-import { osmEntity } from '../osm';
 import { utilArrayFlatten, utilArrayGroupBy } from '../util';
 import { utilDetect } from '../util/detect';
+import { osmEntity } from '../osm';
 
 /** @param {{ [key: string ]: string }} tags */
 function onewayArrowColour(tags) {
@@ -136,7 +136,7 @@ export function svgLines(projection, context) {
             var lines = selection
                 .selectAll('path')
                 .filter(filter)
-                .data(getPathData(isSelected), osmEntity.key);
+                .data(getPathData(isSelected), d => d instanceof osmEntity ? d.key() : d);
 
             lines.exit()
                 .remove();

modules/svg/points.js

@@ -3,7 +3,6 @@ import { clamp } from 'es-toolkit/compat';
 import { select as d3_select } from 'd3';
 
 import { geoScaleToZoom } from '../geo';
-import { osmEntity } from '../osm';
 import { svgPointTransform } from './helpers';
 import { svgTagClasses } from './tag_classes';
 import { presetManager } from '../presets';
@@ -38,9 +37,10 @@ export function svgPoints(projection, context) {
     // Avoid exit/enter if we're just moving stuff around.
     // The node will get a new version but we only need to run the update selection.
     function fastEntityKey(d) {
+        if (typeof d === 'number') return d;
         const mode = context.mode();
         const isMoving = mode && /^(add|draw|drag|move|rotate)/.test(mode.id);
-        return isMoving ? d.id : osmEntity.key(d);
+        return isMoving ? d.id : d.key();
     }
 
 

modules/svg/vertices.js

@@ -3,7 +3,6 @@ import { select as d3_select } from 'd3-selection';
 
 import { presetManager } from '../presets';
 import { geoScaleToZoom } from '../geo';
-import { osmEntity } from '../osm';
 import { svgPassiveVertex, svgPointTransform } from './helpers';
 import { svgTagClasses } from './tag_classes';
 
@@ -31,9 +30,10 @@ export function svgVertices(projection, context) {
     // Avoid exit/enter if we're just moving stuff around.
     // The node will get a new version but we only need to run the update selection.
     function fastEntityKey(d) {
+        if (typeof d === 'number') return d;
         var mode = context.mode();
         var isMoving = mode && /^(add|draw|drag|move|rotate)/.test(mode.id);
-        return isMoving ? d.id : osmEntity.key(d);
+        return isMoving ? d.id : d.key();
     }
 
 
@@ -182,7 +182,7 @@ export function svgVertices(projection, context) {
             .merge(dgroups);
 
         var viewfields = dgroups.selectAll('.viewfield')
-            .data(getDirections, function key(d) { return osmEntity.key(d); });
+            .data(getDirections, d => d.key(d));
 
         // exit
         viewfields.exit()

modules/ui/sections/raw_member_editor.js

@@ -10,7 +10,6 @@ import { actionDeleteMember } from '../../actions/delete_member';
 import { actionMoveMember } from '../../actions/move_member';
 import { modeBrowse } from '../../modes/browse';
 import { modeSelect } from '../../modes/select';
-import { osmEntity } from '../../osm';
 import { getRelationColor } from '../../osm/tags';
 import { svgIcon } from '../../svg/icon';
 import { services } from '../../services';
@@ -150,8 +149,8 @@ export function uiSectionRawMemberEditor(context) {
 
         var items = list.selectAll('li')
             .data(memberships, function(d) {
-                return osmEntity.key(d.relation) + ',' + d.index + ',' +
-                    (d.member ? osmEntity.key(d.member) : 'incomplete');
+                return d.relation.key() + ',' + d.index + ',' +
+                    (d.member ? d.member.key() : 'incomplete');
             });
 
         items.exit()

modules/ui/sections/raw_membership_editor.js

@@ -9,7 +9,7 @@ import { actionChangeMember } from '../../actions/change_member';
 import { actionDeleteMembers } from '../../actions/delete_members';
 
 import { modeSelect } from '../../modes/select';
-import { osmEntity, osmRelation } from '../../osm';
+import { osmRelation } from '../../osm';
 import { getRelationColor, isColorValid } from '../../osm/tags';
 import { services } from '../../services';
 import { svgIcon } from '../../svg/icon';
@@ -82,7 +82,7 @@ export function uiSectionRawMembershipEditor(context) {
             membership = {
                 relation: relation,
                 members: [],
-                hash: osmEntity.key(relation)
+                hash: relation.key()
             };
             for (index = 0; index < relation.members.length; index++) {
                 member = relation.members[index];
@@ -99,7 +99,7 @@ export function uiSectionRawMembershipEditor(context) {
                         membership = {
                             relation: relation,
                             members: [],
-                            hash: osmEntity.key(relation)
+                            hash: relation.key()
                         };
                     }
                 }