CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-06-02 13:11:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/housenumber-labels' into develop

Browse Source
This commit is contained in:
Martin Raifer
2025-05-12 18:02:47 +02:00
parent cf9c6aeeee 009daf7ef6
commit 9b7a98862d
21 changed files with 255 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/validations/crossing_ways.js
+3 -3
View File
@@ -1,4 +1,4 @@
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import { actionAddMidpoint } from '../actions/add_midpoint';
import { actionChangeTags } from '../actions/change_tags';
@@ -447,8 +447,8 @@ export function validationCrossingWays(context) {
var entity1 = graph.hasEntity(this.entityIds[0]),
entity2 = graph.hasEntity(this.entityIds[1]);
return (entity1 && entity2) ? t.append('issues.crossing_ways.message', {
feature: utilDisplayLabel(entity1, graph),
feature2: utilDisplayLabel(entity2, graph)
feature: utilDisplayLabel(entity1, graph, featureType1 === 'building'),
feature2: utilDisplayLabel(entity2, graph, featureType2 === 'building')
}) : '';
},
reference: showReference,