From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 10 Mar 2019 18:51:54 +0000 (+0000)
Subject: move ZZ HS comment knowledge to misc-data.pl
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=54ac7b3d4c43c97f58eeb2c1ebdfd89ec7d454c6;p=pandemic-rising-tide.git

move ZZ HS comment knowledge to misc-data.pl

NFC
---

diff --git a/generate-board b/generate-board
index 959861a..a801ff1 100755
--- a/generate-board
+++ b/generate-board
@@ -583,15 +583,15 @@ sub some_edge_faces (@) {
   }
 }
 
-sub afsluitdijk ($) {
-  my ($inner) = @_;
-  my ($adj) = grep { $_->{Name} eq 'NZ' } @{ $region{$inner}{Adj} };
+sub afsluitdijk ($$) {
+  my ($inner, $comment) = @_;
+  my ($adj) = grep { $_->{Name} eq $c{Sea} } @{ $region{$inner}{Adj} };
   my $dash = 20;
   my (@pos) = adj_ends($adj);
   my $mid = 0.5 * ($pos[0] + $pos[1]);
   my $r = 0.5 * ($pos[1] - $pos[0])->norm();
-  o(sprintf <<'END', facepscolour('sea'), psvec($mid), $r);
-  %% Afsluitdijk
+  o(sprintf <<'END', $comment, facepscolour('sea'), psvec($mid), $r);
+  %% %s
   %s %s %s 0 360 arc closepath fill
 END
   some_edge_faces(()); # just sets the colour
@@ -605,7 +605,7 @@ END
 }
 
 sub afsluitdijken() {
-  afsluitdijk($_) foreach @{ $c{DashedHsInners} };
+  afsluitdijk($_->{Region}, $_->{Comment}) foreach @{ $c{DashedHsInners} };
 }
 
 sub edge_faces() {
diff --git a/misc-data.pl b/misc-data.pl
index 28d3c3c..8d6d37a 100644
--- a/misc-data.pl
+++ b/misc-data.pl
@@ -33,7 +33,10 @@ our %c =
      NZ => 'Noordzee',
  },
  HS => [ 'Roer en Overmaas', 'Schouwen-Duiveland', 'Rijn en IJssel' ],
- DashedHsInners => [ 'ZZ' ],
+ DashedHsInners => [ { 
+     Region => 'ZZ',
+     Comment => 'Afsluitdijk',
+ } ],
  SeaTrack => [qw(2 2 2 3 3 3 4 4 4)],
  CubeAbove => [
    'Wieringermeer'