Commit aa6e87f3 authored by Torsten Rahn's avatar Torsten Rahn
Browse files

Add library and peak symbol for vector osm.

parent faecf23d
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
width="100%"
height="100%"
viewBox="0 0 16 16"
id="svg2"
inkscape:version="0.91 r"
sodipodi:docname="library.20.svg">
<metadata
id="metadata10">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs8" />
<sodipodi:namedview
pagecolor="#dadada"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1600"
inkscape:window-height="845"
id="namedview6"
showgrid="false"
inkscape:zoom="14.402827"
inkscape:cx="11.354981"
inkscape:cy="0.044246787"
inkscape:window-x="-2"
inkscape:window-y="-3"
inkscape:window-maximized="1"
inkscape:current-layer="svg2"
showguides="true"
inkscape:guide-bbox="true" />
<path
inkscape:connector-curvature="0"
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#734a08;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.70896626;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
d="m 7.9052996,0.7472048 -6.1480666,3.5102137 0,0.2492459 -0.034618,-0.039233 c -0.7222332,0.4814889 -0.4106817,2.5362132 0,3.0601863 l 6.8242616,7.8235533 c -0.017638,-0.02073 -0.031523,-0.05116 -0.048465,-0.07385 l 0.1038529,0.120007 6.0834475,-3.590987 0,-0.270017 -0.493876,-0.567726 c -0.170273,-0.59551 -0.192853,-1.4325533 0.09,-1.9362723 l 0.403871,-0.2307833 0,-0.2700164 -6.7804133,-7.78432009 z"
id="rect6414-6-4" />
<path
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#734a08;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.29540259;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
d="m 7.9052996,3.7513071 -6.1480666,3.5102137 0,0.2686083 6.845032,7.8673669 6.083447,-3.59097 0,-0.270913 z"
id="rect6414-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" />
<path
style="fill:#734a08;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.29540259;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 14.543835,8.7254017 c -0.722233,0.4814889 -0.244991,2.5666233 0.165683,3.0905963 l -6.2699372,3.549735 c -0.5664515,-0.665588 -0.685302,-2.556764 0.093577,-3.236512 z"
id="path6478-2"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#734a08;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.29540259;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
d="m 7.9052996,0.7472048 -6.1480666,3.5102137 0,0.2686083 6.7804127,7.7843202 6.1480663,-3.507906 0,-0.2709162 z"
id="rect6414"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" />
<path
style="fill:#734a08;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.29540259;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 1.7215071,4.4678841 c -0.72223325,0.4814889 -0.4106817,2.5348971 0,3.0588702 L 8.5463758,15.350998 C 7.9799184,14.68541 7.7628813,12.978277 8.5417557,12.298529 Z"
id="path6478"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.29540259;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 8.6915616,14.358544 14.125552,11.221228"
id="path6607"
inkscape:connector-curvature="0" />
<path
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.29540259;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 8.5992659,13.673803 14.033255,10.536486"
id="path6607-1"
inkscape:connector-curvature="0" />
<path
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.29540259;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 8.6915616,12.886509 14.125552,9.7491996"
id="path6607-1-0"
inkscape:connector-curvature="0" />
</svg>
......@@ -376,7 +376,7 @@ void GeoDataFeaturePrivate::initializeDefaultStyles()
s_defaultStyle[GeoDataFeature::AccomodationHotel] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "transportation/hotel.16", transportationColor );
s_defaultStyle[GeoDataFeature::AccomodationMotel] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "transportation/motel.16", transportationColor );
s_defaultStyle[GeoDataFeature::AccomodationYouthHostel] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "transportation/hostel.16", transportationColor );
s_defaultStyle[GeoDataFeature::AmenityLibrary] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, QString(), amenityColor );
s_defaultStyle[GeoDataFeature::AmenityLibrary] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "amenity/library.20", amenityColor );
s_defaultStyle[GeoDataFeature::EducationCollege] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, QString(), amenityColor );
s_defaultStyle[GeoDataFeature::EducationSchool] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, QString(), amenityColor );
s_defaultStyle[GeoDataFeature::EducationUniversity] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, QString(), amenityColor );
......@@ -414,6 +414,8 @@ void GeoDataFeaturePrivate::initializeDefaultStyles()
s_defaultStyle[GeoDataFeature::AmenityDrinkingWater] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "amenity/drinking_water.16", amenityColor );
s_defaultStyle[GeoDataFeature::NaturalPeak] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "individual/peak", amenityColor );
s_defaultStyle[GeoDataFeature::ShopBeverages] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "shop/beverages-14", shopColor );
s_defaultStyle[GeoDataFeature::ShopHifi] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "shop/hifi-14", shopColor );
s_defaultStyle[GeoDataFeature::ShopSupermarket] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "shop/shop_supermarket", shopColor );
......
......@@ -226,6 +226,8 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
AmenityDrinkingWater,
AmenityGraveyard,
NaturalPeak,
// OpenStreetMap category Shopping
ShopBeverages,
ShopHifi,
......
......@@ -86,6 +86,8 @@ void OsmPresetLibrary::initializeOsmVisualCategories()
s_visualCategories[ OsmTag( "amenity", "theatre" ) ] = GeoDataFeature::TouristTheatre;
s_visualCategories[ OsmTag( "amenity", "place_of_worship" ) ] = GeoDataFeature::ReligionPlaceOfWorship;
s_visualCategories[ OsmTag( "natural", "peak" ) ] = GeoDataFeature::NaturalPeak;
//FIXME: alcohol != beverages
s_visualCategories[ OsmTag( "shop", "beverages" ) ] = GeoDataFeature::ShopBeverages;
s_visualCategories[ OsmTag( "shop", "hifi" ) ] = GeoDataFeature::ShopHifi;
......
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