diff --git a/qa/layer_freq.sh b/qa/layer_freq.sh index b54d4bfa..b62ba33e 100755 --- a/qa/layer_freq.sh +++ b/qa/layer_freq.sh @@ -1,4 +1,3 @@ - #!/bin/bash set -o errexit set -o pipefail @@ -16,15 +15,16 @@ echo "## $layerid z$z - freq" SQL=$(generate-sqlquery layers/${layerid}/${layerid}.yaml $z ) -read -r -d '' SQLCODE <<- EOMSQL - select $classvars , count(*) as _count_ from - $SQL - GROUP BY $classvars - ORDER BY $classvars - ; -EOMSQL +SQLCODE=$(cat <<-END +select $classvars , count(*) as _count_ from +$SQL +GROUP BY $classvars +ORDER BY $classvars +; +END +) -#echo "\`\`\`SQL" +#echo "\`\`\`sql" #echo "$SQLCODE" #echo "\`\`\`" diff --git a/qa/layer_numvar_analyze.sh b/qa/layer_numvar_analyze.sh index cb5eb6d1..ad15510a 100755 --- a/qa/layer_numvar_analyze.sh +++ b/qa/layer_numvar_analyze.sh @@ -1,4 +1,3 @@ - #!/bin/bash set -o errexit set -o pipefail @@ -16,20 +15,22 @@ echo "## $layerid z$z - $var " SQL=$(generate-sqlquery layers/${layerid}/${layerid}.yaml $z ) -read -r -d '' SQLCODE <<- EOMSQL - SELECT - count($var) as count - ,min($var) as min - ,max($var) as max - ,avg($var) as avg - ,stddev($var) as stddev - ,variance($var) as variance - FROM - $SQL - ; -EOMSQL +SQLCODE=$(cat <<-END +SELECT + count($var) as count + ,min($var) as min + ,max($var) as max + ,avg($var) as avg + ,stddev($var) as stddev + ,variance($var) as variance +FROM + $SQL +; +END +) -#echo "\`\`\`SQL" + +#echo "\`\`\`sql" #echo "$SQLCODE" #echo "\`\`\`" diff --git a/qa/layer_toplength.sh b/qa/layer_toplength.sh index a4c71730..1fa85b28 100755 --- a/qa/layer_toplength.sh +++ b/qa/layer_toplength.sh @@ -1,37 +1,34 @@ - #!/bin/bash set -o errexit set -o pipefail set -o nounset - layerid=$1 classvar=$2 -echo "# TOP30LENGHT - $layerid - $classvar" - for z in {0..15} do echo " " echo "## $layerid z$z max length ($classvar)" -SQL=$(generate-sqlquery layers/${layerid}/${layerid}.yaml $z ) +SQL=$(generate-sqlquery layers/${layerid}/${layerid}.yaml $z ) -read -r -d '' SQLCODE <<- EOMSQL - select $classvar , length( $classvar ) as _length_ from - $SQL - WHERE length( $classvar ) > 0 - ORDER BY length( $classvar ) DESC NULLS LAST - LIMIT 30 - ; -EOMSQL +SQLCODE=$(cat <<-END +select $classvar , length( $classvar ) as _length_ from +$SQL +WHERE length( $classvar ) > 0 +ORDER BY length( $classvar ) DESC NULLS LAST +LIMIT 30 +; +END +) -#echo "\`\`\`SQL" +#echo "\`\`\`sql" #echo "$SQLCODE" #echo "\`\`\`" docker-compose run --rm import-osm /usr/src/app/psql.sh -q -P pager=off -P border=2 -P footer=off -P null='(null)' -c "$SQLCODE" \ - | sed '1d;$d' | sed '$d' | sed 's/+--/|--/g' | sed 's/--+/--|/g' - + | sed '1d;$d' | sed '$d' | sed 's/+--/|--/g' | sed 's/--+/--|/g' + done diff --git a/qa/run.sh b/qa/run.sh index 8909698d..320e6d0b 100755 --- a/qa/run.sh +++ b/qa/run.sh @@ -1,4 +1,3 @@ - #!/bin/bash set -o errexit set -o pipefail @@ -9,9 +8,18 @@ set -o nounset # ---- freq --------------------------------------------------------------- -mkdir -p ./build/qadoc +mkdir -p ./build/qareports rm -f ./build/qareports/*.md +./qa/layer_numvar_analyze.sh transportation_name "ref_length" +./qa/layer_toplength.sh place "name" +./qa/layer_freq.sh poi "class " + +echo "OKÉ" +exit + + +# ----- ./qa/layer_freq.sh aeroway "class" > ./build/qareports/freq_aeroway__class.md ./qa/layer_freq.sh boundary "admin_level,disputed" > ./build/qareports/freq_boundary__admin_level_disputed.md