Merge remote-tracking branch 'upstream/master'

diff --git a/lib/lib.php b/lib/lib.php
index 9d1120cbed9639c2aede011adbdef8a8e382b61a..2deca48478715132491ea9a1ae23465f987c5722 100644 (file)
--- 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 3586caa0936e052ec14a7172769df4b3b4da2d08..dc7cc1b6725958f09afb32379a3d937df75cdd70 160000 (submodule)
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit 3586caa0936e052ec14a7172769df4b3b4da2d08
+Subproject commit dc7cc1b6725958f09afb32379a3d937df75cdd70

diff --git a/sql/functions.sql b/sql/functions.sql
index 6fbfa7326a7bdf2a345a36c96cd85b86c5d84ea7..03825f99270f5bb4e7792eaff3a77f3394be85ee 100644 (file)
--- 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;