remove BDD test for tiger:county

We no longer rely on the import to strip the tag.

diff --git a/settings/flex-base.lua b/settings/flex-base.lua
index 19f4e27bde554dd8e01cd2df2932cec7940a58e0..fe3ce32ae6d85cd18fe0217900ba324da58c12e8 100644 (file)
--- a/settings/flex-base.lua
+++ b/settings/flex-base.lua
@@ -347,16 +347,6 @@ function process_tags(o)
 
     local is_interpolation = o:grab_address{match=INTERPOLATION_TAGS} > 0
 
 
     local is_interpolation = o:grab_address{match=INTERPOLATION_TAGS} > 0
 

-    if ADD_TIGER_COUNTY then
-        local v = o:grab_tag('tiger:county')
-        if v ~= nil then
-            v, num = v:gsub(',.*', ' county')
-            if num == 0 then
-                v = v .. ' county'
-            end
-            o:set_address('tiger:county', v)
-        end
-    end

     o:grab_address{match=ADDRESS_TAGS}
 
     if is_interpolation then
     o:grab_address{match=ADDRESS_TAGS}
 
     if is_interpolation then

diff --git a/settings/import-extratags.lua b/settings/import-extratags.lua
index 535af3c8ced1abec65aa3cf1c816e91156f51a10..7b1880ef7df4486a417e362d4df8a0ff41c626fc 100644 (file)
--- a/settings/import-extratags.lua
+++ b/settings/import-extratags.lua
@@ -123,8 +123,7 @@ HOUSENUMBER_TAGS = tag_match{keys = {'addr:housenumber', 'addr:conscriptionnumbe
 
 INTERPOLATION_TAGS = tag_match{keys = {'addr:interpolation'}}
 
 
 INTERPOLATION_TAGS = tag_match{keys = {'addr:interpolation'}}
 

-ADDRESS_TAGS = tag_match{keys = {'addr:*', 'is_in:*'}}
-ADD_TIGER_COUNTY = true
+ADDRESS_TAGS = tag_match{keys = {'addr:*', 'is_in:*', 'tiger:county'}}

 
 SAVE_EXTRA_MAINS = true
 
 
 SAVE_EXTRA_MAINS = true
 

diff --git a/test/bdd/osm2pgsql/import/tags.feature b/test/bdd/osm2pgsql/import/tags.feature
index 1f6857f2c0ac3dcb5d740f49b90acdce546e45cc..60d241fe68e9d3296e82ae9c0938882d7b991eab 100644 (file)
--- a/test/bdd/osm2pgsql/import/tags.feature
+++ b/test/bdd/osm2pgsql/import/tags.feature
@@ -166,20 +166,6 @@ Feature: Tag evaluation
             | N10003:place    | place    | island         |
 
 
             | N10003:place    | place    | island         |
 
 

-    Scenario: Shorten tiger:county tags
-        When loading osm data
-            """
-            n11001 Tplace=village,tiger:county=Feebourgh%2c%%20%AL
-            n11002 Tplace=village,addr:state=Alabama,tiger:county=Feebourgh%2c%%20%AL
-            n11003 Tplace=village,tiger:county=Feebourgh
-            """
-        Then place contains exactly
-            | object | class | address             |
-            | N11001 | place | 'tiger:county': 'Feebourgh county' |
-            | N11002 | place | 'tiger:county': 'Feebourgh county', 'state': 'Alabama' |
-            | N11003 | place | 'tiger:county': 'Feebourgh county' |
-
-

     Scenario: Building fallbacks
         When loading osm data
             """
     Scenario: Building fallbacks
         When loading osm data
             """