danwizard208
/
wiki-map
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coord trippler MVP

Browse Source
main
Daniel Asher Resnick 3 weeks ago
parent e5be6e33a3
commit 316de4beae
2 changed files with 180 additions and 8 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 141
      coord_tripler.pl
  2. 47
      grid-tester.pl

141
coord_tripler.pl
Unescape View File

@ -45,6 +45,15 @@ my %bounds =
sw_max => "-Inf"
);
my %GRID_DIR =
(
nw => 1,
sw => 2,
s => 3,
se => -1,
ne => -2,
n => -3
);
my $region_query_results = $mw->api
( {
@ -91,7 +100,7 @@ foreach my $page (values %{$subregion_query_results->{query}{pages}})
push @tile_pages, "$subregion_name/Tiles";
}
# As above, get all tile pages in one request.
# Get all tile pages in one request.
# By doing so, we lose context as to which page corresponds to which region,
# so we extract it from the title of the page.
@ -140,11 +149,83 @@ foreach my $page (values %{$location_query_results->{query}{pages}})
add_location(\%regions, \%tile_to_regions, $location_name, $region_name, \%bounds, $nw, $sw);
}
my (%path_specs);
# say STDERR "Getting Path pages";
my $path_query_results = $mw->api
( {
action => 'query',
generator => 'categorymembers',
prop => 'info|revisions',
gcmtitle => 'Category:Paths',
gcmlimit => 'max',
rvprop => 'content',
inprop => 'url',
} ) || croak $mw->{error}->{code} . ': ' . $mw->{error}->{details};
foreach my $path_page_ref (values %{$path_query_results->{query}{pages}})
{
next if $path_page_ref->{title} =~ /^Category:/;
my $path_name = $path_page_ref->{title};
# say STDERR "Processing Path $path_name";
my $path_content = $path_page_ref->{revisions}[0]{'*'};
my $parsed_template = MWTemplate::Parse($path_content, $path_template_name);
next unless $parsed_template;
$path_specs{$path_name} =
{
tile_page => "$path_name/Tiles",
colour => $parsed_template->{named_params}{colour},
};
$path_specs{$path_name}{starts_from} = $parsed_template->{named_params}{starts_from}
if $parsed_template->{named_params}{starts_from};
$path_specs{$path_name}{ends_to} = $parsed_template->{named_params}{ends_to}
if $parsed_template->{named_params}{ends_to};
}
# say STDERR "Getting Path Tile pages";
my $path_tile_query_results = $mw->api
( {
action => 'query',
titles => join('|', map { $_->{tile_page} } values %path_specs),
prop => 'revisions',
rvprop => 'content',
} ) || croak $mw->{error}->{code} . ': ' . $mw->{error}->{details};
foreach my $page (values %{$path_tile_query_results->{query}{pages}})
{
my $content = $page->{revisions}[0]{'*'};
my ($path_name) = $page->{title} =~ /(.*)\/Tiles/;
# say STDERR "Processing tiles for: $path_name";
my @path_coords;
foreach my $coords (split /;/, $content)
{
do { carp "Skipping bad spec: $coords"; next; } unless $coords =~ $coords_regex;
push @path_coords, [$1,$2];
}
$path_specs{$path_name}{new_coords} = [expand_path(@path_coords)];
}
fill_holes(\%regions, \%tile_to_regions, \%bounds);
say "== Regions";
foreach my $region (keys %regions)
{
say ("$region; $regions{$region}{bg}; " . make_output_region_line(\%regions, $region));
}
say "== Paths";
foreach my $path (keys %path_specs)
{
my $line = "$path; " . $path_specs{$path}{colour}
. "; " . $path_specs{$path}{starts_from}
. "; " . $path_specs{$path}{ends_to};
foreach my $coord_pair (@{$path_specs{$path}{new_coords}})
{
$line .= "; " . (join ",", @$coord_pair);
}
say $line;
}
sub expand_coords($regions_hashref, $tile_to_region_hashref, $region, $bounds, @coord_list)
@ -244,6 +325,64 @@ sub fill_holes($regions_hashref, $tile_to_region_hashref, $bounds)
}
}
sub expand_path(@coord_list)
{
my @new_coords;
for(my $i = 0; $i < $#coord_list; $i++)
{
push @new_coords, [$coord_list[$i][0]*3,$coord_list[$i][1]*3];
my $dir = get_edge_direction($coord_list[$i][0], $coord_list[$i][1], $coord_list[$i+1][0], $coord_list[$i+1][1]);
if($dir == $GRID_DIR{nw})
{
push @new_coords, [$coord_list[$i][0]*3+1, $coord_list[$i][1]*3];
push @new_coords, [$coord_list[$i][0]*3+2, $coord_list[$i][1]*3];
}
elsif($dir == $GRID_DIR{sw})
{
push @new_coords, [$coord_list[$i][0]*3, $coord_list[$i][1]*3+1];
push @new_coords, [$coord_list[$i][0]*3, $coord_list[$i][1]*3+2];
}
elsif($dir == $GRID_DIR{s})
{
push @new_coords, [$coord_list[$i][0]*3-1, $coord_list[$i][1]*3+1];
push @new_coords, [$coord_list[$i][0]*3-2, $coord_list[$i][1]*3+2];
}
elsif($dir == $GRID_DIR{se})
{
push @new_coords, [$coord_list[$i][0]*3-1, $coord_list[$i][1]*3];
push @new_coords, [$coord_list[$i][0]*3-2, $coord_list[$i][1]*3];
}
elsif($dir == $GRID_DIR{ne})
{
push @new_coords, [$coord_list[$i][0]*3, $coord_list[$i][1]*3-1];
push @new_coords, [$coord_list[$i][0]*3, $coord_list[$i][1]*3-2];
}
elsif($dir == $GRID_DIR{n})
{
push @new_coords, [$coord_list[$i][0]*3+1, $coord_list[$i][1]*3-1];
push @new_coords, [$coord_list[$i][0]*3+2, $coord_list[$i][1]*3-2];
}
}
push @new_coords, [$coord_list[$#coord_list][0]*3,$coord_list[$#coord_list][1]*3];
return @new_coords;
}
sub get_edge_direction($nw1, $sw1, $nw2, $sw2)
{
my $nw_diff = $nw2 - $nw1;
my $sw_diff = $sw2 - $sw1;
return $GRID_DIR{nw} if $nw_diff == 1 && $sw_diff == 0;
return $GRID_DIR{sw} if $nw_diff == 0 && $sw_diff == 1;
return $GRID_DIR{s} if $nw_diff == -1 && $sw_diff == 1;
return $GRID_DIR{se} if $nw_diff == -1 && $sw_diff == 0;
return $GRID_DIR{ne} if $nw_diff == 0 && $sw_diff == -1;
return $GRID_DIR{n} if $nw_diff == 1 && $sw_diff == -1;
carp("Tiles are not adjacent: $nw1,$sw1—$nw2,$sw2");
return undef;
}
sub make_output_region_line($regions_hashref, $region)
{
my $line = "";

47
grid-tester.pl
Unescape View File

@ -18,17 +18,50 @@ my $grid = HexGrid->new(defaults => {
show_coords => 1});
my $test_file = shift;
open (my $test_fh, $test_file);
open(my $test_fh, $test_file);
my $mode = "";
while (my $line = <$test_fh>)
{
my @fields = split '; ', $line;
my $region = $grid->make_region(shift @fields);
$region->{defaults}{colour} = shift @fields;
foreach my $coords (@fields)
if ($line =~ /== Regions/)
{
do { carp "Skipping bad spec: $coords"; next; } unless $coords =~ $coords_regex;
$region->make_tile_at($1,$2);
$mode = "Regions";
next;
}
if ($line =~ /== Paths/)
{
$mode = "Paths";
next;
}
if($mode eq "Regions")
{
my @fields = split '; ', $line;
my $region = $grid->make_region(shift @fields);
$region->{defaults}{colour} = shift @fields;
foreach my $coords (@fields)
{
do { carp "Skipping bad spec: $coords"; next; } unless $coords =~ $coords_regex;
$region->make_tile_at($1,$2);
}
}
if($mode eq "Paths")
{
my @fields = split '; ', $line;
my $name = shift @fields;
my $colour = shift @fields;
my $starts_from = shift @fields;
my $ends_to = shift @fields;
my @path_coords;
foreach my $coords (@fields)
{
do { carp "Skipping bad spec: $coords"; next; } unless $coords =~ $coords_regex;
push @path_coords, [$1,$2];
}
my $path = $grid->make_path_from($name, \@path_coords, colour => $colour, style => { 'stroke-width' => 5 });
$path->{starts_from} = $HexGrid::DIR{$starts_from} if $starts_from;
$path->{ends_to} = $HexGrid::DIR{$ends_to} if $ends_to;
}
}

Write Preview
Loading…
Cancel
Save