Commit a7980f86 authored by Akshat Tandon's avatar Akshat Tandon

Add International Date Line

Reviewers: rahn, nienhueser

Reviewed By: nienhueser

Differential Revision: https://phabricator.kde.org/D1999
parent 7179d7ed
......@@ -592,6 +592,7 @@ void StyleBuilder::Private::initializeDefaultStyles()
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::InternationalDateLine] = StyleBuilder::Private::createStyle( 1.0, 0.0, "#000000", "#000000", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false );
s_defaultStyle[GeoDataFeature::AdminLevel1] = StyleBuilder::Private::createStyle(0.0, 0.0, "#DF9CCF", "#DF9CCF", false, 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", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3 );
......
......@@ -440,6 +440,7 @@ QString GeoDataFeature::visualCategoryName(GeoDataFeature::GeoDataVisualCategory
s_visualCategoryNames[Satellite] = "Satellite";
s_visualCategoryNames[Landmass] = "Landmass";
s_visualCategoryNames[UrbanArea] = "UrbanArea";
s_visualCategoryNames[InternationalDateLine] = "InternationalDateLine";
s_visualCategoryNames[AdminLevel1] = "AdminLevel1";
s_visualCategoryNames[AdminLevel2] = "AdminLevel2";
s_visualCategoryNames[AdminLevel3] = "AdminLevel3";
......
......@@ -418,6 +418,7 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
//Custom OSM Tags
Landmass,
UrbanArea,
InternationalDateLine,
// Important: Make sure that this is always the last
// item and just use it to specify the array size
......
......@@ -347,6 +347,7 @@ void GeometryLayerPrivate::initializeDefaultValues()
s_defaultMinZoomLevels[GeoDataFeature::Landmass] = 0;
s_defaultMinZoomLevels[GeoDataFeature::UrbanArea] = 3;
s_defaultMinZoomLevels[GeoDataFeature::InternationalDateLine] = 1;
s_defaultMinZoomLevels[GeoDataFeature::AdminLevel1] = 0;
s_defaultMinZoomLevels[GeoDataFeature::AdminLevel2] = 1;
......
......@@ -324,6 +324,7 @@ void OsmPresetLibrary::initializeOsmVisualCategories()
//Custom Marble OSM Tags
s_visualCategories[ OsmTag( "marble_land", "landmass" ) ] = GeoDataFeature::Landmass;
s_visualCategories[ OsmTag( "settlement", "yes" ) ] = GeoDataFeature::UrbanArea;
s_visualCategories[ OsmTag( "marble_line", "date" ) ] = GeoDataFeature::InternationalDateLine;
// Default for buildings
foreach(const QString &value, buildingValues() ) {
......
......@@ -270,7 +270,8 @@ def feature_class(data):
'Country': [('marble_land', 'landmass')],
'1st Order Admin Lines': [('boundary', 'administrative'), ('admin_level', '4')],
'Claim': [('boundary', 'administrative'), ('admin_level', '4')],
'Airport': [('aeroway', 'aerodrome')]
'Airport': [('aeroway', 'aerodrome')],
'Date line': [('marble_line', 'date')]
}
if 'featurecla' in data:
if data['featurecla'] in feat_dict:
......
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