X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0ab0f0ea44c2e93043f00e90c2935f7e742ed9e4..689bcbd6ea1bb83f815075f1f4cc53b8dc1f6393:/lib-sql/functions/importance.sql

diff --git a/lib-sql/functions/importance.sql b/lib-sql/functions/importance.sql
index 30e778d1..1de5899c 100644
--- a/lib-sql/functions/importance.sql
+++ b/lib-sql/functions/importance.sql
@@ -20,6 +20,54 @@ CREATE TYPE place_importance as (
   wikipedia TEXT
 );
 
+{% if 'wikimedia_importance' in db.tables %}
+
+CREATE OR REPLACE FUNCTION get_wikipedia_match(extratags HSTORE, country_code varchar(2))
+  RETURNS wikipedia_article_match
+  AS $$
+DECLARE
+  i INT;
+  wiki_article_title TEXT;
+  wiki_article_language TEXT;
+  result wikipedia_article_match;
+  entry RECORD;
+BEGIN
+  IF extratags ? 'wikipedia' and strpos(extratags->'wikipedia', ':') IN (3,4) THEN
+    wiki_article_language := lower(trim(split_part(extratags->'wikipedia', ':', 1)));
+    wiki_article_title := trim(substr(extratags->'wikipedia',
+                                      strpos(extratags->'wikipedia', ':') + 1));
+
+    FOR result IN
+      SELECT language, title, importance FROM wikimedia_importance
+        WHERE language = wiki_article_language
+              and title = replace(wiki_article_title, ' ', '_')
+    LOOP
+      RETURN result;
+    END LOOP;
+  END IF;
+
+  FOREACH wiki_article_language IN ARRAY ARRAY['ar','bg','ca','cs','da','de','en','es','eo','eu','fa','fr','ko','hi','hr','id','it','he','lt','hu','ms','nl','ja','no','pl','pt','kk','ro','ru','sk','sl','sr','fi','sv','tr','uk','vi','vo','war','zh']
+  LOOP
+    IF extratags ? ('wikipedia:' || wiki_article_language) THEN
+        wiki_article_title := extratags->('wikipedia:' || wiki_article_language);
+
+        FOR result IN
+          SELECT language, title, importance FROM wikimedia_importance
+            WHERE language = wiki_article_language
+                  and title = replace(wiki_article_title, ' ', '_')
+        LOOP
+          RETURN result;
+        END LOOP;
+    END IF;
+
+  END LOOP;
+
+  RETURN NULL;
+END;
+$$
+LANGUAGE plpgsql IMMUTABLE;
+
+{% else %}
 
 -- See: http://stackoverflow.com/questions/6410088/how-can-i-mimic-the-php-urldecode-function-in-postgresql
 CREATE OR REPLACE FUNCTION decode_url_part(p varchar)
@@ -62,10 +110,6 @@ BEGIN
   WHILE langs[i] IS NOT NULL LOOP
     wiki_article := extratags->(case when langs[i] in ('english','country') THEN 'wikipedia' ELSE 'wikipedia:'||langs[i] END);
     IF wiki_article is not null THEN
-      wiki_article := regexp_replace(wiki_article,E'^(.*?)([a-z]{2,3}).wikipedia.org/wiki/',E'\\2:');
-      wiki_article := regexp_replace(wiki_article,E'^(.*?)([a-z]{2,3}).wikipedia.org/w/index.php\\?title=',E'\\2:');
-      wiki_article := regexp_replace(wiki_article,E'^(.*?)/([a-z]{2,3})/wiki/',E'\\2:');
-      --wiki_article := regexp_replace(wiki_article,E'^(.*?)([a-z]{2,3})[=:]',E'\\2:');
       wiki_article := replace(wiki_article,' ','_');
       IF strpos(wiki_article, ':') IN (3,4) THEN
         wiki_article_language := lower(trim(split_part(wiki_article, ':', 1)));
@@ -97,47 +141,11 @@ END;
 $$
 LANGUAGE plpgsql STABLE;
 
