fix scene making scripts and add building-parallel-road scene

Scripts updated to newest libosmium and shebang fixed.

tests/scenes/bin/Makefile

@@ -24,3 +24,4 @@ osm2wkt: osm2wkt.cc
 	$(CXX) $(CXXFLAGS) $(CXXFLAGS_WARNINGS) -o $@ $< $(LDFLAGS) $(LIB_IO)
 
 scenarios: osm2wkt
+	./make_scenes.sh

tests/scenes/bin/make_scenes.sh

@@ -1,4 +1,4 @@
-#/bin/bash -e
+#!/bin/bash -e
 #
 # Regenerates wkts for scenarios.
 #
@@ -11,10 +11,10 @@ if [ ! -d "$datadir" ]; then
 fi
 
 echo "Using datadir $datadir"
-pushd $datadir
+cd $datadir
 
 # remove old wkts
-rm $datadir/*.wkt
+rm -f $datadir/*.wkt
 
 # create wkts from SQL scripts
 for fl in *.sql; do
@@ -27,5 +27,3 @@ for fl in *.osm; do
     echo "Processing $fl.."
     ../bin/osm2wkt $fl
 done
-
-popd

tests/scenes/bin/osm2wkt.cc

@@ -92,10 +92,6 @@ int main(int argc, char* argv[]) {
     reader2.close();
     export_handler.close();
     std::cerr << "Pass 2 done\n";
-
-
-    google::protobuf::ShutdownProtobufLibrary();
-
 }