visualize

Author: michielkallenberg

cybench/runs/viz/dashboard_template.html

@@ -327,7 +327,7 @@ <h3>Drill-down plots</h3>
       try {
         const geo = await d3.json(href);
         if (!geo || !geo.features) return null;
-        const features = geo.features.map(f => ({
+        const features = geo.features.map(f => rewindFeatureForSvg({
           ...f,
           properties: { ...f.properties, loc: String(f.properties.loc ?? "") },
         }));
@@ -339,6 +339,48 @@ <h3>Drill-down plots</h3>
       }
     }
 
+    // Mapbox geojson-rewind (RFC 7946): outer rings CCW for D3/SVG fills.
+    function rewindRing(ring, clockwise) {
+      let area = 0;
+      for (let i = 0, j = ring.length - 1; i < ring.length; j = i++) {
+        const p0 = ring[i];
+        const p1 = ring[j];
+        area += (p1[0] - p0[0]) * (p1[1] + p0[1]);
+      }
+      if ((area < 0) === clockwise) ring.reverse();
+      return ring;
+    }
+
+    function rewindGeometry(geometry, outerClockwise) {
+      if (!geometry) return geometry;
+      if (geometry.type === "Polygon") {
+        return {
+          ...geometry,
+          coordinates: geometry.coordinates.map((ring, i) =>
+            rewindRing(ring.slice(), i === 0 ? outerClockwise : !outerClockwise),
+          ),
+        };
+      }
+      if (geometry.type === "MultiPolygon") {
+        return {
+          ...geometry,
+          coordinates: geometry.coordinates.map(poly =>
+            poly.map((ring, i) =>
+              rewindRing(ring.slice(), i === 0 ? outerClockwise : !outerClockwise),
+            ),
+          ),
+        };
+      }
+      return geometry;
+    }
+
+    function rewindFeatureForSvg(feature) {
+      return {
+        ...feature,
+        geometry: rewindGeometry(feature.geometry, false),
+      };
+    }
+
     function yieldColor(value, extent) {
       if (value == null || !extent) return REGION_FILL_MISSING;
       const [lo, hi] = extent;
@@ -412,19 +454,24 @@ <h3>Drill-down plots</h3>
         { type: "FeatureCollection", features: fitFeatures },
       );
       const path = d3.geoPath(projection);
+      svg.append("rect")
+        .attr("x", 0)
+        .attr("y", 0)
+        .attr("width", REGION_MAP_WIDTH)
+        .attr("height", REGION_MAP_HEIGHT)
+        .attr("fill", "#f8f9fa");
       svg.selectAll("path.region")
         .data(plotFeatures)
         .join("path")
         .attr("class", "region")
-        .attr("fill-rule", "evenodd")
         .attr("d", path)
         .attr("fill", d => {
           const loc = d.properties.loc;
           const v = valueByLoc ? valueByLoc[loc] : null;
           return yieldColor(v, extent);
         })
-        .attr("stroke", "#333")
-        .attr("stroke-width", 0.35)
+        .attr("stroke", "#fff")
+        .attr("stroke-width", 0.5)
         .selectAll("title")
         .data(d => [d])
         .join("title")

cybench/runs/viz/region_map_lib.py

@@ -12,10 +12,8 @@
 
 try:
     from shapely.geometry.base import BaseGeometry
-    from shapely.ops import orient as orient_polygon
 except ImportError:  # pragma: no cover
     BaseGeometry = object  # type: ignore[misc,assignment]
-    orient_polygon = None  # type: ignore[assignment]
 
 # Skip geometries that break map fitting (dateline-spanning admin units).
 _MAX_MAP_LON_SPAN = 60.0
@@ -39,11 +37,9 @@ def dataset_crop(dataset: str) -> str:
 
 
 def prepare_geometry_for_geojson(geometry: BaseGeometry | None) -> BaseGeometry | None:
-    """Rewind rings for GeoJSON/SVG and drop pathological footprints."""
+    """Drop pathological footprints; ring winding is fixed in the dashboard (D3/SVG)."""
     if geometry is None or geometry.is_empty:
         return None
-    if orient_polygon is not None:
-        geometry = orient_polygon(geometry, sign=1.0)
     minx, miny, maxx, maxy = geometry.bounds
     if (maxx - minx) > _MAX_MAP_LON_SPAN or (maxy - miny) > _MAX_MAP_LAT_SPAN:
         return None

tests/runs/test_region_map_lib.py

@@ -30,18 +30,18 @@ def test_dataset_crop():
     assert dataset_crop("wheat_NL") == "wheat"
 
 
-def test_prepare_geometry_rewinds_clockwise_ring():
+def test_prepare_geometry_keeps_ring_orientation():
     from shapely.geometry import Polygon
 
     cw = Polygon([(0, 0), (0, 1), (1, 1), (1, 0), (0, 0)])
-    fixed = prepare_geometry_for_geojson(cw)
-    assert fixed is not None
-    ring = list(fixed.exterior.coords)
+    kept = prepare_geometry_for_geojson(cw)
+    assert kept is not None
+    ring = list(kept.exterior.coords)
     signed = sum(
         (ring[i + 1][0] - ring[i][0]) * (ring[i + 1][1] + ring[i][1])
         for i in range(len(ring) - 1)
     )
-    assert signed < 0
+    assert signed > 0
 
 
 def test_prepare_geometry_drops_dateline_spanning_polygon():