Parse settlement=yes as new UrbanArea category

src/lib/marble/StyleBuilder.cpp

@@ -586,6 +586,7 @@ void StyleBuilder::Private::initializeDefaultStyles()
                                                                                    true, true, Qt::SolidPattern, Qt::SolidLine, Qt::RoundCap, false );
 
     s_defaultStyle[GeoDataFeature::Landmass]                 = StyleBuilder::Private::createWayStyle( "#F1EEE8", "#F1EEE8", true, true );
+    s_defaultStyle[GeoDataFeature::UrbanArea]                = StyleBuilder::Private::createWayStyle( "#E6E3DD", "#E6E3DD", true, true );
 
     s_defaultStyle[GeoDataFeature::AdminLevel1]              = StyleBuilder::Private::createStyle(0.0, 0.0, "#DF9CCF", "#DF9CCF", true, true, Qt::SolidPattern, Qt::CustomDashLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3 );
     s_defaultStyle[GeoDataFeature::AdminLevel2]              = StyleBuilder::Private::createStyle(2.0, 0.0, "#DF9CCF", "#DF9CCF", true, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3 );

src/lib/marble/geodata/data/GeoDataFeature.cpp

@@ -439,6 +439,7 @@ QString GeoDataFeature::visualCategoryName(GeoDataFeature::GeoDataVisualCategory
         s_visualCategoryNames[PowerTower] = "PowerTower";
         s_visualCategoryNames[Satellite] = "Satellite";
         s_visualCategoryNames[Landmass] = "Landmass";
+        s_visualCategoryNames[UrbanArea] = "UrbanArea";
         s_visualCategoryNames[AdminLevel1] = "AdminLevel1";
         s_visualCategoryNames[AdminLevel2] = "AdminLevel2";
         s_visualCategoryNames[AdminLevel3] = "AdminLevel3";

src/lib/marble/geodata/data/GeoDataFeature.h

@@ -415,6 +415,7 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
 
         //Custom OSM Tags
         Landmass,
+        UrbanArea,
 
         // Important: Make sure that this is always the last
         // item and just use it to specify the array size

src/lib/marble/layers/GeometryLayer.cpp

@@ -154,6 +154,7 @@ void GeometryLayerPrivate::initializeDefaultValues()
         s_defaultMinZoomLevels[i] = 15;
 
     s_paintLayerOrder << createPaintLayerOrder("Polygon", GeoDataFeature::Landmass);
+    s_paintLayerOrder << createPaintLayerOrder("Polygon", GeoDataFeature::UrbanArea);
     for ( int i = GeoDataFeature::LanduseAllotments; i <= GeoDataFeature::LanduseVineyard; i++ ) {
         if ((GeoDataFeature::GeoDataVisualCategory)i != GeoDataFeature::LanduseGrass) {
             s_paintLayerOrder << createPaintLayerOrder("Polygon", (GeoDataFeature::GeoDataVisualCategory)i);

src/lib/marble/osm/OsmPresetLibrary.cpp

@@ -321,6 +321,7 @@ void OsmPresetLibrary::initializeOsmVisualCategories()
 
     //Custom Marble OSM Tags
     s_visualCategories[ OsmTag( "marble_land", "landmass" ) ]       = GeoDataFeature::Landmass;
+    s_visualCategories[ OsmTag( "settlement", "yes" ) ]             = GeoDataFeature::UrbanArea;
 
     // Default for buildings
     foreach(const QString &value, buildingValues() ) {
@@ -581,6 +582,7 @@ bool OsmPresetLibrary::isAreaTag(const QString &keyValue)
         s_areaTags.insert( "landuse=grass" );
 
         s_areaTags.insert( "marble_land=landmass" );
+        s_areaTags.insert( "settlement=yes" );
     }
 
     return s_areaTags.contains(keyValue);

tools/shp2osm/polyshp2osm.py

@@ -196,7 +196,7 @@ def feature_class(data):
     'Admin-1 scale rank': [('boundary', 'administrative'), ('admin_level', '4')],
     'Railroad': [('railway', 'rail')],
     'Railroad ferry': [('route', 'ferry')],
-    'Urban area': [('marble_land', 'landmass')],
+    'Urban area': [('settlement', 'yes')],
     'Timezone': [('marble_land', 'landmass')],
     'Historic place': [(city_map,None)],
     'Populated place': [(city_map,None)],
@@ -207,7 +207,7 @@ def feature_class(data):
     'Admin-0 region capital': [(city_map,None)],
     'Admin-1 region capital': [(city_map,None)],
     'Admin-0 capital alt': [(city_map,None)],
-    'Lake Centerline': [('natural', 'water')],
+    'Lake Centerline': [('waterway', 'river')],
     'Port': [('harbour', 'yes')],
     'Island': [('marble_land', 'landmass'), ('place', 'island')],
     'Island group': [('marble_land', 'landmass'), ('place', 'island')],