From 9bfcd56c35c2e1fc7c9fa9d85582c008aefe4b78 Mon Sep 17 00:00:00 2001 From: Benjamin Clark Date: Thu, 9 Dec 2021 12:33:27 -0500 Subject: [PATCH] Fix bug that was causing google validation warnings to appear over changesets with the approved google africa building dataset. --- modules/validations/incompatible_source.js | 2 +- test/spec/validations/incompatible_source.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/validations/incompatible_source.js b/modules/validations/incompatible_source.js index b00e0ab66..8582e7fa8 100644 --- a/modules/validations/incompatible_source.js +++ b/modules/validations/incompatible_source.js @@ -17,7 +17,7 @@ export function validationIncompatibleSource() { { id: 'google', regex: /google/i, - exceptRegex: /((books|drive)\.google|google\s?(books|drive|plus))/i + exceptRegex: /((books|drive)\.google|google\s?(books|drive|plus))|(esri\/Google_Africa_Buildings)/i } ]; diff --git a/test/spec/validations/incompatible_source.js b/test/spec/validations/incompatible_source.js index bb7c72952..b812e5e57 100644 --- a/test/spec/validations/incompatible_source.js +++ b/test/spec/validations/incompatible_source.js @@ -63,4 +63,9 @@ describe('iD.validations.incompatible_source', function () { expect(issue.entityIds[0]).to.eql('w-1'); }); + it('does not flag buildings in the google-africa-buildings dataset', function() { + createWay({ building: 'yes', source: 'esri/Google_Africa_Buildings' }); + var issues = validate(); + expect(issues).to.have.lengthOf(0); + }); });