Minor trailing whitespace cleanup (#596)

Remove extra spaces in a number of files.

.travis.yml

@@ -6,7 +6,7 @@ language: bash
 
 services:
   - docker
-  
+
 before_install:
   - sudo rm -f /usr/local/bin/docker-compose
   - curl -L https://github.com/docker/compose/releases/download/1.7.1/docker-compose-`uname -s`-`uname -m` > docker-compose
@@ -15,9 +15,8 @@ before_install:
   - sudo service docker restart
   - docker-compose -v
   - docker -v
- 
+
 script:
   - sudo service docker restart
   - docker-compose config
   - sudo ./quickstart.sh
-  

Makefile

@@ -41,7 +41,7 @@ build:
 	mkdir -p build
 
 build/openmaptiles.tm2source/data.yml: build
-	mkdir -p build/openmaptiles.tm2source 
+	mkdir -p build/openmaptiles.tm2source
 	docker-compose run --rm openmaptiles-tools generate-tm2source openmaptiles.yaml --host="postgres" --port=5432 --database="openmaptiles" --user="openmaptiles" --password="openmaptiles" > build/openmaptiles.tm2source/data.yml
 
 build/mapping.yaml: build
@@ -141,25 +141,25 @@ start-postserve:
 generate-qareports:
 	./qa/run.sh
 
-build/devdoc: 
+build/devdoc:
 	mkdir -p ./build/devdoc
 
 layers = $(notdir $(wildcard layers/*)) # all layers
 
-etl-graph: 
+etl-graph:
 	@echo 'Use'
 	@echo '   make etl-graph-[layer]	to generate etl graph for [layer]'
 	@echo '   example: make etl-graph-poi'
 	@echo 'Valid layers: $(layers)'
 
 # generate etl graph for a certain layer, e.g. etl-graph-building, etl-graph-place
-etl-graph-%: layers/% build/devdoc 
+etl-graph-%: layers/% build/devdoc
 	docker run --rm -v $$(pwd):/tileset openmaptiles/openmaptiles-tools generate-etlgraph layers/$*/$*.yaml ./build/devdoc
 
 mappingLayers = $(notdir $(patsubst %/mapping.yaml,%, $(wildcard layers/*/mapping.yaml))) # layers with mapping.yaml
 
 # generate mapping graph for a certain layer, e.g. mapping-graph-building, mapping-graph-place
-mapping-graph: 
+mapping-graph:
 	@echo 'Use'
 	@echo '   make mapping-graph-[layer]	to generate mapping graph for [layer]'
 	@echo '   example: make mapping-graph-poi'
@@ -168,7 +168,7 @@ mapping-graph:
 mapping-graph-%: ./layers/%/mapping.yaml build/devdoc
 	docker run --rm -v $$(pwd):/tileset openmaptiles/openmaptiles-tools generate-mapping-graph layers/$*/$*.yaml ./build/devdoc/mapping-diagram-$*
 
-# generate all etl and mapping graphs 
+# generate all etl and mapping graphs
 generate-devdoc: $(addprefix etl-graph-,$(layers)) $(addprefix mapping-graph-,$(mappingLayers))
 
 import-sql-dev:

QUICKSTART.md

@@ -1,5 +1,3 @@
-
-
 ## Quickstart - for small extracts
 
 ### Req:
@@ -12,7 +10,7 @@
         * Please give a feedback, share your experience, write a tutorial
 * bash
 * git
-* make 
+* make
 * bc
 * md5sum
 * docker         >=1.12.3
@@ -47,15 +45,15 @@ cd openmaptiles
 If you have problems with the quickstart
 * check the ./quickstart.log!
 * doublecheck the system requirements!
-* check the current issues: https://github.com/openmaptiles/openmaptiles/issues 
+* check the current issues: https://github.com/openmaptiles/openmaptiles/issues
-* create new issues: 
+* create new issues:
     * create a new gist: https://gist.github.com/ from your ./quickstart.log
-    * doublecheck: don't reveal any sensitive information about your system   
+    * doublecheck: don't reveal any sensitive information about your system
     * create a new issue: https://github.com/openmaptiles/openmaptiles/issues
-        * describe the problems  
+        * describe the problems
-        * add any pertinent information about your environment 
+        * add any pertinent information about your environment
         * link your (quickstart.log) gist!
-    
+
 ### Check other extracts
 
 IF the previous step is working,
@@ -379,25 +377,25 @@ and the generated maps are going to be available in browser on [localhost:8090/t
 
 ### Check tileserver
 
-start: 
+start:
-*  ` make start-tileserver` 
+*  ` make start-tileserver`
 and the generated maps are going to be available in webbrowser on [localhost:8080](http://localhost:8080/).
 
-This is only a quick preview, because your mbtiles only generated to zoom level 7 !  
+This is only a quick preview, because your mbtiles only generated to zoom level 7 !
 
 
 ### Change MIN_ZOOM and MAX_ZOOM
 
 modify the settings in the `.env`  file, the defaults :
 * QUICKSTART_MIN_ZOOM=0
-* QUICKSTART_MAX_ZOOM=7  
+* QUICKSTART_MAX_ZOOM=7
 
 and re-start  `./quickstart.sh `
 *  the new config file re-generating to here  ./data/docker-compose-config.yml
 *  Known problems:
-    * If you use same area - then the ./data/docker-compose-config.yml not re-generating, so you have to modify by hand! 
+    * If you use same area - then the ./data/docker-compose-config.yml not re-generating, so you have to modify by hand!
 
-Hints: 
+Hints:
 * Small increments! Never starts with the MAX_ZOOM = 14
 * The suggested  MAX_ZOOM = 14  - use only with small extracts
 
@@ -410,37 +408,36 @@ the current output:
 
 ```
 ==============================================================================
- OpenMapTiles  https://github.com/openmaptiles/openmaptiles 
+ OpenMapTiles  https://github.com/openmaptiles/openmaptiles
-Hints for testing areas                
+Hints for testing areas
-  make download-geofabrik-list         # list actual geofabrik OSM extracts for download -> <<your-area>> 
+  make download-geofabrik-list         # list actual geofabrik OSM extracts for download -> <<your-area>>
-  make list                            # list actual geofabrik OSM extracts for download -> <<your-area>> 
+  make list                            # list actual geofabrik OSM extracts for download -> <<your-area>>
-  ./quickstart.sh <<your-area>>        # example:  ./quickstart.sh madagascar 
+  ./quickstart.sh <<your-area>>        # example:  ./quickstart.sh madagascar
-  
+
 Hints for designers:
-  make start-postserve                 # start Postserver + Maputnik Editor [ see localhost:8088 ] 
+  make start-postserve                 # start Postserver + Maputnik Editor [ see localhost:8088 ]
-  make start-tileserver                # start klokantech/tileserver-gl [ see localhost:8080 ] 
+  make start-tileserver                # start klokantech/tileserver-gl [ see localhost:8080 ]
-  
+
 Hints for developers:
-  make                                 # build source code  
+  make                                 # build source code
   make download-geofabrik area=albania # download OSM data from geofabrik, and create config file
-  make psql                            # start PostgreSQL console 
+  make psql                            # start PostgreSQL console
-  make psql-list-tables                # list all PostgreSQL tables 
+  make psql-list-tables                # list all PostgreSQL tables
   make psql-vacuum-analyze             # PostgreSQL: VACUUM ANALYZE
   make psql-analyze                    # PostgreSQL: ANALYZE
   make generate-qareports              # generate reports [./build/qareports]
   make generate-devdoc                 # generate devdoc  [./build/devdoc]
-  make import-sql-dev                  # start import-sql  /bin/bash terminal 
+  make import-sql-dev                  # start import-sql  /bin/bash terminal
   make import-osm-dev                  # start import-osm  /bin/bash terminal (imposm3)
-  make clean-docker                    # remove docker containers, PG data volume 
+  make clean-docker                    # remove docker containers, PG data volume
-  make forced-clean-sql                # drop all PostgreSQL tables for clean environment 
+  make forced-clean-sql                # drop all PostgreSQL tables for clean environment
   make docker-unnecessary-clean        # clean unnecessary docker image(s) and container(s)
   make refresh-docker-images           # refresh openmaptiles docker images from Docker HUB
   make remove-docker-images            # remove openmaptiles docker images
   make pgclimb-list-views              # list PostgreSQL public schema views
   make pgclimb-list-tables             # list PostgreSQL public schema tables
   cat  .env                            # list PG database and MIN_ZOOM and MAX_ZOOM information
-  cat ./quickstart.log                 # backup  of the last ./quickstart.sh 
+  cat ./quickstart.log                 # backup  of the last ./quickstart.sh
   make help                            # help about available commands
 ==============================================================================
 ```
- 

layers/boundary/boundary.yaml

@@ -2,8 +2,8 @@ layer:
   id: "boundary"
   description: |
       Contains administrative boundaries as linestrings.
-      Until z5 [Natural Earth data](http://www.naturalearthdata.com/downloads/) is used after which 
+      Until z5 [Natural Earth data](http://www.naturalearthdata.com/downloads/) is used after which
-      OSM boundaries ([`boundary=administrative`](http://wiki.openstreetmap.org/wiki/Tag:boundary%3Dadministrative)) 
+      OSM boundaries ([`boundary=administrative`](http://wiki.openstreetmap.org/wiki/Tag:boundary%3Dadministrative))
       are present from z6 to z14 (also for maritime boundaries with admin_level <= 2 at z4 and z5).
       OSM data contains several [`admin_level`](http://wiki.openstreetmap.org/wiki/Tag:boundary%3Dadministrative#admin_level)
       but for most styles it makes sense to just style `admin_level=2` and `admin_level=4`.

layers/housenumber/housenumber_centroid.sql

@@ -25,7 +25,7 @@ CREATE OR REPLACE FUNCTION housenumber.flag() RETURNS trigger AS $$
 BEGIN
     INSERT INTO housenumber.updates(t) VALUES ('y')  ON CONFLICT(t) DO NOTHING;
     RETURN null;
-END;    
+END;
 $$ language plpgsql;
 
 CREATE OR REPLACE FUNCTION housenumber.refresh() RETURNS trigger AS

layers/housenumber/layer.sql

@@ -1,5 +1,5 @@
 
--- etldoc: layer_housenumber[shape=record fillcolor=lightpink, style="rounded,filled",  
+-- etldoc: layer_housenumber[shape=record fillcolor=lightpink, style="rounded,filled",
 -- etldoc:     label="layer_housenumber | <z14_> z14+" ] ;
 
 CREATE OR REPLACE FUNCTION layer_housenumber(bbox geometry, zoom_level integer)

qa/layer_freq.sh

@@ -11,9 +11,9 @@ echo "# FREQ - $layerid  group by : $classvars "
 for z in {0..15}
 do
 echo " "
-echo "## $layerid z$z  - freq" 
+echo "## $layerid z$z  - freq"
 
-SQL=$(docker run --rm -v $(pwd):/tileset openmaptiles/openmaptiles-tools 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
 select $classvars , count(*) as _count_ from
@@ -29,7 +29,7 @@ END
 #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
 

qa/layer_numvar_analyze.sh

@@ -13,17 +13,17 @@ do
 echo " "
 echo "## $layerid z$z - $var "
 
-SQL=$(docker run --rm -v $(pwd):/tileset openmaptiles/openmaptiles-tools 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
-SELECT 
+SELECT
    count($var)    as count
-  ,min($var)      as min      
+  ,min($var)      as min
-  ,max($var)      as max 
+  ,max($var)      as max
-  ,avg($var)      as avg 
+  ,avg($var)      as avg
-  ,stddev($var)   as stddev 
+  ,stddev($var)   as stddev
-  ,variance($var) as variance 
+  ,variance($var) as variance
-FROM  
+FROM
 ( $SQL ) as t
 ;
 END
@@ -35,6 +35,6 @@ END
 #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

qa/layer_toplength.sh

@@ -11,7 +11,7 @@ do
 echo " "
 echo "## $layerid z$z   max length ($classvar)"
 
-SQL=$(docker run --rm -v $(pwd):/tileset openmaptiles/openmaptiles-tools 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
 SELECT DISTINCT $classvar , length( $classvar ) AS _length_ from

qa/run.sh

@@ -7,7 +7,7 @@ set -o nounset
 #                                    or    make generate-qareports
 
 # ---- freq ---------------------------------------------------------------
-    
+
 mkdir -p ./build/qareports
 rm -f    ./build/qareports/*.md
 
@@ -26,26 +26,26 @@ rm -f    ./build/qareports/*.md
 
 ./qa/layer_freq.sh landuse             "class "               > ./build/qareports/freq_landuse__class.md
 
-./qa/layer_freq.sh park                "class "               > ./build/qareports/freq_park__class.md 
+./qa/layer_freq.sh park                "class "               > ./build/qareports/freq_park__class.md
 
-./qa/layer_freq.sh place               "class "               > ./build/qareports/freq_place__class.md 
+./qa/layer_freq.sh place               "class "               > ./build/qareports/freq_place__class.md
 ./qa/layer_freq.sh place               "class,capital "       > ./build/qareports/freq_place__class_capital.md
-./qa/layer_freq.sh place               "capital "             > ./build/qareports/freq_place__capital.md   
+./qa/layer_freq.sh place               "capital "             > ./build/qareports/freq_place__capital.md
-./qa/layer_freq.sh place               "class,capital,rank "  > ./build/qareports/freq_place__class_capital_rank.md  
+./qa/layer_freq.sh place               "class,capital,rank "  > ./build/qareports/freq_place__class_capital_rank.md
-./qa/layer_freq.sh place               "rank "                > ./build/qareports/freq_place__rank.md 
+./qa/layer_freq.sh place               "rank "                > ./build/qareports/freq_place__rank.md
 
-./qa/layer_freq.sh poi                 "class    "            > ./build/qareports/freq_poi__class.md  
+./qa/layer_freq.sh poi                 "class    "            > ./build/qareports/freq_poi__class.md
 ./qa/layer_freq.sh poi                 "subclass "            > ./build/qareports/freq_poi__subclass.md
-./qa/layer_freq.sh poi                 "rank     "            > ./build/qareports/freq_poi__rank.md  
+./qa/layer_freq.sh poi                 "rank     "            > ./build/qareports/freq_poi__rank.md
-./qa/layer_freq.sh poi                 "class,subclass "      > ./build/qareports/freq_poi__class_subclass.md  
+./qa/layer_freq.sh poi                 "class,subclass "      > ./build/qareports/freq_poi__class_subclass.md
-./qa/layer_freq.sh poi                 "class,subclass,rank"  > ./build/qareports/freq_poi__class_subclass_rank.md  
+./qa/layer_freq.sh poi                 "class,subclass,rank"  > ./build/qareports/freq_poi__class_subclass_rank.md
 ./qa/layer_freq.sh poi                 "class,rank         "  > ./build/qareports/freq_poi__class_rank.md
 
-./qa/layer_freq.sh transportation      "class, oneway, ramp, brunnel, service"    > ./build/qareports/freq_transportation__class_oneway_ramp_brunnel_service.md  
+./qa/layer_freq.sh transportation      "class, oneway, ramp, brunnel, service"    > ./build/qareports/freq_transportation__class_oneway_ramp_brunnel_service.md
-./qa/layer_freq.sh transportation      "oneway, ramp, brunnel, service "          > ./build/qareports/freq_transportation__oneway_ramp_brunnel_service.md  
+./qa/layer_freq.sh transportation      "oneway, ramp, brunnel, service "          > ./build/qareports/freq_transportation__oneway_ramp_brunnel_service.md
-./qa/layer_freq.sh transportation      "class "                                   > ./build/qareports/freq_transportation__class.md  
+./qa/layer_freq.sh transportation      "class "                                   > ./build/qareports/freq_transportation__class.md
 
-./qa/layer_freq.sh transportation_name "class "               > ./build/qareports/freq_transportation_name__class.md  
+./qa/layer_freq.sh transportation_name "class "               > ./build/qareports/freq_transportation_name__class.md
 ./qa/layer_freq.sh transportation_name "ref_length"           > ./build/qareports/freq_transportation_name__ref_length.md
 
 ./qa/layer_freq.sh water               "class "               > ./build/qareports/freq_water__class.md
@@ -56,22 +56,22 @@ rm -f    ./build/qareports/*.md
 
 # ---- toplength -------------------------------------------
 
-./qa/layer_toplength.sh housenumber         "housenumber"   > ./build/qareports/toplength_housenumber__housenumber.md 
+./qa/layer_toplength.sh housenumber         "housenumber"   > ./build/qareports/toplength_housenumber__housenumber.md
 
-./qa/layer_toplength.sh place               "name"          > ./build/qareports/toplength_place__name.md   
+./qa/layer_toplength.sh place               "name"          > ./build/qareports/toplength_place__name.md
-./qa/layer_toplength.sh place               "name_en"       > ./build/qareports/toplength_place__name_en.md   
+./qa/layer_toplength.sh place               "name_en"       > ./build/qareports/toplength_place__name_en.md
 
-./qa/layer_toplength.sh poi                 "name"          > ./build/qareports/toplength_poi__name.md   
+./qa/layer_toplength.sh poi                 "name"          > ./build/qareports/toplength_poi__name.md
-./qa/layer_toplength.sh poi                 "name_en"       > ./build/qareports/toplength_poi__name_en.md   
+./qa/layer_toplength.sh poi                 "name_en"       > ./build/qareports/toplength_poi__name_en.md
 
-./qa/layer_toplength.sh transportation_name "name"          > ./build/qareports/toplength_transportation_name__name.md    
+./qa/layer_toplength.sh transportation_name "name"          > ./build/qareports/toplength_transportation_name__name.md
-./qa/layer_toplength.sh transportation_name "ref"           > ./build/qareports/toplength_transportation_name__ref.md 
+./qa/layer_toplength.sh transportation_name "ref"           > ./build/qareports/toplength_transportation_name__ref.md
-###Todo: ./qa/layer_toplength.sh transportation_name "network"       > ./build/qareports/toplength_transportation_name__network.md 
+###Todo: ./qa/layer_toplength.sh transportation_name "network"       > ./build/qareports/toplength_transportation_name__network.md
 
-./qa/layer_toplength.sh water_name          "name"          > ./build/qareports/toplength_water_name__name.md   
+./qa/layer_toplength.sh water_name          "name"          > ./build/qareports/toplength_water_name__name.md
-./qa/layer_toplength.sh water_name          "name_en"       > ./build/qareports/toplength_water_name__name_en.md 
+./qa/layer_toplength.sh water_name          "name_en"       > ./build/qareports/toplength_water_name__name_en.md
 
-./qa/layer_toplength.sh waterway            "name"          > ./build/qareports/toplength_waterway__name.md   
+./qa/layer_toplength.sh waterway            "name"          > ./build/qareports/toplength_waterway__name.md
 
 
 # ---- numvar analyze -------------------------------------