From 9cb2fb13b5ef69ed40a47de0a32f09ed2e46095a Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Sun, 10 Mar 2013 14:44:46 -0400 Subject: [PATCH] use cemetery pattern for graveyards --- js/id/svg/areas.js | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/js/id/svg/areas.js b/js/id/svg/areas.js index fb369bd2b..7244f06f1 100644 --- a/js/id/svg/areas.js +++ b/js/id/svg/areas.js @@ -26,20 +26,27 @@ iD.svg.Areas = function(projection) { } // Patterns only work in Firefox when set directly on element - var patterns = d3.set([ - 'wetland', 'beach', 'scrub', 'construction', 'cemetery', 'meadow', - 'farmland', 'orchard' - ]); + var patterns = { + wetland: 'wetland', + beach: 'beach', + scrub: 'scrub', + construction: 'construction', + cemetery: 'cemetery', + grave_yard: 'cemetery', + meadow: 'meadow', + famrland: 'farmland', + orchard: 'orchard' + }; + + var patternKeys = ['landuse', 'natural', 'amenity']; function setPattern(selection) { selection.each(function(d) { - if (d.tags.landuse && patterns.has(d.tags.landuse)) { - this.style.fill = 'url("#pattern-' + d.tags.landuse + '")'; - return; - } - if (d.tags.natural && patterns.has(d.tags.natural)) { - this.style.fill = 'url("#pattern-' + d.tags.natural + '")'; - return; + for (var i = 0; i < patternKeys.length; i++) { + if (patterns.hasOwnProperty(d.tags[patternKeys[i]])) { + this.style.fill = 'url("#pattern-' + patterns[d.tags[patternKeys[i]]] + '")'; + return; + } } }); }