From 6ffa91344a8b019052ee4cf3529a41c28c35417f Mon Sep 17 00:00:00 2001 From: Sergey Vartanov Date: Thu, 30 Sep 2021 23:36:26 +0300 Subject: [PATCH] Fix tag parsing. --- map_machine/figure.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/map_machine/figure.py b/map_machine/figure.py index ef45212..584307d 100644 --- a/map_machine/figure.py +++ b/map_machine/figure.py @@ -262,15 +262,17 @@ class Tree(Tagged): """Draw crown and trunk.""" scale: float = flinger.get_scale(self.coordinates) radius: float - if "diameter_crown" in self.tags: + diameter_crown: Optional[float] = self.get_float("diameter_crown") + if diameter_crown is not None: radius = float(self.tags["diameter_crown"]) / 2.0 else: radius = 2.0 color: Color = scheme.get_color("evergreen_color") svg.add(svg.circle(self.point, radius * scale, fill=color, opacity=0.3)) - if "circumference" in self.tags: - radius: float = float(self.tags["circumference"]) / 2.0 / np.pi + circumference: Optional[float] = self.get_float("circumference") + if circumference is not None: + radius: float = circumference / 2.0 / np.pi svg.add(svg.circle(self.point, radius * scale, fill="#B89A74"))