projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Form 477 update for 2022+ reporting (2020 census data), RT#86245 (New FS::Misc::Geo...
[freeside.git]
/
FS
/
FS
/
GeocodeCache.pm
diff --git
a/FS/FS/GeocodeCache.pm
b/FS/FS/GeocodeCache.pm
index
7829c4d
..
430a90f
100644
(file)
--- a/
FS/FS/GeocodeCache.pm
+++ b/
FS/FS/GeocodeCache.pm
@@
-117,16
+117,15
@@
the only one is 'ffiec'.
sub set_censustract {
my $self = shift;
sub set_censustract {
my $self = shift;
- if ( $self->get('censustract') =~ /^\d{9}
\.\d{2}
$/ ) {
+ if ( $self->get('censustract') =~ /^\d{9}
(\.\d{2}|\d{6})
$/ ) {
return $self->get('censustract');
}
return $self->get('censustract');
}
- my $censusyear = $conf->config('census_year');
- return if !$censusyear;
- my $method = 'ffiec';
- # configurable censustract-only lookup goes here if it's ever needed.
+ my $year = $conf->config('census_legacy') || 2020;
+ my $method = ($year==2020) ? 'uscensus' : 'ffiec';
+
$method = "get_censustract_$method";
$method = "get_censustract_$method";
- my $censustract = eval { FS::Misc::Geo->$method($self, $
census
year) };
+ my $censustract = eval { FS::Misc::Geo->$method($self, $year) };
$self->set("censustract_error", $@);
$self->set("censustract", $censustract);
}
$self->set("censustract_error", $@);
$self->set("censustract", $censustract);
}