improvements to scoring, fixing oversimplification and removing some premature optimization

2016-12-01 21:50:39 +00:00
parent 4ce1648550
commit 44932be1f5
3 changed files with 18 additions and 21 deletions
--- a/src/pg/sql/42_observatory_exploration.sql
+++ b/src/pg/sql/42_observatory_exploration.sql
@@ -431,10 +431,7 @@ BEGIN
  RETURN QUERY
  EXECUTE format($string$
    SELECT
-      (1 / (abs(numgeoms - $3)
-        --* (1 / Coalesce(NullIf(notnull_percent, 0), 1))
-        --* (1 / Coalesce(NullIf(percentfill, 0), 0.0001))
-      ))::Numeric * percentfill
+      ((100.0 / (1+abs(log(1 + $3) - log(1 + numgeoms)))) * percentfill)::Numeric
      AS score, *
    FROM (
      WITH clipped_geom AS (