Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions modules/svg/areas.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import deepEqual from 'fast-deep-equal';
import { bisector as d3_bisector } from 'd3-array';
import { svgPath, svgSegmentWay, svgRelationMemberTags } from './helpers';

import { osmEntity } from '../osm';
import { svgPath, svgSegmentWay } from './helpers';
import { svgTagClasses } from './tag_classes';
import { svgTagPattern } from './tag_pattern';

Expand Down Expand Up @@ -94,7 +94,19 @@ export function svgAreas(projection, context) {

for (var i = 0; i < entities.length; i++) {
var entity = entities[i];
if (entity.geometry(graph) !== 'area') continue;
// Skip non-area geometries
if (entity.geometry(graph) !== 'area') continue;

// Boundary relation members should render as lines
var parents = graph.parentRelations(entity);
var isBoundaryMember = parents.some(function(relation) {
return relation.tags && (
relation.tags.type === 'boundary' ||
relation.tags.boundary
);
});

if (isBoundaryMember) continue;
if (!areas[entity.id]) {
areas[entity.id] = {
entity: entity,
Expand Down Expand Up @@ -192,7 +204,7 @@ export function svgAreas(projection, context) {
base.entities[d.id] &&
!deepEqual(graph.entities[d.id].tags, base.entities[d.id].tags);
})
.call(svgTagClasses())
.call(svgTagClasses().tags(svgRelationMemberTags(graph)))
.attr('d', path);


Expand Down