Clip polygons and clippaths to padded viewport

(closes #3529)
This commit is contained in:
Bryan Housel
2016-10-29 21:50:30 -04:00
parent 46b6086dcf
commit fbe9cf3afd
2 changed files with 19 additions and 5 deletions
-2
View File
@@ -109,8 +109,6 @@ export function svgAreas(projection, context) {
.filter(filter)
.data(function(layer) { return data[layer]; }, osmEntity.key);
// Remove exiting areas first, so they aren't included in the `fills`
// array used for sorting below (https://github.com/openstreetmap/iD/issues/1903).
paths.exit()
.remove();
+19 -3
View File
@@ -1,11 +1,27 @@
import * as d3 from 'd3';
export function svgPath(projection, graph, polygon) {
export function svgPath(projection, graph, isArea) {
// Explanation of magic numbers:
// "padding" here allows space for strokes to extend beyond the viewport,
// so that the stroke isn't drawn along the edge of the viewport when
// the shape is clipped.
//
// When drawing lines, pad viewport by 5px.
// When drawing areas, pad viewport by 65px in each direction to allow
// for 60px area fill stroke (see ".fill-partial path.fill" css rule)
var cache = {},
clip = d3.geoIdentity().clipExtent(projection.clipExtent()).stream,
padding = isArea ? 65 : 5,
viewport = projection.clipExtent(),
paddedExtent = [
[viewport[0][0] - padding, viewport[0][1] - padding],
[viewport[1][0] + padding, viewport[1][1] + padding]
],
clip = d3.geoIdentity().clipExtent(paddedExtent).stream,
project = projection.stream,
path = d3.geoPath()
.projection({stream: function(output) { return polygon ? project(output) : project(clip(output)); }});
.projection({stream: function(output) { return project(clip(output)); }});
return function(entity) {
if (entity.id in cache) {