Merge branch 'release-v-1.1.6' into raster-simplification-experiments

2016-12-09 19:38:12 +00:00
parent 59857355c7 99166d1b4e
commit 6a6d1bc3e4
8 changed files with 264 additions and 157 deletions
@@ -437,10 +437,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
+      ((100.0 / (1+abs(log(1 + $3) - log(1 + numgeoms)))) * percentfill)::Numeric
      AS score, *
    FROM (
      WITH clipped_geom AS (