-
-CREATE OR REPLACE FUNCTION get_osm_views(centroid GEOMETRY)
-  RETURNS BIGINT
-  AS $$
-DECLARE
-  result BIGINT;
-BEGIN
-  SELECT ST_Value(osm_views.rast, centroid)
-  FROM osm_views
-  WHERE ST_Intersects(ST_ConvexHull(osm_views.rast), centroid) LIMIT 1 INTO result;
-
-  return COALESCE(result, 0);
-END;
-$$
-LANGUAGE plpgsql STABLE;
-
-
-CREATE OR REPLACE FUNCTION normalize_osm_views(views BIGINT)
-  RETURNS FLOAT
-  AS $$
-  DECLARE
-    normalized_osm_views FLOAT;
-    max_views BIGINT;
-  BEGIN
-    IF views > 0 THEN
-      -- Get the highest view count to use it in normalizing the data
-      SELECT max_views_count FROM osm_views_stat INTO max_views;
-      normalized_osm_views := (LOG(views))/(LOG(max_views));
-    ELSE
-      normalized_osm_views := 0.0;
-    END IF;
-
-    RETURN normalized_osm_views;
-  END;
-$$
-LANGUAGE plpgsql;
-
+{% endif %}
 
 CREATE OR REPLACE FUNCTION compute_importance(extratags HSTORE,
                                               country_code varchar(2),
-                                              osm_type varchar(1), osm_id BIGINT,
+                                              rank_search SMALLINT,
                                               centroid GEOMETRY)
   RETURNS place_importance
   AS $$
@@ -147,39 +155,51 @@ DECLARE
   osm_views_exists BIGINT;
   views BIGINT;
 BEGIN
- -- check if osm_views table exists
- SELECT COUNT(table_name)
-   INTO osm_views_exists
- FROM information_schema.tables
- WHERE table_schema LIKE 'public' AND 
-       table_type LIKE 'BASE TABLE' AND
-       table_name = 'osm_views';
-
-  -- add importance by OSM views if osm_views table exists
-  IF osm_views_exists THEN
-    views := get_osm_views(centroid);
-    result.importance := normalize_osm_views(views) * 0.35;
-  END IF;
-
-  -- add importance by wiki data if the place has one
-  FOR match IN SELECT * FROM get_wikipedia_match(extratags, country_code)
-               WHERE language is not NULL
+  -- add importance by wikipedia article if the place has one
+  FOR match IN
+    SELECT * FROM get_wikipedia_match(extratags, country_code)
+    WHERE language is not NULL
   LOOP
-    result.importance := COALESCE(result.importance, 0) + match.importance * 0.65;
+    result.importance := match.importance;
     result.wikipedia := match.language || ':' || match.title;
     RETURN result;
   END LOOP;
 
-  IF extratags ? 'wikidata' THEN
-    FOR match IN SELECT * FROM wikipedia_article
-                  WHERE wd_page_title = extratags->'wikidata'
-                  ORDER BY language = 'en' DESC, langcount DESC LIMIT 1 LOOP
-      result.importance := COALESCE(result.importance, 0) + match.importance * 0.65;
+  -- Nothing? Then try with the wikidata tag.
+  IF result.importance is null AND extratags ? 'wikidata' THEN
+    FOR match IN
+{% if 'wikimedia_importance' in db.tables %}
+      SELECT * FROM wikimedia_importance
+        WHERE wikidata = extratags->'wikidata'
+        LIMIT 1
+{% else %}
+      SELECT * FROM wikipedia_article
+        WHERE wd_page_title = extratags->'wikidata'
+        ORDER BY language = 'en' DESC, langcount DESC LIMIT 1
+{% endif %}
+    LOOP
+      result.importance := match.importance;
       result.wikipedia := match.language || ':' || match.title;
       RETURN result;
     END LOOP;
   END IF;
 
+  -- Still nothing? Fall back to a default.
+  IF result.importance is null THEN
+    result.importance := 0.40001 - (rank_search::float / 75);
+  END IF;
+
+{% if 'secondary_importance' in db.tables %}
+  FOR match IN
+    SELECT ST_Value(rast, centroid) as importance
+    FROM secondary_importance
+    WHERE ST_Intersects(ST_ConvexHull(rast), centroid) LIMIT 1
+  LOOP
+    -- Secondary importance as tie breaker with 0.0001 weight.
+    result.importance := result.importance + match.importance::float / 655350000;
+  END LOOP;
+{% endif %}
+
   RETURN result;
 END;
 $$