diff --git a/lib/xmet/map.py b/lib/xmet/map.py index 79c55b7..235a3b8 100644 --- a/lib/xmet/map.py +++ b/lib/xmet/map.py @@ -85,26 +85,21 @@ class EquirectMap(): if city.population >= 1000000: radius = 4 - pass elif city.population >= 500000: radius = 3 - pass elif city.population >= 100000: radius = 2 - pass else: radius = 1 - pass - if radius > 2: - extents = cr.text_extents(city.name) + extents = cr.text_extents(city.name) - cr.set_source_rgb(0.2, 0.2, 0.2) - cr.arc(x, y, radius, 0, 2*math.pi) - cr.fill() + cr.set_source_rgb(0.2, 0.2, 0.2) + cr.arc(x, y, radius, 0, 2*math.pi) + cr.fill() - cr.set_font_size(14) - cr.move_to(x + 8, y + extents.height / 2) - cr.show_text(city.name) + cr.set_font_size(14) + cr.move_to(x + 8, y + extents.height / 2) + cr.show_text(city.name) cr.restore()