From: Sarah Hoffmann Date: Thu, 19 Sep 2013 20:08:22 +0000 (+0200) Subject: move blocking of highway objects into osm2pgsql X-Git-Tag: v2.2.0~17^2~24 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/f723eb199836887a535942c387091557a76f88aa move blocking of highway objects into osm2pgsql --- diff --git a/osm2pgsql b/osm2pgsql index 0005c331..48377cec 160000 --- a/osm2pgsql +++ b/osm2pgsql @@ -1 +1 @@ -Subproject commit 0005c3312cdbddb51fdb749315d4c7df59daa82a +Subproject commit 48377cecdccacc64528fe070a1495cb2070e833a diff --git a/sql/functions.sql b/sql/functions.sql index 48720628..09ff155c 100644 --- a/sql/functions.sql +++ b/sql/functions.sql @@ -938,10 +938,6 @@ BEGIN --DEBUG: RAISE WARNING '% %',NEW.osm_type,NEW.osm_id; -- just block these - IF NEW.class = 'highway' and NEW.type in ('turning_circle','traffic_signals','mini_roundabout','noexit','crossing') THEN --- RAISE WARNING 'bad highway %',NEW.osm_id; - RETURN null; - END IF; IF NEW.class in ('landuse','natural') and NEW.name is null THEN -- RAISE WARNING 'empty landuse %',NEW.osm_id; RETURN null; @@ -2044,9 +2040,6 @@ BEGIN END IF; -- Just block these - lots and pointless - IF NEW.class = 'highway' and NEW.type in ('turning_circle','traffic_signals','mini_roundabout','noexit','crossing') THEN - RETURN null; - END IF; IF NEW.class in ('landuse','natural') and NEW.name is null THEN RETURN null; END IF;