poly rendering: GRP 1.6 support

When coordpoly is set (aka TopSky mode), do things like we used to, otherwise only specify COLOR once, then separate polygons with COORDTYPE:OTHER:REGION

Author: a3li

mapbuilder/handlers/jinja.py

@@ -103,7 +103,7 @@ def to_text_buffer(geometry, label: str, color: str, adapt_to_length=True):
         distance += 0.00001 * len(labeltext)
     buffer = shapely.buffer(point, distance).envelope.boundary
 
-    _render_polygon(lines, [buffer], color)
+    _render_polygon(lines, [buffer], color, False)
 
     return "\n".join(lines)
 
@@ -181,21 +181,28 @@ def envelope(geometries):
 def to_poly(geometries, designator: str, color: str | None = None, coordpoly=False):
     lines = [f"// {designator}"] if designator else []
 
-    _render_polygon(lines, _get_geoms(geometries), color)
+    _render_polygon(lines, _get_geoms(geometries), color, coordpoly)
 
     if coordpoly:
         lines.extend((f"COORDPOLY:{coordpoly}", ""))
 
     return "\n".join(lines)
 
 
-def _render_polygon(lines, polygons, color=None):
+def _render_polygon(lines, polygons, color=None, coordpoly=False):
+    if not coordpoly and color is not None:
+        lines.append(f"COLOR:{color}")
+    else:
+        lines.append("")
+
     for polygon in polygons:
-        if color is not None:
-            lines.append(f"COLOR:{color}")
+        if coordpoly:
+            if color is not None:
+                lines.append(f"COLOR:{color}")
+            else:
+                lines.append("")
         else:
-            lines.append("")
-
+            lines.append("COORDTYPE:OTHER:REGION")
         for point in polygon.coords:
             lines.append(f"COORD:{coord2es((point[0], point[1]))}")