Renamed variables
Updated OSM importer to make a distinction between car parks and park and rides.