refactor to the new generate-sqlquery

This commit is contained in:
ImreSamu 2016-12-15 12:59:59 +01:00
parent 2ce6b22d3f
commit 5744baa2d6
3 changed files with 6 additions and 6 deletions

View File

@ -13,11 +13,11 @@ do
echo " " echo " "
echo "## $layerid z$z - freq" echo "## $layerid z$z - freq"
SQL=$(generate-sqlquery layers/${layerid}/${layerid}.yaml $z ) SQL=$(docker run --rm -v $(pwd):/tileset openmaptiles/openmaptiles-tools generate-sqlquery layers/${layerid}/${layerid}.yaml $z )
SQLCODE=$(cat <<-END SQLCODE=$(cat <<-END
select $classvars , count(*) as _count_ from select $classvars , count(*) as _count_ from
$SQL ( $SQL ) as t
GROUP BY $classvars GROUP BY $classvars
ORDER BY $classvars ORDER BY $classvars
; ;

View File

@ -13,7 +13,7 @@ do
echo " " echo " "
echo "## $layerid z$z - $var " echo "## $layerid z$z - $var "
SQL=$(generate-sqlquery layers/${layerid}/${layerid}.yaml $z ) SQL=$(docker run --rm -v $(pwd):/tileset openmaptiles/openmaptiles-tools generate-sqlquery layers/${layerid}/${layerid}.yaml $z )
SQLCODE=$(cat <<-END SQLCODE=$(cat <<-END
SELECT SELECT
@ -24,7 +24,7 @@ SELECT
,stddev($var) as stddev ,stddev($var) as stddev
,variance($var) as variance ,variance($var) as variance
FROM FROM
$SQL ( $SQL ) as t
; ;
END END
) )

View File

@ -11,11 +11,11 @@ do
echo " " echo " "
echo "## $layerid z$z max length ($classvar)" echo "## $layerid z$z max length ($classvar)"
SQL=$(generate-sqlquery layers/${layerid}/${layerid}.yaml $z ) SQL=$(docker run --rm -v $(pwd):/tileset openmaptiles/openmaptiles-tools generate-sqlquery layers/${layerid}/${layerid}.yaml $z )
SQLCODE=$(cat <<-END SQLCODE=$(cat <<-END
SELECT DISTINCT $classvar , length( $classvar ) AS _length_ from SELECT DISTINCT $classvar , length( $classvar ) AS _length_ from
$SQL ( $SQL ) as t
WHERE length( $classvar ) > 0 WHERE length( $classvar ) > 0
ORDER BY length( $classvar ) DESC NULLS LAST ORDER BY length( $classvar ) DESC NULLS LAST
LIMIT 30 LIMIT 30