Lukas Martinelli f3a507473e Merge branch 'master' into feature/transportation ...

Conflicts:
	Makefile
	layers/transportation/README.md
	layers/transportation/mapping.png
	layers/transportation_name/README.md

2016-11-30 18:59:46 +00:00

..

layer.sql

Use new classes in transport_name and add network

2016-11-28 11:09:57 +00:00

merge_highways.sql

Create transportation name out of highway linestring

2016-11-30 08:48:13 +00:00

transportation_name.yaml

Add values to transportation layers

2016-11-30 12:57:33 +00:00