Treat a sole area=yes tag as "untagged" (#1867)

This commit is contained in:
John Firebaugh
2013-10-09 17:20:29 -07:00
parent b5f0ae596f
commit 353eb5e0d1
+6 -14
View File
@@ -1,5 +1,5 @@
iD.validate = function(changes, graph) {
var warnings = [], change;
var warnings = [];
// https://github.com/openstreetmap/josm/blob/mirror/src/org/
// openstreetmap/josm/data/validation/tests/UnclosedWays.java#L80
@@ -22,20 +22,16 @@ iD.validate = function(changes, graph) {
}
for (var i = 0; i < changes.created.length; i++) {
change = changes.created[i];
var change = changes.created[i],
geometry = change.geometry(graph);
if (change.geometry(graph) === 'point' && _.isEmpty(change.tags)) {
if ((geometry === 'point' || geometry === 'line' || geometry === 'area') && !change.isUsed(graph)) {
warnings.push({
message: t('validations.untagged_point'),
message: t('validations.untagged_' + geometry),
entity: change
});
}
if (change.geometry(graph) === 'line' && _.isEmpty(change.tags) &&
graph.parentRelations(change).length === 0) {
warnings.push({ message: t('validations.untagged_line'), entity: change });
}
var deprecatedTags = change.deprecatedTags();
if (!_.isEmpty(deprecatedTags)) {
warnings.push({
@@ -44,11 +40,7 @@ iD.validate = function(changes, graph) {
}), entity: change });
}
if (change.geometry(graph) === 'area' && _.isEmpty(change.tags)) {
warnings.push({ message: t('validations.untagged_area'), entity: change });
}
if (change.geometry(graph) === 'line' && tagSuggestsArea(change)) {
if (geometry === 'line' && tagSuggestsArea(change)) {
warnings.push({
message: t('validations.tag_suggests_area', {tag: tagSuggestsArea(change)}),
entity: change