3pp-mirror/map-machine
1
0
Fork 0
mirror of https://github.com/enzet/map-machine.git synced 2025-08-06 10:09:52 +02:00
Code Issues Projects Releases Packages Wiki Activity

Issue #84: support blur for bridges.

Browse source
This commit is contained in:
Sergey Vartanov 2021-10-11 00:12:13 +03:00
parent 01a1700ba2
commit 84f7e1cef5
2 changed files with 46 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/dictionary.xml
View file

@ -5,11 +5,13 @@
<w>betula</w>
<w>carto</w>
<w>changeset</w>
<w>dasharray</w>
<w>flinger</w>
<w>githooks</w>
<w>josm</w>
<w>landuse</w>
<w>levelname</w>
<w>linalg</w>
<w>linecap</w>
<w>linejoin</w>
<w>mapcss</w>

49
map_machine/road.py
View file

@ -2,12 +2,13 @@
WIP: road shape drawing.
"""
from dataclasses import dataclass
from typing import Any, Optional
from typing import Any, Optional, Union
import numpy as np
import svgwrite
from colour import Color
from svgwrite import Drawing
from svgwrite.filters import Filter
from svgwrite.path import Path
from svgwrite.shapes import Circle
@ -26,6 +27,8 @@ from map_machine.vector import (
__author__ = "Sergey Vartanov"
__email__ = "me@enzet.ru"
USE_BLUR: bool = False
@dataclass
class Lane:
@ -417,7 +420,7 @@ class Road(Tagged):
def get_style(
self, flinger: Flinger, is_border: bool, is_for_stroke: bool = False
) -> dict:
) -> dict[str, Union[int, float, str]]:
"""Get road SVG style."""
width: float
if self.width is not None:
@ -443,7 +446,7 @@ class Road(Tagged):
extra_width = 4.0
scale: float = flinger.get_scale(self.nodes[0].coordinates)
style: dict[str, Any] = {
style: dict[str, Union[int, float, str]] = {
"fill": "none",
"stroke": color.hex,
"stroke-linecap": "butt",
@ -460,11 +463,31 @@ class Road(Tagged):
return style
def get_filter(self, svg: Drawing, is_border: bool) -> Optional[Filter]:
if not USE_BLUR:
return None
if is_border and self.tags.get("bridge") == "yes":
filter_ = svg.defs.add(svg.filter())
filter_.feGaussianBlur(in_="SourceGraphic", stdDeviation=2)
return filter_
return None
def draw(self, svg: Drawing, flinger: Flinger, is_border: bool) -> None:
"""Draw road as simple SVG path."""
style = self.get_style(flinger, is_border)
filter_: Filter = self.get_filter(svg, is_border)
style: dict[str, Union[int, float, str]] = self.get_style(
flinger, is_border
)
path_commands: str = self.line.get_path()
path: Path = Path(d=path_commands)
path: Path
if filter_:
path = Path(d=path_commands, filter=filter_.get_funciri())
else:
path = Path(d=path_commands)
path.update(style)
svg.add(path)
@ -489,8 +512,10 @@ class Road(Tagged):
def draw_lanes(self, svg: Drawing, flinger: Flinger, color: Color) -> None:
"""Draw lane separators."""
scale: float = flinger.get_scale(self.nodes[0].coordinates)
if len(self.lanes) < 2:
return
for index in range(1, len(self.lanes)):
parallel_offset: float = scale * (
-self.width / 2 + index * self.width / len(self.lanes)
@ -512,11 +537,11 @@ class Road(Tagged):
if not name:
return
path = svg.path(d=self.line.get_path(3), fill="none")
path: Path = svg.path(d=self.line.get_path(3), fill="none")
svg.add(path)
text = svg.add(svgwrite.text.Text(""))
text_path = svgwrite.text.TextPath(
text = svg.add(svg.text.Text(""))
text_path = svg.text.TextPath(
path=path,
text=name,
startOffset=None,
@ -676,6 +701,14 @@ class ComplexConnector(Connector):
def draw_border(self, svg: Drawing) -> None:
"""Draw connection outline."""
filter_: Filter = self.road_1.get_filter(svg, True)
if filter_:
path: Path = svg.path(
d=["M"] + self.curve_1 + ["L"] + self.curve_2 + ["Z"],
filter=filter_.get_funciri(),
)
else:
path: Path = svg.path(
d=["M"] + self.curve_1 + ["L"] + self.curve_2 + ["Z"]
)