Commit d1dc497d authored by Akshat Tandon's avatar Akshat Tandon

Add styling for salt lakes/ playas

Differential Revision: https://phabricator.kde.org/D1958
parent cf4231e6
......@@ -706,24 +706,37 @@ GeoDataStyle::ConstPtr StyleBuilder::createStyle(const StyleParameters &paramete
}
}
} else if (placemark->geometry()->nodeType() == GeoDataTypes::GeoDataLinearRingType) {
bool adjustStyle = false;
GeoDataPolyStyle polyStyle = style->polyStyle();
GeoDataLineStyle lineStyle = style->lineStyle();
if (visualCategory == GeoDataFeature::NaturalWater) {
if( osmData.containsTag("salt","yes") ){
polyStyle.setColor("#ffff80");
lineStyle.setPenStyle(Qt::DashLine);
lineStyle.setWidth(2);
adjustStyle = true;
}
}
if(visualCategory == GeoDataFeature::AmenityGraveyard || visualCategory == GeoDataFeature::LanduseCemetery) {
bool adjustStyle = true;
GeoDataPolyStyle polyStyle = style->polyStyle();
if( osmData.containsTag("religion","jewish") ){
polyStyle.setTexturePath(MarbleDirs::path("bitmaps/osmcarto/patterns/grave_yard_jewish.png"));
adjustStyle = true;
} else if( osmData.containsTag("religion","christian") ){
polyStyle.setTexturePath(MarbleDirs::path("bitmaps/osmcarto/patterns/grave_yard_christian.png"));
adjustStyle = true;
} else if( osmData.containsTag("religion","INT-generic") ){
polyStyle.setTexturePath(MarbleDirs::path("bitmaps/osmcarto/patterns/grave_yard_generic.png"));
} else {
adjustStyle = false;
}
if (adjustStyle) {
GeoDataStyle::Ptr newStyle(new GeoDataStyle(*style));
newStyle->setPolyStyle(polyStyle);
style = newStyle;
adjustStyle = true;
}
}
if (adjustStyle) {
GeoDataStyle::Ptr newStyle(new GeoDataStyle(*style));
newStyle->setPolyStyle(polyStyle);
newStyle->setLineStyle(lineStyle);
style = newStyle;
}
QList<GeoDataFeature::GeoDataVisualCategory> categories = OsmPresetLibrary::visualCategories(osmData);
foreach(GeoDataFeature::GeoDataVisualCategory category, categories) {
......
......@@ -244,10 +244,10 @@ def feature_class(data):
'strait': [('natural', 'water')],
'bay': [('natural', 'water')],
'fjord': [('natural', 'water')],
'sea': [('natural', 'water')],
'sea': [('natural', 'water')],
'ocean': [('natural', 'water')],
'channel': [('natural', 'water')],
'Playa': [('natural', 'water')],
'Playa': [('natural', 'water'), ('water', 'lake'), ('salt', 'yes')],
'Antarctic Ice Shelf': [(' glacier:type','shelf'), ('natural', 'glacier')], #Marble does not support the glacier:type tag
'Antarctic Ice Shelf Edge': [('glacier:edge', 'calving_line')], #marble does not support this osm tag
'Glaciated areas': [('natural', 'glacier')],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment