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

Merge branch '2.15-building-crossing-layers' into 2.x

Browse Source
This commit is contained in:
Bryan Housel
2019-10-24 15:15:06 -04:00
parent c2900153d8 d3d2cbb4a2
commit 3886f2dad8
5 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/core.yaml
View File

@@ -1378,9 +1378,9 @@ en:
building-building:
reference: "Buildings should not intersect except on different layers."
building-highway:
reference: "Highways crossing buildings should use bridges, tunnels, coverings, or entrances."
reference: "Highways crossing buildings should use bridges, tunnels, or different layers."
building-railway:
reference: "Railways crossing buildings should use bridges or tunnels."
reference: "Railways crossing buildings should use bridges, tunnels, or different layers."
building-waterway:
reference: "Waterways crossing buildings should use tunnels or different layers."
highway-highway:

4
dist/locales/en.json vendored
View File

@@ -1694,10 +1694,10 @@
"reference": "Buildings should not intersect except on different layers."
},
"building-highway": {
"reference": "Highways crossing buildings should use bridges, tunnels, coverings, or entrances."
"reference": "Highways crossing buildings should use bridges, tunnels, or different layers."
},
"building-railway": {
"reference": "Railways crossing buildings should use bridges or tunnels."
"reference": "Railways crossing buildings should use bridges, tunnels, or different layers."
},
"building-waterway": {
"reference": "Waterways crossing buildings should use tunnels or different layers."

4
modules/ui/fields/radio.js
View File

@@ -75,10 +75,10 @@ export function uiFieldRadio(field, context) {
function structureExtras(selection, tags) {
var selected = selectedKey();
var selected = selectedKey() || tags.layer !== undefined;
var type = context.presets().field(selected);
var layer = context.presets().field('layer');
var showLayer = (selected === 'bridge' || selected === 'tunnel');
var showLayer = (selected === 'bridge' || selected === 'tunnel' || tags.layer !== undefined);
var extrasWrap = selection.selectAll('.structure-extras-wrap')

25
modules/validations/crossing_ways.js
View File

@@ -38,18 +38,12 @@ export function validationCrossingWays(context) {
tags.highway === 'corridor';
}
function allowsStructures(featureType) {
return allowsBridge(featureType) || allowsTunnel(featureType);
}
function allowsBridge(featureType) {
return featureType === 'highway' || featureType === 'railway' || featureType === 'waterway';
}
function allowsTunnel(featureType) {
return featureType === 'highway' || featureType === 'railway' || featureType === 'waterway';
}
function canCover(featureType) {
return featureType === 'building';
}
function getFeatureTypeForCrossingCheck(way, graph) {
@@ -110,20 +104,12 @@ export function validationCrossingWays(context) {
} else if (allowsTunnel(featureType1) && hasTag(tags1, 'tunnel')) return true;
else if (allowsTunnel(featureType2) && hasTag(tags2, 'tunnel')) return true;
if (canCover(featureType1) && canCover(featureType2)) {
if (hasTag(tags1, 'covered') && !hasTag(tags2, 'covered')) return true;
if (!hasTag(tags1, 'covered') && hasTag(tags2, 'covered')) return true;
// crossing covered features that can themselves cover must use different layers
if (hasTag(tags1, 'covered') && hasTag(tags2, 'covered') && layer1 !== layer2) return true;
} else if (canCover(featureType1) && hasTag(tags2, 'covered')) return true;
else if (canCover(featureType2) && hasTag(tags1, 'covered')) return true;
// don't flag crossing waterways and pier/highways
if (featureType1 === 'waterway' && featureType2 === 'highway' && tags2.man_made === 'pier') return true;
if (featureType2 === 'waterway' && featureType1 === 'highway' && tags1.man_made === 'pier') return true;
if (!allowsStructures(featureType1) && !allowsStructures(featureType2)) {
// if no structures are applicable, the layers must be different
if (featureType1 === 'building' || featureType2 === 'building') {
// for building crossings, different layers are enough
if (layer1 !== layer2) return true;
}
return false;
@@ -394,10 +380,13 @@ export function validationCrossingWays(context) {
} else {
useFixID = 'use_different_layers';
}
if (useFixID === 'use_different_layers') {
if (useFixID === 'use_different_layers' ||
featureType1 === 'building' ||
featureType2 === 'building') {
fixes.push(makeChangeLayerFix('higher'));
fixes.push(makeChangeLayerFix('lower'));
} else {
}
if (useFixID !== 'use_different_layers') {
fixes.push(new validationIssueFix({
icon: useFixIcon,
title: t('issues.fix.' + useFixID + '.title')

8
test/spec/validations/crossing_ways.js
View File

@@ -99,7 +99,7 @@ describe('iD.validations.crossing_ways', function () {
});
it('legit crossing between highway and building', function() {
createWaysWithOneCrossingPoint({ highway: 'residential', covered: 'yes' }, { building: 'yes' });
createWaysWithOneCrossingPoint({ highway: 'residential', layer: '-1' }, { building: 'yes' });
var issues = validate();
expect(issues).to.have.lengthOf(0);
});
@@ -123,7 +123,7 @@ describe('iD.validations.crossing_ways', function () {
});
it('legit crossing between railway and building', function() {
createWaysWithOneCrossingPoint({ railway: 'rail', covered: 'yes' }, { building: 'yes' });
createWaysWithOneCrossingPoint({ railway: 'rail', layer: '-1' }, { building: 'yes' });
var issues = validate();
expect(issues).to.have.lengthOf(0);
});
@@ -135,13 +135,13 @@ describe('iD.validations.crossing_ways', function () {
});
it('legit crossing between waterway and building', function() {
createWaysWithOneCrossingPoint({ waterway: 'river', covered: 'yes' }, { building: 'yes' });
createWaysWithOneCrossingPoint({ waterway: 'river', layer: '-1' }, { building: 'yes' });
var issues = validate();
expect(issues).to.have.lengthOf(0);
});
it('legit crossing between building and building', function() {
createWaysWithOneCrossingPoint({ building: 'yes' }, { building: 'yes', covered: 'yes' });
createWaysWithOneCrossingPoint({ building: 'yes' }, { building: 'yes', layer: '1' });
var issues = validate();
expect(issues).to.have.lengthOf(0);
});