Fix #1 and fix #2 for the rivers and roads int the with value use map unit insted of millimeters
for the map use a value evaluated from the city size insted of the fixed '5'