From 777e1cdbd939dc8be01f433f8a6de36dcc5331e4 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 17 Feb 2013 14:53:22 +0100
Subject: [PATCH] remove special handling of mountain passes

clashes with use of place tags on same node,
needs updated osm2pgsql
---
 lib/lib.php       | 1 +
 osm2pgsql         | 2 +-
 sql/functions.sql | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/lib.php b/lib/lib.php
index 9d1120cb..2deca484 100644
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -583,6 +583,7 @@
  'natural:scrub' => array('label'=>'Scrub','frequency'=>20,'icon'=>'',),
  'natural:fen' => array('label'=>'Fen','frequency'=>20,'icon'=>'',),
  'building:yes' => array('label'=>'Building','frequency'=>200,'icon'=>'',),
+ 'mountain_pass:yes' => array('label'=>'Mountain Pass','frequency'=>200,'icon'=>'',),
 
  'amenity:parking' => array('label'=>'Parking','frequency'=>3157,'icon'=>'',),
  'highway:bus_stop' => array('label'=>'Bus Stop','frequency'=>35777,'icon'=>'transport_bus_stop2',),
diff --git a/osm2pgsql b/osm2pgsql
index 3586caa0..dc7cc1b6 160000
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit 3586caa0936e052ec14a7172769df4b3b4da2d08
+Subproject commit dc7cc1b6725958f09afb32379a3d937df75cdd70
diff --git a/sql/functions.sql b/sql/functions.sql
index 6fbfa732..03825f99 100644
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -1155,6 +1155,9 @@ BEGIN
       NEW.rank_address := NEW.rank_search;
     ELSEIF NEW.class = 'natural' and NEW.type in ('coastline') THEN
       RETURN NULL;
+    ELSEIF NEW.class = 'mountain_pass' THEN
+        NEW.rank_search := 20;
+        NEW.rank_address := 0;
     END IF;
 
   END IF;
-- 
2.39.5