From 1d43262fe30abd543075c68f67a0f0d3c5fee04b Mon Sep 17 00:00:00 2001 From: slowe <299787+slowe@users.noreply.github.com> Date: Wed, 24 Jul 2024 19:22:37 +0100 Subject: [PATCH] Rename "2023" as "2024" To avoid some future confusion --- pipelines/society/foodbanks.pl | 2 +- .../society/general-elections-notional.pl | 2 +- pipelines/society/general-elections.pl | 2 +- pipelines/society/police-data.pl | 2 +- src/_components/wrapper.js | 2 +- ...hexjson => uk-constituencies-2024.hexjson} | 0 src/about.njk | 4 +-- ...es-2023.svg => uk-constituencies-2024.svg} | 0 src/index.njk | 6 ++-- .../embeds/average-download-speeds.njk | 2 +- .../below-universal-service-obligation.njk | 2 +- .../economy/broadband/embeds/gigabit.njk | 2 +- .../embeds/receiving-over-30mbps.njk | 2 +- .../embeds/receiving-under-10mbps.njk | 2 +- .../economy/broadband/embeds/superfast.njk | 2 +- src/themes/economy/house-prices.njk | 2 +- .../environment/ancient-woodland/index.njk | 2 +- src/themes/environment/crow/index.njk | 2 +- .../green-belt/embeds/percentage.njk | 2 +- .../environment/green-belt/embeds/total.njk | 2 +- .../embeds/_partials/total-duration.njk | 2 +- .../embeds/_partials/total-spills.njk | 2 +- src/themes/society/crime/index.njk | 28 +++++++++---------- src/themes/society/electorate.njk | 2 +- src/themes/society/eu-referendum.njk | 2 +- .../society/food-banks/embeds/total.njk | 2 +- .../embeds/candidates-2024.njk | 2 +- .../society/general-elections/index.njk | 6 ++-- src/themes/society/population.njk | 6 ++-- src/themes/society/regions.njk | 2 +- .../transport/car-or-van-availability.njk | 2 +- 31 files changed, 49 insertions(+), 49 deletions(-) rename src/_data/hexjson/{uk-constituencies-2023.hexjson => uk-constituencies-2024.hexjson} (100%) rename src/assets/svg/{uk-constituencies-2023.svg => uk-constituencies-2024.svg} (100%) diff --git a/pipelines/society/foodbanks.pl b/pipelines/society/foodbanks.pl index d869d3c..78ac726 100644 --- a/pipelines/society/foodbanks.pl +++ b/pipelines/society/foodbanks.pl @@ -14,7 +14,7 @@ BEGIN use lib $basedir."../lib/"; # Custom functions require "lib.pl"; -my $hexfile = $basedir."../../src/_data/hexjson/uk-constituencies-2023.hexjson"; +my $hexfile = $basedir."../../src/_data/hexjson/uk-constituencies-2024.hexjson"; my $fbkfile = $basedir."../../raw-data/society/foodbanks.json"; my $outfile = $basedir."../../src/themes/society/food-banks/_data/foodbanks.csv"; diff --git a/pipelines/society/general-elections-notional.pl b/pipelines/society/general-elections-notional.pl index 94bd1e0..2ef963b 100644 --- a/pipelines/society/general-elections-notional.pl +++ b/pipelines/society/general-elections-notional.pl @@ -20,7 +20,7 @@ BEGIN my ($hexjson,$lookup,$pcon,$con,$i,$pname,$party); -$hexjson = LoadJSON($basedir."../../src/_data/hexjson/uk-constituencies-2023.hexjson"); +$hexjson = LoadJSON($basedir."../../src/_data/hexjson/uk-constituencies-2024.hexjson"); # Build a lookup from constituency name to code #$lookup = {}; #foreach $pcon (keys(%{$hexjson->{'hexes'}})){ $lookup->{$hexjson->{'hexes'}{$pcon}{'n'}} = $pcon; } diff --git a/pipelines/society/general-elections.pl b/pipelines/society/general-elections.pl index eca4c99..4b3eceb 100644 --- a/pipelines/society/general-elections.pl +++ b/pipelines/society/general-elections.pl @@ -20,7 +20,7 @@ BEGIN my ($hexjson,$lookup,$pcon,@candidates,$con); -$hexjson = LoadJSON($basedir."../../src/_data/hexjson/uk-constituencies-2023.hexjson"); +$hexjson = LoadJSON($basedir."../../src/_data/hexjson/uk-constituencies-2024.hexjson"); # Build a lookup from constituency name to code $lookup = {}; foreach $pcon (keys(%{$hexjson->{'hexes'}})){ $lookup->{$hexjson->{'hexes'}{$pcon}{'n'}} = $pcon; } diff --git a/pipelines/society/police-data.pl b/pipelines/society/police-data.pl index fc15a70..9839c2c 100644 --- a/pipelines/society/police-data.pl +++ b/pipelines/society/police-data.pl @@ -20,7 +20,7 @@ BEGIN # Set some variables my $ofile = $basedir."../../src/_data/sources/society/crime-data.csv"; my $tempdir = $basedir."../../raw-data/society/police/"; -my $hexjson = $basedir.'../../src/_data/hexjson/uk-constituencies-2023.hexjson'; +my $hexjson = $basedir.'../../src/_data/hexjson/uk-constituencies-2024.hexjson'; my $geojson = $basedir."../../raw-data/geojson/constituencies-2023-hires.geojson"; my $popdata = $basedir."../../src/_data/sources/society/population.csv"; # Derived from https://www.ons.gov.uk/peoplepopulationandcommunity/populationandmigration/populationestimates/datasets/parliamentaryconstituencymidyearpopulationestimates diff --git a/src/_components/wrapper.js b/src/_components/wrapper.js index 20bd7ce..d4aa094 100644 --- a/src/_components/wrapper.js +++ b/src/_components/wrapper.js @@ -5,7 +5,7 @@ export default function ({ comp, component, config, download }) { if(!config.attribution) config.attribution = ""; if(config.hexjson=="hexjson.constituencies") config.attribution += (config.attribution ? ' / ' : '')+'Hex layout: 2010 constituencies (Open Innovations and contributors)'; - if(config.hexjson=="hexjson.uk-constituencies-2023" || config.hexjson=="hexjson.uk-constituencies-2023-temporary") config.attribution += (config.attribution ? ' / ' : '')+'Hex layout: 2024 constituencies (Open Innovations and contributors)'; + if(config.hexjson=="hexjson.uk-constituencies-2024" || config.hexjson=="hexjson.uk-constituencies-2023-temporary") config.attribution += (config.attribution ? ' / ' : '')+'Hex layout: 2024 constituencies (Open Innovations and contributors)'; config.attribution += '