#2978 address standardizer doesn't handle street number ranges, also added regress...

git-svn-id: http://svn.osgeo.org/postgis/trunk@14055 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/extensions/address_standardizer/expected/test-standardize_address_1.out b/extensions/address_standardizer/expected/test-standardize_address_1.out
index 14d538d07579e5ddd07fd466a8ebc79b7de4eda3..34e825809135e52a69f384230ceb799a190c8517 100644 (file)
--- a/extensions/address_standardizer/expected/test-standardize_address_1.out
+++ b/extensions/address_standardizer/expected/test-standardize_address_1.out
@@ -16,3 +16,21 @@ SELECT '#2981' As ticket, * FROM standardize_address('us_lex','us_gaz','us_rules
  #2981  |          | 1566      |        |      |         | NEW STATE HIGHWAY |         |        |            |       | RAYNHAM | MASSACHUSETTS | USA     |          |     | 
 (1 row)
 
+SELECT '#2978a' As ticket, * FROM standardize_address('us_lex','us_gaz','us_rules', '10-20 DORRANCE ST PROVIDENCE RI' );
+ ticket | building | house_num | predir | qual | pretype |   name   | suftype | sufdir | ruralroute | extra |    city    |    state     | country | postcode | box | unit 
+--------+----------+-----------+--------+------+---------+----------+---------+--------+------------+-------+------------+--------------+---------+----------+-----+------
+ #2978a |          | 10 20     |        |      |         | DORRANCE | STREET  |        |            |       | PROVIDENCE | RHODE ISLAND | USA     |          |     | 
+(1 row)
+
+SELECT '#2978b' As ticket, * FROM standardize_address('us_lex','us_gaz','us_rules', '10 20 DORRANCE ST PROVIDENCE RI' );
+ ticket | building | house_num | predir | qual | pretype |   name   | suftype | sufdir | ruralroute | extra |    city    |    state     | country | postcode | box | unit 
+--------+----------+-----------+--------+------+---------+----------+---------+--------+------------+-------+------------+--------------+---------+----------+-----+------
+ #2978b |          | 10 20     |        |      |         | DORRANCE | STREET  |        |            |       | PROVIDENCE | RHODE ISLAND | USA     |          |     | 
+(1 row)
+
+SELECT '#2978c' As ticket, * FROM standardize_address('us_lex','us_gaz','us_rules', '10-20 DORRANCE ST, PROVIDENCE, RI');
+ ticket | building | house_num | predir | qual | pretype |   name   | suftype | sufdir | ruralroute | extra |    city    |    state     | country | postcode | box | unit 
+--------+----------+-----------+--------+------+---------+----------+---------+--------+------------+-------+------------+--------------+---------+----------+-----+------
+ #2978c |          | 10 20     |        |      |         | DORRANCE | STREET  |        |            |       | PROVIDENCE | RHODE ISLAND | USA     |          |     | 
+(1 row)
+

diff --git a/extensions/address_standardizer/test-standardize_address_1.sql.in b/extensions/address_standardizer/test-standardize_address_1.sql.in
index 8b2dbf09cb4a28524dd56705bc859af46395593d..9b2a8289052b30d209196684390aa3b27aa9bd21 100644 (file)
--- a/extensions/address_standardizer/test-standardize_address_1.sql.in
+++ b/extensions/address_standardizer/test-standardize_address_1.sql.in
@@ -1,3 +1,6 @@
 select * from parse_address('123 Main Street, Kansas City, MO 45678');
 select * from standardize_address('us_lex'::text, 'us_gaz'::text, 'us_rules'::text, '123 Main Street'::text, 'Kansas City, MO 45678'::text);
-SELECT '#2981' As ticket, * FROM standardize_address('us_lex','us_gaz','us_rules', '1566 NEW STATE HWY, RAYNHAM, MA') ;
+SELECT '#2981' As ticket, * FROM standardize_address('us_lex','us_gaz','us_rules', '1566 NEW STATE HWY, RAYNHAM, MA');
+SELECT '#2978a' As ticket, * FROM standardize_address('us_lex','us_gaz','us_rules', '10-20 DORRANCE ST PROVIDENCE RI' );
+SELECT '#2978b' As ticket, * FROM standardize_address('us_lex','us_gaz','us_rules', '10 20 DORRANCE ST PROVIDENCE RI' );
+SELECT '#2978c' As ticket, * FROM standardize_address('us_lex','us_gaz','us_rules', '10-20 DORRANCE ST, PROVIDENCE, RI');

diff --git a/extensions/address_standardizer/us_rules.sql b/extensions/address_standardizer/us_rules.sql
index b3964de518179d3d2d31d382cf03a6b1016e5cb8..31fbfc903d82c8d6279e654cd19beec9178e64f8 100644 (file)
--- a/extensions/address_standardizer/us_rules.sql
+++ b/extensions/address_standardizer/us_rules.sql
@@ -3436,7 +3436,7 @@ INSERT INTO us_rules (rule) VALUES ('18 0 -1 1 1 -1 3 12');
 INSERT INTO us_rules (rule) VALUES ('25 -1 1 -1 3 12');
 INSERT INTO us_rules (rule) VALUES ('21 0 -1 1 1 -1 3 12');
 INSERT INTO us_rules (rule) VALUES ('0 21 -1 1 1 -1 3 9');
-INSERT INTO us_rules (rule) VALUES ('0 0 -1 1 1 -1 3 9');
+INSERT INTO us_rules (rule) VALUES ('0 0 -1 1 1 -1 3 15');
 INSERT INTO us_rules (rule) VALUES ('21 0 0 -1 1 1 1 -1 3 9');
 INSERT INTO us_rules (rule) VALUES ('0 0 21 -1 1 1 1 -1 3 9');
 INSERT INTO us_rules (rule) VALUES ('0 0 18 -1 1 1 1 -1 3 9');

diff --git a/extras/tiger_geocoder/pagc_normalize/pagc_tables.sql b/extras/tiger_geocoder/pagc_normalize/pagc_tables.sql
index 195e8bcfa58de12d2d05375495248b88b00ac9ca..7bac89a4c7b98a3777d8a3b7b4f6fdd63e9fb770 100644 (file)
--- a/extras/tiger_geocoder/pagc_normalize/pagc_tables.sql
+++ b/extras/tiger_geocoder/pagc_normalize/pagc_tables.sql
@@ -7252,7 +7252,7 @@ INSERT INTO pagc_rules (id, rule) VALUES (3425, '18 0 -1 1 1 -1 3 12');
 INSERT INTO pagc_rules (id, rule) VALUES (3426, '25 -1 1 -1 3 12');
 INSERT INTO pagc_rules (id, rule) VALUES (3427, '21 0 -1 1 1 -1 3 12');
 INSERT INTO pagc_rules (id, rule) VALUES (3428, '0 21 -1 1 1 -1 3 9');
-INSERT INTO pagc_rules (id, rule) VALUES (3429, '0 0 -1 1 1 -1 3 9');
+INSERT INTO pagc_rules (id, rule) VALUES (3429, '0 0 -1 1 1 -1 3 15');
 INSERT INTO pagc_rules (id, rule) VALUES (3430, '21 0 0 -1 1 1 1 -1 3 9');
 INSERT INTO pagc_rules (id, rule) VALUES (3431, '0 0 21 -1 1 1 1 -1 3 9');
 INSERT INTO pagc_rules (id, rule) VALUES (3432, '0 0 18 -1 1 1 1 -1 3 9');

diff --git a/extras/tiger_geocoder/regress/pagc_normalize_address_regress b/extras/tiger_geocoder/regress/pagc_normalize_address_regress
index 4ac3a5058e45fdf00b2833f5bf49278da03a3e7e..50f704a539b99e70ba75571e637956e8c48884b9 100644 (file)
--- a/extras/tiger_geocoder/regress/pagc_normalize_address_regress
+++ b/extras/tiger_geocoder/regress/pagc_normalize_address_regress
@@ -47,4 +47,7 @@ true
 #3259a|212||3RD|AVE|N|SUITE 560|MINNEAPOLIS|MN|55401|t
 #3259b|3937||43RD|AVE|S||MINNEAPOLIS|MN|55406|t
 #2981|1566||NEW STATE HWY||||RAYNHAM|MA||t
+#2978a|10||DORRANCE|ST|||PROVIDENCE|RI||t
+#2978b|10||DORRANCE|ST|||PROVIDENCE|RI||t
+#2978c|10||DORRANCE|ST|||PROVIDENCE|RI||t
 false

diff --git a/extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql b/extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql
index d99ceb4c6cd5a8dd1e31e3e7a0cabcfd7fa45742..148b68e6adeff9e38b867eefb9cd3886ab5a4fc4 100644 (file)
--- a/extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql
+++ b/extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql
@@ -104,6 +104,9 @@ SELECT '#1108a' As ticket, pprint_addy(addy), addy.* FROM normalize_address('529
 SELECT '#3259a' As ticket, * FROM normalize_address('212 Third Ave N Suite 560, Minneapolis, MN 55401');
 SELECT '#3259b' As ticket, * FROM normalize_address('3937 Forty Third AVE S, MINNEAPOLIS, MN 55406');
 SELECT '#2981' As ticket, * FROM normalize_address('1566 NEW STATE HWY, RAYNHAM, MA') ;
+SELECT '#2978a' As ticket, * FROM normalize_address('10-20 DORRANCE ST PROVIDENCE RI' ) ;
+SELECT '#2978b' As ticket, * FROM normalize_address('10 20 DORRANCE ST PROVIDENCE RI' ) ;
+SELECT '#2978c' As ticket, * FROM normalize_address('10-20 DORRANCE ST, PROVIDENCE. RI' ) ;
 
 --\timing
 SELECT set_geocode_setting('use_pagc_address_parser', 'false');