improve manual census map selection, RT#86245, RT#76968,

diff --git a/httemplate/misc/confirm-censustract.html b/httemplate/misc/confirm-censustract.html
index f3fd038..02847f8 100644 (file)
--- a/httemplate/misc/confirm-censustract.html
+++ b/httemplate/misc/confirm-censustract.html
@@ -16,11 +16,13 @@ Confirm census tract
 <% $location{address1} |h %> <% $location{address2} |h %><BR>
 <% $location{city} |h %>, <% $location{state} |h %> <% $location{zip} |h %><BR>
 <BR>
-% my $querystring = "census_year=$year&address=$location{address1}, $location{address2}, $location{city}, $location{state}";
+% my $address1 = $location{address1};
+% $address1 =~ s/(apt|ste|suite|unit)[\s\d]\w*\s*$//i;
+% my $querystring = "census_year=$year&address=$address1, $location{address2}, $location{city}, $location{state}";
 <A HREF="<%$p%>misc/openmap.html?<% $querystring %>"
    REL="opener"
    TARGET="_blank"
->Map service module location</A><BR>
+>Map service location</A><BR>
 % $querystring = "census_year=$year&pre=$pre&zip_code=" . $cache->get('zip');
 <A HREF="<%$p%>misc/openmap.html?<% $querystring %>"
    REL="opener"

diff --git a/httemplate/misc/openmap.html b/httemplate/misc/openmap.html
index a9a7033..15de288 100644 (file)
--- a/httemplate/misc/openmap.html
+++ b/httemplate/misc/openmap.html
@@ -78,6 +78,6 @@ my $census_year = $cgi->param('census_year');
 my $pre         = $cgi->param('pre');
 my $zip_code    = $cgi->param('zip_code');
 my $address     = $cgi->param('address');
-my $loc = $zip_code ? $zip_code : $address;
+my $loc = $zip_code ? $zip_code.', United States' : $address;
 
 </%init>