cartodb4/cartodb-postgresql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix zoom from scale condition for NULL result

Browse Source 
And rewrite in cleaner form.
This commit is contained in:
Javier Goizueta 2016-05-27 15:10:20 +02:00
parent 0b3ad5e569
commit 2a30eb2fd3
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scripts-available/CDB_ZoomFromScale.sql
View File

@ -17,11 +17,20 @@ RETURNS int
LANGUAGE SQL LANGUAGE SQL
IMMUTABLE IMMUTABLE
AS $$ AS $$
SELECT SELECT
CASE CASE
-- Don't bother if the scale is larger than ~zoom level 0 WHEN scaleDenominator > 600000000 THEN
WHEN scaleDenominator > 600000000 OR scaleDenominator = 0 THEN NULL -- Scale is smaller than zoom level 0
WHEN scaleDenominator = 0 THEN _CDB_MaxSupportedZoom() NULL
ELSE CAST (LEAST(ROUND(LOG(2, 559082264.028/scaleDenominator)), _CDB_MaxSupportedZoom()) AS INTEGER) WHEN scaleDenominator = 0 THEN
END; -- Actual zoom level would be infinite
_CDB_MaxSupportedZoom()
ELSE
CAST (
LEAST(
ROUND(LOG(2, 559082264.028/scaleDenominator)),
_CDB_MaxSupportedZoom()
)
AS INTEGER)
END;
$$; $$;