From 7ea5e72212e460fa02f503995724da902dbccddf Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 3 Dec 2016 02:11:50 +0100 Subject: [PATCH] qa fixes --- qa/layer_freq.sh | 8 ++-- qa/layer_numvar_analyze.sh | 18 +++---- qa/layer_toplength.sh | 8 ++-- qa/run.sh | 96 +++++++++++++++++++------------------- 4 files changed, 66 insertions(+), 64 deletions(-) diff --git a/qa/layer_freq.sh b/qa/layer_freq.sh index 8265554..df23cc1 100755 --- a/qa/layer_freq.sh +++ b/qa/layer_freq.sh @@ -9,7 +9,7 @@ echo "# FREQ - $layerid group by : $classvars " for z in {0..15} do echo " " -echo "## $layerid z$z" +echo "## $layerid z$z - freq" SQL=$(generate-qadoc layers/${layerid}/${layerid}.yaml $z ) @@ -21,9 +21,9 @@ read -r -d '' SQLCODE <<- EOMSQL ; EOMSQL -echo "\`\`\`SQL" -echo "$SQLCODE" -echo "\`\`\`" +#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' diff --git a/qa/layer_numvar_analyze.sh b/qa/layer_numvar_analyze.sh index a37c7e9..c18669d 100755 --- a/qa/layer_numvar_analyze.sh +++ b/qa/layer_numvar_analyze.sh @@ -15,20 +15,20 @@ SQL=$(generate-qadoc layers/${layerid}/${layerid}.yaml $z ) read -r -d '' SQLCODE <<- EOMSQL SELECT - count($var) as count_$var - ,min($var) as min_$var - ,max($var) as max_$var - ,avg($var) as avg_$var - ,stddev($var) as stddev_$var - ,variance($var) as variance_$var + 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 -echo "\`\`\`SQL" -echo "$SQLCODE" -echo "\`\`\`" +#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' diff --git a/qa/layer_toplength.sh b/qa/layer_toplength.sh index 3624d30..10a612c 100755 --- a/qa/layer_toplength.sh +++ b/qa/layer_toplength.sh @@ -10,7 +10,7 @@ echo "# TOP30LENGHT - $layerid - $classvar" for z in {0..15} do echo " " -echo "## $layerid z$z" +echo "## $layerid z$z max length ($classvar)" SQL=$(generate-qadoc layers/${layerid}/${layerid}.yaml $z ) @@ -23,9 +23,9 @@ read -r -d '' SQLCODE <<- EOMSQL ; EOMSQL -echo "\`\`\`SQL" -echo "$SQLCODE" -echo "\`\`\`" +#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' diff --git a/qa/run.sh b/qa/run.sh index 518986d..38f2be4 100755 --- a/qa/run.sh +++ b/qa/run.sh @@ -5,80 +5,82 @@ export_path=./build/qadoc -mkdir -p ${export_path} -rm -f ${export_path}/*.md + # ---- freq -./qa/layer_freq.sh aeroway "class" > ${export_path}/freq_aeroway.md + +mkdir -p ./build/qadoc +rm -f ./build/qadoc/*.md -./qa/layer_freq.sh boundary "admin_level,disputed" > ${export_path}/freq_boundary_admin_level_disputed.md -./qa/layer_freq.sh boundary "admin_level" > ${export_path}/freq_boundary_admin_level.md -./qa/layer_freq.sh boundary "disputed" > ${export_path}/freq_boundary_disputed.md +./qa/layer_freq.sh aeroway "class" > ./build/qadoc/freq_aeroway.md -./qa/layer_freq.sh building "render_min_height" > ${export_path}/freq_building.md +./qa/layer_freq.sh boundary "admin_level,disputed" > ./build/qadoc/freq_boundary_admin_level_disputed.md +./qa/layer_freq.sh boundary "admin_level" > ./build/qadoc/freq_boundary_admin_level.md +./qa/layer_freq.sh boundary "disputed" > ./build/qadoc/freq_boundary_disputed.md -#./qa/layer_freq.sh housenumber "housenumber " > ${export_path}freq_housenumber.md -./qa/layer_freq.sh landcover "class, subclass" > ${export_path}/freq_landcover.md +./qa/layer_freq.sh building "render_min_height" > ./build/qadoc/freq_building.md -./qa/layer_freq.sh landuse "class " > ${export_path}/freq_landuse.md +#./qa/layer_freq.sh housenumber "housenumber " > ./build/qadocfreq_housenumber.md +./qa/layer_freq.sh landcover "class, subclass" > ./build/qadoc/freq_landcover.md -./qa/layer_freq.sh park "class " > ${export_path}/freq_park.md +./qa/layer_freq.sh landuse "class " > ./build/qadoc/freq_landuse.md -./qa/layer_freq.sh place "class " > ${export_path}/freq_place_class.md -./qa/layer_freq.sh place "class,capital " > ${export_path}/freq_place_class_capital.md -./qa/layer_freq.sh place "capital " > ${export_path}/freq_place_capital.md -./qa/layer_freq.sh place "class,capital,rank " > ${export_path}/freq_place_class_capital_rank.md -./qa/layer_freq.sh place "rank " > ${export_path}/freq_place_rank.md +./qa/layer_freq.sh park "class " > ./build/qadoc/freq_park.md -./qa/layer_freq.sh poi "class " > ${export_path}/freq_poi_class.md -./qa/layer_freq.sh poi "subclass " > ${export_path}/freq_poi_subclass.md -./qa/layer_freq.sh poi "rank " > ${export_path}/freq_poi_rank.md -./qa/layer_freq.sh poi "class,subclass " > ${export_path}/freq_poi_class_subclass.md -./qa/layer_freq.sh poi "class,subclass,rank" > ${export_path}/freq_poi_class_subclass_rank.md -./qa/layer_freq.sh poi "class,rank " > ${export_path}/freq_poi_class_rank.md +./qa/layer_freq.sh place "class " > ./build/qadoc/freq_place_class.md +./qa/layer_freq.sh place "class,capital " > ./build/qadoc/freq_place_class_capital.md +./qa/layer_freq.sh place "capital " > ./build/qadoc/freq_place_capital.md +./qa/layer_freq.sh place "class,capital,rank " > ./build/qadoc/freq_place_class_capital_rank.md +./qa/layer_freq.sh place "rank " > ./build/qadoc/freq_place_rank.md -./qa/layer_freq.sh transportation "class,subclass " > ${export_path}/freq_transportation_class_subclass.md -./qa/layer_freq.sh transportation "class,subclass,service,oneway,brunnel,ramp" > ${export_path}/freq_transportation_class_subclass_service_oneway_brunnel_ramp.md -./qa/layer_freq.sh transportation "subclass " > ${export_path}/freq_transportation_subclass.md -./qa/layer_freq.sh transportation "class " > ${export_path}/freq_transportation_class.md +./qa/layer_freq.sh poi "class " > ./build/qadoc/freq_poi_class.md +./qa/layer_freq.sh poi "subclass " > ./build/qadoc/freq_poi_subclass.md +./qa/layer_freq.sh poi "rank " > ./build/qadoc/freq_poi_rank.md +./qa/layer_freq.sh poi "class,subclass " > ./build/qadoc/freq_poi_class_subclass.md +./qa/layer_freq.sh poi "class,subclass,rank" > ./build/qadoc/freq_poi_class_subclass_rank.md +./qa/layer_freq.sh poi "class,rank " > ./build/qadoc/freq_poi_class_rank.md -./qa/layer_freq.sh transportation_name "class " > ${export_path}/freq_transportation_name_class.md -./qa/layer_freq.sh transportation_name "reflength " > ${export_path}/freq_transportation_name_reflength.md +./qa/layer_freq.sh transportation "class, oneway, ramp, brunnel, service" > ./build/qadoc/freq_transportation_class_oneway_ramp_brunnel_service.md +./qa/layer_freq.sh transportation "oneway, ramp, brunnel, service " > ./build/qadoc/freq_transportation_oneway_ramp_brunnel_service.md +./qa/layer_freq.sh transportation "class " > ./build/qadoc/freq_transportation_class.md -./qa/layer_freq.sh water "class " > ${export_path}/freq_water.md +./qa/layer_freq.sh transportation_name "class " > ./build/qadoc/freq_transportation_name_class.md +./qa/layer_freq.sh transportation_name "reflength " > ./build/qadoc/freq_transportation_name_reflength.md + +./qa/layer_freq.sh water "class " > ./build/qadoc/freq_water.md + +./qa/layer_freq.sh water_name "class " > ./build/qadoc/freq_water_name.md + +./qa/layer_freq.sh waterway "class " > ./build/qadoc/freq_waterway.md -./qa/layer_freq.sh water_name "class " > ${export_path}/freq_water_name.md -./qa/layer_freq.sh waterway "class " > ${export_path}/freq_waterway.md # ---- toplength -./layer_toplength.sh housenumber "housenumber" > ${export_path}/toplength_housenumber_housenumber.md +./qa/layer_toplength.sh housenumber "housenumber" > ./build/qadoc/toplength_housenumber_housenumber.md -./layer_toplength.sh place "name" > ${export_path}/toplength_place_name.md -./layer_toplength.sh place "name_en" > ${export_path}/toplength_place_name_en.md +./qa/layer_toplength.sh place "name" > ./build/qadoc/toplength_place_name.md +./qa/layer_toplength.sh place "name_en" > ./build/qadoc/toplength_place_name_en.md -./layer_toplength.sh poi "name" > ${export_path}/toplength_poi_name.md -./layer_toplength.sh poi "name_en" > ${export_path}/toplength_poi_name_en.md +./qa/layer_toplength.sh poi "name" > ./build/qadoc/toplength_poi_name.md +./qa/layer_toplength.sh poi "name_en" > ./build/qadoc/toplength_poi_name_en.md -./layer_toplength.sh transportation_name "name" > ${export_path}/toplength_transportation_name.md -./layer_toplength.sh transportation_name "ref" > ${export_path}/toplength_transportation_ref.md -./layer_toplength.sh transportation_name "network" > ${export_path}/toplength_transportation_network.md - -./layer_toplength.sh water_name "name" > ${export_path}/toplength_water_name_name.md -./layer_toplength.sh water_name "name_en" > ${export_path}/toplength_water_name_name_en.md - -./layer_toplength.sh waterway "name" > ${export_path}/toplength_waterway_name.md +./qa/layer_toplength.sh transportation_name "name" > ./build/qadoc/toplength_transportation_name.md +./qa/layer_toplength.sh transportation_name "ref" > ./build/qadoc/toplength_transportation_ref.md +./qa/layer_toplength.sh transportation_name "network" > ./build/qadoc/toplength_transportation_network.md +./qa/layer_toplength.sh water_name "name" > ./build/qadoc/toplength_water_name_name.md +./qa/layer_toplength.sh water_name "name_en" > ./build/qadoc/toplength_water_name_name_en.md +./qa/layer_toplength.sh waterway "name" > ./build/qadoc/toplength_waterway_name.md # ---- numvar analyze -./qa/layer_numvar_analyze.sh building "render_min_height" > ${export_path}/numvara_building_render_min_height.md -./qa/layer_numvar_analyze.sh building "render_max_height" > ${export_path}/numvara_building_render_max_height.md +./qa/layer_numvar_analyze.sh building "render_min_height" > ./build/qadoc/numvara_building_render_min_height.md +./qa/layer_numvar_analyze.sh building "render_max_height" > ./build/qadoc/numvara_building_render_max_height.md -./qa/layer_numvar_analyze.sh transportation_name "ref_length" > ${export_path}/numvara_transportation_name_ref_length.md +./qa/layer_numvar_analyze.sh transportation_name "ref_length" > ./build/qadoc/numvara_transportation_name_ref_length.md