Index: trunk/resources/data/boundaries.osm =================================================================== --- trunk/resources/data/boundaries.osm (revision 16006) +++ trunk/resources/data/boundaries.osm (revision 16006) @@ -0,0 +1,58752 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/data/defaultpresets.xml =================================================================== --- trunk/resources/data/defaultpresets.xml (revision 16006) +++ trunk/resources/data/defaultpresets.xml (revision 16006) @@ -0,0 +1,8017 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/data/gpx-drawing-extensions-1.0.xsd =================================================================== --- trunk/resources/data/gpx-drawing-extensions-1.0.xsd (revision 16006) +++ trunk/resources/data/gpx-drawing-extensions-1.0.xsd (revision 16006) @@ -0,0 +1,103 @@ + + + + + + This schema defines drawing extensions for the GPX 1.1 schema (http://www.topografix.com/GPX/1/1/gpx.xsd). + Elements in this schema should be used as child elements of the "extensions" element defined by the GPX schema. + + + + + + + + + The color of the element, i.e. #RRGGBB or #RRGGBBAA. + Note that applications should apply possible alpha values to the lines and opacity to the whole track. This means that overlapping parts of the + track with alpha values will look more intense than individual lines, whereas the opacity affects the whole track including overlapping parts. + + + + + + + + The opacity of the element between 0.00 and 1.00. + + + + + + + + The width of the line in pixels, applications may use a width relative to this value if required. + + + + + + + + The dash pattern of the line, see gpxd:dashPattern_type. Should always be relative to the width. + + + + + + + + + + The hexColor_type must be a # followed by a 6 or 8-digit hex representation of the color (with or without the alpha value). + + + + + + + + + + + + The opacity_type must be a decimal value between 0 and 1. + + + + + + + + + + + + The dashPattern_type can be + - a representation of the pattern as y-n-y-n-... with y being the relative length of the line that is + visible and n being the relative length of the line that is hidden to create a dashed / dotted line. + Has to have an even number of segments (at least two) and can contain multi-digit numbers. + - one of the following predefined values: + none, dash-long, dash-medium, dash-short, dot-sparse, dot-normal, dot-dense, dash-dot, dash-dot-dot + + + + + + + + + + + + + + + + Index: trunk/resources/data/gpx-extensions-1.1.xsd =================================================================== --- trunk/resources/data/gpx-extensions-1.1.xsd (revision 16006) +++ trunk/resources/data/gpx-extensions-1.1.xsd (revision 16006) @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + The layerPreferences contain the preferences that can be set for the layer, e.g. in the "Customize track drawing" dialog in JOSM. + + + + + + + + + + + + + + + + Index: trunk/resources/data/gpx-extensions.xsd =================================================================== --- trunk/resources/data/gpx-extensions.xsd (revision 16006) +++ trunk/resources/data/gpx-extensions.xsd (revision 16006) @@ -0,0 +1,14 @@ + + + + + + + + + + + + + Index: trunk/resources/data/gpx/brown2green.txt =================================================================== --- trunk/resources/data/gpx/brown2green.txt (revision 16006) +++ trunk/resources/data/gpx/brown2green.txt (revision 16006) @@ -0,0 +1,15 @@ +# License: GPL. For details,see LICENSE file. +# +# diverging brown to green, designed by http://colorbrewer2.org/ +# +# color map must start at first line without comment +# +0,0,0 +1,102,9 +53,151,143 +128,205,193 +199,234,229 +246,232,195 +223,194,125 +191,129,45 +140,81,10 Index: trunk/resources/data/gpx/inferno.txt =================================================================== --- trunk/resources/data/gpx/inferno.txt (revision 16006) +++ trunk/resources/data/gpx/inferno.txt (revision 16006) @@ -0,0 +1,267 @@ +# License: GPL. For details,see LICENSE file. +# +# based on color map aka inferno with adjustment to more brighter values +# Used to reconstruct the colormap in viscm (http://bids.github.io/colormap/) +# parameters = {'xp': [-2.059155383623448,55.527989656842408,34.409268195655187,4.76708575112832,-9.505963894261754}, +# 'yp': [-25.66489361702122,-20.376712328767127,26.997716894977174,20.56737588652487,32.047872340425585}, +# 'min_Jp': 33.3692722372, +# max_Jp': 95} +# +# color map must start at first line without comment +# +0.21520753,0.27038249,0.57012105 +0.22312459,0.27103303,0.57166455 +0.23080347,0.27168503,0.57324007 +0.23833063,0.27231877,0.57483869 +0.24568074,0.27294692,0.57646522 +0.25289476,0.2735611,0.57811579 +0.25997831,0.27416334,0.57979067 +0.2669379,0.27475519,0.58148978 +0.27380298,0.27532947,0.58321 +0.28055428,0.27589622,0.58495399 +0.287239,0.2764405,0.58671621 +0.29381911,0.27697939,0.58850116 +0.30035424,0.27749166,0.59030167 +0.3067935,0.27799996,0.59212335 +0.31320428,0.2784783,0.59395808 +0.31952836,0.27895311,0.59581191 +0.32583529,0.27939586,0.59767646 +0.3320659,0.27983431,0.59955752 +0.33828602,0.28023999,0.60144712 +0.34443919,0.2806404,0.60335045 +0.35058925,0.28100652,0.60525968 +0.35668082,0.28136625,0.60717967 +0.36277287,0.28169157,0.60910303 +0.3688165,0.28200806,0.61103375 +0.37486069,0.28229156,0.61296536 +0.38086771,0.28256263,0.61490057 +0.38687304,0.28280326,0.61683417 +0.39285321,0.28302691,0.61876728 +0.39882725,0.28322388,0.6206963 +0.40478897,0.28339829,0.62262037 +0.41073803,0.28355108,0.62453795 +0.41668846,0.28367469,0.62644568 +0.42261777,0.28378305,0.62834468 +0.42856299,0.28385455,0.63022847 +0.43448626,0.28391267,0.63210021 +0.44042184,0.28393692,0.63395343 +0.44634815,0.28394123,0.63578925 +0.45227252,0.28392157,0.63760476 +0.45820558,0.28387152,0.63939628 +0.46412436,0.28380662,0.6411656 +0.47006356,0.28370439,0.64290476 +0.47599406,0.28358471,0.64461676 +0.48192565,0.28344156,0.64629781 +0.48786962,0.28326756,0.64794343 +0.49380435,0.28307827,0.64955593 +0.49975251,0.28285825,0.65112821 +0.50570289,0.28261587,0.65266041 +0.51164619,0.2823585,0.65415271 +0.51760901,0.28206718,0.65559589 +0.52356861,0.28175913,0.65699349 +0.52952249,0.28143693,0.65834417 +0.5354961,0.28108192,0.65963775 +0.54146547,0.28071283,0.66087903 +0.54742976,0.28033111,0.66206616 +0.55340844,0.27992224,0.66318972 +0.55938599,0.27949898,0.66425255 +0.56535835,0.27906539,0.66525388 +0.57133473,0.2786149,0.66618743 +0.57731677,0.27814689,0.66704956 +0.58329279,0.27767173,0.66784277 +0.58926275,0.27719044,0.66856469 +0.59523878,0.27669389,0.66920646 +0.601212,0.27619042,0.66976956 +0.60717734,0.27568537,0.67025404 +0.61313444,0.27518023,0.67065755 +0.6190896,0.27467077,0.67097344 +0.62504118,0.27415958,0.67119949 +0.63098171,0.27365438,0.67133763 +0.63691049,0.27315721,0.67138563 +0.64282668,0.27267021,0.67134132 +0.64873334,0.2721922,0.67119941 +0.65463011,0.27172501,0.67095685 +0.66051031,0.27127617,0.67061602 +0.66637279,0.27084839,0.67017505 +0.67221629,0.27044454,0.66963216 +0.67803951,0.27006762,0.66898569 +0.68384101,0.26972075,0.66823411 +0.68962043,0.2694062,0.66737478 +0.69537788,0.26912584,0.66640432 +0.70110815,0.26888634,0.66532544 +0.70680955,0.26869125,0.66413723 +0.71248034,0.26854423,0.66283897 +0.71811869,0.26844898,0.66143017 +0.72372274,0.26840929,0.6599105 +0.72929057,0.26842895,0.65827991 +0.7348202,0.26851179,0.65653854 +0.74030966,0.26866163,0.65468679 +0.74575692,0.26888225,0.65272532 +0.75115994,0.26917738,0.65065505 +0.75651668,0.26955067,0.64847715 +0.76182512,0.27000568,0.64619309 +0.76708321,0.27054582,0.64380458 +0.77228898,0.27117434,0.64131363 +0.77744045,0.27189431,0.63872252 +0.78253571,0.27270861,0.63603377 +0.7875729,0.27361986,0.63325018 +0.79255022,0.27463045,0.6303748 +0.79746596,0.27574247,0.62741092 +0.80231908,0.27695738,0.62436032 +0.80710794,0.27827681,0.62122676 +0.81183046,0.27970239,0.6180159 +0.8164853,0.28123501,0.61473188 +0.82107123,0.28287522,0.611379 +0.82558714,0.28462328,0.60796168 +0.83003205,0.28647909,0.60448445 +0.8344051,0.28844227,0.60095193 +0.83870608,0.29051198,0.59736649 +0.84293394,0.29268742,0.59373445 +0.84708799,0.29496738,0.59006162 +0.8511679,0.29735032,0.58635274 +0.85517346,0.29983446,0.58261253 +0.85910459,0.30241779,0.57884566 +0.86296154,0.30509821,0.57505503 +0.8667442,0.30787334,0.57124668 +0.87045278,0.31074062,0.56742555 +0.87408763,0.3136974,0.5635959 +0.87764922,0.31674094,0.55976186 +0.88113814,0.31986844,0.55592693 +0.88455499,0.32307701,0.55209513 +0.88790044,0.32636363,0.54827073 +0.89117526,0.32972536,0.54445721 +0.89438031,0.33315921,0.54065783 +0.89751647,0.33666226,0.53687571 +0.90058468,0.34023153,0.53311396 +0.90358593,0.34386414,0.52937539 +0.90652122,0.34755725,0.52566255 +0.90939159,0.35130809,0.5219778 +0.91219812,0.35511391,0.51832354 +0.91494189,0.35897199,0.51470218 +0.91762398,0.36287988,0.51111515 +0.92024546,0.36683514,0.50756411 +0.92280743,0.3708354,0.50405059 +0.92531095,0.37487835,0.5005761 +0.92775723,0.37896156,0.49714278 +0.93014721,0.38308319,0.4937508 +0.93248195,0.38724127,0.49040111 +0.93476246,0.3914339,0.48709457 +0.93698975,0.39565929,0.48383192 +0.93916494,0.39991543,0.48061464 +0.94128894,0.40420083,0.47744286 +0.94336261,0.40851411,0.47431661 +0.94538686,0.4128538,0.47123623 +0.94736256,0.41721856,0.468202 +0.94929056,0.42160708,0.46521414 +0.95117192,0.42601776,0.46227381 +0.95300724,0.4304498,0.45938022 +0.95479724,0.43490219,0.4565332 +0.95654264,0.43937392,0.45373274 +0.95824414,0.44386407,0.45097877 +0.95990241,0.44837175,0.44827118 +0.96151825,0.45289592,0.44561039 +0.96309223,0.45743586,0.44299605 +0.9646248,0.46199106,0.44042751 +0.96611649,0.46656086,0.43790454 +0.96756782,0.47114466,0.43542688 +0.96897927,0.47574187,0.43299428 +0.9703513,0.48035197,0.43060645 +0.97168455,0.48497424,0.42826362 +0.9729793,0.48960837,0.42596514 +0.97423583,0.49425407,0.42371048 +0.97545448,0.49891094,0.42149932 +0.97663559,0.50357865,0.41933134 +0.97777945,0.50825686,0.41720624 +0.97888633,0.51294528,0.41512369 +0.97995654,0.5176436,0.41308347 +0.98099046,0.52235141,0.41108558 +0.98198808,0.5270687,0.40912927 +0.98294961,0.53179527,0.40721424 +0.98387521,0.53653092,0.40534022 +0.98476504,0.54127549,0.40350692 +0.98561924,0.54602881,0.40171405 +0.98643793,0.55079072,0.39996136 +0.98722122,0.55556111,0.3982486 +0.98796936,0.5603397,0.39657571 +0.98868226,0.56512655,0.39494219 +0.98936,0.56992153,0.3933478 +0.99000264,0.57472455,0.39179229 +0.99061026,0.57953551,0.39027544 +0.99118291,0.5843543,0.38879701 +0.99172063,0.58918085,0.38735678 +0.99222348,0.59401505,0.38595451 +0.99269152,0.59885681,0.38458997 +0.99312476,0.60370607,0.38326287 +0.99352325,0.60856274,0.38197295 +0.99388704,0.61342672,0.38071994 +0.9942162,0.61829793,0.37950355 +0.9945108,0.62317625,0.37832349 +0.99477091,0.62806159,0.37717942 +0.99499662,0.63295383,0.376071 +0.99518804,0.63785286,0.37499782 +0.99534511,0.64275869,0.37395927 +0.99546806,0.64767111,0.372955 +0.99555705,0.65258996,0.37198453 +0.99561226,0.65751512,0.37104728 +0.99563387,0.66244643,0.37014263 +0.99562207,0.66738375,0.36926988 +0.99557709,0.6723269,0.36842829 +0.99549919,0.67727574,0.367617 +0.99538832,0.68223028,0.3668348 +0.99524486,0.6871903,0.36608079 +0.99506928,0.69215551,0.36535402 +0.99486193,0.69712571,0.36465327 +0.99462316,0.70210071,0.36397724 +0.99435337,0.70708033,0.36332451 +0.99405297,0.71206436,0.36269354 +0.99372226,0.7170527,0.36208252 +0.99336115,0.72204548,0.36148919 +0.99297075,0.72704212,0.36091215 +0.99255157,0.73204239,0.36034933 +0.99210417,0.7370461,0.35979848 +0.9916291,0.74205305,0.35925722 +0.99112697,0.74706302,0.35872299 +0.99059766,0.75207625,0.35819249 +0.99004191,0.75709248,0.3576629 +0.98946091,0.76211118,0.35713157 +0.98885534,0.76713218,0.35659523 +0.98822592,0.77215526,0.3560504 +0.98757341,0.77718026,0.35549344 +0.98689724,0.78220771,0.35491939 +0.98619894,0.78723702,0.35432474 +0.98547981,0.79226775,0.35370552 +0.98474069,0.79729971,0.35305716 +0.98398247,0.80233272,0.35237485 +0.98320475,0.80736733,0.3516524 +0.98240874,0.81240322,0.35088461 +0.9815964,0.81743967,0.35006665 +0.9807688,0.8224765,0.34919255 +0.97992705,0.82751352,0.34825605 +0.97906945,0.83255201,0.34724796 +0.97819995,0.83759034,0.34616365 +0.97731989,0.84262826,0.34499577 +0.97643067,0.84766553,0.34373656 +0.97553084,0.85270337,0.34237486 +0.9746244,0.85774026,0.34090421 +0.97371347,0.86277567,0.3393158 +0.97279937,0.8678095,0.33759927 +0.97188135,0.87284272,0.33574113 +0.97096472,0.87787333,0.33373367 +0.97005177,0.88290083,0.33156512 +0.96914211,0.88792612,0.3292193 +0.9682402,0.89294775,0.32668465 +0.96735004,0.89796453,0.32394813 +0.96647255,0.90297683,0.32099108 +0.96561166,0.9079836,0.31779718 +0.96477281,0.91298312,0.31435094 +0.96395774,0.91797553,0.31062911 +0.96317157,0.92295935,0.30661145 +0.96242046,0.92793272,0.30227735 +0.96170672,0.93289563,0.29759626 +0.96103783,0.93784572,0.29254395 +0.96041973,0.94278138,0.2870899 +0.95985661,0.94770189,0.28119495 +0.95935719,0.95260448,0.27482525 +0.95892721,0.9574878,0.26793369 +0.95857402,0.9623498,0.2604697 +0.9583055,0.96718821,0.25237504 Index: trunk/resources/data/gpx/red2blue.txt =================================================================== --- trunk/resources/data/gpx/red2blue.txt (revision 16006) +++ trunk/resources/data/gpx/red2blue.txt (revision 16006) @@ -0,0 +1,18 @@ +# License: GPL. For details, see LICENSE file. +# +# diverging red to blue, designed by http://colorbrewer2.org/ +# +# color map must start at first line without comment +# +0,0,0 +49,54,149 +69,117,180 +116,173,209 +171,217,233 +224,243,248 +254,224,144 +253,174,97 +244,109,67 +215,48,39 +165,0,38 + Index: trunk/resources/data/gpx/viridis.txt =================================================================== --- trunk/resources/data/gpx/viridis.txt (revision 16006) +++ trunk/resources/data/gpx/viridis.txt (revision 16006) @@ -0,0 +1,267 @@ +# License: GPL. For details,see LICENSE file. +# +# Used to reconstruct the colormap in viscm (http://bids.github.io/colormap/) +# {'xp': [-8.9697272381347659,-14.962877923066287,-32.371553722153038,-30.373836827175865,-6.9720103431575922,-8.684339110280888 +# 'yp': [-25.513698630136986,15.296803652968038,-30.650684931506845,20.719178082191775,25.570776255707756,32.990867579908667 +# 'min_Jp': 33.3692722372, +# 'max_Jp': 95} +# +# color map must start at first line without comment +# +0.0331179,0.29975688,0.57579112 +0.04256739,0.3028265,0.57286799 +0.0512467,0.30584793,0.57009011 +0.05914659,0.30882508,0.5674503 +0.06654831,0.3117815,0.5647918 +0.07345228,0.31469781,0.56227052 +0.07995739,0.31757925,0.55986398 +0.08619278,0.32044241,0.55745447 +0.09212195,0.32327213,0.55517502 +0.09780928,0.32607626,0.55297584 +0.10331033,0.32886259,0.55080222 +0.10859491,0.33162106,0.54875221 +0.11372563,0.33436292,0.54673886 +0.11870231,0.33708616,0.54479015 +0.12351267,0.33978626,0.54295921 +0.12822783,0.3424784,0.541114 +0.13279867,0.34515022,0.53938101 +0.13725748,0.34780851,0.53770555 +0.14161799,0.35045603,0.53606914 +0.14585622,0.3530865,0.53454415 +0.15002582,0.35571293,0.5330082 +0.15408488,0.35832466,0.5315781 +0.15806357,0.36092928,0.53018482 +0.16195691,0.36352554,0.52884943 +0.16576237,0.36611275,0.52758751 +0.16949979,0.36869662,0.52634711 +0.1731454,0.37127046,0.52520656 +0.17673382,0.37384485,0.52406183 +0.18023309,0.37641026,0.52302135 +0.18367353,0.37897678,0.5219859 +0.18703181,0.38153698,0.52104134 +0.19032855,0.38409867,0.52011314 +0.19354787,0.38665632,0.5192658 +0.19670438,0.38921652,0.51843878 +0.19978526,0.39177424,0.51769017 +0.20280277,0.39433623,0.51695934 +0.20574448,0.39689659,0.51631112 +0.20862219,0.39946359,0.51567252 +0.21142395,0.40203013,0.51511745 +0.21415805,0.40460435,0.51457709 +0.21681705,0.40718098,0.51410601 +0.21940294,0.40976427,0.5136727 +0.22191346,0.4123542,0.51328427 +0.22434688,0.41494912,0.51295975 +0.22670152,0.4175556,0.51265342 +0.22897578,0.42016834,0.51241261 +0.23116721,0.42279102,0.51221511 +0.23327224,0.42542553,0.5120539 +0.23529113,0.42806929,0.51195199 +0.23721876,0.4307259,0.51189091 +0.23905088,0.43339672,0.51186833 +0.24078829,0.43607984,0.51190068 +0.24242777,0.43877648,0.5119848 +0.24395722,0.44149191,0.51209793 +0.24538089,0.44422266,0.51226326 +0.24669486,0.44696981,0.512479 +0.24789484,0.44973443,0.51274365 +0.24897073,0.45251957,0.51304809 +0.24992008,0.45532509,0.51339708 +0.25074106,0.45815079,0.51379462 +0.25142853,0.46099761,0.51423996 +0.2519772,0.46386643,0.51473252 +0.25238166,0.46675805,0.51527187 +0.25263645,0.46967322,0.51585774 +0.25273608,0.47261257,0.51648993 +0.25267511,0.47557666,0.51716828 +0.25244821,0.47856593,0.51789267 +0.25205017,0.4815807,0.51866293 +0.25147595,0.48462119,0.51947882 +0.25072074,0.48768749,0.52034 +0.24977992,0.49077954,0.52124597 +0.24864914,0.49389721,0.52219605 +0.24732429,0.4970402,0.52318934 +0.2458015,0.50020813,0.5242247 +0.24407712,0.50340048,0.52530069 +0.24213937,0.50661827,0.52641341 +0.23998809,0.50986008,0.52756205 +0.2376243,0.51312431,0.5287454 +0.23504515,0.51641008,0.52996075 +0.23223599,0.51971846,0.53120267 +0.22919943,0.52304738,0.53246911 +0.22593842,0.52639479,0.53375736 +0.22243635,0.52976175,0.53506084 +0.21869708,0.53314592,0.53637622 +0.21472177,0.53654544,0.53769908 +0.21049097,0.53996144,0.53902151 +0.20602332,0.5433894,0.54034076 +0.20129189,0.54683133,0.54164703 +0.19632014,0.5502822,0.54293704 +0.1910817,0.5537437,0.54420016 +0.1856016,0.55721085,0.54543206 +0.17986279,0.56068409,0.5466222 +0.17388472,0.56415953,0.54776421 +0.16767592,0.56763485,0.54884959 +0.16124118,0.57110836,0.54986858 +0.15461572,0.57457555,0.55081476 +0.14782653,0.57803342,0.55167986 +0.14090518,0.58147916,0.55245531 +0.13391472,0.5849079,0.5531362 +0.12692017,0.58831582,0.55371706 +0.12000191,0.59169907,0.55419371 +0.11326013,0.59505365,0.55456398 +0.10681409,0.59837568,0.55482785 +0.10079543,0.60166197,0.55498638 +0.09534887,0.60490977,0.55504241 +0.09063347,0.60811639,0.55500215 +0.08679049,0.61128079,0.55487004 +0.08394854,0.6144023,0.55465197 +0.08221537,0.61748019,0.55435753 +0.08164325,0.6205151,0.55399342 +0.08223013,0.62350855,0.55356369 +0.08394439,0.62646065,0.55308231 +0.08668611,0.6293742,0.55254872 +0.09034668,0.63225032,0.55197376 +0.09479378,0.63509139,0.55135952 +0.09989897,0.63789906,0.55071423 +0.10553908,0.64067585,0.55003665 +0.11160448,0.64342303,0.54933941 +0.11800283,0.64614329,0.54861541 +0.12465323,0.64883798,0.54787462 +0.13149053,0.65150897,0.54711829 +0.13846531,0.65415809,0.5463437 +0.1455335,0.65678673,0.54555555 +0.15265709,0.65939627,0.54476003 +0.15981518,0.66198821,0.54395146 +0.16698676,0.66456378,0.54313117 +0.17415531,0.66712409,0.54230031 +0.18130458,0.66967023,0.54146307 +0.18842545,0.67220323,0.54061925 +0.19551341,0.67472397,0.53976647 +0.2025629,0.67723331,0.53890516 +0.20956984,0.67973202,0.53803564 +0.2165314,0.68222082,0.53715809 +0.22344573,0.68470038,0.53627262 +0.23031175,0.6871713,0.53537923 +0.23712903,0.68963415,0.53447784 +0.24389765,0.69208946,0.53356833 +0.25061808,0.6945377,0.53265048 +0.25729111,0.69697932,0.53172407 +0.26391778,0.6994147,0.53078879 +0.27049933,0.70184423,0.52984433 +0.27703712,0.70426823,0.52889033 +0.28353264,0.70668701,0.52792642 +0.28998746,0.70910086,0.52695218 +0.29640321,0.71151001,0.52596722 +0.30278152,0.71391471,0.5249711 +0.30912407,0.71631516,0.52396339 +0.31543254,0.71871153,0.52294366 +0.3217086,0.72110401,0.52191145 +0.3279539,0.72349274,0.52086633 +0.33417008,0.72587784,0.51980786 +0.34035875,0.72825944,0.5187356 +0.34652147,0.73063763,0.51764911 +0.35265864,0.73301261,0.51654918 +0.35877137,0.73538448,0.51543583 +0.3648628,0.73775319,0.51430692 +0.37093438,0.74011877,0.51316203 +0.37698751,0.74248126,0.51200075 +0.38302357,0.7448407,0.51082267 +0.38904388,0.7471971,0.5096274 +0.39504973,0.74955049,0.50841457 +0.40104082,0.75190103,0.5071855 +0.40701899,0.75424866,0.50593917 +0.41298655,0.75659325,0.50467398 +0.41894464,0.75893479,0.50338958 +0.42489434,0.76127325,0.50208564 +0.43083671,0.76360862,0.50076184 +0.43677259,0.76594088,0.4994181 +0.44270136,0.7682702,0.49805594 +0.44862605,0.77059628,0.49667271 +0.45454756,0.77291909,0.49526814 +0.46046679,0.77523857,0.49384196 +0.46638456,0.77755469,0.4923939 +0.47230148,0.7798674,0.49092398 +0.47821759,0.78217677,0.48943283 +0.48413494,0.78448256,0.48791871 +0.49005423,0.78678471,0.48638138 +0.49597616,0.78908317,0.48482063 +0.50190137,0.79137786,0.48323626 +0.5078303,0.79366877,0.48162833 +0.5137638,0.79595578,0.47999631 +0.51970278,0.79823879,0.47833963 +0.52564777,0.80051774,0.47665809 +0.53159931,0.80279254,0.47495153 +0.53755788,0.80506315,0.47321975 +0.54352447,0.80732942,0.47146196 +0.54949945,0.80959129,0.46967805 +0.55548322,0.81184871,0.4678679 +0.56147617,0.8141016,0.46603131 +0.5674787,0.81634992,0.46416812 +0.57349149,0.81859354,0.46227771 +0.57951582,0.82083223,0.46035867 +0.58555114,0.82306609,0.45841193 +0.59159777,0.82529507,0.45643726 +0.59765599,0.82751909,0.45443444 +0.60372607,0.82973812,0.45240324 +0.60980907,0.83195194,0.45034236 +0.61590608,0.83416034,0.44825035 +0.62201604,0.83636352,0.44612867 +0.62813915,0.83856142,0.443977 +0.6342756,0.84075401,0.44179501 +0.64042559,0.84294124,0.43958235 +0.64658927,0.84512308,0.43733862 +0.65276961,0.84729891,0.43505957 +0.65896438,0.84946917,0.43274795 +0.66517356,0.85163387,0.43040351 +0.67139725,0.85379299,0.4280257 +0.67763555,0.85594651,0.42561396 +0.68388856,0.8580944,0.42316766 +0.69015635,0.86023667,0.42068611 +0.69643989,0.86237309,0.41816731 +0.70274062,0.86450334,0.41560843 +0.70905639,0.86662792,0.41301167 +0.71538721,0.86874683,0.41037609 +0.72173308,0.87086011,0.40770069 +0.72809396,0.87296778,0.40498434 +0.7344698,0.87506988,0.40222583 +0.74086053,0.87716647,0.39942384 +0.74726606,0.8792576,0.39657691 +0.75368625,0.88134336,0.39368347 +0.76012096,0.88342383,0.39074178 +0.76656999,0.88549913,0.38774996 +0.77303308,0.8875694,0.38470595 +0.77950995,0.88963477,0.38160749 +0.78600023,0.89169545,0.37845211 +0.79250349,0.89375165,0.37523713 +0.79901921,0.89580363,0.37195957 +0.80554676,0.8978517,0.36861621 +0.8120854,0.89989622,0.3652035 +0.81863422,0.90193761,0.36171754 +0.82519216,0.90397637,0.35815405 +0.83175795,0.9060131,0.35450833 +0.83833008,0.90804849,0.3507752 +0.84490673,0.91008337,0.34694895 +0.85148576,0.91211872,0.34302325 +0.85806684,0.91415505,0.33898699 +0.86465276,0.91619201,0.3348209 +0.87123317,0.91823316,0.33052851 +0.87780375,0.9202804,0.32609988 +0.88435971,0.92233593,0.32152327 +0.89091043,0.92439784,0.31675269 +0.89743393,0.9264737,0.31180336 +0.9039243,0.92856651,0.3066523 +0.91038551,0.93067656,0.30124469 +0.91678774,0.93281453,0.29559791 +0.92313653,0.9349809,0.28963085 +0.92939556,0.93718902,0.28335908 +0.93555967,0.93944353,0.2766966 +0.94159054,0.94175935,0.26963707 +0.94745672,0.94414992,0.26213946 +0.95312442,0.94662987,0.25415069 +0.9585465,0.94921781,0.24566287 +0.96367764,0.95193147,0.23667632 +0.96847776,0.95478608,0.22720755 +0.97291733,0.95779215,0.21729217 +0.97698301,0.96095356,0.20697158 + Index: trunk/resources/data/help-browser.css =================================================================== --- trunk/resources/data/help-browser.css (revision 16006) +++ trunk/resources/data/help-browser.css (revision 16006) @@ -0,0 +1,191 @@ +@CHARSET "ISO-8859-1"; +/* + * This is the CSS file used in the internal help browser. + * Refer to https://docs.oracle.com/javase/8/docs/api/javax/swing/text/html/CSS.html + * and https://www.w3.org/TR/CSS1/ to see what CSS properties are supported by Java. + * - Not rendered are width, height, float, clear, display, font-variant and others. + * - Inline elements can't have borders, margins and paddings. + */ +body {margin-left: 0.2cm; font-family: Arial, sans-serif; font-size:14pt; font-weight:normal} +p {margin-top: 5px; margin-bottom: 5px;} +h1 {font-family: Arial, sans-serif; font-size:24pt; font-weight:bold} +h2 {margin-top: 14pt; font-family: Arial, sans-serif; font-size:20pt; font-weight:bold} +h3 {margin-top: 14pt; font-family: Arial, sans-serif; font-size:16pt; font-weight:bold} +h4 {margin-top: 14pt; font-family: Arial, sans-serif; font-size:14pt; font-weight:bold} +a {font-family: Arial, sans-serif; font-size:14pt; font-weight:normal; text-decoration: underline; color: blue} +ul {margin-left: 1cm; list-style-type: disc} +ul ul {margin-left: 1cm; list-style-type: circle} +ol {margin-left: 1cm;} +strong {font-weight: bold} +b {font-weight: bold} +em {font-style: italic} +i {font-style: italic} +code, pre, samp, tt { + background-color: rgb(240, 240, 240); + font-family: Courier New; + color: rgb(102, 0, 0); +} +code, tt { + font-size: 110%; +} +.warning-header { + font-family: Arial, sans-serif; + font-size:24pt; + font-weight:bold +} +.warning-body { + background-color:rgb(253,255,221); + padding: 10pt; + border-color:rgb(128,128,128); + border-style: solid; + border-width: 1px; +} + +.error-header { + font-family: Arial, sans-serif; + font-size:24pt; + font-weight:bold +} +.error-body { + background-color:rgb(254,195,190); + padding: 10pt; + border-color:rgb(128,128,128); + border-style: solid; + border-width: 1px; +} + +/******** + TRAC CSS + ********/ + +dl.wiki { margin-top: 5px; margin-bottom: 5px } +dl.wiki dt { font-weight: bold } +dl.wiki dd { margin-left: 40px } + +div.code pre .hll { background-color: #ffffcc } +div.code pre { background: #ffffff; } +div.code pre .c { color: #999988; font-style: italic } /* Comment */ +div.code pre .err { color: #a61717; background-color: #e3d2d2 } /* Error */ +div.code pre .k { font-weight: bold } /* Keyword */ +div.code pre .o { font-weight: bold } /* Operator */ +div.code pre .ch { color: #999988; font-style: italic } /* Comment.Hashbang */ +div.code pre .cm { color: #999988; font-style: italic } /* Comment.Multiline */ +div.code pre .cp { color: #999999; font-weight: bold } /* Comment.Preproc */ +div.code pre .cpf { color: #999988; font-style: italic } /* Comment.PreprocFile */ +div.code pre .c1 { color: #999988; font-style: italic } /* Comment.Single */ +div.code pre .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */ +div.code pre .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ +div.code pre .ge { font-style: italic } /* Generic.Emph */ +div.code pre .gr { color: #aa0000 } /* Generic.Error */ +div.code pre .gh { color: #999999 } /* Generic.Heading */ +div.code pre .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ +div.code pre .go { color: #888888 } /* Generic.Output */ +div.code pre .gp { color: #555555 } /* Generic.Prompt */ +div.code pre .gs { font-weight: bold } /* Generic.Strong */ +div.code pre .gu { color: #aaaaaa } /* Generic.Subheading */ +div.code pre .gt { color: #aa0000 } /* Generic.Traceback */ +div.code pre .kc { font-weight: bold } /* Keyword.Constant */ +div.code pre .kd { font-weight: bold } /* Keyword.Declaration */ +div.code pre .kn { font-weight: bold } /* Keyword.Namespace */ +div.code pre .kp { font-weight: bold } /* Keyword.Pseudo */ +div.code pre .kr { font-weight: bold } /* Keyword.Reserved */ +div.code pre .kt { color: #445588; font-weight: bold } /* Keyword.Type */ +div.code pre .m { color: #009999 } /* Literal.Number */ +div.code pre .s { color: #bb8844 } /* Literal.String */ +div.code pre .na { color: #008080 } /* Name.Attribute */ +div.code pre .nb { color: #999999 } /* Name.Builtin */ +div.code pre .nc { color: #445588; font-weight: bold } /* Name.Class */ +div.code pre .no { color: #008080 } /* Name.Constant */ +div.code pre .ni { color: #800080 } /* Name.Entity */ +div.code pre .ne { color: #990000; font-weight: bold } /* Name.Exception */ +div.code pre .nf { color: #990000; font-weight: bold } /* Name.Function */ +div.code pre .nn { color: #555555 } /* Name.Namespace */ +div.code pre .nt { color: #000080 } /* Name.Tag */ +div.code pre .nv { color: #008080 } /* Name.Variable */ +div.code pre .ow { font-weight: bold } /* Operator.Word */ +div.code pre .w { color: #bbbbbb } /* Text.Whitespace */ +div.code pre .mb { color: #009999 } /* Literal.Number.Bin */ +div.code pre .mf { color: #009999 } /* Literal.Number.Float */ +div.code pre .mh { color: #009999 } /* Literal.Number.Hex */ +div.code pre .mi { color: #009999 } /* Literal.Number.Integer */ +div.code pre .mo { color: #009999 } /* Literal.Number.Oct */ +div.code pre .sb { color: #bb8844 } /* Literal.String.Backtick */ +div.code pre .sc { color: #bb8844 } /* Literal.String.Char */ +div.code pre .sd { color: #bb8844 } /* Literal.String.Doc */ +div.code pre .s2 { color: #bb8844 } /* Literal.String.Double */ +div.code pre .se { color: #bb8844 } /* Literal.String.Escape */ +div.code pre .sh { color: #bb8844 } /* Literal.String.Heredoc */ +div.code pre .si { color: #bb8844 } /* Literal.String.Interpol */ +div.code pre .sx { color: #bb8844 } /* Literal.String.Other */ +div.code pre .sr { color: #808000 } /* Literal.String.Regex */ +div.code pre .s1 { color: #bb8844 } /* Literal.String.Single */ +div.code pre .ss { color: #bb8844 } /* Literal.String.Symbol */ +div.code pre .bp { color: #999999 } /* Name.Builtin.Pseudo */ +div.code pre .vc { color: #008080 } /* Name.Variable.Class */ +div.code pre .vg { color: #008080 } /* Name.Variable.Global */ +div.code pre .vi { color: #008080 } /* Name.Variable.Instance */ +div.code pre .il { color: #009999 } /* Literal.Number.Integer.Long */ + +table.code td .hll { background-color: #ffffcc } +table.code td { background: #ffffff; } +table.code td .c { color: #999988; font-style: italic } /* Comment */ +table.code td .err { color: #a61717; background-color: #e3d2d2 } /* Error */ +table.code td .k { font-weight: bold } /* Keyword */ +table.code td .o { font-weight: bold } /* Operator */ +table.code td .ch { color: #999988; font-style: italic } /* Comment.Hashbang */ +table.code td .cm { color: #999988; font-style: italic } /* Comment.Multiline */ +table.code td .cp { color: #999999; font-weight: bold } /* Comment.Preproc */ +table.code td .cpf { color: #999988; font-style: italic } /* Comment.PreprocFile */ +table.code td .c1 { color: #999988; font-style: italic } /* Comment.Single */ +table.code td .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */ +table.code td .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ +table.code td .ge { font-style: italic } /* Generic.Emph */ +table.code td .gr { color: #aa0000 } /* Generic.Error */ +table.code td .gh { color: #999999 } /* Generic.Heading */ +table.code td .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ +table.code td .go { color: #888888 } /* Generic.Output */ +table.code td .gp { color: #555555 } /* Generic.Prompt */ +table.code td .gs { font-weight: bold } /* Generic.Strong */ +table.code td .gu { color: #aaaaaa } /* Generic.Subheading */ +table.code td .gt { color: #aa0000 } /* Generic.Traceback */ +table.code td .kc { font-weight: bold } /* Keyword.Constant */ +table.code td .kd { font-weight: bold } /* Keyword.Declaration */ +table.code td .kn { font-weight: bold } /* Keyword.Namespace */ +table.code td .kp { font-weight: bold } /* Keyword.Pseudo */ +table.code td .kr { font-weight: bold } /* Keyword.Reserved */ +table.code td .kt { color: #445588; font-weight: bold } /* Keyword.Type */ +table.code td .m { color: #009999 } /* Literal.Number */ +table.code td .s { color: #bb8844 } /* Literal.String */ +table.code td .na { color: #008080 } /* Name.Attribute */ +table.code td .nb { color: #999999 } /* Name.Builtin */ +table.code td .nc { color: #445588; font-weight: bold } /* Name.Class */ +table.code td .no { color: #008080 } /* Name.Constant */ +table.code td .ni { color: #800080 } /* Name.Entity */ +table.code td .ne { color: #990000; font-weight: bold } /* Name.Exception */ +table.code td .nf { color: #990000; font-weight: bold } /* Name.Function */ +table.code td .nn { color: #555555 } /* Name.Namespace */ +table.code td .nt { color: #000080 } /* Name.Tag */ +table.code td .nv { color: #008080 } /* Name.Variable */ +table.code td .ow { font-weight: bold } /* Operator.Word */ +table.code td .w { color: #bbbbbb } /* Text.Whitespace */ +table.code td .mb { color: #009999 } /* Literal.Number.Bin */ +table.code td .mf { color: #009999 } /* Literal.Number.Float */ +table.code td .mh { color: #009999 } /* Literal.Number.Hex */ +table.code td .mi { color: #009999 } /* Literal.Number.Integer */ +table.code td .mo { color: #009999 } /* Literal.Number.Oct */ +table.code td .sb { color: #bb8844 } /* Literal.String.Backtick */ +table.code td .sc { color: #bb8844 } /* Literal.String.Char */ +table.code td .sd { color: #bb8844 } /* Literal.String.Doc */ +table.code td .s2 { color: #bb8844 } /* Literal.String.Double */ +table.code td .se { color: #bb8844 } /* Literal.String.Escape */ +table.code td .sh { color: #bb8844 } /* Literal.String.Heredoc */ +table.code td .si { color: #bb8844 } /* Literal.String.Interpol */ +table.code td .sx { color: #bb8844 } /* Literal.String.Other */ +table.code td .sr { color: #808000 } /* Literal.String.Regex */ +table.code td .s1 { color: #bb8844 } /* Literal.String.Single */ +table.code td .ss { color: #bb8844 } /* Literal.String.Symbol */ +table.code td .bp { color: #999999 } /* Name.Builtin.Pseudo */ +table.code td .vc { color: #008080 } /* Name.Variable.Class */ +table.code td .vg { color: #008080 } /* Name.Variable.Global */ +table.code td .vi { color: #008080 } /* Name.Variable.Instance */ +table.code td .il { color: #009999 } /* Literal.Number.Integer.Long */ Index: trunk/resources/data/maps.xsd =================================================================== --- trunk/resources/data/maps.xsd (revision 16006) +++ trunk/resources/data/maps.xsd (revision 16006) @@ -0,0 +1,756 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/data/overpass-wizard.js =================================================================== --- trunk/resources/data/overpass-wizard.js (revision 16006) +++ trunk/resources/data/overpass-wizard.js (revision 16006) @@ -0,0 +1,4 @@ +var overpassWizard=function(){"use strict";function e(r,n,t,u){this.message=r,this.expected=n,this.found=t,this.location=u,this.name="SyntaxError","function"==typeof Error.captureStackTrace&&Error.captureStackTrace(this,e)}function r(e){var r={};if(e||(e={}),!e){if("undefined"==typeof $)return!1;try{$.ajax("data/iD_presets.json",{async:!1,dataType:"json"}).success((function(r){e=r})).error((function(){throw new Error}))}catch(e){console.error("failed to load presets file","data/iD_presets.json",e)}}return Object.keys(e).map((function(r){var n=e[r];n.nameCased=n.name,n.name=n.name.toLowerCase(),n.terms=n.terms?n.terms.map((function(e){return e.toLowerCase()})):[]})),function(){if("undefined"!=typeof $&&"undefined"!=typeof i18n){var r=i18n.getLanguage();if("en"!=r){var n="data/iD_presets_"+r+".json";try{$.ajax(n,{async:!1,dataType:"json"}).success((function(r){Object.keys(r).map((function(n){var t=r[n];(n=e[n]).translated=!0;var u=n.name;n.nameCased=t.name,n.name=t.name.toLowerCase(),t.terms&&(n.terms=t.terms.split(",").map((function(e){return e.trim().toLowerCase()})).concat(n.terms)),n.terms.unshift(u)}))})).error((function(){throw new Error}))}catch(e){console.error("failed to load preset translations file: "+n)}}}}(),r.get_query_clause=function(r){var n=r.free.toLowerCase(),t=Object.keys(e).map((function(r){return e[r]})).filter((function(e){return!1!==e.searchable&&(e.name===n||(e._termsIndex=e.terms.indexOf(n),-1!=e._termsIndex))}));if(0===t.length)return!1;t.sort((function(e,r){return e.name===n?-1:r.name===n?1:e._termsIndex-r._termsIndex}));var u=t[0],a=[];return u.geometry.forEach((function(e){switch(e){case"point":case"vertex":a.push("node");break;case"line":a.push("way");break;case"area":a.push("way"),a.push("relation");break;case"relation":a.push("relation");break;default:console.error("unknown geometry type "+e+" of preset "+u.name)}})),{types:a.filter((function(e,r,n){return n.indexOf(e)===r})),conditions:Object.keys(u.tags).map((function(e){var r=u.tags[e];return{query:"*"===r?"key":"eq",key:e,val:r}}))}},r.fuzzy_search=function(r){var n=r.free.toLowerCase(),t=2+Math.floor(n.length/7);function u(e){return levenshteinDistance(e,n)<=t}var a=Object.keys(e).map((function(r){return e[r]})).filter((function(e){return!1!==e.searchable&&(!!u(e.name)||e.terms.some(u))}));if(0===a.length)return!1;function o(e){return[e.name].concat(e.terms).map((function(e,r){return levenshteinDistance(e,n)})).reduce((function(e,r){return e<=r?e:r}))}return a.sort((function(e,r){return o(e)-o(r)})),a[0].nameCased},r}var n;return function(e,r){function n(){this.constructor=e}n.prototype=r.prototype,e.prototype=new n}(e,Error),e.buildMessage=function(e,r){var n={literal:function(e){return'"'+u(e.text)+'"'},class:function(e){var r=e.parts.map((function(e){return Array.isArray(e)?a(e[0])+"-"+a(e[1]):a(e)}));return"["+(e.inverted?"^":"")+r+"]"},any:function(){return"any character"},end:function(){return"end of input"},other:function(e){return e.description}};function t(e){return e.charCodeAt(0).toString(16).toUpperCase()}function u(e){return e.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,(function(e){return"\\x0"+t(e)})).replace(/[\x10-\x1F\x7F-\x9F]/g,(function(e){return"\\x"+t(e)}))}function a(e){return e.replace(/\\/g,"\\\\").replace(/\]/g,"\\]").replace(/\^/g,"\\^").replace(/-/g,"\\-").replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,(function(e){return"\\x0"+t(e)})).replace(/[\x10-\x1F\x7F-\x9F]/g,(function(e){return"\\x"+t(e)}))}function o(e){return n[e.type](e)}return"Expected "+function(e){var r,n,t=e.map(o);if(t.sort(),t.length>0){for(r=1,n=1;r",y("<>",!1),function(e,r){return{query:"neq",key:e,val:r}},"*",y("*",!1),function(e){return{query:"key",key:e}},"is",y("is",!1),"not",y("not",!1),"null",y("null",!1),"IS",y("IS",!1),"NOT",y("NOT",!1),"NULL",y("NULL",!1),function(e){return{query:"nokey",key:e}},"~=",y("~=",!1),"~",y("~",!1),"=~",y("=~",!1),function(e,r){return{query:"like",key:e,val:r.regex?r:{regex:r}}},"like",y("like",!1),"LIKE",y("LIKE",!1),function(e,r){return{query:"likelike",key:e.regex?e:{regex:e},val:r.regex?r:{regex:r}}},"!~",y("!~",!1),function(e,r){return{query:"notlike",key:e,val:r.regex?r:{regex:r}}},":",y(":",!1),function(e,r){return{query:"substr",key:e,val:r}},"type",y("type",!1),function(e){return{query:"type",type:e}},"user",y("user",!1),"uid",y("uid",!1),"newer",y("newer",!1),"id",y("id",!1),function(e,r){return{query:"meta",meta:e,val:r}},function(e){return{query:"free form",free:e}},k("Key"),/^[a-zA-Z0-9_:\-]/,m([["a","z"],["A","Z"],["0","9"],"_",":","-"],!1,!1),function(e){return e.join("")},'"',y('"',!1),"'",y("'",!1),function(e){return e[1]},k("string"),/^[^'" ()~=!*\/:<>&|[\]{}#+@$%?\^.,]/,m(["'",'"'," ","(",")","~","=","!","*","/",":","<",">","&","|","[","]","{","}","#","+","@","$","%","?","^",".",","],!0,!1),function(e){return e.join("")},"\\",y("\\",!1),{type:"any"},function(e){return e},function(e){return e},/^['"\\bfnrtv]/,m(["'",'"',"\\","b","f","n","r","t","v"],!1,!1),function(e){return e.replace("b","\b").replace("f","\f").replace("n","\n").replace("r","\r").replace("t","\t").replace("v","\v")},"/",y("/",!1),"i",y("i",!1),"",function(e){return{regex:e[1],modifier:e[3]}},"\\/",y("\\/",!1),function(){return"/"},k("whitespace"),/^[ \t\n\r]/,m([" ","\t","\n","\r"],!1,!1)],f=[q("%;;/:#;!/1$;;/($8#: #!!)(#'#(\"'#&'#"),q('%;"/Y#$;""6>7?.A &2@""6@7A.5 &2B""6B7C.) &2D""6D7E/H$$;h&&(h=p,d=[]),d.push(e))}function q(e){return e.split("").map((function(e){return e.charCodeAt(0)-32}))}if((t=function e(n){for(var t,u=f[n],a=0,o=[],i=u.length,c=[],$=[];;){for(;ap?(i=a+3+u[a+1],a+=3):(i=a+3+u[a+1]+u[a+2],a+=3+u[a+1]);break;case 18:c.push(i),o.push(a+4+u[a+2]+u[a+3]),r.substr(p,l[u[a+1]].length)===l[u[a+1]]?(i=a+4+u[a+2],a+=4):(i=a+4+u[a+2]+u[a+3],a+=4+u[a+2]);break;case 19:c.push(i),o.push(a+4+u[a+2]+u[a+3]),r.substr(p,l[u[a+1]].length).toLowerCase()===l[u[a+1]]?(i=a+4+u[a+2],a+=4):(i=a+4+u[a+2]+u[a+3],a+=4+u[a+2]);break;case 20:c.push(i),o.push(a+4+u[a+2]+u[a+3]),l[u[a+1]].test(r.charAt(p))?(i=a+4+u[a+2],a+=4):(i=a+4+u[a+2]+u[a+3],a+=4+u[a+2]);break;case 21:$.push(r.substr(p,u[a+1])),p+=u[a+1],a+=2;break;case 22:$.push(l[u[a+1]]),p+=l[u[a+1]].length,a+=2;break;case 23:$.push(s),0===g&&x(l[u[a+1]]),a+=2;break;case 24:$[$.length-1-u[a+1]],a+=2;break;case 25:p,a++;break;case 26:t=u.slice(a+4,a+4+u[a+3]).map((function(e){return $[$.length-1-e]})),$.splice($.length-u[a+2],u[a+2],l[u[a+1]].apply(null,t)),a+=4+u[a+3];break;case 27:$.push(e(u[a+1])),a+=2;break;case 28:g++,a++;break;case 29:g--,a++;break;default:throw new Error("Invalid opcode: "+u[a]+".")}if(!(c.length>0))break;i=c.pop(),a=o.pop()}return $[0]}(c))!==s&&p===r.length)return t;throw t!==s&&p.searchArea;"),c="(area.searchArea)";break;case"around":u.comment&&p.push("// adjust the search radius (in meters) here"),p.push("{{radius="+u.aroundRadius+"}}"),c="(around:{{radius}},{{geocodeCoords:"+a.area+"}})";break;case"bbox":c=u.globalBbox?"":"({{bbox}})";break;case"global":c=void 0;break;default:return console.error("unknown bounds condition: "+a.bounds),!1}function $(e){function r(e){return e.replace(/([()[{*+.$^\\|?])/g,"\\$1")}function n(e){if("string"==typeof e)return e.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\t/g,"\\t").replace(/\n/g,"\\n")}var t=n(e.key),u=n(e.val);switch("substr"===e.query&&(e.query="like",e.val={regex:r(e.val)}),""===u&&("eq"===e.query?(e.query="like",e.val={regex:"^$"}):"neq"===e.query&&(e.query="notlike",e.val={regex:"^$"})),""===t&&("key"===e.query?(e.query="likelike",e.key={regex:"^$"},e.val={regex:".*"}):"eq"===e.query?(e.query="likelike",e.key={regex:"^$"},e.val={regex:"^"+r(e.val)+"$"}):"like"===e.query&&(e.query="likelike",e.key={regex:"^$"})),e.query){case"key":return'["'+t+'"]';case"nokey":return'["'+t+'"!~".*"]';case"eq":return'["'+t+'"="'+u+'"]';case"neq":return'["'+t+'"!="'+u+'"]';case"like":return'["'+t+'"~"'+n(e.val.regex)+'"'+("i"===e.val.modifier?",i":"")+"]";case"likelike":return(e.key.modifier||"")==(e.val.modifier||"")?'[~"'+n(e.key.regex)+'"~"'+n(e.val.regex)+'"'+("i"===e.val.modifier?",i":"")+"]":"i"===e.val.modifier?'[~"'+n(e.key.regex)+'"~"'+n(e.val.regex)+'",i][~"'+n(e.key.regex)+'"~".*"]':'[~"'+n(e.key.regex)+'"~"'+n(e.val.regex)+'",i][~".*"~"'+n(e.val.regex)+'"]';case"notlike":return'["'+t+'"!~"'+n(e.val.regex)+'"'+("i"===e.val.modifier?",i":"")+"]";case"meta":switch(e.meta){case"id":return"("+u+")";case"newer":return e.val.match(/^-?\d+ ?(seconds?|minutes?|hours?|days?|weeks?|months?|years?)?$/)?'(newer:"{{date:'+u+'}}")':'(newer:"'+u+'")';case"user":return'(user:"'+u+'")';case"uid":return"(uid:"+u+")";default:return console.error("unknown query type: meta/"+e.meta),!1}case"free form":default:return console.error("unknown query type: "+e.query),!1}}function h(e){function r(e){return null===e.match(/^[a-zA-Z0-9_]+$/)?'"'+e.replace(/"/g,'\\"')+'"':e}function n(e){return null===e.regex.match(/^[a-zA-Z0-9_]+$/)||e.modifier?"/"+e.regex.replace(/\//g,"\\/")+"/"+(e.modifier||""):e.regex}switch(e.query){case"key":return i(r(e.key)+"=*");case"nokey":return i(r(e.key)+"!=*");case"eq":return i(r(e.key)+"="+r(e.val));case"neq":return i(r(e.key)+"!="+r(e.val));case"like":return i(r(e.key)+"~"+n(e.val));case"likelike":return i("~"+n(e.key)+"~"+n(e.val));case"notlike":return i(r(e.key)+"!~"+n(e.val));case"substr":return i(r(e.key)+":"+r(e.val));case"meta":switch(e.meta){case"id":return i("id:"+r(e.val));case"newer":return i("newer:"+r(e.val));case"user":return i("user:"+r(e.val));case"uid":return i("uid:"+r(e.val));default:return""}case"free form":return i(r(e.free));default:return""}}a.query=(l=a.query,(f={logical:"or",queries:[]}).queries=function e(r){if(!r.logical)return[{logical:"and",queries:[r]}];if("and"===r.logical){for(var n=e(r.queries[0]),t=e(r.queries[1]),u=[],a=0;a;"),p.push("out skel qt;")):"recursive_meta"===u.outputMode?(p.push("(._;>;);"),p.push("out meta;")):p.push("out "+u.outputMode+";"),p.join("\n")}}(); Index: trunk/resources/data/preferences.xsd =================================================================== --- trunk/resources/data/preferences.xsd (revision 16006) +++ trunk/resources/data/preferences.xsd (revision 16006) @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/data/tag2link.sophox.sparql =================================================================== --- trunk/resources/data/tag2link.sophox.sparql (revision 16006) +++ trunk/resources/data/tag2link.sophox.sparql (revision 16006) @@ -0,0 +1,5 @@ +SELECT (CONCAT("Key:", ?permanent_key_ID) as ?OSM_key) ?formatter_URL WHERE { + ?item osmdt:P2 osmd:Q7. + ?item osmdt:P16 ?permanent_key_ID. + ?item osmdt:P8 ?formatter_URL. +} Index: trunk/resources/data/tag2link.wikidata.sparql =================================================================== --- trunk/resources/data/tag2link.wikidata.sparql (revision 16006) +++ trunk/resources/data/tag2link.wikidata.sparql (revision 16006) @@ -0,0 +1,10 @@ +SELECT ?OSM_key ?formatter_URL WHERE { + { ?item wdt:P1282 ?OSM_key. } + FILTER(STRSTARTS(?OSM_key, 'Key:')) . + + { + { ?item wdt:P1630 ?formatter_URL. } + UNION + { ?item wdt:P3303 ?formatter_URL. } + } +} Index: trunk/resources/data/tagging-preset.xsd =================================================================== --- trunk/resources/data/tagging-preset.xsd (revision 16006) +++ trunk/resources/data/tagging-preset.xsd (revision 16006) @@ -0,0 +1,339 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/data/validator/addresses.mapcss =================================================================== --- trunk/resources/data/validator/addresses.mapcss (revision 16006) +++ trunk/resources/data/validator/addresses.mapcss (revision 16006) @@ -0,0 +1,41 @@ +/* #10232 */ +way[addr:interpolation=odd] > node[addr:housenumber][get(split(".", tag("addr:housenumber")/2), 1)=0] { + throwWarning: tr("Even housenumber in odd address interpolation."); +} +way[addr:interpolation=even] > node[addr:housenumber][get(split(".", tag("addr:housenumber")/2), 1)=5] { + throwWarning: tr("Odd housenumber in even address interpolation."); +} +way[addr:interpolation] { + throwOther: tr("Way with {0}. Tag each housenumber separately if possible.", "{0.key}"); +} + +/* #13752 */ +*[!addr:housenumber][addr:street][addr:housename=~/^[0-9]+[a-zA-Z]?$/] { + throwOther: tr("Object has no {0}, however, it has {1} and {2} whose value looks like a housenumber.", "{0.key}", "{1.key}", "{2.key}"); + assertMatch: "node addr:street=foo addr:housename=1"; + assertMatch: "node addr:street=foo addr:housename=1a"; + assertMatch: "node addr:street=foo addr:housename=221B"; + assertNoMatch: "node addr:street=foo addr:housename=1 addr:housenumber=1"; + assertNoMatch: "node addr:housename=1"; + assertNoMatch: "node addr:street=foo addr:housename=bar"; +} +*[addr:housenumber][addr:housename]["addr:housenumber"=*"addr:housename"] { + throwWarning: tr("Same value of {0} and {1}", "{0.key}", "{1.key}"); + assertMatch: "node addr:housename=1 addr:housenumber=1"; + assertNoMatch: "node addr:housename=1 addr:housenumber=2"; +} + +/* #17486 */ +*[addr:housenumber=bb][inside("BA")] { + set ok_housenumber; +} +*[addr:housenumber][addr:housenumber!~/[0-9]/]!.ok_housenumber { + throwWarning: tr("{0} without number", "{0.key}"); + assertNoMatch: "way addr:housenumber=0"; + assertNoMatch: "way addr:housenumber=5a"; + assertNoMatch: "way addr:housenumber=5/1"; + assertMatch: "way addr:housenumber=?"; + assertMatch: "way addr:housenumber=unknown"; + assertMatch: "way addr:housenumber=Palace of Westminster"; + assertMatch: "way addr:housenumber=S/N"; +} Index: trunk/resources/data/validator/combinations.mapcss =================================================================== --- trunk/resources/data/validator/combinations.mapcss (revision 16006) +++ trunk/resources/data/validator/combinations.mapcss (revision 16006) @@ -0,0 +1,681 @@ +/* Rules partially derived from Taginfo statistics - see ticket #5017 + * Taginfo query: select keypairs.key1, keypairs.key2, keypairs.count_all, keys.count_all, cast(keypairs.count_all as real)/keys.count_all as from_fraction_all from keys, keypairs where key1='waterway' and keys.key=keypairs.key2 and (key1<>'highway' or keypairs.count_all>12000) and (key1<>'railway' or keypairs.count_all>3000) and (key1<>'waterway' or keypairs.count_all>800) and key2 not like '%:%' and from_fraction_all>0.97 and 1 union select keypairs.key2, keypairs.key1, keypairs.count_all, keys.count_all, cast(keypairs.count_all as real)/keys.count_all as from_fraction_all from keys, keypairs where key2='waterway' and keys.key=keypairs.key1 and (key2<>'highway' or keypairs.count_all>12000) and (key2<>'railway' or keypairs.count_all>3000) and (key2<>'waterway' or keypairs.count_all>800) and key1 not like '%:%' and from_fraction_all>0.97 and 1 order by keypairs.count_all desc limit 1000; + */ + +way[surface=~/^(unpaved|compacted|gravel|fine_gravel|pebblestone|ground|earth|dirt|grass|sand|mud|ice|salt|snow|woodchips)$/] { /* without grass_paver as it is controversial */ + set unpaved_surface; +} + +/* {0.key} without {1.key} (warning level) */ +way[junction ][!highway][junction!=yes], +way[lanes ][!highway][leisure!=track][leisure!=swimming_pool], +way[living_street ][!highway], +way[maintenance ][!highway], +way[median ][!highway], +way[motorroad ][!highway], +node[ntd_id ][!highway], +way[sac_scale ][!highway], +way[sidewalk ][!highway], +way[step_count ][!highway][man_made!=tower], +way[tracktype ][!highway], +way[trail_visibility ][!highway], /* #15029 */ +way[trolley_wire ][!highway], +way[zip_left ][!highway], +way[zip_right ][!highway], +way[detail ][!railway][route!=railway], +way[eddy_current_brake ][!railway][route!=railway], +way[electrified ][!railway][route!=railway][!highway], /* #16007 */ +way[etcs ][!railway][route!=railway], +way[gauge ][!railway][route!=railway], +way[grade_of_track ][!railway][route!=railway], +way[kursbuchstrecke ][!railway][route!=railway], +way[lzb ][!railway][route!=railway], +way[old_railway_operator ][!railway][route!=railway], +way[operating_procedure ][!railway][route!=railway], +way[pzb ][!railway][route!=railway], +way[structure_gauge ][!railway][route!=railway], +way[tilting_technology ][!railway][route!=railway], +way[track_class ][!railway][route!=railway], +way[tracks ][!railway][route!=railway], +way[traffic_mode ][!railway][route!=railway], +way[workrules ][!railway][route!=railway], +way[stream ][!waterway], +way[length_unit ][!waterway], +way[canal ][!waterway], +way[have_riverbank ][!waterway], +*[border_type ][!boundary], +*[piste:difficulty ][!piste:type], +*[place ][!name][place!=islet], +*[transformer ][!power], +*[source:date ][!source], +*[source:name ][!name], +*[source:maxspeed:forward ][!maxspeed:forward][!maxspeed], +*[source:maxspeed:backward ][!maxspeed:backward][!maxspeed], +*[source:building ][!building], +*[source:ref ][!ref], +*[source:population ][!population], +*[source:postal_code ][!postal_code], +*[source:ele ][!ele], +*[source:ref:INSEE ][!ref:INSEE], +*[source:lit ][!lit], +*[source:hgv ][!hgv], +*[source:highway ][!highway], +*[source:maxaxleload ][!maxaxleload], +*[source:surface ][!surface], +*[source:bridge ][!bridge], +*[source:old_name ][!old_name], +*[source:bicycle ][!bicycle], +*[source:designation ][!designation], +*[source:height ][!height], +*[source:lanes ][!lanes], +*[source:postcode ][!addr:postcode], +*[source:housenumber ][!addr:housenumber], +*[source:addr:postcode ][!addr:postcode], +*[source:addr:housenumber ][!addr:housenumber], +*[source:addr ][!/^addr:/], +*[source:maxspeed ][!/^maxspeed:?/] { + throwWarning: tr("{0} without {1}", "{0.key}", "{1.key}"); + group: tr("missing tag"); + assertMatch: "way lanes=42"; + assertNoMatch: "way lanes=42 highway=unclassified"; + assertMatch: "node source:addr:postcode=postman"; + assertMatch: "node source:addr=postman"; + assertNoMatch: "node source:addr=postman addr:housenumber=42"; +} + +/* {0.key} without {1.key} (info level) */ +way[lanes:forward][!lanes:backward][oneway!=yes][oneway!=-1], +way[lanes:backward][!lanes:forward][oneway!=yes][oneway!=-1], +*[leaf_type ][!leaf_cycle], +*[leaf_cycle][!leaf_type] { + throwOther: tr("{0} without {1}", "{0.key}", "{1.key}"); + group: tr("missing tag"); +} + +/* {0.key} without {1.tag}, #17997 */ +node[railway:switch ][railway!=switch], +*[generator:source ][power!=generator], +*[generator:method ][power!=generator], +*[generator:type ][power!=generator], +node[fire_hydrant:type ][emergency!=fire_hydrant][disused:emergency!=fire_hydrant], +node[manhole ][man_made!=manhole], +way[fence_type ][barrier!=fence], +*[recycling_type ][amenity!=recycling], +*[information ][tourism!=information], +node[board_type ][information!=board], +*[shelter_type ][amenity!=shelter], +node[lamp_type ][highway!=street_lamp], +node[map_type ][information!=map], +*[site_type ][historic!=archaeological_site], +*[artwork_type ][tourism!=artwork][exhibit!=artwork], +*[castle_type ][historic!=castle], +*[parking ][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/][parking!=yes][parking!=no], +way[cutline ][man_made!=cutline], +*[ref:FR:ARCEP ][telecom!=connection_point], +*[ref:FR:ARCEP ][telecom:medium!=fibre], +*[ref:FR:Orange ][telecom:medium!=fibre], +*[ref:FR:SFR ][telecom:medium!=fibre], +*[ref:FR:PTT ][telecom:medium!=copper], +*[bunker_type ][military!=bunker] { + throwWarning: tr("{0} without {1}", "{0.key}", "{1.tag}"); + group: tr("missing tag"); +} + +/* {0.key} without {1.tag} or {2.tag}, #15107 */ +*[iata ][aeroway!=aerodrome][aeroway!=helipad], +*[icao ][aeroway!=aerodrome][aeroway!=helipad], +*[bridge:movable ][bridge!=movable][man_made!=bridge], +*[substation ][power!=substation][pipeline!=substation], +*[reservoir_type ][landuse!=reservoir][water!=reservoir], +way[waterway=pressurised ][tunnel!=flooded][man_made!=pipeline] { + throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.tag}", "{2.tag}"); + group: tr("missing tag"); +} + +/* {0.tag} without {1.key} (warning level), #18411, #18246 */ +way[railway=construction][!construction], +way[highway=construction][!construction], +node[traffic_sign=maxspeed][!maxspeed], +node[actuator=manual][!handle], +node[emergency=fire_hydrant][!fire_hydrant:type], +way[ boundary=administrative][!admin_level], +relation[boundary=administrative][!admin_level], +relation[route=bicycle ][!network][type=route], +relation[route=hiking ][!network][type=route], +relation[route=foot ][!network][type=route], +relation[route=horse ][!network][type=route], +relation[route=piste][!piste:type][type=route], +relation[route=ski ][!piste:type][type=route], +*[tourism=information][!information], +*[leisure=pitch][!sport], +*[aeroway=terminal][!building], +*[office=government][!government], +*[power=generator][!generator:source], +*[amenity=recycling][!/^recycling:/][recycling_type!=centre], +*[amenity=social_facility][!social_facility], +*[amenity=place_of_worship][!religion] { + throwWarning: tr("{0} without {1}", "{0.tag}", "{1.key}"); + group: tr("missing tag"); +} + +/* {0.tag} without {1.key} (info level), #15107 */ +*[aeroway=runway ][!ref], +*[aeroway=runway ][!surface], +node[highway=crossing ][!crossing], +way[highway=track ][!tracktype], +way[power=cable ][!location], +node[power=transformer ][!voltage:primary], +node[power=transformer ][!voltage:secondary], +node[transformer=distribution ][!voltage:primary][power=pole], +node[transformer=distribution ][!voltage:secondary][power=pole], +way[power=line ][!voltage], +way[power=minor_line ][!voltage], +way[power=cable ][!voltage], +*[power=generator ][!voltage][generator:output:electricity], +*[power=plant ][!voltage][plant:output:electricity], +*[power=substation ][!substation], +*[power=switch ][!switch], +*[power=transformer ][!transformer], +*[amenity=bank ][!operator], +*[amenity=cinema ][!operator], +*[amenity=fast_food ][!operator], +*[amenity=fuel ][!operator], +*[mountain_pass=yes ][!ele], +*[natural=peak ][!ele], +*[natural=water ][!water], +*[amenity=place_of_worship ][!denomination], +*[amenity=parking ][!parking], +*[amenity=parking_entrance ][!parking] { + throwOther: tr("{0} without {1}", "{0.tag}", "{1.key}"); + group: tr("missing tag"); + assertMatch: "way power=line"; + assertNoMatch: "way power=line voltage=1"; + assertMatch: "way power=switch"; + assertMatch: "way power=substation"; + assertMatch: "way power=substation transformer=foobar"; + assertNoMatch: "way power=substation substation=foobar"; + assertMatch: "way power=generator generator:output:electricity=yes"; + assertNoMatch: "way power=generator"; + assertNoMatch: "way power=generator generator:output:electricity=yes voltage=1"; +} + +/* {0.key} without {1.key} or {2.tag} */ +way[bridge:structure ][!bridge][man_made!=bridge], +*[smoothness ][!highway][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking|bicycle_parking)$/], +*[segregated ][!highway][railway!=crossing] { + throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.key}", "{2.tag}"); + group: tr("missing tag"); +} + +/* {0.tag} without {1.tag} (info level) see #11600 #11393 #11850 */ +way[highway=motorway][!oneway][junction!=roundabout], +way[highway=motorway_link][!oneway][junction!=roundabout] { + throwOther: tr("{0} without {1}", "{0.tag}", "{1.tag}"); + group: tr("missing tag"); +} + +/* {0.tag} without {1.tag} */ +way[usage=penstock][man_made!=pipeline], +way[usage=penstock][waterway!=pressurised] { + throwWarning: tr("{0} without {1}", "{0.tag}", "{1.tag}"); + group: tr("missing tag"); +} + +/* {0.tag} without {1.tag} or {2.tag} */ +*[amenity=recycling][recycling_type!=container][recycling_type!=centre] { + throwWarning: tr("{0} without {1} or {2}", "{0.tag}", "{1.tag}", "{2.tag}"); + group: tr("missing tag"); +} + +/* {0.key} without {1.key}, {2.tag} or {3.tag} */ +*[intermittent ][!waterway][natural!~/^(water|spring)$/][landuse!~/^(basin|reservoir)$/][ford!=yes], +*[boat ][!waterway][natural!=water ][landuse!~/^(basin|reservoir)$/][ford!=yes] { + throwWarning: tr("{0} without {1}, {2}, {3} or {4}", "{0.key}", "{1.key}", "{2.tag}", "{3.tag}", "{4.tag}"); + group: tr("missing tag"); +} + +/* {0.key} without {1.key}, {2.key} or {3.key}, #17253 */ +way[oneway ][!highway][!railway][!aerialway][attraction!=summer_toboggan][aeroway!~/^(runway|taxiway)$/], +*[snowplowing][!highway][!amenity][!leisure] { + throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.key}", "{2.key}", "{3.key}"); + group: tr("missing tag"); +} + +/* {0.key} without {1.key}, {2.key} or {3.tag}, #17255 */ +way[incline ][!highway][!railway][aeroway!~/^(runway|taxiway)$/][attraction!=summer_toboggan], +*[toll ][!highway][!barrier][route!~/^(ferry|road)$/] { + throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.key}", "{2.key}", "{3.tag}"); + group: tr("missing tag"); +} + +/* {0.tag} together with {1.key}, see #17664, #17707, #16464, #10837, #14034, #9389, #11977, #13156, #16888 */ +*[power=plant][/^generator:/], +*[power=generator][/^plant:/], +*[power=plant][voltage], +*[power=plant][frequency], +*[internet_access=no][internet_access:fee], +node[power=transformer][voltage], +node[transformer=distribution][voltage][power=pole], +*[amenity=vending_machine][shop], +*[noname?][name], +way[oneway=yes][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath][oneway:bicycle!=no][oneway:psv!=no], +way[oneway=yes][/:forward/ ][!traffic_sign:forward ][bicycle:forward!=use_sidepath ][oneway:bicycle!=no][oneway:psv!=no], +way[oneway=-1 ][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath][oneway:bicycle!=no][oneway:psv!=no], +way[oneway=-1 ][/:forward/ ][!traffic_sign:forward ][bicycle:forward!=use_sidepath ][oneway:bicycle!=no][oneway:psv!=no] { + throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.key}"); + group: tr("suspicious tag combination"); + assertMatch: "way power=plant generator:source=wind"; + assertMatch: "way power=generator plant:source=combustion"; +} + +/* {0.tag} together with {1.tag} (info level), see #9696 */ +way[highway=footway][oneway=no] { + throwOther: tr("{0} together with {1}", "{0.tag}", "{1.tag}"); + group: tr("suspicious tag combination"); +} + +/* {0.tag} together with {1.tag}, see #18411, #17950, #17330, #17623, #17592, #17594, #17542, #16861, #16147, #10186 */ +*[barrier=kerb][kerb=no], +way[highway=construction][construction=yes], +way[railway=construction][construction=yes], +*[man_made=bridge][bridge=yes], +*[man_made=tunnel][tunnel=yes], +*[amenity=police][police], +node[highway=crossing][crossing=no], +node[railway=crossing][crossing=no], +way[junction=yes][highway], +way[tracktype=grade1][surface].unpaved_surface, +way[tracktype=grade2][surface][surface=~/^(sand|mud)$/], +way[segregated][bicycle=no], +way[segregated][foot=no], +way[man_made=pipeline][tunnel=flooded], +way[waterway=canal][tunnel=yes] { + throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}"); + group: tr("suspicious tag combination"); +} + +/* {0.tag} together with {1.tag} (error level) */ +relation[type=multipolygon][area=no] { + throwError: tr("{0} together with {1}", "{0.tag}", "{1.tag}"); + group: tr("suspicious tag combination"); +} + +/* {0.key} together with {1.key}, #18267, #17630, #17604 */ +node[marker][cover], +node[marker][voltage], +node[marker][pressure], +node[marker][diameter], +node[marker][substance], +*[building:part][building], +*[addr:street][addr:place][outside("CZ,DK")] { + throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}"); + group: tr("suspicious tag combination"); +} + +/* {0.tag} together with {1.tag} and {2.key}, #18471 */ +way[highway=~/^(cycleway|footway|path)$/][segregated=no][sidewalk =~/^(left|right|both)$/] { + throwWarning: tr("{0} together with {1} and {2}", "{0.tag}", "{1.tag}", "{2.key}"); + group: tr("suspicious tag combination"); +} + +/* #11127, #13727 */ +way[waterway][bridge=yes][waterway!=weir] { + throwWarning: tr("{0} together with {1}", "{0.key}", "{1.tag}"); + suggestAlternative: "bridge=aqueduct"; + group: tr("suspicious tag combination"); + fixAdd: "bridge=aqueduct"; +} +way[waterway=weir][bridge=yes][highway] { + throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}"); + suggestAlternative: "waterway=weir + ford=yes"; + suggestAlternative: "waterway=dam"; + suggestAlternative: tr("two objects, one with {0} and one with {1} + {2} + {3}", "{0.tag}", "{2.key}", "{1.tag}", "layer"); + group: tr("suspicious tag combination"); +} + +/* #16214 */ +relation[type=multipolygon] >[role="inner"] way[area][eval(number_of_tags()) = 1] { + throwWarning: tr("{0} on an inner multipolygon ring without further tags", "{0.tag}"); + fixRemove: "area"; + set area_yes_autofix; + group: tr("suspicious tag combination"); +} + +/* only {0.key}, see #11104 #12422 #14950 */ +*[access][eval(number_of_tags()) = 1], +*[area][eval(number_of_tags()) = 1]!.area_yes_autofix, +*[name][eval(number_of_tags()) = 1], +*[ref][eval(number_of_tags()) = 1], +*[lit][eval(number_of_tags()) = 1] { + throwWarning: tr("incomplete object: only {0}", "{0.key}"); + group: tr("missing tag"); +} +/* only {0.key} and {1.key} */ +*[name][area][eval(number_of_tags()) = 2], +*[name][ref][eval(number_of_tags()) = 2] { + throwWarning: tr("incomplete object: only {0} and {1}", "{0.key}", "{1.key}"); + group: tr("missing tag"); +} +/* only {0.tag}, #15269 */ +*[tourism=attraction][eval(number_of_tags()) = 1] { + throwWarning: tr("incomplete object: only {0}", "{0.tag}"); + group: tr("missing tag"); +} +/* only {0.key} and {1.tag} */ +*[name][tourism=attraction][eval(number_of_tags()) = 2] { + throwWarning: tr("incomplete object: only {0} and {1}", "{0.key}", "{1.tag}"); + group: tr("missing tag"); +} + +/* #9811, #11491, #12865, #14310 */ +*[place][place!=farm][/^(addr:housenumber|addr:housename|addr:flats|addr:conscriptionnumber|addr:street|addr:place|addr:city|addr:country|addr:full|addr:hamlet|addr:suburb|addr:subdistrict|addr:district|addr:province|addr:state|addr:interpolation|addr:interpolation|addr:inclusion)$/], +/* addr:postcode is used together with place in some countries */ +*[boundary][/^addr:/], +*[highway][/^addr:/][highway!=services][highway!=rest_area][!"addr:postcode"] { + throwWarning: tr("{0} together with addr:*", "{0.key}"); + group: tr("suspicious tag combination"); + assertMatch: "node place=foo addr:housenumber=5"; + assertMatch: "node place=foo addr:housenumber=5 addr:postcode=12345"; + assertNoMatch: "node place=foo addr:postcode=12345"; +} +*[!highway][postal_code]["addr:postcode"][postal_code=*"addr:postcode"] { + throwWarning: tr("{0} together with {1}", "{1.key}", "{2.key}"); + group: tr("suspicious tag combination"); +} +*[!highway][postal_code]["addr:postcode"][postal_code!=*"addr:postcode"] { + throwWarning: tr("{0} together with {1} and conflicting values", "{1.key}", "{2.key}"); + group: tr("suspicious tag combination"); +} +way[highway][postal_code]["addr:postcode"][postal_code=*"addr:postcode"] { + throwWarning: tr("{0} together with {1}", "{1.key}", "{2.key}"); + group: tr("suspicious tag combination"); + fixRemove: "addr:postcode"; +} +way[highway][postal_code]["addr:postcode"][postal_code!=*"addr:postcode"] { + throwWarning: tr("{0} together with {1} and conflicting values", "{1.key}", "{2.key}"); + group: tr("suspicious tag combination"); +} +way[highway][highway!=services][highway!=rest_area][!postal_code]["addr:postcode"] { + throwWarning: tr("{0} together with {1}", "{0.key}", "{4.key}"); + suggestAlternative: "postal_code"; + group: tr("suspicious tag combination"); + fixChangeKey: "addr:postcode=>postal_code"; +} + +/* #9195 */ +way[highway=footway][cycleway=lane] { + throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}"); + suggestAlternative: "highway=path + foot=designated + bicycle=designated + segregated=yes"; + group: tr("suspicious tag combination"); +} + +/* {0} on suspicious object */ +*[tunnel ][!highway][!railway][!waterway][!piste:type][public_transport!=platform][route!=ferry][man_made!=pipeline][man_made!=goods_conveyor][man_made!=wildlife_crossing][man_made!=tunnel], +*[bridge ][!highway][!railway][!waterway][!piste:type][public_transport!=platform][route!=ferry][man_made!=pipeline][man_made!=goods_conveyor][man_made!=wildlife_crossing][man_made!=bridge][building!=bridge], +*[psv ][!highway][!railway][!waterway][barrier!=bollard][amenity !~ /^parking.*/], +*[width ][!highway][!railway][!waterway][!aeroway][!cycleway][!footway][!barrier][!man_made][!entrance][natural!=stone][leisure!=track], +*[maxspeed][!highway][!railway][traffic_sign !~ /^((.*;)?maxspeed(;.*)?|[A-Z][A-Z]:.+)$/][traffic_sign:forward !~ /^((.*;)?maxspeed(;.*)?|[A-Z][A-Z]:.+)$/][traffic_sign:backward !~ /^((.*;)?maxspeed(;.*)?|[A-Z][A-Z]:.+)$/][type != enforcement][waterway !~ /^(river|canal|lock)$/][!traffic_calming][aerialway!=zip_line] { + throwWarning: tr("{0} on suspicious object", "{0.key}"); + group: tr("suspicious tag combination"); +} + +*[amenity][amenity =~ /^(restaurant|cafe|fast_food|pub|place_of_worship|school|university|hospital|library|theatre|courthouse|bank|cinema|pharmacy|fuel)$/][!name][noname!=yes] { + throwOther: tr("{0} without {1}", "{0.tag}", "{2.key}"); + group: tr("missing tag"); + assertMatch: "node amenity=restaurant"; + assertNoMatch: "node amenity=restaurant noname=yes"; + assertNoMatch: "node amenity=restaurant name=Foobar"; +} + +/* #10193, #16157 */ +way[highway][barrier], +*[highway][waterway][waterway!=dam][waterway!=weir], +way[highway][natural][natural!=ridge], +*[landuse][building][landuse!=retail] { + throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}"); + group: tr("suspicious tag combination"); + assertNoMatch: "node highway=street_lamp natural=birds_nest"; +} + +/* #6932 */ +*[natural=water][leisure=swimming_pool] { + throwWarning: tr("natural water used for swimming pool"); + group: tr("suspicious tag combination"); + fixRemove: "natural"; +} + +/* #9593, #11183, #12418, #12761, #17254 */ +*[sport][sport!=skiing][!building][!club][tourism != hotel][highway != raceway][!leisure][natural !~ /^(beach|bare_rock|cliff|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports][attraction!=summer_toboggan] { + throwWarning: tr("sport without physical feature"); + group: tr("missing tag"); + assertMatch: "node sport=tennis"; + assertNoMatch: "node sport=tennis leisure=pitch"; + assertNoMatch: "node sport=beachvolleyball natural=beach"; + assertNoMatch: "node sport=skiing"; /* skiing has deprecated warning */ + assertNoMatch: "node sport=swimming tourism=hotel"; + assertNoMatch: "node sport=10pin amenity=restaurant"; +} + +/* {0.key} without {1.key} or {2.key} see #10140 */ +*[building:levels][!building][!building:part], +way[usage][!railway][!waterway][route!=railway][man_made!=pipeline] { + throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.key}", "{2.key}"); + group: tr("missing tag"); +} + +/* any other *_name tag (with some exceptions) but not a name , see #10837 #11297 #11539 #16437 */ +*[/_name$/][!name][!old_name][!loc_name][!uic_name][!artist_name][!lock_name][!"osak:municipality_name"][!"osak:street_name"][noname!=yes] { + throwWarning: tr("alternative name without {0}", "{1.key}"); + group: tr("missing tag"); +} + +/* #10837 */ +way[destination][!oneway?][junction!=roundabout][highway] { + throwWarning: tr("incomplete usage of {0} on a way without {1}", "{0.key}", "{1.key}"); + suggestAlternative: "destination:forward"; + suggestAlternative: "destination:backward"; +} + +/* #11389 */ +way["maxspeed:forward"=*"maxspeed:backward"][!maxspeed] { + throwWarning: tr("Same value of {0} and {1}", "{0.key}", "{1.key}"); + suggestAlternative: "maxspeed"; + group: tr("suspicious tag combination"); + fixChangeKey: "maxspeed:forward=>maxspeed"; + fixRemove: "maxspeed:backward"; +} +way["maxspeed:forward"=*maxspeed]["maxspeed:backward"=*maxspeed][maxspeed] { + throwWarning: tr("Same value of {0}, {1} and {2}", "{0.key}", "{1.key}", "{2.key}"); + set AllSameMaxspeed; + suggestAlternative: "maxspeed"; + group: tr("suspicious tag combination"); + fixRemove: "maxspeed:forward"; + fixRemove: "maxspeed:backward"; +} +way["maxspeed:forward"]["maxspeed:backward"][maxspeed]!.AllSameMaxspeed { + throwWarning: tr("{0} and {1} together with {2} and conflicting values", "{0.key}", "{1.key}", "{2.key}"); + group: tr("suspicious tag combination"); +} +way["maxspeed:forward"][maxspeed][!"maxspeed:backward"], +way["maxspeed:backward"][maxspeed][!"maxspeed:forward"] { + throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}"); + group: tr("suspicious tag combination"); +} + +/* #11837 */ +way[layer][layer<0][bridge][bridge!=no][location!=underground][indoor!=yes][!tunnel], +way[layer][layer>0][tunnel][tunnel!=no][location!=overground][indoor!=yes][!bridge] { + throwWarning: tr("{0} together with {1}", "{2.tag}", "{0.tag}"); + group: tr("suspicious tag combination"); +} + +/* #12942 */ +relation[oneway][type!=route] { + throwWarning: tr("{0} on a relation without {1}", "{0.key}", "{1.tag}"); +} + +/* #9182 */ +way[waterway][layer][layer=~/^(-1|-2|-3|-4|-5)$/][!tunnel][culvert!=yes][covered!=yes][pipeline!=yes][location!=underground][eval(waylength()) > 400] { + throwWarning: tr("Long waterway with {0} but without a tag which defines it as tunnel or underground. Remove {1} or add a tunnel tag if applicable. Also check crossing bridges and their {1} tags.", "{1.tag}", "{1.key}"); + group: tr("suspicious tag combination"); +} +way[waterway][layer][layer=~/^(-1|-2|-3|-4|-5)$/][!tunnel][culvert!=yes][covered!=yes][pipeline!=yes][location!=underground][eval(waylength()) <= 400] { + throwOther: tr("Short waterway with {0} but without a tag which defines it as tunnel or underground. Remove {1} or add a tunnel tag if applicable. Also check crossing bridges and their {1} tags.", "{1.tag}", "{1.key}"); + group: tr("suspicious tag combination"); +} + +/* #13144, #15536 */ +*[unisex=yes][female=yes][male!=yes][shop=hairdresser], +*[unisex=yes][male=yes][female!=yes][shop=hairdresser] { + throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}"); + group: tr("suspicious tag combination"); +} +*[unisex=yes][female=yes][male=yes][shop=hairdresser] { + throwWarning: tr("{0} together with {1} and {2}. Remove {1} and {2}", "{0.tag}", "{1.tag}", "{2.tag}"); + group: tr("suspicious tag combination"); + fixRemove: "female"; + fixRemove: "male"; +} +*[female=yes][male=yes][!unisex][shop=hairdresser] { + throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}"); + suggestAlternative: "unisex=yes"; + group: tr("suspicious tag combination"); + fixRemove: "female"; + fixRemove: "male"; + fixAdd: "unisex=yes"; +} + +/* {1.key} without {2.tag} see #13138, #14468 */ +way!:closed[water][natural!~/water|bay|strait/][water!=intermittent][amenity!=lavoir], /* water=intermittent is deprecated and has an own warning */ +area:closed[water][natural!~/water|bay|strait/][water!=intermittent][amenity!=lavoir] { + throwWarning: tr("{0} without {1}", "{1.key}", "{2.tag}"); + group: tr("missing tag"); +} + +/* see #8519, #11529, limited to motorways and trunks to avoid false positives for streets with lanes for non motorized traffic */ +way[highway =~ /^(motorway|motorway_link|trunk|trunk_link)$/][lanes][turn:lanes ][tag(lanes)!=eval(count(split("|", tag("turn:lanes"))))], +way[highway =~ /^(motorway|motorway_link|trunk|trunk_link)$/][lanes][change:lanes ][tag(lanes)!=eval(count(split("|", tag("change:lanes"))))], +way[highway =~ /^(motorway|motorway_link|trunk|trunk_link)$/][lanes][maxspeed:lanes ][tag(lanes)!=eval(count(split("|", tag("maxspeed:lanes"))))], +way[highway =~ /^(motorway|motorway_link|trunk|trunk_link)$/][lanes][minspeed:lanes ][tag(lanes)!=eval(count(split("|", tag("minspeed:lanes"))))], +way[highway =~ /^(motorway|motorway_link|trunk|trunk_link)$/][lanes][destination:lanes ][tag(lanes)!=eval(count(split("|", tag("destination:lanes"))))], +way[highway =~ /^(motorway|motorway_link|trunk|trunk_link)$/][lanes][destination:ref:lanes ][tag(lanes)!=eval(count(split("|", tag("destination:ref:lanes"))))], +way[highway =~ /^(motorway|motorway_link|trunk|trunk_link)$/][lanes][destination:symbol:lanes][tag(lanes)!=eval(count(split("|", tag("destination:symbol:lanes"))))] { + throwWarning: tr("Different number of lanes in the keys {0} and {1}", "{1.key}", "{2.key}"); + group: tr("suspicious tag combination"); +} + +/* #13680 */ +area[golf=bunker][natural=beach] { + throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}"); + suggestAlternative: "natural=sand"; + suggestAlternative: "surface=sand"; + group: tr("suspicious tag combination"); +} + +/* #13705 */ +relation[type=multipolygon][building] > way { + set part_of_building_MP; +} +way["addr:housenumber"][!building][!"building:part"][!"demolished:building"][!note][!amenity][!leisure][!landuse][!man_made][!tourism][!barrier]!.part_of_building_MP { + /* don't exclude shop because a lot of real missing bulding tag cases have a shop tag. */ + throwOther: tr("possibly missing {0} tag", "{1.key}"); + group: tr("missing tag"); +} + +/* #14125, #14323, #18185 */ +way[highway][lanes][!lanes:forward][!lanes:backward][oneway!=yes][oneway!=-1][oneway!=reversible][junction!=roundabout][lanes>2][get(split(".", tag(lanes)/2), 1)=5] { + throwWarning: tr("street with odd number of {0}, but without {1} and {2} or {3}", "{1.key}", "{2.key}", "{3.key}", "{4.key}"); + group: tr("missing tag"); + assertNoMatch: "way highway=primary lanes=2"; + assertNoMatch: "way highway=primary lanes=3 lanes:backward=2"; + assertNoMatch: "way highway=primary lanes=3 oneway=-1"; + assertNoMatch: "way highway=primary lanes=4"; + assertMatch: "way highway=primary lanes=3"; +} + +/* #15774 */ +node[emergency=fire_hydrant][fire_hydrant:count][fire_hydrant:count!=1] { + throwOther: tr("{0} together with {1}. Tag each hydrant separately.", "{0.tag}", "{1.tag}"); +} + +/* #12502 */ +node[leisure=park][natural=tree] { + throwWarning: tr("{0} together with {1} on a node. Remove {0}.", "{0.tag}", "{1.tag}"); + group: tr("suspicious tag combination"); + fixRemove: "leisure"; +} + +/* #17305 */ +area[boundary=administrative][landuse=residential] { + throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}"); + group: tr("suspicious tag combination"); +} + +/* #17391 */ +way[highway=pedestrian][width][width<3] { + throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}"); + suggestAlternative: "highway=footway"; + group: tr("suspicious tag combination"); + fixAdd: "highway=footway"; + assertMatch: "way highway=pedestrian width=0.8"; + assertMatch: "way highway=pedestrian width=1"; + assertNoMatch: "way highway=pedestrian width=3"; + assertNoMatch: "way highway=pedestrian width=5.5"; +} + +/* see #17623 */ +way:areaStyle[highway][highway =~ /motorway|trunk|primary|secondary|tertiary|unclassified|residential|service$|living_street|pedestrian|track|path|footway|cycleway|bus_guideway|bridleway/][area!=yes] { + throwOther: tr("A linear object {0} without {1} has a tag indicating that it is an area.", "{1.tag}", "{3.tag}"); + group: tr("suspicious tag combination"); +} + +/* #17804 */ +area[cemetery=sector][landuse=cemetery] { + throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}"); + group: tr("suspicious tag combination"); +} + +/* #17967 */ +*[highway=cycleway][cycleway=track] { + throwWarning: tr("{0} together with {1}. Remove {1}.", "{0.tag}", "{1.tag}"); + group: tr("suspicious tag combination"); + fixRemove: "cycleway"; +} + +/* #17973, #18183, #18331 */ +way[highway=path ][foot][foot!=no ][foot!=use_sidepath ][!segregated][bicycle][bicycle!=no][bicycle!=use_sidepath][bicycle!=dismount]!.unpaved_surface, +way[highway=footway ][bicycle][bicycle!=no][bicycle!=use_sidepath][!segregated][bicycle!=dismount]!.unpaved_surface, +way[highway=cycleway][foot][foot!=no ][foot!=use_sidepath ][!segregated]!.unpaved_surface { + throwWarning: tr("Combined foot- and cycleway without {0}.", "{4.key}"); + group: tr("missing tag"); +} + +/* #17989 */ +node[emergency_ward_entrance][emergency!=emergency_ward_entrance] { + throwWarning: tr("{0} without {1}", "{0.tag}", "{1.tag}"); + group: tr("missing tag"); + fixAdd: "emergency=emergency_ward_entrance"; +} + +/* #18203 */ +way[construction][construction!=yes][construction!=minor][highway][highway!=construction] { + throwWarning: tr("{0} together with {1}", "{3.tag}", "{0.tag}"); + group: tr("suspicious tag combination"); +} + +/* #18374 */ +*[amenity=recycling][collection_times="24/7"][!opening_hours], +*[amenity=recycling][collection_times ][!opening_hours][collection_times=~/[a-z]-[A-Z].*[0-9]-[0-9]/] { + throwWarning: tr("{0} together with {1}. Probably {2} is meant.", "{1.key}", "{0.tag}", "{2.key}"); + group: tr("suspicious tag combination"); + fixChangeKey: "collection_times => opening_hours"; + assertMatch: "node amenity=recycling collection_times=\"Mo-Fr 06:00-20:00\""; + assertNoMatch: "node amenity=recycling collection_times=\"Mo-Fr 15:00\""; + assertNoMatch: "node amenity=recycling collection_times=\"Mo 08:00-11:00\""; + assertNoMatch: "node amenity=recycling collection_times=\"Sa[2,4] 8:00-11:00\""; +} +*[amenity=recycling][collection_times="24/7"][opening_hours], +*[amenity=recycling][collection_times ][opening_hours][collection_times=~/[a-z]-[A-Z].*[0-9]-[0-9]/] { + throwWarning: tr("{0} together with {1}. Probably {2} is meant.", "{1.key}", "{0.tag}", "{2.key}"); + group: tr("suspicious tag combination"); +} Index: trunk/resources/data/validator/deprecated.mapcss =================================================================== --- trunk/resources/data/validator/deprecated.mapcss (revision 16006) +++ trunk/resources/data/validator/deprecated.mapcss (revision 16006) @@ -0,0 +1,1954 @@ +*[barrier=wire_fence] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + group: tr("deprecated tagging"); + suggestAlternative: "barrier=fence + fence_type=chain_link"; + fixAdd: "barrier=fence"; + fixAdd: "fence_type=chain_link"; + assertMatch: "way barrier=wire_fence"; + assertNoMatch: "way barrier=fence"; +} + +*[barrier=wood_fence] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "barrier=fence + fence_type=wood"; + group: tr("deprecated tagging"); + fixAdd: "barrier=fence"; + fixAdd: "fence_type=wood"; +} + +node[highway=ford] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "ford=yes"; + group: tr("deprecated tagging"); + fixRemove: "highway"; + fixAdd: "ford=yes"; +} +way[highway=ford] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "highway=* + ford=yes"; + group: tr("deprecated tagging"); +} + +way[class] { + /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */ + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "highway"; + group: tr("deprecated tagging"); +} + +*[highway=stile] { + /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */ + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "barrier=stile"; + group: tr("deprecated tagging"); + fixRemove: "highway"; + fixAdd: "barrier=stile"; +} + +*[highway=incline] { + /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */ + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "incline"; + group: tr("deprecated tagging"); +} + +*[highway=incline_steep] { + /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */ + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "incline"; + group: tr("deprecated tagging"); +} + +*[highway=unsurfaced] { + /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */ + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "highway=* + surface=unpaved"; + group: tr("deprecated tagging"); + fixAdd: "highway=road"; + fixAdd: "surface=unpaved"; +} + +*[landuse=wood] { + /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */ + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "landuse=forest"; + suggestAlternative: "natural=wood"; + group: tr("deprecated tagging"); +} + +*[natural=marsh] { + /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */ + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "natural=wetland + wetland=marsh"; + group: tr("deprecated tagging"); + fixAdd: "natural=wetland"; + fixAdd: "wetland=marsh"; +} + +*[highway=byway] { + /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */ + throwWarning: tr("{0} is deprecated", "{0.tag}"); + group: tr("deprecated tagging"); +} + +*[power_source] { + /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */ + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "generator:source"; + group: tr("deprecated tagging"); +} + +*[power_rating] { + /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */ + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "generator:output"; + group: tr("deprecated tagging"); +} + +*[shop=antique] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=antiques"; + group: tr("deprecated tagging"); + fixAdd: "shop=antiques"; +} + +*[shop=bags] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=bag"; + group: tr("deprecated tagging"); + fixAdd: "shop=bag"; +} + +/* #17527 */ +*[shop=fashion] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=clothes"; + group: tr("deprecated tagging"); + fixAdd: "shop=clothes"; +} + +*[shop=organic] { + /* from http://wiki.openstreetmap.org/wiki/Tag:shop=organic */ + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=* + organic=yes"; + suggestAlternative: "shop=* + organic=only"; + group: tr("deprecated tagging"); +} + +*[shop=pets] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=pet"; + group: tr("deprecated tagging"); + fixAdd: "shop=pet"; +} + +*[shop=pharmacy] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "amenity=pharmacy"; + group: tr("deprecated tagging"); + fixChangeKey: "shop => amenity"; +} + +*[bicycle_parking=sheffield] { + /* from http://wiki.openstreetmap.org/wiki/Key:bicycle_parking */ + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "bicycle_parking=stands"; + group: tr("deprecated tagging"); + fixAdd: "bicycle_parking=stands"; +} + +*[amenity=emergency_phone] { + /* http://wiki.openstreetmap.org/wiki/Tag:emergency=phone */ + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "emergency=phone"; + group: tr("deprecated tagging"); + fixRemove: "amenity"; + fixAdd: "emergency=phone"; +} + +*[sport=gaelic_football] { + /* fix #8132 - http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_football */ + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "sport=gaelic_games"; + group: tr("deprecated tagging"); + fixAdd: "sport=gaelic_games"; +} + +*[power=station] { + /* see #8847 / #8961 - http://wiki.openstreetmap.org/wiki/Tag:power=station */ + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "power=plant"; + suggestAlternative: "power=substation"; + group: tr("deprecated tagging"); +} + +*[power=sub_station] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "power=substation"; + group: tr("deprecated tagging"); + fixAdd: "power=substation"; +} + +*[location=rooftop] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "location=roof"; + group: tr("deprecated tagging"); + fixAdd: "location=roof"; +} + +*[generator:location] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "location"; + group: tr("deprecated tagging"); + fixChangeKey: "generator:location => location"; +} + +*[generator:method=dam] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "generator:method=water-storage"; + group: tr("deprecated tagging"); + fixAdd: "generator:method=water-storage"; +} + +*[generator:method=pumped-storage] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "generator:method=water-pumped-storage"; + group: tr("deprecated tagging"); + fixAdd: "generator:method=water-pumped-storage"; +} + +*[generator:method=pumping] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "generator:method=water-pumped-storage"; + group: tr("deprecated tagging"); + fixAdd: "generator:method=water-pumped-storage"; +} + +*[fence_type=chain] { + /* see #8962 - http://wiki.openstreetmap.org/wiki/Key:fence_type */ + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "barrier=chain"; + suggestAlternative: "barrier=fence + fence_type=chain_link"; + group: tr("deprecated tagging"); +} + +*[building=entrance] { + /* see #9000 - http://wiki.openstreetmap.org/wiki/Key:entrance */ + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "entrance"; + group: tr("deprecated tagging"); +} + +*[board_type=board] { + /* see #9213 - Useless tag proposed in internal preset for years */ + throwWarning: tr("{0} is deprecated", "{0.tag}"); + group: tr("deprecated tagging"); + fixRemove: "board_type"; +} + +*[man_made=measurement_station] { + /* see #8434 - http://wiki.openstreetmap.org/wiki/Proposed_features/monitoring_station */ + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "man_made=monitoring_station"; + group: tr("deprecated tagging"); + fixAdd: "man_made=monitoring_station"; +} + +*[measurement=water_level] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "monitoring:water_level=yes"; + group: tr("deprecated tagging"); + fixRemove: "measurement"; + fixAdd: "monitoring:water_level=yes"; +} + +*[measurement=weather] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "monitoring:weather=yes"; + group: tr("deprecated tagging"); + fixRemove: "measurement"; + fixAdd: "monitoring:weather=yes"; +} + +*[measurement=seismic] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "monitoring:seismic_activity=yes"; + group: tr("deprecated tagging"); + fixRemove: "measurement"; + fixAdd: "monitoring:seismic_activity=yes"; +} + +*[monitoring:river_level] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "monitoring:water_level"; + group: tr("deprecated tagging"); + fixChangeKey: "monitoring:river_level => monitoring:water_level"; +} + +*[stay] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "maxstay"; + group: tr("deprecated tagging"); + fixChangeKey: "stay => maxstay"; +} + +*[emergency=aed] { + /* see #9554 - http://wiki.openstreetmap.org/wiki/Proposed_features/automated_external_defibrillator */ + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "emergency=defibrillator"; + group: tr("deprecated tagging"); + fixAdd: "emergency=defibrillator"; +} + +/* from http://wiki.openstreetmap.org/wiki/Conditional_restrictions#Deprecated_tags */ +*[day_on][!restriction], +*[day_off][!restriction], +*[date_on][!restriction], +*[date_off][!restriction], +*[hour_on][!restriction], +*[hour_off][!restriction] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "*:conditional"; + group: tr("deprecated tagging"); + assertMatch: "node day_on=0-12"; +} + +/* see #10000, http://wiki.openstreetmap.org/wiki/Tag%3Aaccess%3Ddesignated */ +*[access=designated] { + throwWarning: tr("''{0}'' is meaningless, use more specific tags, e.g. ''{1}''", "access=designated", "bicycle=designated"); + assertMatch: "way access=designated"; +} +*[access=official] { + throwWarning: tr("''{0}'' does not specify the official mode of transportation, use ''{1}'' for example", "access=official", "bicycle=official"); + assertMatch: "way access=official"; +} + +/* see #10085 - give warning for fixme=yes */ +*[fixme=yes], *[FIXME=yes] { + throwWarning: tr("{0}={1} is unspecific. Instead of ''{1}'' please give more information about what exactly should be fixed.", "{0.key}", "{0.value}"); + assertMatch: "way fixme=yes"; +} + +*[name][name=~/^(?i)fixme$/] { + throwWarning: tr("Wrong usage of {0} tag. Remove {1}, because it is clear that the name is missing even without an additional tag.", "{0.key}", "{0.tag}"); + fixRemove: "name"; + assertMatch: "node name=fixme"; + assertMatch: "node name=Fixme"; + assertMatch: "node name=FIXME"; + assertNoMatch: "node name=valid name"; +} + +*[note][note=~/^(?i)fixme$/] { + throwWarning: tr("{0} is unspecific. Instead use the key fixme with the information what exactly should be fixed in the value of fixme.", "{0.tag}"); +} + +/* see #10107, #10108, #10929, #13391 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */ +*[type=broad_leaved], +*[type=broad_leafed] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "leaf_type=broadleaved"; + group: tr("deprecated tagging"); + fixRemove: "{0.key}"; + fixAdd: "leaf_type=broadleaved"; +} + +*[wood=coniferous], +*[type=coniferous], +*[type=conifer] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "leaf_type=needleleaved"; + group: tr("deprecated tagging"); + fixRemove: "{0.key}"; + fixAdd: "leaf_type=needleleaved"; +} + +*[wood=mixed] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "leaf_type=mixed"; + group: tr("deprecated tagging"); + fixRemove: "wood"; + fixAdd: "leaf_type=mixed"; +} + +*[wood=evergreen], +*[type=evergreen] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "leaf_cycle=evergreen"; + group: tr("deprecated tagging"); + fixRemove: "{0.key}"; + fixAdd: "leaf_cycle=evergreen"; +} + +*[type=deciduous], +*[type=deciduos] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "leaf_cycle=deciduous"; + group: tr("deprecated tagging"); + fixRemove: "type"; + fixAdd: "leaf_cycle=deciduous"; +} + +*[wood=deciduous] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "leaf_type + leaf_cycle"; + group: tr("deprecated tagging"); +} + +node[type=palm], +way[type=palm] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "leaf_type"; + suggestAlternative: "trees"; + suggestAlternative: "species"; + group: tr("deprecated tagging"); +} + +*[natural=land] { + throwWarning: tr("{0} is deprecated. Please use instead a multipolygon.", "{0.tag}"); + group: tr("deprecated tagging"); + assertMatch: "way natural=land"; +} + +/* see #10447 - https://wiki.openstreetmap.org/wiki/Proposed_features/Bridge_types#Deprecated_bridge_key_values */ +*[bridge=causeway] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "ford=yes"; + suggestAlternative: "bridge=low_water_crossing"; + suggestAlternative: "embankment=yes"; + group: tr("deprecated tagging"); +} +*[bridge=swing] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "bridge:movable=swing"; + suggestAlternative: "bridge:structure=simple-suspension"; + group: tr("deprecated tagging"); +} +*[bridge=suspension] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "bridge=yes + bridge:structure=suspension"; + group: tr("deprecated tagging"); + fixAdd: "bridge=yes"; + fixAdd: "bridge:structure=suspension"; +} +*[bridge=pontoon] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "bridge=yes + bridge:structure=floating"; + group: tr("deprecated tagging"); + fixAdd: "bridge=yes"; + fixAdd: "bridge:structure=floating"; +} + +/* See #10530 - Incorrect tag proposed in internal preset for years */ +*[fee=interval], +*[lit=interval], +*[supervised=interval] { + throwWarning: tr("{0} is deprecated. Please specify interval by using opening_hours syntax", "{0.tag}"); + group: tr("deprecated tagging"); +} + +/* See #10582 - JOSM supported this tag as "don't upload this" feature, before the introduction of upload flag at layer level */ +*[/josm\/ignore/] { + throwError: tr("{0} is deprecated. Please delete this object and use a private layer instead", "{0.key}"); + group: tr("deprecated tagging"); + fixDeleteObject: this; +} + +/* see #8281 */ +*[sport=diving] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "sport=scuba_diving"; + suggestAlternative: "sport=cliff_diving"; + group: tr("deprecated tagging"); +} + +/* see #8281 */ +*[parking=park_and_ride] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "amenity=parking + park_ride=yes"; + group: tr("deprecated tagging"); + fixRemove: "parking"; + fixAdd: "amenity=parking"; + fixAdd: "park_ride=yes"; +} + +/* see #18334, #17950, #10661, #10837, #11737, #12771 */ +*[manhole=plain], +*[manhole=unknown], +*[manhole=yes], +*[police=yes], +*[traffic_calming=yes], +*[access=restricted], +*[barrier=yes], +*[aerialway=yes][!public_transport], +*[amenity=yes], +*[leisure=yes], +*[shop="*"], +*[shop=yes][amenity!=fuel], +*[craft=yes], +*[service=yes], +*[place=yes] { + throwWarning: tr("{0}={1} is unspecific. Please replace ''{1}'' by a specific value.", "{0.key}", "{0.value}"); +} + +/* see #10693 - http://wiki.openstreetmap.org/wiki/Proposed_features/drop_recommendation_for_place_name , #10837 */ +*[place_name][!name] { + throwWarning: tr("{0} should be replaced with {1}", "{0.key}", "{1.key}"); + fixChangeKey: "place_name => name"; +} +*[place][place_name = *name] { + throwWarning: tr("{0} = {1}; remove {0}", "{1.key}", "{1.value}"); + fixRemove: "{1.key}"; +} + +way[sidewalk=yes] { + throwWarning: tr("{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or ''both''.", "{0.key}", "{0.value}"); +} + +*[waterway=water_point] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "amenity=water_point"; + group: tr("deprecated tagging"); + fixChangeKey: "waterway => amenity"; +} +*[waterway=waste_disposal] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "amenity=waste_disposal"; + group: tr("deprecated tagging"); + fixChangeKey: "waterway => amenity"; +} +*[waterway=mooring] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "mooring=yes"; + group: tr("deprecated tagging"); + fixRemove: "waterway"; + fixAdd: "mooring=yes"; +} + +/* see #10837 */ +*[building][levels], +*[building:part=yes][levels] { + throwWarning: tr("{0} is deprecated", "{1.key}"); + suggestAlternative: "building:levels"; + group: tr("deprecated tagging"); + fixChangeKey: "levels => building:levels"; +} + +/* see #10691 */ +*[protected_class] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "protect_class"; + group: tr("deprecated tagging"); + fixChangeKey: "protected_class => protect_class"; +} + +/* see #11070 */ +*[kerb=unknown], +*[lock=unknown], +*[hide=unknown], +*[shelter=unknown], +*[access=unknown], +*[capacity:parent=unknown], +*[capacity:women=unknown], +*[capacity:disabled=unknown], +*[crossing=unknown], +*[foot=unknown] { + throwWarning: tr("Unspecific tag {0}", "{0.tag}"); +} + +/* unclear definition, see #11183 */ +*[sport=skiing] { + throwWarning: tr("Definition of {0} is unclear", "{0.tag}"); + suggestAlternative: tr("{0} + {1} + {2}", "piste:type=*", "piste:difficulty=*", "piste:grooming=*"); + group: tr("deprecated tagging"); +} + +/* see #11223 */ +*[waterway=wadi] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "{0.key}=* + intermittent=yes"; + suggestAlternative: "natural=valley"; + group: tr("deprecated tagging"); +} + +/* see #10346, #15667 (waterway has its own rules in unnecessary.mapcss) */ +way[oneway=1][!waterway] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "oneway=yes"; + group: tr("deprecated tagging"); + fixAdd: "oneway=yes"; +} + +/* see #11329, #15667 */ +way[oneway=-1][!waterway] { + throwWarning: tr("{0} is not recommended. Use the Reverse Ways function from the Tools menu.", "{0.tag}"); +} + +*[drinkable] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "drinking_water"; + group: tr("deprecated tagging"); +} + +/* see #10329, #15877 */ + /* simple key change */ +*[color][!colour] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "colour"; + group: tr("deprecated tagging"); + fixChangeKey: "color => colour"; + assertMatch: "way color=red"; + assertNoMatch: "way color=red colour=red"; +} +area[building:color][!building:colour] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "building:colour"; + group: tr("deprecated tagging"); + fixChangeKey: "building:color => building:colour"; + assertMatch: "way building:color=red"; + assertNoMatch: "way building:color=red building:colour=red"; +} +area[roof:color][!roof:colour] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "roof:colour"; + group: tr("deprecated tagging"); + fixChangeKey: "roof:color => roof:colour"; + assertMatch: "way roof:color=red"; + assertNoMatch: "way roof:color=red roof:colour=red"; +} + /* both tags with same value, remove color */ +*[color][colour][color=*colour] { + throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}"); + suggestAlternative: "colour"; + group: tr("deprecated tagging"); + set samecolor; + fixRemove: "color"; + assertMatch: "way color=red colour=red"; + assertNoMatch: "way color=red colour=green"; +} +area[building:color][building:colour]["building:color"=*"building:colour"] { + throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}"); + suggestAlternative: "building:colour"; + group: tr("deprecated tagging"); + set samebuildingcolor; + fixRemove: "building:color"; + assertMatch: "way building:color=red building:colour=red"; + assertNoMatch: "way building:color=red building:colour=green"; +} +area[roof:color][roof:colour]["roof:color"=*"roof:colour"] { + throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}"); + suggestAlternative: "roof:colour"; + group: tr("deprecated tagging"); + set sameroofcolor; + fixRemove: "roof:color"; + assertMatch: "way roof:color=red roof:colour=red"; + assertNoMatch: "way roof:color=red roof:colour=green"; +} + /* both tags with different values, no autofix */ +*[color][colour]!.samecolor { + throwWarning: tr("{0} together with {1} and conflicting values", "{0.key}", "{1.key}"); + suggestAlternative: "colour"; + group: tr("deprecated tagging"); + assertNoMatch: "way color=red colour=red"; + assertMatch: "way color=red colour=green"; +} +*[building:color][building:colour]!.samebuildingcolor { + throwWarning: tr("{0} together with {1} and conflicting values", "{0.key}", "{1.key}"); + suggestAlternative: "building:colour"; + group: tr("deprecated tagging"); + assertNoMatch: "way building:color=red building:colour=red"; + assertMatch: "way building:color=red building:colour=green"; +} +*[roof:color][roof:colour]!.sameroofcolor { + throwWarning: tr("{0} together with {1} and conflicting values", "{0.key}", "{1.key}"); + suggestAlternative: "roof:colour"; + group: tr("deprecated tagging"); + assertNoMatch: "way roof:color=red roof:colour=red"; + assertMatch: "way roof:color=red roof:colour=green"; +} +/* further more universal checks, no autofix */ +/* gpxd:color has another warning in unnecessary.mapcss */ +*[/:color/][!building:color][!roof:color][!gpxd:color] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: ":colour"; + group: tr("deprecated tagging"); + assertNoMatch: "way color=red"; + assertNoMatch: "way roof:color=grey"; + assertMatch: "way cycleway:surface:color=grey"; +} +*[/color:/] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "colour:"; + group: tr("deprecated tagging"); + assertNoMatch: "way color=red"; + assertMatch: "way color:back=grey"; +} + +/* see #11234 */ +*[/=|\+|\/|&|<|>|;|'|"|%|#|@|\\|,|\.|\{|\}|\?|\*|\^|\$/] { + throwWarning: tr("{0}", "{0.key}"); + group: tr("key with uncommon character"); +} + +/* see #11330, #18642 */ +*[/^.$/], +node[/^..$/], +way[/^..$/][route=ferry][!to], +way[/^..$/][route!=ferry], +relation[/^..$/][!to] { + throwWarning: tr("uncommon short key"); + assertNoMatch: "relation to=Berlin"; + assertMatch: "relation fo=bar"; + assertMatch: "way to=bar"; + assertNoMatch: "way to=Zuidschermer;Akersloot route=ferry"; + assertMatch: "node fo=bar"; + assertMatch: "node f=b"; +} + +/* see #11439 */ +*[sport=hockey] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "sport=field_hockey"; + suggestAlternative: "sport=ice_hockey"; + group: tr("deprecated tagging"); +} + +/* see #11471 */ +*[sport=billard], +*[sport=billards], +*[sport=billiard] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "sport=billiards"; + group: tr("deprecated tagging"); + fixAdd: "sport=billiards"; +} + +/* see #11499, #16928 */ +*[payment:credit_cards=yes] { + throwWarning: tr("{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}.", "{0.tag}", "payment:mastercard=yes", "payment:visa=yes"); +} +*[payment:debit_cards=yes] { + throwWarning: tr("{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}.", "{0.tag}", "payment:maestro=yes", "payment:girocard=yes"); +} +*[payment:electronic_purses=yes] { + throwWarning: tr("{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}.", "{0.tag}", "payment:ep_geldkarte=yes", "payment:ep_quick=yes"); +} +*[payment:cryptocurrencies=yes] { + throwWarning: tr("{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}.", "{0.tag}", "payment:bitcoin=yes", "payment:litecoin=yes"); +} + +/* defunct payment cards */ +*[payment:ep_quick], +*[payment:ep_cash], +*[payment:ep_proton], +*[payment:ep_chipknip] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + group: tr("deprecated tagging"); + fixRemove: "{0.key}"; +} + +/* see #8717 */ +*[kp][highway=milestone], +*[kp][railway=milestone], +*[kp][waterway=milestone] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "distance"; + group: tr("deprecated tagging"); + fixChangeKey: "kp => distance"; +} +*[pk][highway=milestone], +*[pk][railway=milestone], +*[pk][waterway=milestone] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "distance"; + group: tr("deprecated tagging"); + fixChangeKey: "pk => distance"; +} + +*[postcode] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "addr:postcode"; + group: tr("deprecated tagging"); + suggestAlternative: "postal_code"; +} + +*[water=intermittent] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "intermittent=yes"; + group: tr("deprecated tagging"); + fixRemove: "water"; + fixAdd: "intermittent=yes"; +} + +/* #10907, #14141 */ +/* type=waterway on ways is questionable, but the autofix doesn't make it better, so disabled; type=route and type=network is used only on relations */ +way[type][type!=waterway][man_made=pipeline], +node[type][pipeline=marker] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "substance"; + group: tr("deprecated tagging"); + fixChangeKey: "type => substance"; +} + +*[landuse=farm] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "landuse=farmland"; + suggestAlternative: "landuse=farmyard"; + group: tr("deprecated tagging"); +} + +/* #12135 comment:11 */ +*[seamark=buoy]["seamark:type"=~/^(buoy_cardinal|buoy_installation|buoy_isolated_danger|buoy_lateral|buoy_safe_water|buoy_special_purpose|mooring)$/] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "{1.tag}"; + group: tr("deprecated tagging"); + fixRemove: "seamark"; +} +*[seamark=buoy]["seamark:type"!~/^(buoy_cardinal|buoy_installation|buoy_isolated_danger|buoy_lateral|buoy_safe_water|buoy_special_purpose|mooring)$/] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "{1.tag}"; + group: tr("deprecated tagging"); +} +/* #12135 - Tag removed rom rendering https://github.com/gravitystorm/openstreetmap-carto/pull/1830 */ +*[landuse=conservation] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "boundary=protected_area"; + group: tr("deprecated tagging"); + fixAdd: "boundary=protected_area"; + fixRemove: "landuse"; +} + +/* #12205 */ +*[amenity=kiosk] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=kiosk"; + group: tr("deprecated tagging"); + fixChangeKey: "amenity => shop"; +} +*[amenity=shop] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=*"; + group: tr("deprecated tagging"); +} +*[shop=fishmonger] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=seafood"; + group: tr("deprecated tagging"); + fixAdd: "shop=seafood"; +} +*[shop=fish] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=seafood"; + suggestAlternative: "shop=pet"; + suggestAlternative: "shop=fishing"; + group: tr("deprecated tagging"); +} +*[shop=betting] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=bookmaker"; + suggestAlternative: "shop=lottery"; + suggestAlternative: "amenity=casino"; + suggestAlternative: "leisure=amusement_arcade"; + suggestAlternative: "leisure=adult_gaming_centre"; + suggestAlternative: "amenity=gambling"; + group: tr("deprecated tagging"); +} +*[shop=perfume] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=perfumery"; + group: tr("deprecated tagging"); + fixAdd: "shop=perfumery"; +} +*[amenity=exercise_point] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "leisure=fitness_station"; + group: tr("deprecated tagging"); + fixAdd: "leisure=fitness_station"; + fixRemove: "amenity"; +} +*[shop=auto_parts] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=car_parts"; + group: tr("deprecated tagging"); + fixAdd: "shop=car_parts"; +} +*[amenity=car_repair] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=car_repair"; + group: tr("deprecated tagging"); + fixChangeKey: "amenity => shop"; +} + +/* #12311 */ +*[amenity=studio][type=audio], +*[amenity=studio][type=radio], +*[amenity=studio][type=television], +*[amenity=studio][type=video] { + throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}"); + suggestAlternative: "studio"; + group: tr("deprecated tagging"); + fixChangeKey: "type => studio"; +} + +/* #11507, #12297, #15409 */ +*[power=cable_distribution_cabinet] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "man_made=street_cabinet + street_cabinet=*"; + group: tr("deprecated tagging"); + fixAdd: "man_made=street_cabinet"; + fixRemove: "power"; +} + +/* #16430 */ +*[power][location=kiosk] { + throwWarning: tr("{0} is deprecated", "{1.tag}"); + group: tr("deprecated tagging"); + fixAdd: "man_made=street_cabinet"; + fixAdd: "street_cabinet=power"; + fixRemove: "location"; +} + +/* #12276 */ +*[man_made=well] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "man_made=water_well"; + suggestAlternative: "man_made=petroleum_well"; + group: tr("deprecated tagging"); +} +*[amenity=dog_bin], +*[amenity=dog_waste_bin] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "amenity=waste_basket + waste=dog_excrement + vending=excrement_bags"; + group: tr("deprecated tagging"); + fixAdd: "amenity=waste_basket"; + fixAdd: "waste=dog_excrement"; + fixAdd: "vending=excrement_bags"; +} +*[amenity=artwork] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "tourism=artwork"; + group: tr("deprecated tagging"); + fixAdd: "tourism=artwork"; + fixRemove: "amenity"; +} +*[amenity=community_center] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "amenity=community_centre"; + group: tr("deprecated tagging"); + fixAdd: "amenity=community_centre"; +} +*[man_made=cut_line] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "man_made=cutline"; + group: tr("deprecated tagging"); + fixAdd: "man_made=cutline"; +} +*[amenity=park] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "leisure=park"; + group: tr("deprecated tagging"); + fixAdd: "leisure=park"; + fixRemove: "amenity"; +} +*[amenity=hotel] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "tourism=hotel"; + group: tr("deprecated tagging"); + fixAdd: "tourism=hotel"; + fixRemove: "amenity"; +} +*[shop=window], +*[shop=windows] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "craft=window_construction"; + group: tr("deprecated tagging"); + fixAdd: "craft=window_construction"; + fixRemove: "shop"; +} +*[amenity=education] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "amenity=college"; + suggestAlternative: "amenity=school"; + suggestAlternative: "amenity=university"; + group: tr("deprecated tagging"); +} +*[shop=gallery] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=art"; + group: tr("deprecated tagging"); + fixAdd: "shop=art"; +} +*[shop=gambling], +*[leisure=gambling] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=bookmaker"; + suggestAlternative: "shop=lottery"; + suggestAlternative: "amenity=casino"; + suggestAlternative: "leisure=amusement_arcade"; + suggestAlternative: "amenity=gambling"; + group: tr("deprecated tagging"); +} +*[office=real_estate], +*[office=real_estate_agent] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "office=estate_agent"; + group: tr("deprecated tagging"); + fixAdd: "office=estate_agent"; +} +*[shop=glass] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=glaziery"; + suggestAlternative: "craft=glaziery"; + group: tr("deprecated tagging"); +} +*[amenity=proposed], +*[amenity=proposed], +*[amenity=disused], +*[shop=disused], +*[highway=abandoned], +*[historic=abandoned] { + throwWarning: tr("{0} is deprecated. Use the {1}: key prefix instead.", "{0.tag}", "{0.value}"); + group: tr("deprecated tagging"); +} + +/* #12431 */ +*[amenity=swimming_pool] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "leisure=swimming_pool"; + group: tr("deprecated tagging"); + fixChangeKey: "amenity => leisure"; +} + +/* #17379 */ +*[amenity=sauna] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "leisure=sauna"; + group: tr("deprecated tagging"); + fixChangeKey: "amenity => leisure"; +} + +/* #12494, #17554 */ +*[/^[^t][^i][^g].+_[0-9]$/][!/^note_[0-9]$/][!/^description_[0-9]$/] { + throwWarning: tr("{0}", "{0.key}"); + group: tr("questionable key (ending with a number)"); + assertMatch: "way name_1=foo"; + assertNoMatch: "way note_2=foo"; + assertNoMatch: "way description_3=foo"; + assertNoMatch: "way tiger:name_base_1=bar"; /*should not warn for key tiger:name_base_1 */ +} + +/* #12500 */ +*[sport=skating] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "sport=ice_skating"; + suggestAlternative: "sport=roller_skating"; + group: tr("deprecated tagging"); +} + +way[barrier=wall][type=noise_barrier][!wall], +way[barrier=wall][type=noise_barrier][wall=noise_barrier] { + throwWarning: tr("{0} is deprecated", "{1.tag}"); + suggestAlternative: "wall=noise_barrier"; + group: tr("deprecated tagging"); + fixChangeKey: "type => wall"; +} +way[barrier=wall][type=noise_barrier][wall][wall!=noise_barrier] { + throwWarning: tr("{0} is deprecated", "{1.tag}"); + suggestAlternative: "wall=noise_barrier"; + group: tr("deprecated tagging"); +} + +/* #8978, 12588 */ +*[amenity=public_building] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "amenity=townhall"; + suggestAlternative: "amenity=community_centre"; + suggestAlternative: "amenity=hospital"; + suggestAlternative: "leisure=sports_centre"; + suggestAlternative: "office=government"; + suggestAlternative: "building=hospital"; + suggestAlternative: "building=public"; + suggestAlternative: "..."; + group: tr("deprecated tagging"); +} + +/* #18517 */ +*[office=administrative] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "office=government"; + group: tr("deprecated tagging"); + fixAdd: "office=government"; +} + +/* #12708 */ +*[vending=news_papers] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "vending=newspapers"; + group: tr("deprecated tagging"); + fixAdd: "vending=newspapers"; +} + +/* #12771 */ +*[service=drive_through] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "service=drive-through"; + group: tr("deprecated tagging"); + fixAdd: "service=drive-through"; +} + +/* #12771, #9895 */ +*[noexit][noexit!=yes][noexit!=no], /* noexit=no has an own warning */ +way[highway=service][service][service !~ /^(alley|drive-through|drive_through|driveway|emergency_access|parking_aisle|rest_area|slipway|yes)$/], /* drive_through and yes have special warnings */ +way[railway=rail][service][service !~ /^(crossover|siding|spur|yard)$/], +way[waterway=canal][service][service !~ /^(irrigation|transportation|water_power)$/] { + throwWarning: tr("The key {0} has an uncommon value.", "{1.key}"); +} + +/* #13008 */ +*[name:botanical] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "species"; + group: tr("deprecated tagging"); +} + +/* #11344, #13101, #15480 */ +node[pole=air_to_ground], +node[pole=transition] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "location:transition=yes"; + group: tr("deprecated tagging"); + fixAdd: "location:transition=yes"; + fixRemove: "pole"; +} +node[tower=air_to_ground], +node[tower=transition] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "location:transition=yes"; + group: tr("deprecated tagging"); + fixAdd: "location:transition=yes"; + fixRemove: "tower"; +} + +/* #13138 */ +area[landuse=pond] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "natural=water + water=pond"; + group: tr("deprecated tagging"); + fixAdd: "natural=water"; + fixAdd: "water=pond"; + fixRemove: "landuse"; +} + +*[shop=souvenir], +*[shop=souvenirs], +*[shop=souveniers] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=gift"; + group: tr("deprecated tagging"); + fixAdd: "shop=gift"; +} + +*[vending=animal_food] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "vending=animal_feed"; + group: tr("deprecated tagging"); + fixAdd: "vending=animal_feed"; +} + +/* #14376 */ +node[vending=photos][amenity=vending_machine], +node[vending=photo][amenity=vending_machine] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "amenity=photo_booth"; + group: tr("deprecated tagging"); + fixRemove: "vending"; + fixAdd: "amenity=photo_booth"; + +} +node[vending=photos][amenity!=vending_machine] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "amenity=photo_booth"; + group: tr("deprecated tagging"); +} + +/* #13653 */ +node[highway=emergency_access_point][phone][!emergency_telephone_code], +way[highway=emergency_access_point][phone][!emergency_telephone_code] { + throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}"); + suggestAlternative: "emergency_telephone_code"; + group: tr("deprecated tagging"); + fixChangeKey: "phone => emergency_telephone_code"; + assertMatch: "node highway=emergency_access_point phone=123"; + assertNoMatch: "node highway=emergency_access_point emergency_telephone_code=456"; + assertNoMatch: "node highway=emergency_access_point phone=123 emergency_telephone_code=456"; + assertNoMatch: "node phone=123"; +} +node[highway=emergency_access_point][phone=*emergency_telephone_code], +way[highway=emergency_access_point][phone=*emergency_telephone_code] { + throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}"); + suggestAlternative: "emergency_telephone_code"; + group: tr("deprecated tagging"); + fixRemove: "phone"; + assertNoMatch: "node highway=emergency_access_point phone=123"; + assertNoMatch: "node highway=emergency_access_point emergency_telephone_code=123"; + assertMatch: "node highway=emergency_access_point phone=123 emergency_telephone_code=123"; +} +node[highway=emergency_access_point][phone][emergency_telephone_code][phone!=*emergency_telephone_code], +way[highway=emergency_access_point][phone][emergency_telephone_code][phone!=*emergency_telephone_code] { + throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}"); + suggestAlternative: "emergency_telephone_code"; + group: tr("deprecated tagging"); + assertNoMatch: "node highway=emergency_access_point phone=123"; + assertNoMatch: "node highway=emergency_access_point emergency_telephone_code=123"; + assertNoMatch: "node highway=emergency_access_point phone=123 emergency_telephone_code=123"; +} + +/* #13879 */ +way[tracktype=1] { + throwError: tr("{0}", "{0.tag}"); + suggestAlternative: "tracktype=grade1"; + group: tr("misspelled value"); + fixAdd: "tracktype=grade1"; +} +way[tracktype=2] { + throwError: tr("{0}", "{0.tag}"); + suggestAlternative: "tracktype=grade2"; + group: tr("misspelled value"); + fixAdd: "tracktype=grade2"; +} +way[tracktype=3] { + throwError: tr("{0}", "{0.tag}"); + suggestAlternative: "tracktype=grade3"; + group: tr("misspelled value"); + fixAdd: "tracktype=grade3"; +} +way[tracktype=4] { + throwError: tr("{0}", "{0.tag}"); + suggestAlternative: "tracktype=grade4"; + group: tr("misspelled value"); + fixAdd: "tracktype=grade4"; +} +way[tracktype=5] { + throwError: tr("{0}", "{0.tag}"); + suggestAlternative: "tracktype=grade5"; + group: tr("misspelled value"); + fixAdd: "tracktype=grade5"; +} +way[tracktype][tracktype!~/^(1|2|3|4|5|grade1|grade2|grade3|grade4|grade5)$/] { + throwError: tr("wrong value: {0}", "{0.tag}"); + suggestAlternative: "tracktype=grade1"; + suggestAlternative: "tracktype=grade2"; + suggestAlternative: "tracktype=grade3"; + suggestAlternative: "tracktype=grade4"; + suggestAlternative: "tracktype=grade5"; +} + +area[area][area!=yes][area!=no] { + throwError: tr("wrong value: {0}", "{0.tag}"); + suggestAlternative: "area=yes"; + suggestAlternative: "area=no"; +} + +/* #13953 */ +*[amenity=hunting_stand][lock=yes], +*[amenity=hunting_stand][lock=no] { + throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}"); + suggestAlternative: "lockable"; + group: tr("deprecated tagging"); + fixChangeKey: "lock => lockable"; +} + +*[amenity=advertising][!advertising] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "advertising=*"; + group: tr("deprecated tagging"); +} +*[amenity=advertising][advertising] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "advertising=*"; + group: tr("deprecated tagging"); + fixRemove: "amenity"; +} + +way[direction=up][incline=up], +way[direction=down][incline=down], +way[direction=up][!incline], +way[direction=down][!incline] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "incline"; + group: tr("deprecated tagging"); + fixChangeKey: "direction => incline"; +} +way[direction=up][incline][incline!=up], +way[direction=down][incline][incline!=down] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "incline"; + group: tr("deprecated tagging"); +} + +*[building=true], +*[building="*"], +*[building=Y], +*[building=y], +*[building=1] { + throwError: tr("{0}", "{0.tag}"); + suggestAlternative: "building=yes"; + group: tr("misspelled value"); + fixAdd: "building=yes"; +} + +/* #17786, #18612 */ +*[building=abandoned], +*[building=address], +*[building=bing], +*[building=collapsed], +*[building=damaged], +*[building=demolished], +*[building=disused], +*[building=fixme], +*[building=occupied], +*[building=razed] { + throwWarning: tr("{0} is not a building type.", "{0.tag}"); + group: tr("deprecated tagging"); +} +*[building=other], +*[building=unclassified], +*[building=undefined], +*[building=unknown], +*[building=unidentified] { + throwWarning: tr("{0} is not a building type.", "{0.tag}"); + group: tr("deprecated tagging"); + fixAdd: "building=yes"; +} + +/* #15675 */ +node[power=transformer][location=pole][transformer] { + throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}"); + group: tr("deprecated tagging"); + fixChangeKey: "location => power"; +} +node[power=transformer][location=pole][!transformer] { + throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}"); + group: tr("deprecated tagging"); + fixChangeKey: "location => power"; + fixAdd: "transformer=yes"; +} + +node[tourism=picnic_table], +node[amenity=picnic_table], +node[leisure=picnic], +node[leisure=picnic_site] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "tourism=picnic_site"; + suggestAlternative: "leisure=picnic_table"; + group: tr("deprecated tagging"); +} + +/* #15804 */ +relation[water=salt], +way[water=salt], +way[water=salt_pool], +way[water=salt_panne], +way[water=salt_pond] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "salt=yes"; + suggestAlternative: "landuse=salt_pond"; + group: tr("deprecated tagging"); +} + +/* #15805 */ +way[water=tidal] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "tidal=yes"; + fixAdd: "tidal=yes"; + fixRemove: "water"; + group: tr("deprecated tagging"); +} + +*[amenity=toilet] { + throwError: tr("{0}", "{0.tag}"); + suggestAlternative: "amenity=toilets"; + group: tr("misspelled value"); + fixAdd: "amenity=toilets"; +} + +way[power=busbar] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "power=line + line=busbar"; + group: tr("deprecated tagging"); + fixAdd: "power=line"; + fixAdd: "line=busbar"; +} + +/* #16924 */ +*[man_made=MDF], +*[man_made=telephone_exchange] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "telecom=exchange"; + fixAdd: "telecom=exchange"; + fixRemove: "man_made"; + group: tr("deprecated tagging"); +} +*[building=central_office] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "telecom=exchange"; + fixAdd: "telecom=exchange"; + fixAdd: "building=yes"; + group: tr("deprecated tagging"); +} +*[telecom=central_office] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "telecom=exchange"; + fixAdd: "telecom=exchange"; + group: tr("deprecated tagging"); +} + +/* #16925 */ +node[communication=outdoor_dslam], +node[man_made=outdoor_dslam], +node[street_cabinet=outdoor_dslam] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "telecom=service_device"; + fixAdd: "telecom=service_device"; + fixRemove: "{0.key}"; + group: tr("deprecated tagging"); +} +node[telecom=dslam], +node[telecom=outdoor_dslam] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "telecom=service_device"; + fixAdd: "telecom=service_device"; + group: tr("deprecated tagging"); +} + +/* #15774 */ +node[amenity=fire_hydrant] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "emergency=fire_hydrant"; + fixChangeKey: "amenity => emergency"; + group: tr("deprecated tagging"); +} +node[fire_hydrant:type=pond] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "water_source=pond"; + fixAdd: "water_source=pond"; + fixRemove: "{0.key}"; + group: tr("deprecated tagging"); +} +node[fire_hydrant:flow_capacity] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "flow_rate"; + group: tr("deprecated tagging"); +} +node[emergency=fire_hydrant][in_service=no] { + throwWarning: tr("{0} is deprecated", "{1.tag}"); + suggestAlternative: "disused:emergency=fire_hydrant"; + fixAdd: "disused:emergency=fire_hydrant"; + fixRemove: "{1.key}"; + fixRemove: "{0.key}"; + group: tr("deprecated tagging"); +} +node[fire_hydrant:water_source] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "water_source"; + fixChangeKey: "fire_hydrant:water_source => water_source"; + group: tr("deprecated tagging"); +} + +/* #17383 */ +*[natural=waterfall] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "waterway=waterfall"; + fixChangeKey: "natural => waterway"; + group: tr("deprecated tagging"); +} + +/* #17249 */ +*[religion=unitarian] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "religion=unitarian_universalist"; + fixAdd: "religion=unitarian_universalist"; + group: tr("deprecated tagging"); +} + +*[shop=shopping_centre] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=mall"; + fixAdd: "shop=mall"; + group: tr("deprecated tagging"); +} + +/* #17504 */ +*[is_in], +node[/^is_in:.*$/], +way[/^is_in:.*$/] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + group: tr("deprecated tagging"); + fixRemove: "{0.key}"; +} + +/* #17593 */ +*[sport=football] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "sport=soccer"; + suggestAlternative: "sport=american_football"; + suggestAlternative: "sport=australian_football"; + suggestAlternative: "sport=canadian_football"; + suggestAlternative: "sport=rugby_league"; + suggestAlternative: "sport=rugby_union"; + suggestAlternative: "sport=gaelic_games"; + group: tr("deprecated tagging"); +} + +/* #17556 */ +*[leisure=common] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "landuse=*"; + suggestAlternative: "leisure=*"; + suggestAlternative: "designation=common"; + group: tr("deprecated tagging"); +} + +/* #17043 */ +*[cuisine=vegan], +*[cuisine=vegetarian] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: concat("diet:", "{0.value}", "=yes"); + suggestAlternative: concat("diet:", "{0.value}", "=only"); + group: tr("deprecated tagging"); +} + +/* #17798 */ +*[kitchen_hours] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "opening_hours:kitchen"; + fixChangeKey: "kitchen_hours => opening_hours:kitchen"; + group: tr("deprecated tagging"); +} + +/* #17681 */ +*[shop=money_transfer] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "amenity=money_transfer"; + fixChangeKey: "shop => amenity"; + group: tr("deprecated tagging"); +} + +*[contact:google_plus] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + fixRemove: "contact:google_plus"; + group: tr("deprecated tagging"); +} + +/* #17370 */ +*[amenity=garages], +*[amenity=garage] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: concat("building=", "{0.value}"); + suggestAlternative: "landuse=garages"; + suggestAlternative: "amenity=parking + parking=garage_boxes"; + group: tr("deprecated tagging"); +} +*[shop=winery], +*[amenity=winery] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "craft=winery"; + suggestAlternative: "shop=wine"; + group: tr("deprecated tagging"); +} +*[amenity=youth_centre] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "amenity=community_centre + community_centre=youth_centre"; + fixAdd: "amenity=community_centre"; + fixAdd: "community_centre=youth_centre"; + group: tr("deprecated tagging"); +} +*[building:type][building=yes], +*[building:type][!building] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "building"; + group: tr("deprecated tagging"); + fixChangeKey: "building:type => building"; + assertMatch: "way building:type=church"; + assertMatch: "way building:type=church building=yes"; + assertNoMatch: "way building:type=church building=supermarket"; +} +*[building:type][building][building!=yes] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "building"; + group: tr("deprecated tagging"); + assertNoMatch: "way building:type=church"; + assertNoMatch: "way building:type=church building=yes"; + assertMatch: "way building:type=church building=supermarket"; +} +*[escalator] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "highway=steps + conveying=*"; + group: tr("deprecated tagging"); +} +*[fenced] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "barrier=fence"; + group: tr("deprecated tagging"); +} +*[historic_name][!old_name] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "old_name"; + group: tr("deprecated tagging"); + fixChangeKey: "historic_name => old_name"; +} +*[historic_name][old_name] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "old_name"; + group: tr("deprecated tagging"); +} +*[landuse=field] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "landuse=farmland"; + group: tr("deprecated tagging"); + fixAdd: "landuse=farmland"; +} +*[leisure=beach] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "natural=beach"; + suggestAlternative: "leisure=beach_resort"; + group: tr("deprecated tagging"); +} +*[leisure=club] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "club=*"; + group: tr("deprecated tagging"); +} +*[leisure=video_arcade] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "leisure=amusement_arcade"; + suggestAlternative: "leisure=adult_gaming_centre"; + group: tr("deprecated tagging"); +} +*[man_made=jetty] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "man_made=pier"; + group: tr("deprecated tagging"); + fixAdd: "man_made=pier"; +} +*[man_made=village_pump] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "man_made=water_well"; + group: tr("deprecated tagging"); + fixAdd: "man_made=water_well"; +} +*[man_made=water_tank] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "man_made=storage_tank + content=water"; + group: tr("deprecated tagging"); + fixAdd: "man_made=storage_tank"; + fixAdd: "content=water"; +} +*[natural=moor] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "natural=heath"; + suggestAlternative: "natural=scrub"; + suggestAlternative: "natural=grassland"; + suggestAlternative: "natural=wetland"; + suggestAlternative: "natural=fell"; + suggestAlternative: "natural=tundra"; + suggestAlternative: "landuse=meadow + meadow=agricultural"; + group: tr("deprecated tagging"); +} +*[noexit=no][!fixme] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "fixme=continue"; + group: tr("deprecated tagging"); + fixAdd: "fixme=continue"; + fixRemove: "noexit"; +} +*[noexit=no][fixme] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "fixme=continue"; + group: tr("deprecated tagging"); +} +*[shop=dive] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=scuba_diving"; + group: tr("deprecated tagging"); + fixAdd: "shop=scuba_diving"; +} +*[shop=furnace] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=fireplace"; + suggestAlternative: "craft=plumber"; + group: tr("deprecated tagging"); +} +*[sport=paragliding] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "sport=free_flying"; + group: tr("deprecated tagging"); + fixAdd: "sport=free_flying"; +} +*[tourism=bed_and_breakfast] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "tourism=guest_house + guest_house=bed_and_breakfast"; + group: tr("deprecated tagging"); + fixAdd: "tourism=guest_house"; + fixAdd: "guest_house=bed_and_breakfast"; +} + +/* #17880 */ +*[diaper=yes], +*[diaper=no] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: concat("changing_table=", "{0.value}"); + group: tr("deprecated tagging"); + fixChangeKey: "diaper => changing_table"; + set diaper_checked; +} +*[diaper][diaper =~ /^[1-9][0-9]*$/] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: concat("changing_table=yes + changing_table:count=", "{0.value}"); + group: tr("deprecated tagging"); + fixChangeKey: "diaper => changing_table:count"; + fixAdd: "changing_table=yes"; + set diaper_checked; +} +*[diaper=room] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "changing_table=room"; + suggestAlternative: "changing_table=dedicated_room"; + group: tr("deprecated tagging"); + set diaper_checked; +} +*[diaper]!.diaper_checked { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "changing_table"; + group: tr("deprecated tagging"); +} +*[diaper:male=yes] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "changing_table:location=male_toilet"; + group: tr("deprecated tagging"); + fixAdd: "changing_table:location=male_toilet"; + fixRemove: "diaper:male"; + set diaper___checked; +} +*[diaper:female=yes] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "changing_table:location=female_toilet"; + group: tr("deprecated tagging"); + fixAdd: "changing_table:location=female_toilet"; + fixRemove: "diaper:female"; + set diaper___checked; +} +*[diaper:unisex=yes] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "changing_table:location=unisex_toilet"; + group: tr("deprecated tagging"); + fixAdd: "changing_table:location=unisex_toilet"; + fixRemove: "diaper:unisex"; + set diaper___checked; +} +*[diaper:wheelchair=yes], +*[diaper:wheelchair=no] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: concat("changing_table:wheelchair=", "{0.value}"); + group: tr("deprecated tagging"); + fixChangeKey: "diaper:wheelchair => changing_table:wheelchair"; + set diaper___checked; +} +*[diaper:fee=yes], +*[diaper:fee=no] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: concat("changing_table:fee=", "{0.value}"); + group: tr("deprecated tagging"); + fixChangeKey: "diaper:fee => changing_table:fee"; + set diaper___checked; +} +*[/^diaper:/]!.diaper___checked { + throwWarning: tr("{0} is deprecated", "diaper:*"); + suggestAlternative: "changing_table:*"; + group: tr("deprecated tagging"); +} +*[changing_table][changing_table!~/^(yes|no|limited)$/] { + throwWarning: tr("wrong value: {0}", "{0.tag}"); + suggestAlternative: "changing_table=yes"; + suggestAlternative: "changing_table=no"; + suggestAlternative: "changing_table=limited"; +} + +/* #17990 */ +*[roof:shape=half_hipped] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "roof:shape=half-hipped"; + group: tr("deprecated tagging"); + fixAdd: "roof:shape=half-hipped"; +} + +/* #18003 */ +*[bridge_name] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "bridge:name"; + group: tr("deprecated tagging"); + fixChangeKey: "bridge_name => bridge:name"; +} + +/* #18007 */ +*[access=public] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "access=yes"; + group: tr("deprecated tagging"); + fixAdd: "access=yes"; +} + +/* #17330 */ +*[crossing=island] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "crossing:island=yes"; + group: tr("deprecated tagging"); + fixRemove: "crossing"; + fixAdd: "crossing:island=yes"; +} + +/* #18152 */ +*[recycling:metal] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "recycling:scrap_metal"; + group: tr("deprecated tagging"); + fixChangeKey: "recycling:metal => recycling:scrap_metal"; +} + +/* #18154 */ +*[shop=dog_grooming] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "shop=pet_grooming"; + fixAdd: "shop=pet_grooming"; + group: tr("deprecated tagging"); +} + +/* #17984 */ +*[tower:type=anchor], +*[tower:type=suspension] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: concat("line_attachment=", "{0.value}"); + fixChangeKey: "tower:type => line_attachment"; + group: tr("deprecated tagging"); +} +node[pole:type=anchor], +node[pole:type=suspension] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: concat("line_attachment=", "{0.value}"); + fixChangeKey: "pole:type => line_attachment"; + group: tr("deprecated tagging"); +} + +/* #18267 */ +node[man_made=pipeline_marker], +node[pipeline=marker], +node[power=marker], +node[cable=marker] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "marker=* + utility=*"; + group: tr("deprecated tagging"); +} + +/* #17643 */ +way[barrier=embankment] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "man_made=embankment"; + suggestAlternative: "embankment=yes"; + group: tr("deprecated tagging"); +} + +/* #18469 */ +way[landuse=churchyard] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "landuse=religious"; + suggestAlternative: "amenity=graveyard"; + group: tr("deprecated tagging"); +} + +*[sloped_curb=yes][!kerb], +*[sloped_curb=both][!kerb] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "kerb=lowered"; + group: tr("deprecated tagging"); + fixRemove: "sloped_curb"; + fixAdd: "kerb=lowered"; +} +*[sloped_curb=no][!kerb] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "kerb=yes"; + group: tr("deprecated tagging"); + fixRemove: "sloped_curb"; + fixAdd: "kerb=yes"; +} +*[sloped_curb][sloped_curb !~ /^(yes|both|no)$/][!kerb], +*[sloped_curb][kerb] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "kerb=*"; + group: tr("deprecated tagging"); +} + +/* #18571 */ +*[unnamed=yes] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "noname=yes"; + fixChangeKey: "unnamed => noname"; + group: tr("deprecated tagging"); +} + +node[segregated][segregated!=yes][segregated!=no], +way[segregated ][segregated!=yes][segregated!=no] { + throwWarning: tr("unusual value of {0}", "{0.key}"); +} + +/* #18603 */ +way[bicycle:oneway] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "oneway:bicycle"; + fixChangeKey: "bicycle:oneway => oneway:bicycle"; + group: tr("deprecated tagging"); +} + +/* #18605 */ +*[building:height] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "height"; + fixChangeKey: "building:height => height"; + group: tr("deprecated tagging"); +} +*[building:min_height] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "min_height"; + fixChangeKey: "building:min_height => min_height"; + group: tr("deprecated tagging"); +} + +/* #11232 */ +way[highway][construction=yes][highway!=construction] { + throwWarning: tr("{0} is deprecated", "{1.tag}"); + suggestAlternative: "construction=minor"; + suggestAlternative: concat("highway=construction + construction=", "{0.value}"); + group: tr("deprecated tagging"); +} + +/* #18659 */ +*[car][amenity=charging_station] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "motorcar"; + group: tr("deprecated tagging"); + fixChangeKey: "car => motorcar"; +} + +/* #18767 */ +*[navigationaid=approach_light], +*[navigationaid="ALS (Approach lighting system)"] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "navigationaid=als"; + group: tr("deprecated tagging"); + fixAdd: "navigationaid=als"; +} + +/* #18819 */ +node[exit_to] { + throwWarning: tr("{0} is deprecated", "{0.key}"); + suggestAlternative: "destination"; + group: tr("deprecated tagging"); +} Index: trunk/resources/data/validator/geometry.mapcss =================================================================== --- trunk/resources/data/validator/geometry.mapcss (revision 16006) +++ trunk/resources/data/validator/geometry.mapcss (revision 16006) @@ -0,0 +1,421 @@ +/* {0} on a node, should be a way */ +node[area=no], +node[oneway], +node[bridge], +node[sidewalk], +node[footway][footway!=crossing], /* footway=crossing has own warning in highway.mapcss */ +node[man_made=embankment], +node[man_made=groyne], +node[man_made=cutline], +node[power=line], +node[cutline], +node[aerialway=cable_car], +node[aerialway=gondola], +node[aerialway=chair_lift], +node[aerialway=mixed_lift], +node[aerialway=drag_lift], +node[aerialway=t-bar], +node[aerialway=j-bar], +node[aerialway=platter], +node[aerialway=magic_carpet], +node[aerialway=rope_tow], +node[aerialway=goods], +node[aeroway=taxiway], +node[aeroway=runway], +node[railway=rail], +node[railway=narrow_gauge], +node[railway=monorail], +node[railway=preserved], +node[railway=light_rail], +node[railway=subway], +node[railway=tram], +node[railway=disused], +node[railway=abandoned], +node[waterway=river], +node[waterway=canal], +node[waterway=stream], +node[waterway=ditch], +node[waterway=drain], +node[natural=coastline], +node[natural=ridge], +node[natural=valley], +node[natural=tree_row] { + throwWarning: tr("{0} on a node. Should be used on a way.", "{0.tag}"); + assertMatch: "node oneway=-1"; + assertNoMatch: "way oneway=-1"; + assertMatch: "node bridge=yes"; + assertMatch: "node bridge=viaduct"; +} + +/* {0} on a node, should be a way or relation */ +node[boundary=administrative] { + throwWarning: tr("{0} on a node. Should be used on a way or relation.", "{0.tag}"); +} + +/* {0} on a node, should be an area; #10679 #16528 #16792 #12502 #17402*/ +node[golf=green], +node[golf=bunker], +node[golf=fairway], +node[area=yes], +node[area:highway], +node[landuse], +node[natural=scree], +node[natural=scrub], +node[natural=fell], +node[natural=heath], +node[natural=wood], +node[natural=grassland], +node[natural=wetland], +node[natural=water], +node[natural=mud], +node[natural=beach], +node[natural=sand], +node[natural=wood], +node[natural=bare_rock], +node[natural=glacier], +node[leisure=park][natural!=tree], /* For nodes with both tags another warning is created in combinations.mapcss */ +node[leisure=nature_reserve], +node[waterway=riverbank], +node[man_made=bridge], +node[man_made=breakwater], +node[aeroway=apron], +node[power=plant], +node[power=switchgear], +node[building:part], +node[source:outline] { + throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}"); +} + +/* {0} on a node, should be a relation; Error level; see #10252, #10769, #14288 */ +node[type=multipolygon], +node[interval], +node[route], +node[restriction] { + throwError: tr("{0} on a node. Should be used in a relation", "{0.tag}"); +} + +/* {0} on a way, should be a node */ +way[line_attachment], +way[emergency=fire_hydrant], +way[entrance], +way[door], +way[railway=subway_entrance], +way[man_made=survey_point], +way[aeroway=holding_position], +way[power=transformer], +way[power=pole], +way[power=catenary_mast], +way[power=terminal], +way[power=tower]!:closed, +way[amenity=vending_machine], +way[natural=peak], +way[natural=saddle], +way[natural=volcano], +way[natural=tree], +way[highway=give_way], +way[highway=milestone], +way[highway=mini_roundabout], +way[highway=stop], +way[highway=street_lamp], +way[highway=traffic_signals], +way[highway=turning_loop], +way[highway=turning_circle], +way[highway=motorway_junction] { + throwWarning: tr("{0} on a way. Should be used on a node.", "{0.tag}"); +} + +/* {0} on a way, should be a relation; see #15642, #10252, #14288 */ +way[restriction][restriction =~ /^(no_right_turn|no_left_turn|no_u_turn|no_straight_on|only_right_turn|only_left_turn|only_straight_on|no_entry|no_exit)$/], +way[type=multipolygon], +way[interval][route!=ferry], +way[route=bus] { + throwError: tr("{0} on a way. Should be used in a relation", "{0.tag}"); +} + +/* #14395, #17025 */ +way[highway][area!=yes][!tunnel][!covered] > node { + set node_in_highway; +} +way[highway][area!=yes][!tunnel][!covered]:closed > node { + set node_in_closed_highway; +} +way[highway][area!=yes][!tunnel][!covered] >[index=1] node, +way[highway][area!=yes][!tunnel][!covered] >[index=-1] node { + set first_last_highway_node; +} +way[building][building!=no] > node[!entrance].node_in_closed_highway, +way[building][building!=no] > node[!entrance].node_in_highway!.first_last_highway_node { + throwWarning: tr("node connects highway and building"); +} + +/* #15035, must not warn for node 3815077900*/ +node[man_made!=monitoring_station][at(0.0,0.0)] { + throwError: tr("Object at Position 0.00E 0.00N. There is nothing at this position except an already mapped weather buoy."); + fixDeleteObject: this; +} + +/* see ticket:#10125 */ +node[source:geometry] { + throwWarning: tr("{0} on a node", "{0.key}"); + fixChangeKey: "source:geometry => source:position"; +} + +/* Building inside building (spatial test) */ +*[building][building!~/no|entrance/][any(tag("layer"),"0") = any(parent_tag("layer"),"0")] ∈ +area[building][building!~/no|entrance/] { + throwWarning: tr("Building inside building"); +} + +/* Building overlapping building (spatial test) */ +area[building][building!~/no|entrance/] ⧉ area[building][building!~/no|entrance/] { + throwWarning: tr("Overlapping buildings"); +} + +/* Overlapping areas (spatial test) */ +area[natural =~ /^(water|wetland|coastline)$/], area[landuse=reservoir] { + set water_area; +} + +/* area:closed:areaStyle.water_area ⧉ area:closed:areaStyle.water_area -- does not work for now -- see ticket#10215 */ +area:closed:areaStyle[natural =~ /^(water|wetland|coastline)$/] ⧉ area:closed:areaStyle.water_area, +area:closed:areaStyle[landuse=reservoir] ⧉ area:closed:areaStyle.water_area { + throwWarning: tr("Overlapping Water Areas"); +} + +area:closed:areaStyle ⧉ area:closed:areaStyle { + throwOther: tr("Overlapping Areas"); +} + +/* see ticket #9311 */ +node[amenity=parking]["capacity:disabled" !~ /^(yes|[0-9]+)$/] ∈ area[amenity=parking] { + throwWarning: tr("{0} inside {1}", "amenity=parking", "amenity=parking"); + group: tr("{0} inside {1}", "amenity", "amenity"); +} + +/* see ticket #9556 */ +area:closed:areaStyle[tag("natural") = parent_tag("natural")] ⧉ area:closed:areaStyle[natural] { + throwWarning: tr("Overlapping Identical Natural Areas"); +} + +area:closed:areaStyle[tag("landuse") = parent_tag("landuse")] ⧉ area:closed:areaStyle[landuse] { + throwWarning: tr("Overlapping Identical Landuses"); +} + +/* see ticket:#9522 */ +node[tag("amenity") = parent_tag("amenity")] ∈ area[amenity][amenity != parking] { + throwWarning: tr("{0} inside {1}", concat("amenity=", tag("amenity")), concat("amenity=", tag("amenity"))); + group: tr("{0} inside {1}", "amenity", "amenity"); +} +node[tag("leisure") = parent_tag("leisure")] ∈ area[leisure] { + throwWarning: tr("{0} inside {1}", concat("leisure=", tag("leisure")), concat("leisure=", tag("leisure"))); + group: tr("{0} inside {1}", "leisure", "leisure"); +} +node[tag("tourism") = parent_tag("tourism")] ∈ area[tourism] { + throwWarning: tr("{0} inside {1}", concat("tourism=", tag("tourism")), concat("tourism=", tag("tourism"))); + group: tr("{0} inside {1}", "tourism", "tourism"); +} +node[tag("shop") = parent_tag("shop")] ∈ area[shop] { + throwWarning: tr("{0} inside {1}", concat("shop=", tag("shop")), concat("shop=", tag("shop"))); + group: tr("{0} inside {1}", "shop", "shop"); +} +node[tag("power") = parent_tag("power")] ∈ area[power] { + throwWarning: tr("{0} inside {1}", concat("power=", tag("power")), concat("power=", tag("power"))); + group: tr("{0} inside {1}", "power", "power"); +} + +/* isolated nodes which should be part of a way, see #10825, #15478 */ +node:unconnected:in-downloaded-area[entrance], +node:unconnected:in-downloaded-area[traffic_calming], +node:unconnected:in-downloaded-area[highway=passing_place], +node:unconnected:in-downloaded-area[highway=mini_roundabout], +node:unconnected:in-downloaded-area[highway=motorway_junction], +node:unconnected:in-downloaded-area[highway=turning_loop], +node:unconnected:in-downloaded-area[highway=turning_circle], +node:unconnected:in-downloaded-area[highway=stop], +node:unconnected:in-downloaded-area[highway=give_way], +node:unconnected:in-downloaded-area[highway=traffic_signals], +node:unconnected:in-downloaded-area[highway=crossing], +node:unconnected:in-downloaded-area[crossing], +node:unconnected:in-downloaded-area[highway=milestone], +node:unconnected:in-downloaded-area[railway=milestone], +node:unconnected:in-downloaded-area[railway=crossing], +node:unconnected:in-downloaded-area[railway=level_crossing], +node:unconnected:in-downloaded-area[railway=buffer_stop], +node:unconnected:in-downloaded-area[public_transport=stop_position], +node:unconnected:in-downloaded-area[aeroway=holding_position], +node:unconnected:in-downloaded-area[noexit], +node:unconnected:in-downloaded-area[waterway=dam], +node:unconnected:in-downloaded-area[waterway=weir], +node:unconnected:in-downloaded-area[waterway=waterfall], +node:unconnected:in-downloaded-area[amenity=ferry_terminal], +node:unconnected:in-downloaded-area[leisure=slipway], +node:unconnected:in-downloaded-area[mountain_pass=yes], +node:unconnected:in-downloaded-area[barrier=gate], +node:unconnected:in-downloaded-area[barrier=lift_gate], +node:unconnected:in-downloaded-area[barrier=swing_gate], +node:unconnected:in-downloaded-area[barrier=toll_booth], +node:unconnected:in-downloaded-area[barrier=turnstile], +node:unconnected:in-downloaded-area[barrier=full-height_turnstile], +node:unconnected:in-downloaded-area[barrier=motorcycle_barrier], +node:unconnected:in-downloaded-area[barrier=rope], +node:unconnected:in-downloaded-area[barrier=sally_port], +node:unconnected:in-downloaded-area[barrier=spikes], +node:unconnected:in-downloaded-area[barrier=stile], +node:unconnected:in-downloaded-area[barrier=sump_buster], +node:unconnected:in-downloaded-area[barrier=kerb], +node:unconnected:in-downloaded-area[barrier=border_control], +node:unconnected:in-downloaded-area[barrier=bump_gate], +node:unconnected:in-downloaded-area[barrier=bus_trap], +node:unconnected:in-downloaded-area[barrier=cattle_grid], +node:unconnected:in-downloaded-area[barrier=chain], +node:unconnected:in-downloaded-area[barrier=cycle_barrier], +node:unconnected:in-downloaded-area[barrier=hampshire_gate], +node:unconnected:in-downloaded-area[barrier=height_restrictor], +node:unconnected:in-downloaded-area[barrier=debris] { + throwWarning: tr("{0}", "{2.tag}"); + group: tr("isolated node which must be connected to a way"); +} + +/* #11127 */ +way[railway][bridge] > node, +way[highway][bridge] > node { + set node_in_bridge; +} +way[waterway] > node.node_in_bridge { + throwWarning: tr("node connects waterway and bridge"); +} + +/* #11128, #14812, #15032 */ +way[highway] > node[tourism=information][information=guidepost] { + set guidepost; + throwOther: tr("{0} node connected to a highway", "{1.tag}"); +} +way >[index=1] node, +way >[index=-1] node { + set first_last_node; +} +way[highway] > node[amenity][!entrance][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking|bicycle_parking|bus_station|car_wash|ferry_terminal|weighbridge|taxi|toilets)$/], +way[highway] > node[building][!entrance], +way[highway] > node[leisure][!entrance][leisure!=slipway][leisure!=fitness_station], +way[highway] > node[office][!entrance], +way[highway] > node[shop][!entrance], +way[highway] > node[tourism][!entrance][tourism!=viewpoint]!.guidepost.first_last_node:connection, +way[highway] > node[tourism][!entrance][tourism!=viewpoint]!.guidepost!.first_last_node { + throwWarning: tr("{0} node connected to a highway", "{0.key}"); +} + +/* #18817 */ +way[man_made=pipeline][location=underground] > node[marker], +way[power=cable ][location=underground] > node[marker] { + throwWarning: tr("{0} node connected to an underground object", "{0.key}"); +} + +way[junction=roundabout]:righthandtraffic:clockwise, +way[junction=roundabout]!:righthandtraffic:anticlockwise { + throwWarning: tr("suspicious roundabout direction"); +} + +/* #12496 */ +area:closed[place=islet][eval(areasize()) > 1500000] { + throwWarning: tr("{0} on a large area", "{1.tag}"); + suggestAlternative: "place=island"; + fixAdd: "place=island"; +} + +area:closed[place=island][eval(areasize()) < 500000] { + throwWarning: tr("{0} on a small area", "{1.tag}"); + suggestAlternative: "place=islet"; + fixAdd: "place=islet"; +} + +/* #15648 */ +way[place=island]!:closed { + throwError: tr("Way with {0} not closed.", "{0.tag}"); +} + +/* #12561 - building larger than Aalsmeer Flower Auction (518000) and Tesla factory (510000) */ +area:closed[building][building!=no][eval(areasize()) > 520000] { + throwError: tr("Too large building"); +} + +/* #12577 */ +way[power=line] > node, +way[power=minor_line] > node, +way[power=cable] > node { + set node_in_power_way; +} +way[!power][!building] > node.node_in_power_way { + throwWarning: tr("Node connects a power line or cable with an object which is not related to the power infrastructure."); +} + +/* #12646, #12992, #16334 */ +way[waterway=~/^(stream|river|drain)$/]!:closed >[index=-1] node[natural!=sinkhole][natural!=cave_entrance]!:connection:in-downloaded-area { + throwWarning: tr("Waterway ends without a connection to another waterway or the direction of the waterway is wrong."); +} + +/* #10717, #14535 */ +way:closed[natural=coastline] ∈ area[natural=water], +way:closed[natural=coastline] ∈ area[waterway=riverbank] { + throwError: tr("Coastline inside {1}", "{0.tag}"); +} + +/* #10471 */ +way[waterway] > node[ford?] { set ford_on_waterway; } +way[highway] > node[ford?] { set ford_on_highway; } +node[ford?]:in-downloaded-area!.ford_on_waterway, node[ford?]:in-downloaded-area!.ford_on_highway { + throwWarning: tr("{0} should be on the node where {1} and {2} intersect", "ford", "highway", "waterway"); +} + +/* #13877 */ +area:closed[waterway = canal][area!=no], +area:closed[waterway = drain][area!=no], +area:closed[waterway = ditch][area!=no], +area:closed[waterway = stream][area!=no], +area:closed[waterway = river][area!=no] { + throwWarning: tr("{0} is the tag for the linear waterway. To tag the water area use {1} + {2} instead.", "{1.tag}", "natural=water", "water=*"); +} + +/* #15097 */ +way[highway][area!=yes] > node, +way[man_made=pier] > node { + set node_in_highway_pier; +} +way[route=ferry][tunnel=yes] > node, +way[route=ferry][bridge=yes] > node { + set node_in_ferry_bridge_tunnel; +} +way[route=ferry]!:closed >[index= 1] node!.node_in_highway_pier!.node_in_ferry_bridge_tunnel:in-downloaded-area, +way[route=ferry]!:closed >[index=-1] node!.node_in_highway_pier!.node_in_ferry_bridge_tunnel:in-downloaded-area { + throwWarning: tr("Ferry route is not connected to the road network or branches."); +} +way[amenity=ferry_terminal] > node, +way[man_made=pier] > node { + set node_in_terminal_pier; +} +way[route=ferry]!:closed >[index= 1] node[amenity!=ferry_terminal][man_made!=pier]!.node_in_terminal_pier!.node_in_ferry_bridge_tunnel:in-downloaded-area, +way[route=ferry]!:closed >[index=-1] node[amenity!=ferry_terminal][man_made!=pier]!.node_in_terminal_pier!.node_in_ferry_bridge_tunnel:in-downloaded-area { + throwWarning: tr("Ferry route is not connected to a ferry terminal or branches."); +} + +/* #10391 - Many misuses of building=hangar instead of building=barn/industrial/warehouse */ +area:closed2[aeroway] ⊉ way[building=hangar][!aeroway] { + throwWarning: tr("{0} outside of {1}", "{0.tag}", "aeroway"); + suggestAlternative: "building=barn"; + suggestAlternative: "building=industrial"; + suggestAlternative: "building=warehouse"; +} + +/* #17533 - Check waterway flow direction */ +*[waterway][waterway!=drain] > node:connection { + set notDrain; +} +way[waterway=drain] >[index!=1] node:connection { + set notDrainFirstNode; +} +way[waterway=drain] >[index!=-1] node:connection { + set notDrainLastNode; +} +way[waterway=drain] > node:connection!.notDrainFirstNode!.notDrain, +way[waterway=drain] > node:connection!.notDrainLastNode!.notDrain { + throwWarning: tr("incorrect drain flow direction"); +} Index: trunk/resources/data/validator/highway.mapcss =================================================================== --- trunk/resources/data/validator/highway.mapcss (revision 16006) +++ trunk/resources/data/validator/highway.mapcss (revision 16006) @@ -0,0 +1,165 @@ +way[highway=~/^(motorway|trunk|primary|secondary|tertiary)$/] { + set major_road; +} +way[highway=~/^.*_link$/] { + set link_road; +} +way[highway=~/^(unclassified|residential|living_street|service)$/] { + set minor_road; +} + +way[highway][name =~ /(?i).* (Ave|Blvd|Br|Brg|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pky|Pkwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)[.]?$/] { + throwWarning: tr("abbreviated street name"); + assertMatch: "way highway=unclassified name=\"Foo Ave\""; + assertMatch: "way highway=unclassified name=\"Foo Ave.\""; + assertMatch: "way highway=unclassified name=\"Bou Blvd.\""; + assertMatch: "way highway=unclassified name=\"Bou blvd.\""; +} + +node[highway =~ /motorway|trunk|primary|secondary|tertiary|unclassified|residential|service|living_street|pedestrian|track|path|footway|cycleway|bus_guideway|bridleway/][highway!=motorway_junction][highway!=services] { + throwWarning: tr("wrong highway tag on a node"); + assertMatch: "node highway=primary"; + assertMatch: "node highway=primary_link"; + assertNoMatch: "node highway=traffic_calming"; + assertNoMatch: "node highway=bus_stop"; + assertNoMatch: "node highway=crossing"; + assertNoMatch: "node highway=emergency_access_point"; + assertNoMatch: "node highway=give_way"; + assertNoMatch: "node highway=mini_roundabout"; + assertNoMatch: "node highway=motorway_junction"; + assertNoMatch: "node highway=passing_place"; + assertNoMatch: "node highway=rest_area"; + assertNoMatch: "node highway=speed_camera"; + assertNoMatch: "node highway=street_lamp"; + assertNoMatch: "node highway=services"; + assertNoMatch: "node highway=stop"; + assertNoMatch: "node highway=traffic_signals"; + assertNoMatch: "node highway=turning_circle"; +} + +way[highway=crossing], +way[railway=crossing], +way[railway=level_crossing] { + throwWarning: tr("wrong crossing tag on a way"); + assertMatch: "way highway=crossing"; + assertNoMatch: "node highway=crossing"; +} + +/* #18060 */ +node[footway=crossing] { + throwWarning: tr("{0} on a node", "{0.tag}"); + suggestAlternative: "highway=crossing"; + suggestAlternative: "railway=crossing"; +} +node[cycleway=crossing] { + throwWarning: tr("{0} on a node", "{0.tag}"); + suggestAlternative: "highway=crossing + bicycle=yes"; + suggestAlternative: "railway=crossing + bicycle=yes"; +} + +way[highway=unclassified][!name][noname!=yes] { + throwOther: tr("Unnamed unclassified highway"); + assertMatch: "way highway=unclassified"; + assertNoMatch: "way highway=unclassified noname=yes"; + assertNoMatch: "way highway=unclassified name=Foo"; +} + +/* #17970 */ +relation[type=route][route=road][ref] > way.major_road { + set road_route_has_ref; +} +way.major_road!.road_route_has_ref[!ref][!destination:ref][noref!=yes][junction!=roundabout] { + throwOther: tr("highway without a reference"); + group: tr("missing tag"); + assertMatch: "way highway=primary"; + assertNoMatch: "way highway=primary ref=123"; + assertNoMatch: "way highway=primary destination:ref=123"; + assertNoMatch: "way highway=primary noref=yes"; +} + +way[highway=yes], +way[highway=road] { + throwWarning: tr("Unspecific highway type"); + assertMatch: "way highway=road"; + assertNoMatch: "way highway=residential"; +} + +way[highway=footway][maxspeed], +way[highway=steps][maxspeed], +way[highway=cycleway][bicycle=no], +way[highway=footway][foot=no], +way[highway=cycleway][cycleway=lane] { + throwWarning: tr("{0} used with {1}", "{0.value}", "{1.tag}"); + assertNoMatch: "way highway=cycleway bicycle=yes"; + assertNoMatch: "way highway=cycleway"; + assertNoMatch: "way highway=footway foot=yes"; + assertNoMatch: "way highway=footway"; + assertMatch: "way highway=cycleway cycleway=lane"; + assertNoMatch: "way highway=cycleway"; + assertNoMatch: "way highway=residential cycleway=lane"; + assertMatch: "way highway=footway maxspeed=20"; + assertNoMatch: "way highway=residential maxspeed=20"; + assertNoMatch: "way highway=footway"; +} + +/* footway, see #10851, #10976, #15439 */ +way[footway=left][/^footway:/], +way[footway=right][/^footway:/], +way[footway=both][/^footway:/], +way[footway=no][/^footway:/] { + throwWarning: tr("{0} is deprecated, use {1} instead. Also check similar tags like {2}", "{0.tag}", "sidewalk", "{1.key}"); + group: tr("deprecated tagging"); + set not_fixable_footway; + assertMatch: "way footway=both footway:surface=asphalt"; +} +way[footway=none][/footway:/] { + throwWarning: tr("{0} is deprecated, use {1} instead. Also check similar tags like {2}", "{0.tag}", "sidewalk=no", "{1.key}"); + group: tr("deprecated tagging"); + set not_fixable_footway; +} +way[footway=left]!.not_fixable_footway, +way[footway=right]!.not_fixable_footway, +way[footway=both]!.not_fixable_footway, +way[footway=no]!.not_fixable_footway { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "sidewalk"; + group: tr("deprecated tagging"); + fixChangeKey: "footway => sidewalk"; + set fixable_footway; +} +way[footway=none]!.not_fixable_footway { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "sidewalk=no"; + group: tr("deprecated tagging"); + fixRemove: "footway"; + fixAdd: "sidewalk=no"; + set fixable_footway; +} +way[footway][footway!=sidewalk][footway!=crossing]!.fixable_footway!.not_fixable_footway { /* do not trigger this rule if already one of the 4 previous rules applied */ + throwWarning: tr("Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use ''{3}'' instead.", "{0.key}", "{1.value}", "{2.value}", "sidewalk=left|right|both|no"); + assertNoMatch: "way footway=left"; + assertNoMatch: "way footway=none"; + assertNoMatch: "way footway=left footway:left:surface=asphalt"; + assertMatch: "way footway=bar"; +} + +/* #11270, #9297, #15439, #16424, #17022 */ +way[railway =~ /^(miniature|narrow_gauge|preserved|rail)$/][!highway] > node { set .is_in_railway } +way[highway =~ /^(bridleway|cycleway|footway|path|steps)$/] > node { set .is_in_minor_road } +way[highway =~ /^(bus_guideway|living_street|motorway|motorway_link|pedestrian|primary|primary_link|raceway|residential|road|secondary|secondary_link|service|tertiary|tertiary_link|track|trunk|trunk_link|unclassified)$/] > node { set .is_in_major_road } +node[railway!=crossing][crossing!=no].is_in_railway.is_in_minor_road!.is_in_major_road { + throwWarning: tr("pedestrian railway crossing without {0}", "{0.tag}"); + group: tr("missing tag"); + fixAdd: "railway=crossing"; +} +node[railway!=level_crossing].is_in_railway.is_in_major_road!.is_in_minor_road { + throwWarning: tr("railway crossing without {0}", "{0.tag}"); + group: tr("missing tag"); + fixAdd: "railway=level_crossing"; +} + +node[highway=crossing][barrier=kerb].is_in_major_road { + throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}"); + suggestAlternative: "kerb=*"; + group: tr("suspicious tag combination"); +} Index: trunk/resources/data/validator/ignoretags.cfg =================================================================== --- trunk/resources/data/validator/ignoretags.cfg (revision 16006) +++ trunk/resources/data/validator/ignoretags.cfg (revision 16006) @@ -0,0 +1,418 @@ +# JOSM IgnoreTags +; This is used for checks "key/tag not in presets" +; K: the given tag will not produce a "tag not in presets" error, but it is +; used as dictionary entry for spell checking the given key and also +; for the key/value combination. +; E: ignore tags with this key and add the key to the spell check dictionary. +; S: ignore tag if key starts with this string. +; F: ignore tag if key ends with this string. +; +; +; Ignore valid and semi-valid keys that start with... +; +S:opengeodb +S:openGeoDB +S:name: +S:note: +S:description: +S:ref: +S:CLC: +S:tiger: +S:gnis: +S:census: +S:local_authority: +S:au.gov.abs: +S:qroti: +S:is_in +S:wikipedia +S:source: +S:source_ref: +S:historic: +S:proposed: +S:planned: +S:construction: +S:disused: +S:abandoned: +S:removed: +S:demolished: +S:TMC: +S:tmc: +S:parking:lane +S:josm +S:capacity: +; +; Ignore valid and semi-valid keys that equal... +; +E:name +E:loc_name +E:attribution +E:heritage +E:old_name +E:operator +E:usage +E:construction +E:collection +E:addr:state +E:import_uuid +E:image +E:mapillary +E:url +E:website +E:postal_code +E:source:boundary +E:hour_on +E:hour_off +E:tower:type +E:icn +E:ncn +E:rcn +E:lcn +E:icn_ref +E:ncn_ref +E:rcn_ref +E:lcn_ref +E:isced:level +E:place_name +E:cycleway +E:abutters +E:survey_date +E:survey:date +E:right:state +E:left:state +E:height +E:opening_hours +E:service_times +E:collection_times +E:duration +E:interval +E:maxspeed +E:maxstay +E:colour +E:level +E:brand +E:network +E:incline +E:wikidata +E:zone:maxspeed +E:osmc:symbol +E:de:amtlicher_gemeindeschluessel +E:de:regionalschluessel +E:building:colour +E:building:material +E:roof:colour +E:roof:material +E:roof:height +E:roof:orientation +E:roof:shape +E:turn:lanes +E:turn:lanes:forward +E:turn:lanes:backward +E:change:lanes +E:change:lanes:forward +E:change:lanes:backward +E:maxspeed:lanes +E:maxspeed:lanes:forward +E:maxspeed:lanes:backward +E:minspeed:lanes +E:minspeed:lanes:forward +E:minspeed:lanes:backward +E:cycleway:lanes +E:cycleway:lanes:forward +E:cycleway:lanes:backward +E:area:highway +E:tmc +E:memorial:addr +E:memorial:text +E:memorial:ref +E:wheelchair:description +E:denotation +E:seamark:type +E:traffic_sign +E:building:levels +E:exit_to +E:distance +E:voltage +E:amperage +E:capacity +E:cables +E:circuits +E:direction +E:fire_hydrant:pressure +E:width +E:length +E:layer +E:end_date +E:start_date +E:expressway +E:border_type +E:faa +E:dataset +; +; Ignore valid and semi-valid keys that end with... +; +F::nswgnb +F::forward +F::backward +F::left +F::right +F::conditional +F::wikipedia +F::wikidata +; +; Misc Tags +; +K:bollard=unremovable +K:traffic_calming=dynamic_bump +K:type=is_in +K:type=benchmark +K:noref=yes +K:bridge=swing +K:residential=rural +K:residential=urban +K:surface=earth +K:waterway=rapids +K:bicycle=dismount +K:wall=no +K:man_made=petroleum_well +K:man_made=yes +K:man_made=clearcut +K:man_made=maypole +K:railway=razed +K:railway=stop +K:station=subway +K:office=yes +K:pilgrimage=yes +K:bdouble=yes +K:bdouble=no +K:seasonal=no +K:memorial:type=stolperstein +K:toilets:wheelchair=yes +K:toilets:wheelchair=no +K:locality=townland +K:place=allotments +K:place=city_block +K:place=plot +K:building=bank +K:building=bunker +K:building=chalet +K:building=civic +K:building=clinic +K:building=houseboat +K:building=shop +K:building=static_caravan +K:building=semi +K:building=semidetached_house +K:building=slurry_tank +K:building=trullo +K:leisure=recreation_ground +E:old_railway_operator +K:maintenance=gritting +K:glacier:edge=calving_line +K:glacier:edge=grounding_line +K:glacier:type=shelf +K:glacier:type=rock +K:glacier:type=mountain +K:glacier:type=ice_tongue +K:glacier:type=icecap +K:waterway=artificial +K:waterway=drystream +K:allotments=plot +K:land_area=administrative +K:attraction=summer_toboggan +; +; Highway Key/Value Pairs +; +K:highway=proposed +E:proposed +E:tracktype +K:living_street=yes +K:priority_road=designated +K:priority_road=yes_unposted +K:priority_road=end +K:hazmat=designated +K:hazmat=no +K:hazmat:water=no +K:hazmat:water=permissive +K:lanes=7 +K:lanes=8 +K:lanes=9 +K:oneway=-1 +K:traffic_signals=blinker +K:traffic_signals=blink_mode +K:traffic_signals=emergency +K:traffic_signals=ramp_meter +K:traffic_signals=signal +K:traffic_signals=crossing +; +; Amenity Key/Value Pairs +; +K:amenity=crematorium +K:amenity=gallery +K:amenity=gym +K:amenity=signpost +K:amenity=mobile_money_agent +; +; Cuisine Tags +; +K:cuisine=pie +; +; Historic Tags +; +K:historic=building +K:historic=wreck +K:historic=charcoal_pile +K:historic=heritage +; +; Landcover Tags +; +K:landcover=grass +K:landcover=trees +; +; Lifecycle Tags +; +;K:historic=yes +K:planned=yes +K:construction=yes +;K:disused=yes +K:abandoned=yes +K:removed=yes +K:demolished=yes +; +; Military Tags +; +K:military=danger_area +K:military=naval_base +; +; Natural Tags +; +K:natural=marsh +K:natural=shrub +; +; Relation Tags +; +K:relation=to +K:relation=from +; +; Christian Denominations +; +K:denomination=apostolic +K:denomination=christian_community +K:denomination=christian_scientist +K:denomination=coptic_orthodox +K:denomination=czechoslovak_hussite +K:denomination=dutch_reformed +K:denomination=foursquare +K:denomination=kabbalah +K:denomination=karaite +K:denomination=living_waters_church +K:denomination=maronite +K:denomination=mennonite +K:denomination=salvation_army +K:denomination=united_reformed +K:denomination=uniting +; +; Jewish Denominations +; +K:denomination=alternative +K:denomination=ashkenazi +K:denomination=hasidic +K:denomination=humanistic +K:denomination=liberal +K:denomination=modern_orthodox +K:denomination=neo_orthodox +K:denomination=progressive +K:denomination=reconstructionist +K:denomination=renewal +K:denomination=samaritan +K:denomination=ultra_orthodox +; +; Muslim Denominations +; +K:denomination=alaouite +K:denomination=druze +K:denomination=ismaili +; +; Pastafarian Denominations +; +K:denomination=EVKdFSMiD +; +; Other Denominations +; +K:denomination=masonic +; +; Shop Key/Value Pairs +; +K:shop=boat +K:shop=ice_cream +K:shop=organic +K:shop=pasta +K:shop=tiles +K:shop=vacant +K:shop=games +; +; Craft Key/Value Pairs +K:craft=tailor +; +; Sports Tags +; +K:sport=boxing +K:sport=netball +K:sport=cliff_diving +; +; Tourism Tags +; +K:tourism=yes +; +; Type Key/Value Pairs +; +K:type=tmc +K:type=TMC +; +; Other tags that might produce false positives +; +K:crop=rape +K:crossing=marked +K:crossing=controlled +K:highway=trail +K:highway=ford +K:indoor=door +K:natural=land +K:natural=hill +K:natural=arete +K:natural=slope +K:piste:grooming=classic;skating +K:power=sub_station +K:product=wine +K:railway=derail +K:railway=radio +K:resource=peat +K:resource=sand +K:shop=trade +K:sidewalk=none +K:sport=skating +K:surface=hard +K:manhole=plain +; +; Tags not yet decided (to remove from this section when added or deprecated) +; see josm tickets: 17770 10759 15309 15774 16315 16658 16793 +; +K:service=irrigation +K:man_made=mast +K:man_made=tunnel +K:amenity=childcare +K:landuse=logging +K:indoor=wall +K:indoor=room +K:indoor=corridor +K:highway=corridor +K:historic=citywalls +K:crossing=zebra +K:healthcare=dentist +K:healthcare=doctor +K:healthcare=hospital +K:healthcare=pharmacy +K:healthcare=clinic +K:healthcare=centre +K:healthcare=physiotherapist +K:golf=cartpath +K:man_made=water_tap Index: trunk/resources/data/validator/multiple.mapcss =================================================================== --- trunk/resources/data/validator/multiple.mapcss (revision 16006) +++ trunk/resources/data/validator/multiple.mapcss (revision 16006) @@ -0,0 +1,44 @@ +/* see #9757, #10869 - Better handling of semicolon in values +*/ +*["addr:street" =~ /.+;(.+)?/], +*[highway =~ /.+;(.+)?/], +*[lanes =~ /.+;(.+)?/], +*[maxspeed =~ /.+;(.+)?/], +*[name =~ /.+;(.+)?/], +*[surface =~ /.+;(.+)?/], +*[water =~ /.+;(.+)?/] { + throwWarning: tr("{0} with multiple values", "{0.key}"); +} + +*[source =~ /^(;.*|.*;;.*|.*;)$/], +*["source:addr" =~ /^(;.*|.*;;.*|.*;)$/], +*["source:maxspeed" =~ /^(;.*|.*;;.*|.*;)$/], +*["source:name" =~ /^(;.*|.*;;.*|.*;)$/], +*["source:position" =~ /^(;.*|.*;;.*|.*;)$/], +*["source:postcode" =~ /^(;.*|.*;;.*|.*;)$/], +*[ref =~ /^(;.*|.*;;.*|.*;)$/], +*[int_ref =~ /^(;.*|.*;;.*|.*;)$/], +*[old_ref =~ /^(;.*|.*;;.*|.*;)$/], +*[source_ref =~ /^(;.*|.*;;.*|.*;)$/], +*[route_ref =~ /^(;.*|.*;;.*|.*;)$/], +*[attribution =~ /^(;.*|.*;;.*|.*;)$/], +*[name =~ /^(;.*|.*;;.*|.*;)$/], +*[alt_name =~ /^(;.*|.*;;.*|.*;)$/], +*[note =~ /^(;.*|.*;;.*|.*;)$/], +*[fixme =~ /^(;.*|.*;;.*|.*;)$/], +*["addr:housenumber" =~ /^(;.*|.*;;.*|.*;)$/], +*[destination =~ /^(;.*|.*;;.*|.*;)$/], +*[exit_to =~ /^(;.*|.*;;.*|.*;)$/], +*[surface =~ /^(;.*|.*;;.*|.*;)$/], +*["building:use" =~ /^(;.*|.*;;.*|.*;)$/], +*[traffic_sign =~ /^(;.*|.*;;.*|.*;)$/], +*[voltage =~ /^(;.*|.*;;.*|.*;)$/], +*[cuisine =~ /^(;.*|.*;;.*|.*;)$/] { + throwWarning: tr("empty value in semicolon-separated ''{0}''", "{0.key}"); + assertMatch: "node ref=;A1"; + assertMatch: "node ref=A1;"; + assertMatch: "node ref=;"; + assertMatch: "node ref=A1;;A2"; + assertNoMatch: "node ref=A1"; + assertNoMatch: "node ref=A1;A2"; +} Index: trunk/resources/data/validator/numeric.mapcss =================================================================== --- trunk/resources/data/validator/numeric.mapcss (revision 16006) +++ trunk/resources/data/validator/numeric.mapcss (revision 16006) @@ -0,0 +1,414 @@ +/* measurement values and units warnings (tickets #8687, #15719) */ + +*[/^[0-9]+$/] { + throwWarning: tr("numerical key"); + assertMatch: "way 123=foo"; + assertNoMatch: "way ref.1=foo"; +} + +*[layer =~ /^\+\d/] { + throwWarning: tr("{0} value with + sign", "{0.key}"); + fixAdd: concat("layer=", replace(tag("layer"), "+", "")); + assertMatch: "node layer=+1"; + assertNoMatch: "node layer=1"; + assertNoMatch: "node layer=-1"; + assertNoMatch: "node layer=+foo"; +} + +*[layer][layer !~ /^0$|^(-|\+)?[1-5]$/] { + throwWarning: tr("{0} should be an integer value between -5 and 5", "{0.key}"); + assertMatch: "node layer=-50"; + assertMatch: "node layer=6"; + assertMatch: "node layer=+10"; + assertMatch: "node layer=0.5"; + assertMatch: "node layer=0;1"; + assertNoMatch: "node layer=-5"; + assertNoMatch: "node layer=0"; + assertNoMatch: "node layer=2"; + assertNoMatch: "node layer=+5"; /* this is an invalid value, but this case is already covered by the previous rule */ +} + +*[building:levels][building:levels !~ /^(([0-9]|[1-9][0-9]*)(\.5)?)$/], +*[level][level !~ /^((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5)(;((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5))*$/] { /* all numbers from -∞ to ∞ in 0.5 steps, optional multiple values separated by a ; */ + throwWarning: tr("{0} should have numbers only with optional .5 increments", "{0.key}"); + assertMatch: "node level=one"; + assertMatch: "node level=01"; + assertMatch: "node level=-03"; + assertMatch: "node level=-01.5"; + assertMatch: "node level=2.3"; + assertMatch: "node level=-0"; + assertNoMatch: "node level=0"; + assertNoMatch: "node level=1"; + assertNoMatch: "node level=-1"; + assertNoMatch: "node level=-0.5"; + assertNoMatch: "node level=1.5"; + assertNoMatch: "node level=12"; + assertNoMatch: "node level=0;1"; + assertNoMatch: "node level=1;1.5"; + assertNoMatch: "node level=1;0.5"; + assertNoMatch: "node level=0;-0.5"; + assertNoMatch: "node level=-0.5;0"; + assertNoMatch: "node level=-1;-0.5"; + assertNoMatch: "node building:levels=1.5"; + assertMatch: "node building:levels=-1"; + assertNoMatch: "node building:levels=0"; /* valid because there can be building:levels:underground > 0 or roof:levels > 0 */ +} + +*[height][height =~ /^[0-9]+,[0-9][0-9]?( (m|ft))?$/] { + throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}"); + fixAdd: concat("height=", replace(tag("height"), ",", ".")); + set height_separator_autofix; + assertMatch: "node height=5,5"; + assertMatch: "node height=12,00"; + assertMatch: "node height=12,5 ft"; + assertNoMatch: "node height=12,000"; + assertNoMatch: "node height=3,50,5"; + assertNoMatch: "node height=3.5"; + assertNoMatch: "node height=4"; +} +*[height][height !~ /^(([0-9]+\.?[0-9]*( (m|ft))?)|([1-9][0-9]*\'((10|11|[0-9])((\.[0-9]+)?)\")?))$/]!.height_separator_autofix { + throwWarning: tr("unusual value of {0}: meters is default; point is decimal separator; if units, put space then unit", "{0.key}"); + assertMatch: "node height=medium"; + assertMatch: "node height=-5"; + assertNoMatch: "node height=2 m"; + assertNoMatch: "node height=5"; + assertNoMatch: "node height=7.8"; + assertNoMatch: "node height=20 ft"; + assertNoMatch: "node height=22'"; +} + +*[maxheight][maxheight =~ /^[0-9]+,[0-9][0-9]?( (m|ft))?$/] { + throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}"); + fixAdd: concat("maxheight=", replace(tag("maxheight"), ",", ".")); + set maxheight_separator_autofix; + assertMatch: "node maxheight=5,5"; + assertMatch: "node maxheight=12,00"; + assertMatch: "node maxheight=12,5 ft"; + assertNoMatch: "node maxheight=12,000"; + assertNoMatch: "node maxheight=3,50,5"; + assertNoMatch: "node maxheight=3.5"; + assertNoMatch: "node maxheight=4"; +} +*[maxheight][maxheight !~ /^(([1-9][0-9]*(\.[0-9]+)?( (m|ft))?)|([0-9]+\'(([0-9]|10|11)(\.[0-9]*)?\")?)|none|default|below_default)$/]!.maxheight_separator_autofix { + throwWarning: tr("unusual value of {0}: meters is default; point is decimal separator; if units, put space then unit", "{0.key}"); + assertMatch: "node maxheight=something"; + assertMatch: "node maxheight=-5"; + assertMatch: "node maxheight=0"; + assertNoMatch: "node maxheight=4"; + assertNoMatch: "node maxheight=3.5"; + assertNoMatch: "node maxheight=2 m"; + assertNoMatch: "node maxheight=14 ft"; + assertNoMatch: "node maxheight=10'"; + assertNoMatch: "node maxheight=16'3\""; +} + +*[width][width =~ /^[0-9]+,[0-9][0-9]?( (m|ft))?$/] { + throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}"); + fixAdd: concat("width=", replace(tag("width"), ",", ".")); + set width_separator_autofix; + assertMatch: "node width=5,5"; + assertMatch: "node width=12,00"; + assertNoMatch: "node width=12,000"; + assertNoMatch: "node width=3,50,5"; + assertNoMatch: "node width=3.5"; + assertNoMatch: "node width=4"; +} +*[width][width !~ /^(([0-9]+\.?[0-9]*( [a-z]+)?)|([0-9]+\'([0-9]+\.?[0-9]*\")?))$/]!.width_separator_autofix { + throwWarning: tr("unusual value of {0}: meters is default; point is decimal separator; if units, put space then unit", "{0.key}"); + assertMatch: "way width=something"; + assertMatch: "way width=-5"; + assertNoMatch: "way width=3"; + assertNoMatch: "way width=0.5"; + assertNoMatch: "way width=1 m"; + assertNoMatch: "way width=10 ft"; + assertNoMatch: "way width=1'"; + assertNoMatch: "way width=10'5\""; +} + +*[maxwidth][maxwidth =~ /^[0-9]+,[0-9][0-9]?( (m|ft))?$/] { + throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}"); + fixAdd: concat("maxwidth=", replace(tag("maxwidth"), ",", ".")); + set maxwidth_separator_autofix; + assertMatch: "node maxwidth=5,5"; + assertMatch: "node maxwidth=12,00"; + assertNoMatch: "node maxwidth=12,000"; + assertNoMatch: "node maxwidth=3,50,5"; + assertNoMatch: "node maxwidth=3.5"; + assertNoMatch: "node maxwidth=4"; +} +*[maxwidth][maxwidth !~ /^(([0-9]+\.?[0-9]*( (m|ft))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/]!.maxwidth_separator_autofix { + throwWarning: tr("unusual value of {0}: meters is default; point is decimal separator; if units, put space then unit", "{0.key}"); + assertMatch: "way maxwidth=something"; + assertMatch: "way maxwidth=-5"; + assertNoMatch: "way maxwidth=2"; + assertNoMatch: "way maxwidth=6'6\""; + assertNoMatch: "way maxwidth=2.5"; + assertNoMatch: "way maxwidth=7 ft"; +} + +*[maxweight][maxweight =~ /^[0-9]+,[0-9][0-9]?( (t|kg|lbs))?$/] { + throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}"); + fixAdd: concat("maxweight=", replace(tag("maxweight"), ",", ".")); + set maxweight_separator_autofix; + assertMatch: "node maxweight=5,5"; + assertMatch: "node maxweight=12,00"; + assertNoMatch: "node maxweight=12,000"; + assertNoMatch: "node maxweight=3,50,5"; + assertNoMatch: "node maxweight=3.5"; + assertNoMatch: "node maxweight=4"; +} +*[maxweight][maxweight !~ /^(([0-9]+\.?[0-9]*( (t|kg|lbs))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/]!.maxweight_separator_autofix { + throwWarning: tr("unusual value of {0}: tonne is default; point is decimal separator; if units, put space then unit", "{0.key}"); + assertMatch: "way maxweight=something"; + assertMatch: "way maxweight=-5"; + assertNoMatch: "way maxweight=2"; + assertNoMatch: "way maxweight=6'6\""; + assertNoMatch: "way maxweight=2.5"; + assertNoMatch: "way maxweight=7 kg"; +} + +way[maxspeed][maxspeed !~ /^(signals|none|unposted|variable|walk|[1-9][0-9]*( [a-z]+)?|[A-Z][A-Z]:(urban|rural|living_street|motorway))$/], +way[maxspeed:forward][maxspeed:forward !~ /^(signals|none|unposted|variable|walk|[1-9][0-9]*( [a-z]+)?|[A-Z][A-Z]:(urban|rural|living_street|motorway))$/], +way[maxspeed:backward][maxspeed:backward !~ /^(signals|none|unposted|variable|walk|[1-9][0-9]*( [a-z]+)?|[A-Z][A-Z]:(urban|rural|living_street|motorway))$/] { + throwWarning: tr("unusual value of {0}", "{0.key}"); + assertMatch: "way maxspeed=something"; + assertMatch: "way maxspeed=-50"; + assertMatch: "way maxspeed=0"; + assertNoMatch: "way maxspeed=50"; + assertNoMatch: "way maxspeed=30 mph"; + assertNoMatch: "way maxspeed=RO:urban"; + assertNoMatch: "way maxspeed=RU:rural"; + assertNoMatch: "way maxspeed=RU:living_street"; + assertNoMatch: "way maxspeed=DE:motorway"; + assertNoMatch: "way maxspeed=signals"; + assertNoMatch: "way maxspeed=none"; + assertNoMatch: "way maxspeed=variable"; +} + +*[distance][distance =~ /^[0-9]+,[0-9][0-9]?( (m|km|mi|nmi))?$/] { + throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}"); + fixAdd: concat("distance=", replace(tag("distance"), ",", ".")); + set distance_separator_autofix; + assertMatch: "node distance=5,5"; + assertMatch: "node distance=12,00"; + assertNoMatch: "node distance=12,000"; + assertNoMatch: "node distance=3,50,5"; + assertNoMatch: "node distance=3.5"; + assertNoMatch: "node distance=4"; +} +*[distance][distance !~ /^(([0-9]+\.?[0-9]*( (m|km|mi|nmi))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/]!.distance_separator_autofix { + throwWarning: tr("unusual value of {0}: kilometers is default; point is decimal separator; if units, put space then unit", "{0.key}"); + assertMatch: "way distance=something"; + assertMatch: "way distance=-5"; + assertNoMatch: "way distance=2"; + assertNoMatch: "way distance=2.5"; + assertNoMatch: "way distance=7 mi"; +} + +way[voltage][voltage =~ /(.*[A-Za-z].*)|.*,.*|.*( ).*/] { + throwWarning: tr("voltage should be in volts with no units/delimiter/spaces"); + assertMatch: "way voltage=medium"; + assertNoMatch: "way voltage=15000"; +} + +/* some users are using frequency for other purposes (not electromagnetic) + with the values 'perennial' and 'intermittent'; the vast majority are 0, 16.7, 50 and 60 */ +way[frequency][frequency !~ /^(0|[1-9][0-9]*(\.[0-9]+)?)( (kHz|MHz|GHz|THz))?$/] { + throwWarning: tr("unusual value of {0}", "{0.key}"); + assertMatch: "way frequency=something"; + assertNoMatch: "way frequency=0"; /* DC */ + assertNoMatch: "way frequency=16.7"; + assertNoMatch: "way frequency=50"; + assertNoMatch: "way frequency=680 kHz"; + assertNoMatch: "way frequency=123.5 MHz"; +} + +way[gauge][gauge !~ /^([1-9][0-9]{1,3}(;[1-9][0-9]{1,3})*|broad|standard|narrow)$/] { + throwWarning: tr("unusual value of {0}", "{0.key}"); + assertMatch: "way gauge=something"; + assertNoMatch: "way gauge=1435"; + assertNoMatch: "way gauge=1000;1435"; + assertNoMatch: "way gauge=standard"; + assertNoMatch: "way gauge=narrow"; +} + +/* the numbers for percentage and degrees include could probably be bracketed a bit more precisely */ +way[incline][incline !~ /^(up|down|-?([0-9]+?(\.[1-9]%)?|100)[%°]?)$/] { + throwWarning: tr("unusual value of {0}", "{0.key}"); + suggestAlternative: "x%"; + suggestAlternative: "x°"; + suggestAlternative: "up"; + suggestAlternative: "down"; + assertMatch: "way incline=extreme"; + assertNoMatch: "way incline=up"; + assertNoMatch: "way incline=down"; + assertNoMatch: "way incline=10%"; + assertNoMatch: "way incline=-5%"; + assertNoMatch: "way incline=10°"; +} + +/* see ticket #9631 */ +*[population][population !~ /^[0-9]+$/ ] { + throwWarning: tr("{0} must be a numeric value", "{0.key}"); +} + +/* must be an integer positive number only and not 0, see #10837 (lanes), #11055 (screen) */ +way[lanes][lanes !~ /^[1-9]([0-9]*)$/][highway], +way["lanes:backward"]["lanes:backward" !~ /^[1-9]([0-9]*)$/][highway], +way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway], +*[screen][screen !~ /^[1-9]([0-9]*)$/][amenity=cinema] { + throwError: tr("{0} must be a positive integer number", "{0.key}"); + assertMatch: "way highway=residential lanes=-1"; + assertMatch: "way highway=residential lanes=5.5"; + assertMatch: "way highway=residential lanes=1;2"; + assertMatch: "way highway=residential lanes:forward=-1"; + assertMatch: "way highway=residential lanes:backward=-1"; + assertNoMatch: "way highway=residential lanes=1"; + assertMatch: "node amenity=cinema screen=led"; + assertNoMatch: "node amenity=cinema screen=8"; +} +*[admin_level][admin_level !~ /^(1|2|3|4|5|6|7|8|9|10|11|12)$/] { + throwWarning: tr("unusual value of {0}", "{0.key}"); + assertMatch: "node admin_level=0"; + assertMatch: "node admin_level=-1"; + assertMatch: "node admin_level=13"; + assertNoMatch: "node admin_level=5"; +} + +/* #14989 */ +*[direction][direction<0], +*[direction][direction>=360], +*[direction][direction !~ /^([0-9][0-9]?[0-9]?|north|east|south|west|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW|forward|backward|both|clockwise|anti-clockwise|anticlockwise|up|down)((-|;)([0-9][0-9]?[0-9]?|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW))*$/] { + throwWarning: tr("unusual value of {0}", "{0.key}"); + assertMatch: "node direction=north-down"; + assertMatch: "node direction=rome"; + assertMatch: "node direction=C"; + assertMatch: "node direction=NNNE"; + assertMatch: "node direction=1360"; + assertNoMatch: "node direction=NE-S"; /* ranges are used at tourism=viewpoint*/ + assertMatch: "node direction=north-south"; /* ranges only in numbers or short NESW form */ + assertMatch: "node direction=north-east"; /* if range use N-E, if single direcion use NE */ + assertNoMatch: "node direction=0-360"; /* complete panorama view */ + assertNoMatch: "node direction=45-100;190-250;300-360"; + assertMatch: "node direction=45-100;190-250;300-"; + assertNoMatch: "node direction=45-100;190-250;300"; + assertNoMatch: "node direction=90;270"; + assertNoMatch: "node direction=up"; + assertNoMatch: "node direction=down"; /* up/down are replaced by incline tag, has separate warning */ + assertMatch: "node direction=-10"; + assertNoMatch: "node direction=0"; + assertNoMatch: "node direction=45"; + assertMatch: "node direction=360"; + assertNoMatch: "node direction=N"; + assertNoMatch: "node direction=NNE"; + assertNoMatch: "node direction=west"; + assertNoMatch: "node direction=forward"; + assertNoMatch: "node direction=anti-clockwise"; + assertNoMatch: "node direction=anticlockwise"; /* both spellings are in use and even wiki uses both */ +} + +/* #14786 (should be safe to just remove the meters unit from the value) */ +*[ele][ele =~ /^-?[0-9]+(\.[0-9]+)? ?m$/] { + throwWarning: tr("{0} must be a numeric value, in meters and without units", "{0.key}"); + fixAdd: concat("ele=", trim(replace(tag("ele"), "m", ""))); + set ele_meter_remove_autofix; + assertMatch: "node ele=12m"; + assertMatch: "node ele=12 m"; + assertNoMatch: "node ele=12km"; + assertMatch: "node ele=12.1m"; + assertMatch: "node ele=-12.1 m"; + assertNoMatch: "node ele=12"; + assertNoMatch: "node ele=high"; +} +*[ele][ele =~ /^[0-9]+,[0-9][0-9]?$/] { + throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}"); + fixAdd: concat("ele=", replace(tag("ele"), ",", ".")); + set ele_separator_autofix; + assertMatch: "node ele=5,5"; + assertMatch: "node ele=12,00"; + assertNoMatch: "node ele=8,848"; /* wrongly used thousands separator */ + assertNoMatch: "node ele=3,50,5"; + assertNoMatch: "node ele=3.5"; + assertNoMatch: "node ele=4"; +} +*[ele][ele !~ /^-?[0-9]+(\.[0-9]+)?$/]!.ele_meter_remove_autofix!.ele_separator_autofix { + throwWarning: tr("{0} must be a numeric value, in meters and without units", "{0.key}"); + assertNoMatch: "node ele=12m"; + assertNoMatch: "node ele=12 m"; + assertMatch: "node ele=12km"; + assertNoMatch: "node ele=12.1m"; + assertNoMatch: "node ele=-12.1 m"; + assertNoMatch: "node ele=12"; + assertMatch: "node ele=high"; +} + +/* #17530 */ +*[ele][ele =~ /^-?[0-9]+\.[0-9][0-9][0-9]+$/] { + throwWarning: tr("{0}", "{0.tag}"); + group: tr("Unnecessary amount of decimal places"); + fixAdd: concat("ele=", round(tag("ele")*100)/100); + assertNoMatch: "node ele=12"; + assertNoMatch: "node ele=1.12"; + assertMatch: "node ele=12.123"; + assertMatch: "node ele=12.1234"; + assertMatch: "node ele=-12.6789"; + assertNoMatch: "node ele=12.123 m"; + assertNoMatch: "node ele=high"; +} + +/* #15774 */ +node[fire_hydrant:pressure="#"] { + throwError: tr("unusual value of {0}", "{0.key}"); +} + +*[interval][interval !~ /^([0-9][0-9]?|[0-9][0-9]:[0-5][0-9](:[0-9][0-9])?)$/] { + throwWarning: tr("unusual value of {0}", "{0.key}"); + assertNoMatch: "way interval=5"; + assertNoMatch: "way interval=20"; + assertNoMatch: "way interval=00:05"; + assertNoMatch: "way interval=00:05:00"; + assertNoMatch: "way interval=03:00:00"; + assertMatch: "way interval=123"; + assertMatch: "way interval=0:5:0"; + assertMatch: "way interval=00:65:00"; +} + +/* #15107 */ +*[aeroway=helipad ][iata][iata!~/^[A-Z]{3}$/], +*[aeroway=aerodrome][iata][iata!~/^[A-Z]{3}$/] { + throwWarning: tr("wrong value: {0}", "{1.tag}"); + group: tr("Airport tagging"); + assertNoMatch: "way aeroway=aerodrome iata=BER"; + assertMatch: "way aeroway=aerodrome iata=BERL"; + assertMatch: "way aeroway=aerodrome iata=BE"; + assertMatch: "way aeroway=aerodrome iata=ber"; +} +*[aeroway=helipad ][icao][icao!~/^[A-Z]{4}$/], +*[aeroway=aerodrome][icao][icao!~/^[A-Z]{4}$/] { + throwWarning: tr("wrong value: {0}", "{1.tag}"); + group: tr("Airport tagging"); + assertNoMatch: "way aeroway=aerodrome icao=EDDB"; + assertMatch: "way aeroway=aerodrome icao=EDDBA"; + assertMatch: "way aeroway=aerodrome icao=EDD"; + assertMatch: "way aeroway=aerodrome icao=eddb"; +} +*[aeroway=helipad ][icao][icao!~/^(AG|AN|AY|BG|BI|BK|C|DA|DB|DF|DG|DI|DN|DR|DT|DX|EB|ED|EE|EF|EG|EH|EI|EK|EL|EN|EP|ES|ET|EV|EY|FA|FB|FC|FD|FE|FG|FH|FI|FJ|FK|FL|FM|FN|FO|FP|FQ|FS|FT|FV|FW|FX|FY|FZ|GA|GB|GC|GE|GF|GG|GL|GM|GO|GQ|GS|GU|GV|HA|HB|HC|HD|HE|HH|HK|HL|HR|HS|HT|HU|K|LA|LB|LC|LD|LE|LF|LG|LH|LI|LJ|LK|LL|LM|LN|LO|LP|LQ|LR|LS|LT|LU|LV|LW|LX|LY|LZ|MB|MD|MG|MH|MK|MM|MN|MP|MR|MS|MT|MU|MW|MY|MZ|NC|NF|NG|NI|NL|NS|NT|NV|NW|NZ|OA|OB|OE|OI|OJ|OK|OL|OM|OO|OP|OR|OS|OT|OY|PA|PB|PC|PF|PG|PH|PJ|PK|PL|PM|PO|PP|PT|PW|RC|RJ|RK|RO|RP|SA|SB|SC|SD|SE|SF|SG|SH|SI|SJ|SK|SL|SM|SN|SO|SP|SS|SU|SV|SW|SY|TA|TB|TD|TF|TG|TI|TJ|TK|TL|TN|TQ|TR|TT|TU|TV|TX|U|UA|UB|UC|UD|UG|UK|UM|UT|VA|VC|VD|VE|VG|VH|VI|VL|VM|VN|VO|VQ|VR|VT|VV|VY|WA|WB|WI|WM|WP|WQ|WR|WS|Y|Z|ZK|ZM)/], +*[aeroway=aerodrome][icao][icao!~/^(AG|AN|AY|BG|BI|BK|C|DA|DB|DF|DG|DI|DN|DR|DT|DX|EB|ED|EE|EF|EG|EH|EI|EK|EL|EN|EP|ES|ET|EV|EY|FA|FB|FC|FD|FE|FG|FH|FI|FJ|FK|FL|FM|FN|FO|FP|FQ|FS|FT|FV|FW|FX|FY|FZ|GA|GB|GC|GE|GF|GG|GL|GM|GO|GQ|GS|GU|GV|HA|HB|HC|HD|HE|HH|HK|HL|HR|HS|HT|HU|K|LA|LB|LC|LD|LE|LF|LG|LH|LI|LJ|LK|LL|LM|LN|LO|LP|LQ|LR|LS|LT|LU|LV|LW|LX|LY|LZ|MB|MD|MG|MH|MK|MM|MN|MP|MR|MS|MT|MU|MW|MY|MZ|NC|NF|NG|NI|NL|NS|NT|NV|NW|NZ|OA|OB|OE|OI|OJ|OK|OL|OM|OO|OP|OR|OS|OT|OY|PA|PB|PC|PF|PG|PH|PJ|PK|PL|PM|PO|PP|PT|PW|RC|RJ|RK|RO|RP|SA|SB|SC|SD|SE|SF|SG|SH|SI|SJ|SK|SL|SM|SN|SO|SP|SS|SU|SV|SW|SY|TA|TB|TD|TF|TG|TI|TJ|TK|TL|TN|TQ|TR|TT|TU|TV|TX|U|UA|UB|UC|UD|UG|UK|UM|UT|VA|VC|VD|VE|VG|VH|VI|VL|VM|VN|VO|VQ|VR|VT|VV|VY|WA|WB|WI|WM|WP|WQ|WR|WS|Y|Z|ZK|ZM)/] { + throwWarning: tr("wrong value: {0}", "{1.tag}"); + group: tr("Airport tagging"); + assertNoMatch: "way aeroway=aerodrome icao=EDDB"; + assertMatch: "way aeroway=aerodrome icao=EQQQ"; +} + +/* #18573 */ +*[isced:level][isced:level !~ /^(0|1|2|3|4|5|6|7|8)((;|-)(1|2|3|4|5|6|7|8))*$/] { + throwWarning: tr("unusual value of {0}", "{0.key}"); + assertMatch: "node isced:level=secondary"; + assertMatch: "node isced:level=0,1,2,3"; + assertMatch: "node isced:level=9"; + assertMatch: "node isced:level=10"; + assertNoMatch: "node isced:level=0;1;2;3"; + assertNoMatch: "node isced:level=0"; + assertNoMatch: "node isced:level=5"; + assertNoMatch: "node isced:level=0-3"; +} Index: trunk/resources/data/validator/relation.mapcss =================================================================== --- trunk/resources/data/validator/relation.mapcss (revision 16006) +++ trunk/resources/data/validator/relation.mapcss (revision 16006) @@ -0,0 +1,43 @@ +/* relation types */ + +relation[!type] { + throwError: tr("relation without type"); + assertMatch: "relation name=Foo"; + assertNoMatch: "relation type=route name=Foo"; +} + +/* from http://wiki.openstreetmap.org/wiki/Types_of_relation */ +/* see also #9071 */ +relation[type=route][!route], +relation[type=route_master][!route_master], +relation[type=restriction][!/^restriction/], /* see #11586 */ +relation[type=boundary][!boundary][!disused:boundary], +relation[type=public_transport][!public_transport], +relation[type=waterway][!waterway], +relation[type=enforcement][!enforcement] { + throwWarning: tr("{0} relation without {0} tag", "{1.key}"); + group: tr("missing tag"); + assertMatch: "relation type=route"; + assertNoMatch: "relation type=route route=train"; + assertMatch: "relation type=route_master"; + assertNoMatch: "relation type=route_master route_master=train"; + assertMatch: "relation type=restriction"; + assertNoMatch: "relation type=restriction restriction=no_left_turn"; + assertMatch: "relation type=boundary"; + assertNoMatch: "relation type=boundary boundary=administrative"; + assertNoMatch: "relation type=site site=administrative"; + assertMatch: "relation type=public_transport"; + assertNoMatch: "relation type=public_transport public_transport=stop_area"; + assertMatch: "relation type=waterway"; + assertNoMatch: "relation type=waterway waterway=river"; + assertMatch: "relation type=enforcement"; + assertNoMatch: "relation type=enforcement enforcement=maxspeed"; +} + +/* #15208, #16242 */ +relation[type=route][route=mtb ] > way[bicycle=no], +relation[type=route][route=bicycle] > way[bicycle=no], +relation[type=route][route=mtb ] > way[bicycle=use_sidepath], +relation[type=route][route=bicycle] > way[bicycle=use_sidepath] { + throwWarning: tr("way with {0} is part of a bicycle route relation", "{0.tag}"); +} Index: trunk/resources/data/validator/religion.mapcss =================================================================== --- trunk/resources/data/validator/religion.mapcss (revision 16006) +++ trunk/resources/data/validator/religion.mapcss (revision 16006) @@ -0,0 +1,37 @@ +/* absent/unknown denomination (ticket #7811) */ + +*[religion =~ /^(christian|jewish|muslim)$/][!denomination][type!=route] { + throwOther: tr("religion without denomination"); + group: tr("missing tag"); + assertMatch: "node religion=christian"; + assertNoMatch: "node religion=christian denomination=catholic"; + assertNoMatch: "node religion=foobar"; +} + +*[religion=christian][denomination][denomination !~ /^(anglican|apostolic|baptist|catholic|church_of_scotland|christian_community|christian_scientist|coptic_orthodox|czechoslovak_hussite|dutch_reformed|evangelical|foursquare|greek_catholic|greek_orthodox|iglesia_ni_cristo|jehovahs_witness|kabbalah|karaite|living_waters_church|lutheran|maronite|mennonite|methodist|mormon|new_apostolic|nondenominational|old_catholic|orthodox|pentecostal|presbyterian|protestant|quaker|reformed|roman_catholic|romanian_orthodox|russian_orthodox|salvation_army|serbian_orthodox|seventh_day_adventist|spiritist|united|united_reformed|united|united_methodist|united_reformed|uniting)$/] { + throwOther: tr("unknown christian denomination"); + assertMatch: "node religion=christian denomination=foobar"; + assertNoMatch: "node religion=christian denomination=catholic"; + assertNoMatch: "node religion=christian"; +} + +*[religion=muslim][denomination][denomination !~ /^(alaouite|druze|ibadi|ismaili|nondenominational|shia|sunni)$/] { + throwOther: tr("unknown muslim denomination"); + assertMatch: "node religion=muslim denomination=foobar"; + assertNoMatch: "node religion=muslim denomination=alaouite"; + assertNoMatch: "node religion=muslim"; +} + +*[religion=jewish][denomination][denomination !~ /^(alternative|ashkenazi|conservative|hasidic|humanistic|liberal|modern_orthodox|neo_orthodox|nondenominational|orthodox|progressive|reconstructionist|reform|renewal|samaritan|ultra_orthodox)$/] { + throwOther: tr("unknown jewish denomination"); + assertMatch: "node religion=jewish denomination=foobar"; + assertNoMatch: "node religion=jewish denomination=alternative"; + assertNoMatch: "node religion=jewish"; +} + +*[religion=catholic] { + throwWarning: tr("{0}", "{0.tag}"); + suggestAlternative: "religion=christian + denomination=catholic"; + fixChangeKey: "religion => denomination"; + fixAdd: "religion=christian"; +} Index: trunk/resources/data/validator/territories.mapcss =================================================================== --- trunk/resources/data/validator/territories.mapcss (revision 16006) +++ trunk/resources/data/validator/territories.mapcss (revision 16006) @@ -0,0 +1,45 @@ +/* see ticket #12914 -- Discourage contributors to use operator=ERDF in France. */ +*[operator=ERDF][inside("FR")] { + throwWarning: tr("{0} is deprecated", "{0.tag}"); + suggestAlternative: "operator=Enedis"; + group: tr("deprecated tagging"); + fixAdd: "operator=Enedis"; +} + +/* #13932, #15283 */ +*[addr:street =~ /(?i).*Strasse.*/][addr:street !~ /(?i).*Strasser.*/][inside("DE,AT")], +*[name =~ /(?i).*Strasse.*/][name !~ /(?i).*Strasser.*/][inside("DE,AT")] { + throwError: tr("street name contains ss"); + assertMatch: "way name=Hauptstrasse"; + assertNoMatch: "way name=Hauptstraße"; + assertNoMatch: "way name=Kapitän-Strasser-Straße"; + assertNoMatch: "way name=Peter-Strasser-Platz"; + +} +*[addr:street =~ /(?i).*Straße.*/][inside("LI,CH")], +*[name =~ /(?i).*Straße.*/][inside("LI,CH")] { + throwError: tr("street name contains ß"); + assertMatch: "way name=Hauptstraße"; + assertNoMatch: "way name=Hauptstrasse"; +} + +/* #17484 */ +relation[type=associatedStreet][inside("DE")] { + throwWarning: tr("{0} is deprecated in {1}", "{0.tag}", "Deutschland"); + suggestAlternative: "addr:street"; + group: tr("deprecated tagging"); +} + +/* #15107 */ +*[aeroway=helipad ][!faa][inside("US")], +*[aeroway=aerodrome][!faa][inside("US")] { + throwOther: tr("{0} without {1}", "{0.tag}", "{1.key}"); + group: tr("Airport tagging"); +} +*[aeroway=aerodrome][!icao][faa!~/\d/][inside("US")], +*[aeroway=aerodrome][!iata][faa!~/\d/][inside("US")] { + throwOther: tr("{0} without {1}", "{0.tag}", "{1.key}"); + group: tr("Airport tagging"); + assertNoMatch: "way aeroway=aerodrome faa=OK12"; + assertMatch: "way aeroway=aerodrome faa=ORD"; +} Index: trunk/resources/data/validator/unnecessary.mapcss =================================================================== --- trunk/resources/data/validator/unnecessary.mapcss (revision 16006) +++ trunk/resources/data/validator/unnecessary.mapcss (revision 16006) @@ -0,0 +1,177 @@ +*[access][highway=proposed], +*[motor_vehicle?][!vehicle][!access][bicycle_road!=yes][highway =~ /^(motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified|residential|service|living_street)$/], +*[bridge=no], +*[building=no], +*[elevation="0"], +*[layer="0"] { + /* see #9365 - Useless tag layer=0 */ + throwWarning: tr("{0} is unnecessary", "{0.tag}"); + group: tr("unnecessary tag"); + fixRemove: "{0.key}"; + assertMatch: "way layer=0"; + assertMatch: "way bridge=no"; + assertMatch: "way highway=proposed access=no"; + assertMatch: "way highway=motorway motor_vehicle=yes"; + assertNoMatch: "way highway=motorway access=no motor_vehicle=yes"; +} + +area:closed[amenity ][area?][!highway], +area:closed[building][area?], +area:closed[landuse ][area?][!highway], +area:closed[leisure ][area?][!highway][leisure!=track][leisure!=slipway], +area:closed[natural ][area?], +area:closed[shop ][area?] { + throwWarning: tr("{0} is unnecessary for {1}", "{2.key}", "{1.key}"); + group: tr("unnecessary tag"); + fixRemove: "{2.key}"; +} + +/* #14256, #15664 */ +area:closed[highway=rest_area][area?], +area:closed[highway=services][area?], +area:closed[aeroway=aerodrome][area?], +area:closed[aeroway=helipad][area?] { + throwWarning: tr("{0} is unnecessary for {1}", "{2.key}", "{1.tag}"); + group: tr("unnecessary tag"); + fixRemove: "{2.key}"; +} + +/* #9257, #17482 */ +way[foot =~ /^(yes|designated)$/][highway =~ /^(footway|pedestrian)$/][!access], +way[bicycle =~ /^(yes|designated)$/][highway=cycleway][!vehicle][!access][foot!=designated], +*[gnis:Class="Populated Place"][place=city], +*[gnis:Class="Populated Place"][place=town], +*[gnis:Class="Populated Place"][place=village], +*[gnis:Class="Populated Place"][place=hamlet], +*[gnis:Class=Summit][natural=peak] { + throwWarning: tr("{0} is unnecessary for {1}", "{0.tag}", "{1.tag}"); + group: tr("unnecessary tag"); + fixRemove: "{0.key}"; + assertMatch: "way highway=pedestrian foot=designated"; + assertNoMatch: "way highway=pedestrian access=no foot=designated"; + assertMatch: "node gnis:Class=\"Populated Place\" place=village"; + assertNoMatch: "node gnis:Class=\"Populated Place\" place=locality"; +} + +*[emergency=permissive] { + /* see #9458 - emergency=permissive makes no sense */ + throwWarning: tr("{0} makes no sense", "{0.tag}"); + fixAdd: "emergency=yes"; + assertMatch: "way emergency=permissive"; + assertNoMatch: "way emergency=designated"; +} + +/* see ticket #7639 -- Warn when a node has the same tags as its parent way. */ +way >:sameTags node:tagged { + throwWarning: tr("Nodes duplicating parent way tags"); +} + +/* #15477 */ +*[payment:cash][payment:coins][payment:notes] { + throwWarning: tr("{0} together with {1} and {2}. Remove {0}.", "{0.key}", "{1.key}", "{2.key}"); + group: tr("unnecessary tag"); + fixRemove: "payment:cash"; +} + +/* see #10346, #15667 */ +way[waterway][oneway?] { + throwWarning: tr("{0} is unnecessary for {1}", "{1.key}", "{0.key}"); + group: tr("unnecessary tag"); + fixRemove: "{1.key}"; +} +way[waterway][oneway=-1] { + throwWarning: tr("{0} is unnecessary for {1}. The flow direction is defined by the way direction.", "{1.key}", "{0.key}"); + group: tr("unnecessary tag"); +} + +/* #15774 */ +node[emergency=fire_hydrant][fire_hydrant:count=1] { + throwWarning: tr("{0} is unnecessary for {1}", "{1.tag}", "{0.tag}"); + group: tr("unnecessary tag"); + fixRemove: "{1.key}"; +} + +/* #17100, #17471, #17629, #17633 */ +*[name][name=~/^(?i)(parc|park)$/][leisure=park], +*[name][name=~/^(?i)(pond)$/][water=pond], +*[name][name=~/^(?i)(chapel|chapelle|kapelle)$/][building=chapel], +*[name][name=~/^(?i)(church|église|biserica)$/][amenity=place_of_worship][religion=christian], +*[name][name=~/^(?i)(mosque|cami|masjid|مسجد)$/][amenity=place_of_worship][religion=muslim], +*[name][name=~/^(?i)(parking|parkplatz)$/][amenity=parking], +*[name][name=~/^(?i)(post office)$/][amenity=post_office], +*[name][name=~/^(?i)(restaurant)$/][amenity=restaurant], +*[name][name=~/^(?i)(toilets?)$/][amenity=toilets], +*[name][name=~/^(?i)(playground|spielplatz)$/][leisure=playground], +*[name][name=~/^(?i)(shop|boutique)$/][shop][shop!=no], +*[name][name=~/^(?i)(building|bangunan)$/][building][building!=no], +*[name][name=~/^(?i)(house|casa|maison|rumah|vivienda)$/][building=house], +*[name][name=~/^(?i)(kiosk)$/][shop=kiosk], +*[name][name=~/^(?i)(path)$/][highway=path], +*[name][name=~/^(?i)(jalan)$/][highway], +*[name][name=~/^(?i)(silo)$/][man_made=silo], +*[name][name=~/^(?i)(silo)$/][building=silo], +*[name][name=~/^(?i)(cemetery|cementerio|cimetière|cmentarz|friedhof)$/][amenity=grave_yard], +*[name][name=~/^(?i)(cemetery|cementerio|cimetière|cmentarz|friedhof)$/][landuse=cemetery], +*[name][name=~/^(?i)(monument aux morts|war memorial)$/][historic=memorial][memorial=war_memorial], +*[name][name=~/^(?i)(school|école|Школа)$/][building=school], +*[name][name=~/^(?i)(school|école|Школа)$/][amenity=school], +*[name][name=~/^(?i)(école élémentaire)$/][amenity=school]["school:FR"="élémentaire"], +*[name][name=~/^(?i)(école maternelle)$/][amenity=school]["school:FR"="maternelle"], +*[name][name=~/^(?i)(école primaire)$/][amenity=school]["school:FR"="primaire"], +*[name][name=~/^(?i)(collège)$/][amenity=school]["school:FR"="collège"], +*[name][name=~/^(?i)(lycée)$/][amenity=school]["school:FR"="lycée"], +*[name][name=~/^(?i)(Аптека|farmacia|pharmacy|pharmacie)$/][amenity=pharmacy], +*[name][name=~/^(?i)(hydrant)$/][emergency=fire_hydrant], +*[name][name=~/^(?i)(АГЗС|АЗС)$/][amenity=fuel] { + throwWarning: tr("{0}", "{0.tag}"); + group: tr("descriptive name"); + fixRemove: "name"; + assertMatch: "node name=parking amenity=parking"; + assertMatch: "node name=Parking amenity=parking"; + assertNoMatch: "node name=Parking_with_suffix amenity=parking"; + assertNoMatch: "node name=Megaparking amenity=parking"; + assertMatch: "relation name=parking amenity=parking type=multipolygon"; + assertMatch: "relation name=Parking amenity=parking type=multipolygon"; + assertNoMatch: "way name=parking"; + assertMatch: "relation name=PLAYGROUND leisure=playground type=multipolygon"; + assertMatch: "node name=PLaYGrOUNd leisure=playground"; + assertMatch: "node name=shop shop=whatever"; + assertNoMatch: "node name=shop shop=no"; + assertNoMatch: "way name=shop leisure=playground"; + assertMatch: "way name=building building=yes"; + assertMatch: "way name=building building=house"; + assertMatch: "way name=Rumah building=house"; + assertNoMatch: "way name=Rumah building=yes"; + assertMatch: "way name=house building=house"; + assertNoMatch: "way name=house building=yes"; + assertMatch: "way name=kiosk building=yes shop=kiosk"; + assertNoMatch: "way name=kiosk building=yes"; + assertMatch: "way name=silo man_made=silo"; + assertMatch: "way name=Silo man_made=silo building=silo"; + assertMatch: "way name=Silo building=silo"; + assertMatch: "way name=cemetery amenity=grave_yard"; + assertMatch: "way name=Cmentarz amenity=grave_yard"; + assertNoMatch: "way name=kiosk amenity=grave_yard"; +} +*[name][name=~/^(?i)(school|école|Школа)$/][building][building!=school][building!=no], +*[name][name=~/^(?i)(house|casa|rumah|vivienda)$/][building][building!=house][building!=no] { + throwWarning: tr("{0}", "{0.tag}"); + group: tr("descriptive name"); + /* without fixRemove to avoid possible information loss */ + assertNoMatch: "way name=building building=yes"; + assertNoMatch: "way name=building building=house"; + assertNoMatch: "way name=Rumah building=house"; + assertMatch: "way name=Rumah building=yes"; + assertNoMatch: "way name=house building=house"; + assertMatch: "way name=house building=yes"; +} + +/* #2760 */ +*[/^(gpx|gpxx|gpxd):/] { + throwWarning: tr("{0} should not be uploaded", "{0.key}"); + group: tr("unnecessary tag"); + fixRemove: "{0.key}"; + assertMatch: "node gpx:time=2018-01-01T12:00:00Z"; + assertMatch: "node gpxd:color=#FF0000"; + assertNoMatch: "node source=gpx:foo"; +} Index: trunk/resources/data/validator/wikipedia.mapcss =================================================================== --- trunk/resources/data/validator/wikipedia.mapcss (revision 16006) +++ trunk/resources/data/validator/wikipedia.mapcss (revision 16006) @@ -0,0 +1,153 @@ +/* validation for the wikipedia=* tag - see tickets #8383, #14425, #18251 */ + +/* If there is no language at all, this is broken. Also catches 'wikipedia' used as 'email', 'website', 'ele' [sic!] ... */ +*[wikipedia][wikipedia !~ /(?i)^[-a-z]{2,12}:/] { + throwError: tr("wikipedia tag has no language given, use ''wikipedia''=''language:page title''"); + assertMatch: "node wikipedia=Foobar"; + assertNoMatch: "node wikipedia=en:Foobar"; + assertNoMatch: "node wikipedia=en-GB:Foobar"; +} + +/* Valid languages are extracted from , which may change, so this is a warning only. */ +*[wikipedia =~ /(?i)^[-a-z]{2,12}:/][wikipedia !~ /^https?:\/\//][wikipedia !~ /^(ab|ace|ady|af|ak|als|am|an|ang|ar|arc|arz|as|ast|atj|av|ay|az|azb|ba|ban|bar|bat-smg|bcl|be|be-x-old|bg|bh|bi|bjn|bm|bn|bo|bpy|br|bs|bug|bxr|ca|cbk-zam|cdo|ce|ceb|ch|chr|chy|ckb|co|cr|crh|cs|csb|cu|cv|cy|da|de|din|diq|dsb|dty|dv|dz|ee|el|eml|en|eo|es|et|eu|ext|fa|ff|fi|fiu-vro|fj|fo|fr|frp|frr|fur|fy|ga|gag|gan|gcr|gd|gl|glk|gn|gom|gor|got|gu|gv|ha|hak|haw|he|hi|hif|hr|hsb|ht|hu|hy|hyw|ia|id|ie|ig|ik|ilo|inh|io|is|it|iu|ja|jam|jbo|jv|ka|kaa|kab|kbd|kbp|kg|ki|kk|kl|km|kn|ko|koi|krc|ks|ksh|ku|kv|kw|ky|la|lad|lb|lbe|lez|lfn|lg|li|lij|lmo|ln|lo|lrc|lt|ltg|lv|mai|map-bms|mdf|mg|mhr|mi|min|mk|ml|mn|mnw|mr|mrj|ms|mt|mwl|my|myv|mzn|na|nah|nap|nds|nds-nl|ne|new|nl|nn|no|nov|nqo|nrm|nso|nv|ny|oc|olo|om|or|os|pa|pag|pam|pap|pcd|pdc|pfl|pi|pih|pl|pms|pnb|pnt|ps|pt|qu|rm|rmy|rn|ro|roa-rup|roa-tara|ru|rue|rw|sa|sah|sat|sc|scn|sco|sd|se|sg|sh|shn|si|simple|sk|sl|sm|sn|so|sq|sr|srn|ss|st|stq|su|sv|sw|szl|szy|ta|tcy|te|tet|tg|th|ti|tk|tl|tn|to|tpi|tr|ts|tt|tum|tw|ty|tyv|udm|ug|uk|ur|uz|ve|vec|vep|vi|vls|vo|wa|war|wo|wuu|xal|xh|xmf|yi|yo|za|zea|zh|zh-classical|zh-min-nan|zh-yue|zu):/] { + throwWarning: tr("wikipedia tag has an unknown language prefix"); + assertMatch: "node wikipedia=X-Y-Z:Foobar"; + assertNoMatch: "node wikipedia=en:Foobar"; +} + +*[wikipedia =~ /^https?:\/\//], +*[wikipedia =~ /(?i)^[-a-z]{2,12}:https?:\/\//] { + throwWarning: tr("wikipedia tag format is deprecated"); + suggestAlternative: tr("''wikipedia''=''language:page title''"); + group: tr("deprecated tagging"); + assertMatch: "node wikipedia=http://en.wikipedia.org/wiki/OpenStreetMap"; + assertNoMatch: "node wikipedia=en:OpenStreetMap"; +} + +*[wikipedia =~ /^be-x-old:/] { + throwWarning: tr("wikipedia ''{0}'' language is obsolete, use ''{1}'' instead", "be-x-old", "be-tarask"); + fixAdd: concat("wikipedia=be-tarask:", get(regexp_match("^be-x-old:(.+)$", tag("wikipedia")),1)); + assertMatch: "node wikipedia=be-x-old:foo"; + assertNoMatch: "node wikipedia=abe-x-old:foo"; +} + +*[wikipedia =~ /^cz:/] { + throwWarning: tr("wikipedia ''{0}'' language is invalid, use ''{1}'' instead", "cz", "cs"); + fixAdd: concat("wikipedia=cs:", get(regexp_match("^cz:(.+)$", tag("wikipedia")),1)); + assertMatch: "node wikipedia=cz:foo"; + assertNoMatch: "node wikipedia=en:cz:foo"; +} + +*[wikimedia_commons =~ /%[0-9A-F][0-9A-F]/] { + throwError: tr("{0} tag should not have URL-encoded values like ''%27''", "{0.key}"); + fixAdd: concat("wikimedia_commons=", trim(replace(URL_decode(tag("wikimedia_commons")), "_", " "))); + assertMatch: "node wikimedia_commons=File:Foo%27s"; + assertNoMatch: "node wikimedia_commons=File:Foo"; +} + +*[wikipedia =~ /(?i)^[-a-z]{2,12}:.*%[0-9A-F][0-9A-F]/] { + throwError: tr("{0} tag should not have URL-encoded values like ''%27''", "{0.key}"); + fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)(.*)$", tag("wikipedia")),1), trim(replace(URL_decode(get(regexp_match("(?i)^([-a-z]+:)(.+)$", tag("wikipedia")),2)), "_", " "))); + assertMatch: "node wikipedia=en:Foo%27s"; + assertNoMatch: "node wikipedia=en:Foo"; +} + +*[/^wikipedia:[-a-z]{2,12}$/][/^wikipedia:[-a-z]{2,12}$/ =~ /(?i).*%[0-9A-F][0-9A-F]/] { + throwError: tr("{0} tag should not have URL-encoded values like ''%27''", "{0.key}"); + /* fixAdd: concat("{0.key}", "=", get(regexp_match("(?i)^([-a-z]+:)(.*)$", tag("{0.key}")),1), trim(replace(URL_decode(get(regexp_match("(?i)^([-a-z]+:)(.+)$", tag("{0.key}")),2)), "_", " "))); */ + /* tag("{0.key}") is not yet supported */ + assertMatch: "node wikipedia:de=Foo%27s"; + assertNoMatch: "node wikipedia:de=Foo"; +} + +*[wikipedia =~ /(?i)^[-a-z]{2,12}: /] { + throwWarning: tr("wikipedia title should not start with a space after language code"); + fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)(.*)$", tag("wikipedia")),1), trim(get(regexp_match("(?i)^([-a-z]+:)(.*)$", tag("wikipedia")),2))); + assertMatch: "node wikipedia=en: foo"; + assertNoMatch: "node wikipedia=en:foo"; +} + +*[wikipedia =~ /(?i)^[-a-z]{2,12}:wiki\//] { + throwWarning: tr("wikipedia title should not have ''{0}'' prefix", "wiki/"); + fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)wiki/(.*)$", tag("wikipedia")),1), trim(get(regexp_match("(?i)^([-a-z]+:)wiki/(.*)$", tag("wikipedia")),2))); + assertMatch: "node wikipedia=en:wiki/foo"; + assertNoMatch: "node wikipedia=en:foo"; +} + +/* All wikipedias except "jbo" automatically capitalize first letter of the page title. + To see the latest list, see + and look for 'wgCapitalLinks' setting. */ +*[wikipedia =~ /^[-a-zA-Z]{2,12}:\p{Ll}/][wikipedia !~ /^jbo:/][wikipedia !~ /(?i)^[-a-z]{2,12}:https?:/] { + throwWarning: tr("wikipedia page title should have first letter capitalized"); + fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)(.)(.*)$", tag("wikipedia")),1), upper(get(regexp_match("(?i)^([-a-z]+:)(.)(.*)$", tag("wikipedia")),2)), get(regexp_match("(?i)^([-a-z]+:)(.)(.*)$", tag("wikipedia")),3)); + assertMatch: "node wikipedia=en:foo"; + assertNoMatch: "node wikipedia=en:Foo"; + assertMatch: "node wikipedia=ru:абв"; + assertNoMatch: "node wikipedia=ru:Абв"; +} + +*[wikipedia =~ /(?i)^[-a-z]{2,12}:.*_/][wikipedia !~ /(?i)^[-a-z]{2,12}:https?:/] { + throwWarning: tr("wikipedia page title should have spaces instead of underscores (''_''→'' '')"); + fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)(.+)$", tag("wikipedia")),1), trim(replace(get(regexp_match("(?i)^([-a-z]+:)(.+)$", tag("wikipedia")),2), "_", " "))); + assertMatch: "node wikipedia=en:foo_bar"; + assertNoMatch: "node wikipedia=en:foo bar"; +} + +*[wikipedia ^= "da:da:"], +*[wikipedia ^= "da:dk:"], +*[wikipedia ^= "de:de:"], +*[wikipedia ^= "dk:dk:"], +*[wikipedia ^= "en:de:"], +*[wikipedia ^= "en:en:"], +*[wikipedia ^= "en:es:"], +*[wikipedia ^= "en:eu:"], +*[wikipedia ^= "en:fr:"], +*[wikipedia ^= "en:ja:"], +*[wikipedia ^= "en:pl:"], +*[wikipedia ^= "en:pt:"], +*[wikipedia ^= "en:zh:"], +*[wikipedia ^= "es:es:"], +*[wikipedia ^= "eu:eu:"], +*[wikipedia ^= "fr:fr:"], +*[wikipedia ^= "ja:ja:"], +*[wikipedia ^= "pl:en:"], +*[wikipedia ^= "pl:pl:"], +*[wikipedia ^= "pt:pt:"], +*[wikipedia ^= "ru:fr:"], +*[wikipedia ^= "ru:ru:"], +*[wikipedia ^= "zh:zh:"] { + throwWarning: tr("wikipedia language seems to be duplicated, e.g. en:en:Foo"); + fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)([-a-z]+:)(.*)$", tag("wikipedia")),2), trim(get(regexp_match("(?i)^([-a-z]+:)([-a-z]+:)(.*)$", tag("wikipedia")),3))); + assertMatch: "node wikipedia=en:en:Foo"; + assertMatch: "node wikipedia=en:fr:Foo"; + assertNoMatch: "node wikipedia=en:Bar"; +} + +/* Detect invalid wikidata tags */ +*[wikidata][wikidata !~ /^Q[1-9][0-9]{0,8}$/] { + throwError: tr("wikidata tag must be in Qnnnn format, where n is a digit"); + assertMatch: "node wikidata=a"; + assertMatch: "node wikidata=Q"; + assertMatch: "node wikidata=Q0"; + assertMatch: "node wikidata=Q0123"; + assertNoMatch: "node wikidata=Q123"; + assertNoMatch: "node wikidata=Q1"; +} + +/* Wikipedia without wikidata */ +*[wikipedia][!wikidata] { + throwOther: tr("wikipedia tag is set, but there is no wikidata tag. Wikipedia plugin might help with wikidata id lookups"); + group: tr("missing tag"); + assertMatch: "node wikipedia=a"; + assertNoMatch: "node wikipedia=a wikidata=Q123"; + assertNoMatch: "node wikidata=Q1"; + assertNoMatch: "node foo=bar"; +} + +/* Wikipedia:lang without wikipedia */ +*[!wikipedia][/^wikipedia:/] { + throwWarning: tr("''{0}'' tag is set, but no ''{1}'' tag. Make sure to set ''wikipedia=language:value'' for the main article and optional ''wikipedia:language=value'' only for additional articles that are not just other language variants of the main article.", "{1.key}", "{0.key}"); + assertMatch: "node wikipedia:en=a"; + assertNoMatch: "node wikipedia=a wikipedia:en=b"; + assertNoMatch: "node wikipedia=Foo"; +} Index: trunk/resources/data/validator/words.cfg =================================================================== --- trunk/resources/data/validator/words.cfg (revision 16006) +++ trunk/resources/data/validator/words.cfg (revision 16006) @@ -0,0 +1,309 @@ +# NOTE: Order *is* significant, case also. +# +# special symbols, must be first character: +# # Comment +# + correctly spelled key +# - incorrectly spelled key. Must follow correctly spelled key before next correctly spelled key. +# +# There must not be any white space before or after words, unless they are to be included in +# the bad spelling. +# There is no need to add bad spelling with different upper/lower case for keys +# which appear in the presets or the ignoreTags.cfg (prefixes E: and K:) +# There is no need to add bad spelling with leading or trailing blanks. + ++abutters +-abuters +-abbutter +-abbutters +-abuttors +-abuutters +-ubutters ++amenity +-ameninty +-amienty +-amienity +-amenitzy +-amenety +-amenitry +-amnity +-amentiy +-aminity +-amneity +-amnenity +-aminety +-amentity +-ammenity +-ameinty +-anemity +-amemity +-ameity +-amenty +-maenity +-emenity ++barrier +-barier ++bicycle +-bycycle +-biycle +-bycicle +-bicyle +-cycle +-bike +-bikes ++commercial +-comercial ++denomination +-denonimation +-denomionation +-denomation +-demonination +-demomination +-denomition +-denomincation +-denominatation +-denoination ++foot +-foor ++height +-hieght ++highway +-higwhay +-highways +-highwaay +-huighway +-highwayt +-ghway +-highaway +-highwway +-ighway +-higjway +-hioghway +-hiway +-hihjway +-higheway +-hughway +-hihgway +-higoway +-highwat +-highwah +-gighway +-higyway +-hichway +-hingway +-hhighway +-highwayu +-hyighway +-hiughway +-highwya +-hifhway +-hihway +-hifgway +-highjway +-highwy +-hgihway +-highawy +-highwau +-highay +-higbway +-hignway +-higway +-highwayx +-hoghway +-highwa +-hghway ++image +-imaqge ++layer +-leyer +-lyaer ++leisure +-leissure +-leiruse +-lesure +-liesure +-lieusure +-lesiure +-leasure ++name +-nane +-nme +-namee +-nname +-naem +-nmae +-nacme +-n ame +-name` +-namw +-bame +-nam +-namr +-anme ++note:fa +-note:fa +-notes:fa ++oneway +-aneway +-onewway +-onewau +-oneay +-neway +-oneweay +-onewa +-omeway +-one_way +-onway +-oeway +-eway ++railway +-raillway ++source +-sorce +-soruce +-soure +-souce +-sourec +-aource +-sourse ++waterway +-waterwa +-waterwy +-wateway +# +# Not sorted. +# ++aerialway +-areilway +-areialway +-arielway ++aeroway +-aeoroway +-areoway +-airoway ++airport +-aeroport ++bridge +-brideg +-brdige +-bridgde +-birdge +-bidge +-brige +-brigde +-bridgw ++building +-buidling +-buillding +-buiding +-bulding +-buildinq ++complete +-complite ++construction +-constrution +-contruction ++cycleway +-cylceway ++description +-descripion +-desription +-decription ++freight +-frieght ++full_name:fa +-full_name:Fa ++int_name +-iint_name ++junction +-junktion +-junctoin +-junctioin +-juntion +-junctiion +-jounction +-jumction +-juction ++landuse +-land_use +-lansuse +-lanudse +-lanuse ++local_name +-local_nama ++man_made +-mand_made +-nan_made +-madmade +-manmade ++mapping_status +-mappingstatus ++minspeed +-min_speed ++maxspeed +-maspeed +-max_speed +-maxsepeed +-maxseep +-mayspeed +-maxpeed ++maxheight +-max_hieght +-max_height ++maxweight +-maxwieght +-max_weight +-max_wieght +-maxweihgt ++motorcar +-otorcar +-motocar +-motorcars +-motocars ++motorcycle +-motorcylce +-motocycle ++natural +-nataural +-natrual +-nautral ++note_1 +-note_! ++note_2 +-note2 ++old_name +-oldname ++postal_code +-posatl_code ++private +-privat ++recycling:glas +-recyling:glas ++recycling:paper +-reycling:paper ++religion +-relgion ++residential +-residentail ++restriction +-restrction ++source:name +-source:Name ++source:url +-source_url ++surface +-sruface ++tourism +-tourismn +-tourim +-toursim +-touristm ++tracktype +-tractype +-tracltype +-trackype ++tunnel +-tunne +-tunel +-tunnely ++type +-tyoe Index: trunk/resources/images/Mf_closedway.svg =================================================================== --- trunk/resources/images/Mf_closedway.svg (revision 16006) +++ trunk/resources/images/Mf_closedway.svg (revision 16006) @@ -0,0 +1,8 @@ + + + + + + + + Index: trunk/resources/images/Mf_multipolygon.svg =================================================================== --- trunk/resources/images/Mf_multipolygon.svg (revision 16006) +++ trunk/resources/images/Mf_multipolygon.svg (revision 16006) @@ -0,0 +1,12 @@ + + + + + + Index: trunk/resources/images/Mf_node.svg =================================================================== --- trunk/resources/images/Mf_node.svg (revision 16006) +++ trunk/resources/images/Mf_node.svg (revision 16006) @@ -0,0 +1,5 @@ + + + + + Index: trunk/resources/images/Mf_relation.svg =================================================================== --- trunk/resources/images/Mf_relation.svg (revision 16006) +++ trunk/resources/images/Mf_relation.svg (revision 16006) @@ -0,0 +1,8 @@ + + + + + + + + Index: trunk/resources/images/Mf_way.svg =================================================================== --- trunk/resources/images/Mf_way.svg (revision 16006) +++ trunk/resources/images/Mf_way.svg (revision 16006) @@ -0,0 +1,8 @@ + + + + + + + + Index: trunk/resources/images/OLmarker.svg =================================================================== --- trunk/resources/images/OLmarker.svg (revision 16006) +++ trunk/resources/images/OLmarker.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/addnode.svg =================================================================== --- trunk/resources/images/addnode.svg (revision 16006) +++ trunk/resources/images/addnode.svg (revision 16006) @@ -0,0 +1,5 @@ + + + + + Index: trunk/resources/images/aligncircle.svg =================================================================== --- trunk/resources/images/aligncircle.svg (revision 16006) +++ trunk/resources/images/aligncircle.svg (revision 16006) @@ -0,0 +1,9 @@ + + + + + Index: trunk/resources/images/alignline.svg =================================================================== --- trunk/resources/images/alignline.svg (revision 16006) +++ trunk/resources/images/alignline.svg (revision 16006) @@ -0,0 +1,9 @@ + + + + + + Index: trunk/resources/images/anglesnap.svg =================================================================== --- trunk/resources/images/anglesnap.svg (revision 16006) +++ trunk/resources/images/anglesnap.svg (revision 16006) @@ -0,0 +1,18 @@ + + + + + + + + + + + + + Index: trunk/resources/images/apply.svg =================================================================== --- trunk/resources/images/apply.svg (revision 16006) +++ trunk/resources/images/apply.svg (revision 16006) @@ -0,0 +1,11 @@ + + + + + + + + + + + Index: trunk/resources/images/audio-back.svg =================================================================== --- trunk/resources/images/audio-back.svg (revision 16006) +++ trunk/resources/images/audio-back.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/audio-faster.svg =================================================================== --- trunk/resources/images/audio-faster.svg (revision 16006) +++ trunk/resources/images/audio-faster.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/audio-fwd.svg =================================================================== --- trunk/resources/images/audio-fwd.svg (revision 16006) +++ trunk/resources/images/audio-fwd.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/audio-next.svg =================================================================== --- trunk/resources/images/audio-next.svg (revision 16006) +++ trunk/resources/images/audio-next.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/audio-playpause.svg =================================================================== --- trunk/resources/images/audio-playpause.svg (revision 16006) +++ trunk/resources/images/audio-playpause.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/audio-prev.svg =================================================================== --- trunk/resources/images/audio-prev.svg (revision 16006) +++ trunk/resources/images/audio-prev.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/audio-slower.svg =================================================================== --- trunk/resources/images/audio-slower.svg (revision 16006) +++ trunk/resources/images/audio-slower.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/audio-sync.svg =================================================================== --- trunk/resources/images/audio-sync.svg (revision 16006) +++ trunk/resources/images/audio-sync.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/combineway.svg =================================================================== --- trunk/resources/images/combineway.svg (revision 16006) +++ trunk/resources/images/combineway.svg (revision 16006) @@ -0,0 +1,5 @@ + + + + + Index: trunk/resources/images/copy.svg =================================================================== --- trunk/resources/images/copy.svg (revision 16006) +++ trunk/resources/images/copy.svg (revision 16006) @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/cursor/crosshair.svg =================================================================== --- trunk/resources/images/cursor/crosshair.svg (revision 16006) +++ trunk/resources/images/cursor/crosshair.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/cursor/modifier/add_node_lock.svg =================================================================== --- trunk/resources/images/cursor/modifier/add_node_lock.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/add_node_lock.svg (revision 16006) @@ -0,0 +1,6 @@ + + + + + + Index: trunk/resources/images/cursor/modifier/addnode.svg =================================================================== --- trunk/resources/images/cursor/modifier/addnode.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/addnode.svg (revision 16006) @@ -0,0 +1,5 @@ + + + + + Index: trunk/resources/images/cursor/modifier/create_note.svg =================================================================== --- trunk/resources/images/cursor/modifier/create_note.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/create_note.svg (revision 16006) @@ -0,0 +1,10 @@ + + + + + + + + + + Index: trunk/resources/images/cursor/modifier/joinnode.svg =================================================================== --- trunk/resources/images/cursor/modifier/joinnode.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/joinnode.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/cursor/modifier/joinway.svg =================================================================== --- trunk/resources/images/cursor/modifier/joinway.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/joinway.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/cursor/modifier/lock.svg =================================================================== --- trunk/resources/images/cursor/modifier/lock.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/lock.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/cursor/modifier/mode.svg =================================================================== --- trunk/resources/images/cursor/modifier/mode.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/mode.svg (revision 16006) @@ -0,0 +1,5 @@ + + + + + Index: trunk/resources/images/cursor/modifier/parallel.svg =================================================================== --- trunk/resources/images/cursor/modifier/parallel.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/parallel.svg (revision 16006) @@ -0,0 +1,5 @@ + + + + + Index: trunk/resources/images/cursor/modifier/parallel_add.svg =================================================================== --- trunk/resources/images/cursor/modifier/parallel_add.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/parallel_add.svg (revision 16006) @@ -0,0 +1,6 @@ + + + + + + Index: trunk/resources/images/cursor/modifier/parallel_remove.svg =================================================================== --- trunk/resources/images/cursor/modifier/parallel_remove.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/parallel_remove.svg (revision 16006) @@ -0,0 +1,6 @@ + + + + + + Index: trunk/resources/images/cursor/modifier/rectangle.svg =================================================================== --- trunk/resources/images/cursor/modifier/rectangle.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/rectangle.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/cursor/modifier/select_add.svg =================================================================== --- trunk/resources/images/cursor/modifier/select_add.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/select_add.svg (revision 16006) @@ -0,0 +1,8 @@ + + + + + + + + Index: trunk/resources/images/cursor/modifier/select_node.svg =================================================================== --- trunk/resources/images/cursor/modifier/select_node.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/select_node.svg (revision 16006) @@ -0,0 +1,8 @@ + + + + + + + + Index: trunk/resources/images/cursor/modifier/select_node_add.svg =================================================================== --- trunk/resources/images/cursor/modifier/select_node_add.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/select_node_add.svg (revision 16006) @@ -0,0 +1,9 @@ + + + + + + + + + Index: trunk/resources/images/cursor/modifier/select_node_remove.svg =================================================================== --- trunk/resources/images/cursor/modifier/select_node_remove.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/select_node_remove.svg (revision 16006) @@ -0,0 +1,9 @@ + + + + + + + + + Index: trunk/resources/images/cursor/modifier/select_remove.svg =================================================================== --- trunk/resources/images/cursor/modifier/select_remove.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/select_remove.svg (revision 16006) @@ -0,0 +1,8 @@ + + + + + + + + Index: trunk/resources/images/cursor/modifier/select_way.svg =================================================================== --- trunk/resources/images/cursor/modifier/select_way.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/select_way.svg (revision 16006) @@ -0,0 +1,9 @@ + + + + + + + + + Index: trunk/resources/images/cursor/modifier/select_way_add.svg =================================================================== --- trunk/resources/images/cursor/modifier/select_way_add.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/select_way_add.svg (revision 16006) @@ -0,0 +1,10 @@ + + + + + + + + + + Index: trunk/resources/images/cursor/modifier/select_way_remove.svg =================================================================== --- trunk/resources/images/cursor/modifier/select_way_remove.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/select_way_remove.svg (revision 16006) @@ -0,0 +1,10 @@ + + + + + + + + + + Index: trunk/resources/images/cursor/modifier/selection.svg =================================================================== --- trunk/resources/images/cursor/modifier/selection.svg (revision 16006) +++ trunk/resources/images/cursor/modifier/selection.svg (revision 16006) @@ -0,0 +1,7 @@ + + + + + + + Index: trunk/resources/images/cursor/normal.svg =================================================================== --- trunk/resources/images/cursor/normal.svg (revision 16006) +++ trunk/resources/images/cursor/normal.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/data/changeset.svg =================================================================== --- trunk/resources/images/data/changeset.svg (revision 16006) +++ trunk/resources/images/data/changeset.svg (revision 16006) @@ -0,0 +1,90 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/data/closedway.svg =================================================================== --- trunk/resources/images/data/closedway.svg (revision 16006) +++ trunk/resources/images/data/closedway.svg (revision 16006) @@ -0,0 +1,8 @@ + + + + + Index: trunk/resources/images/data/imagery/historicmap.svg =================================================================== --- trunk/resources/images/data/imagery/historicmap.svg (revision 16006) +++ trunk/resources/images/data/imagery/historicmap.svg (revision 16006) @@ -0,0 +1,3 @@ + + + Index: trunk/resources/images/data/imagery/historicphoto.svg =================================================================== --- trunk/resources/images/data/imagery/historicphoto.svg (revision 16006) +++ trunk/resources/images/data/imagery/historicphoto.svg (revision 16006) @@ -0,0 +1,3 @@ + + + Index: trunk/resources/images/data/imagery/map.svg =================================================================== --- trunk/resources/images/data/imagery/map.svg (revision 16006) +++ trunk/resources/images/data/imagery/map.svg (revision 16006) @@ -0,0 +1,8 @@ + + + + + + + + Index: trunk/resources/images/data/imagery/osmbasedmap.svg =================================================================== --- trunk/resources/images/data/imagery/osmbasedmap.svg (revision 16006) +++ trunk/resources/images/data/imagery/osmbasedmap.svg (revision 16006) @@ -0,0 +1,252 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 01011001 + 00110101 + 10010011 + + + + 01011001 + 00110101 + 10010011 + + + + Index: trunk/resources/images/data/imagery/other.svg =================================================================== --- trunk/resources/images/data/imagery/other.svg (revision 16006) +++ trunk/resources/images/data/imagery/other.svg (revision 16006) @@ -0,0 +1,1 @@ + Index: trunk/resources/images/data/imagery/photo.svg =================================================================== --- trunk/resources/images/data/imagery/photo.svg (revision 16006) +++ trunk/resources/images/data/imagery/photo.svg (revision 16006) @@ -0,0 +1,3 @@ + + + Index: trunk/resources/images/data/multipolygon.svg =================================================================== --- trunk/resources/images/data/multipolygon.svg (revision 16006) +++ trunk/resources/images/data/multipolygon.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + + + + + + + + Index: trunk/resources/images/data/node.svg =================================================================== --- trunk/resources/images/data/node.svg (revision 16006) +++ trunk/resources/images/data/node.svg (revision 16006) @@ -0,0 +1,5 @@ + + + + + Index: trunk/resources/images/data/projection/Departements_Lambert4Zones.svg =================================================================== --- trunk/resources/images/data/projection/Departements_Lambert4Zones.svg (revision 16006) +++ trunk/resources/images/data/projection/Departements_Lambert4Zones.svg (revision 16006) @@ -0,0 +1,513 @@ + + + + France divisée en 4 Zones de Lambert + + + + + + image/svg+xml + + + France divisée en 4 Zones de Lambert + 2010-01-08 + + + Kevin (tsaitgaist) REDON + + + + + based on https://secure.wikimedia.org/wikipedia/commons/wiki/File:D%C3%A9partements_de_France.svg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Mer Méditérranée + Golfe deGascogne + OcéanAtlantiqueNord + Manche + + + 2a + 2b + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 21 + 22 + 23 + 24 + 25 + 26 + 27 + 28 + 29 + 30 + 31 + 32 + 33 + 34 + 35 + 36 + 37 + 38 + 39 + 40 + 41 + 42 + 43 + 44 + 45 + 46 + 47 + 48 + 49 + 50 + 51 + 52 + 53 + 54 + 55 + 56 + 57 + 58 + 59 + 60 + 61 + 62 + 63 + 64 + 65 + 66 + 67 + 68 + 69 + 01 + 02 + 03 + 04 + 05 + 06 + 07 + 08 + 09 + 70 + 71 + 72 + 73 + 74 + 76 + 77 + 78 + 79 + 80 + 81 + 82 + 83 + 84 + 85 + 86 + 87 + 88 + 89 + 90 + 91 + 95 + + + + + + + + + + + + + + + + Lambert INord + Lambert IICentre + Lambert IIISud + Lambert IVCorse + 48.15° + 44.45° + 42.76° + + Index: trunk/resources/images/data/projection/LambertCC9Zones.svg =================================================================== --- trunk/resources/images/data/projection/LambertCC9Zones.svg (revision 16006) +++ trunk/resources/images/data/projection/LambertCC9Zones.svg (revision 16006) @@ -0,0 +1,498 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Mer Méditérranée + Golfe deGascogne + OcéanAtlantiqueNord + Manche + + + 2a + 2b + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 21 + 22 + 23 + 24 + 25 + 26 + 27 + 28 + 29 + 30 + 31 + 32 + 33 + 34 + 35 + 36 + 37 + 38 + 39 + 40 + 41 + 42 + 43 + 44 + 45 + 46 + 47 + 48 + 49 + 50 + 51 + 52 + 53 + 54 + 55 + 56 + 57 + 58 + 59 + 60 + 61 + 62 + 63 + 64 + 65 + 66 + 67 + 68 + 69 + 01 + 02 + 03 + 04 + 05 + 06 + 07 + 08 + 09 + 70 + 71 + 72 + 73 + 74 + 76 + 77 + 78 + 79 + 80 + 81 + 82 + 83 + 84 + 85 + 86 + 87 + 88 + 89 + 90 + 91 + 95 + + + zone 9(CC50) + zone 7(CC48) + zone 8(CC49) + zone 6(CC47) + zone 5(CC46) + zone 4(CC45) + zone 3(CC44) + zone 2(CC43) + zone 1(CC42) + + Index: trunk/resources/images/data/sequence.svg =================================================================== --- trunk/resources/images/data/sequence.svg (revision 16006) +++ trunk/resources/images/data/sequence.svg (revision 16006) @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/data/way.svg =================================================================== --- trunk/resources/images/data/way.svg (revision 16006) +++ trunk/resources/images/data/way.svg (revision 16006) @@ -0,0 +1,7 @@ + + + + + Index: trunk/resources/images/dialogs/about/facebook.svg =================================================================== --- trunk/resources/images/dialogs/about/facebook.svg (revision 16006) +++ trunk/resources/images/dialogs/about/facebook.svg (revision 16006) @@ -0,0 +1,1 @@ + Index: trunk/resources/images/dialogs/about/github.svg =================================================================== --- trunk/resources/images/dialogs/about/github.svg (revision 16006) +++ trunk/resources/images/dialogs/about/github.svg (revision 16006) @@ -0,0 +1,1 @@ + Index: trunk/resources/images/dialogs/about/openstreetmap.svg =================================================================== --- trunk/resources/images/dialogs/about/openstreetmap.svg (revision 16006) +++ trunk/resources/images/dialogs/about/openstreetmap.svg (revision 16006) @@ -0,0 +1,9 @@ + + + + + + Index: trunk/resources/images/dialogs/about/twitter.svg =================================================================== --- trunk/resources/images/dialogs/about/twitter.svg (revision 16006) +++ trunk/resources/images/dialogs/about/twitter.svg (revision 16006) @@ -0,0 +1,1 @@ + Index: trunk/resources/images/dialogs/activate.svg =================================================================== --- trunk/resources/images/dialogs/activate.svg (revision 16006) +++ trunk/resources/images/dialogs/activate.svg (revision 16006) @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/bookmark-new.svg =================================================================== --- trunk/resources/images/dialogs/bookmark-new.svg (revision 16006) +++ trunk/resources/images/dialogs/bookmark-new.svg (revision 16006) @@ -0,0 +1,496 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + New Bookmark + + + text + plaintext + regular + document + + + + + + Andreas Nilsson + + + http://www.gnome.org + + + Luca Ferretti +Jakub Steiner +Lapo Calamandrei + + + December 2006 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/bookmark.svg =================================================================== --- trunk/resources/images/dialogs/bookmark.svg (revision 16006) +++ trunk/resources/images/dialogs/bookmark.svg (revision 16006) @@ -0,0 +1,553 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + New Bookmark + + + text + plaintext + regular + document + + + + + + Andreas Nilsson + + + http://www.gnome.org + + + Luca Ferretti +Jakub Steiner +Lapo Calamandrei + + + December 2006 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/changeset/changesetmanager.svg =================================================================== --- trunk/resources/images/dialogs/changeset/changesetmanager.svg (revision 16006) +++ trunk/resources/images/dialogs/changeset/changesetmanager.svg (revision 16006) @@ -0,0 +1,416 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + + + window + create + new + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/changeset/downloadchangeset.svg =================================================================== --- trunk/resources/images/dialogs/changeset/downloadchangeset.svg (revision 16006) +++ trunk/resources/images/dialogs/changeset/downloadchangeset.svg (revision 16006) @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/changeset/downloadchangesetcontent.svg =================================================================== --- trunk/resources/images/dialogs/changeset/downloadchangesetcontent.svg (revision 16006) +++ trunk/resources/images/dialogs/changeset/downloadchangesetcontent.svg (revision 16006) @@ -0,0 +1,308 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/changeset/updatechangeset.svg =================================================================== --- trunk/resources/images/dialogs/changeset/updatechangeset.svg (revision 16006) +++ trunk/resources/images/dialogs/changeset/updatechangeset.svg (revision 16006) @@ -0,0 +1,344 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/changeset/updatechangesetcontent.svg =================================================================== --- trunk/resources/images/dialogs/changeset/updatechangesetcontent.svg (revision 16006) +++ trunk/resources/images/dialogs/changeset/updatechangesetcontent.svg (revision 16006) @@ -0,0 +1,372 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/changesetdialog.svg =================================================================== --- trunk/resources/images/dialogs/changesetdialog.svg (revision 16006) +++ trunk/resources/images/dialogs/changesetdialog.svg (revision 16006) @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/collapse.svg =================================================================== --- trunk/resources/images/dialogs/collapse.svg (revision 16006) +++ trunk/resources/images/dialogs/collapse.svg (revision 16006) @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/dialogs/conflict/copyaftercurrentleft.svg =================================================================== --- trunk/resources/images/dialogs/conflict/copyaftercurrentleft.svg (revision 16006) +++ trunk/resources/images/dialogs/conflict/copyaftercurrentleft.svg (revision 16006) @@ -0,0 +1,109 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/conflict/copyaftercurrentright.svg =================================================================== --- trunk/resources/images/dialogs/conflict/copyaftercurrentright.svg (revision 16006) +++ trunk/resources/images/dialogs/conflict/copyaftercurrentright.svg (revision 16006) @@ -0,0 +1,109 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/conflict/copybeforecurrentleft.svg =================================================================== --- trunk/resources/images/dialogs/conflict/copybeforecurrentleft.svg (revision 16006) +++ trunk/resources/images/dialogs/conflict/copybeforecurrentleft.svg (revision 16006) @@ -0,0 +1,109 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/conflict/copybeforecurrentright.svg =================================================================== --- trunk/resources/images/dialogs/conflict/copybeforecurrentright.svg (revision 16006) +++ trunk/resources/images/dialogs/conflict/copybeforecurrentright.svg (revision 16006) @@ -0,0 +1,109 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/conflict/copyendleft.svg =================================================================== --- trunk/resources/images/dialogs/conflict/copyendleft.svg (revision 16006) +++ trunk/resources/images/dialogs/conflict/copyendleft.svg (revision 16006) @@ -0,0 +1,113 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/conflict/copyendright.svg =================================================================== --- trunk/resources/images/dialogs/conflict/copyendright.svg (revision 16006) +++ trunk/resources/images/dialogs/conflict/copyendright.svg (revision 16006) @@ -0,0 +1,113 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/conflict/copystartleft.svg =================================================================== --- trunk/resources/images/dialogs/conflict/copystartleft.svg (revision 16006) +++ trunk/resources/images/dialogs/conflict/copystartleft.svg (revision 16006) @@ -0,0 +1,113 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/conflict/copystartright.svg =================================================================== --- trunk/resources/images/dialogs/conflict/copystartright.svg (revision 16006) +++ trunk/resources/images/dialogs/conflict/copystartright.svg (revision 16006) @@ -0,0 +1,113 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/conflict/mergeincomplete.svg =================================================================== --- trunk/resources/images/dialogs/conflict/mergeincomplete.svg (revision 16006) +++ trunk/resources/images/dialogs/conflict/mergeincomplete.svg (revision 16006) @@ -0,0 +1,72 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + Index: trunk/resources/images/dialogs/conflict/movedown.svg =================================================================== --- trunk/resources/images/dialogs/conflict/movedown.svg (revision 16006) +++ trunk/resources/images/dialogs/conflict/movedown.svg (revision 16006) @@ -0,0 +1,102 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/conflict/moveup.svg =================================================================== --- trunk/resources/images/dialogs/conflict/moveup.svg (revision 16006) +++ trunk/resources/images/dialogs/conflict/moveup.svg (revision 16006) @@ -0,0 +1,102 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/conflict/remove.svg =================================================================== --- trunk/resources/images/dialogs/conflict/remove.svg (revision 16006) +++ trunk/resources/images/dialogs/conflict/remove.svg (revision 16006) @@ -0,0 +1,102 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/conflict/tagconflictresolved.svg =================================================================== --- trunk/resources/images/dialogs/conflict/tagconflictresolved.svg (revision 16006) +++ trunk/resources/images/dialogs/conflict/tagconflictresolved.svg (revision 16006) @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + Index: trunk/resources/images/dialogs/conflict/tagconflictunresolved.svg =================================================================== --- trunk/resources/images/dialogs/conflict/tagconflictunresolved.svg (revision 16006) +++ trunk/resources/images/dialogs/conflict/tagconflictunresolved.svg (revision 16006) @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + Index: trunk/resources/images/dialogs/conflict/tagkeepmine.svg =================================================================== --- trunk/resources/images/dialogs/conflict/tagkeepmine.svg (revision 16006) +++ trunk/resources/images/dialogs/conflict/tagkeepmine.svg (revision 16006) @@ -0,0 +1,76 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/dialogs/conflict/tagkeeptheir.svg =================================================================== --- trunk/resources/images/dialogs/conflict/tagkeeptheir.svg (revision 16006) +++ trunk/resources/images/dialogs/conflict/tagkeeptheir.svg (revision 16006) @@ -0,0 +1,76 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/dialogs/conflict/tagundecide.svg =================================================================== --- trunk/resources/images/dialogs/conflict/tagundecide.svg (revision 16006) +++ trunk/resources/images/dialogs/conflict/tagundecide.svg (revision 16006) @@ -0,0 +1,86 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/dialogs/delete.svg =================================================================== --- trunk/resources/images/dialogs/delete.svg (revision 16006) +++ trunk/resources/images/dialogs/delete.svg (revision 16006) @@ -0,0 +1,708 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + 2006-04-19 + + + + delete + remove + trashbin + trashcan + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/down.svg =================================================================== --- trunk/resources/images/dialogs/down.svg (revision 16006) +++ trunk/resources/images/dialogs/down.svg (revision 16006) @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Go down + August 2006 + + + Andreas Nilsson + + + + + Jakub Steiner + + + http://www.gnome.org + + + down + arrow + go + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/first.svg =================================================================== --- trunk/resources/images/dialogs/first.svg (revision 16006) +++ trunk/resources/images/dialogs/first.svg (revision 16006) @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Go first + August 2006 + + + Andreas Nilsson + + + + + Jakub Steiner + + + http://www.gnome.org + + + first + arrow + go + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/geoimage.svg =================================================================== --- trunk/resources/images/dialogs/geoimage.svg (revision 16006) +++ trunk/resources/images/dialogs/geoimage.svg (revision 16006) @@ -0,0 +1,681 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + Photo Camera + + + camera + photo + SLR + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/last.svg =================================================================== --- trunk/resources/images/dialogs/last.svg (revision 16006) +++ trunk/resources/images/dialogs/last.svg (revision 16006) @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Go last + August 2006 + + + Andreas Nilsson + + + + + Jakub Steiner + + + http://www.gnome.org + + + last + arrow + go + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/layerlist/scale.svg =================================================================== --- trunk/resources/images/dialogs/layerlist/scale.svg (revision 16006) +++ trunk/resources/images/dialogs/layerlist/scale.svg (revision 16006) @@ -0,0 +1,18 @@ + + + + + + image/svg+xml + + + + + + + + + + + + Index: trunk/resources/images/dialogs/mappaint/wireframe_small.svg =================================================================== --- trunk/resources/images/dialogs/mappaint/wireframe_small.svg (revision 16006) +++ trunk/resources/images/dialogs/mappaint/wireframe_small.svg (revision 16006) @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/mapstyle.svg =================================================================== --- trunk/resources/images/dialogs/mapstyle.svg (revision 16006) +++ trunk/resources/images/dialogs/mapstyle.svg (revision 16006) @@ -0,0 +1,333 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/next.svg =================================================================== --- trunk/resources/images/dialogs/next.svg (revision 16006) +++ trunk/resources/images/dialogs/next.svg (revision 16006) @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/previous.svg =================================================================== --- trunk/resources/images/dialogs/previous.svg (revision 16006) +++ trunk/resources/images/dialogs/previous.svg (revision 16006) @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + Go previous + August 2006 + + + Andreas Nilsson + + + + + Jakub Steiner + + + http://www.gnome.org + + + previous + arrow + go + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/propertiesdialog.svg =================================================================== --- trunk/resources/images/dialogs/propertiesdialog.svg (revision 16006) +++ trunk/resources/images/dialogs/propertiesdialog.svg (revision 16006) @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + 2008-05-12 + + + Jean-Victor Balin + + + fr-FR + + + icon + note + ticket + + + jean.victor.balin@gmail.com + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/relation/deletemembers.svg =================================================================== --- trunk/resources/images/dialogs/relation/deletemembers.svg (revision 16006) +++ trunk/resources/images/dialogs/relation/deletemembers.svg (revision 16006) @@ -0,0 +1,113 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/relation/selectmembers.svg =================================================================== --- trunk/resources/images/dialogs/relation/selectmembers.svg (revision 16006) +++ trunk/resources/images/dialogs/relation/selectmembers.svg (revision 16006) @@ -0,0 +1,125 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/relation/selectprimitives.svg =================================================================== --- trunk/resources/images/dialogs/relation/selectprimitives.svg (revision 16006) +++ trunk/resources/images/dialogs/relation/selectprimitives.svg (revision 16006) @@ -0,0 +1,125 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/taginfo.svg =================================================================== --- trunk/resources/images/dialogs/taginfo.svg (revision 16006) +++ trunk/resources/images/dialogs/taginfo.svg (revision 16006) @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + Index: trunk/resources/images/dialogs/up.svg =================================================================== --- trunk/resources/images/dialogs/up.svg (revision 16006) +++ trunk/resources/images/dialogs/up.svg (revision 16006) @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Go up + August 2006 + + + Andreas Nilsson + + + + + Jakub Steiner + + + http://www.gnome.org + + + up + arrow + go + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/download_along_way.svg =================================================================== --- trunk/resources/images/download_along_way.svg (revision 16006) +++ trunk/resources/images/download_along_way.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/downloadalongtrack.svg =================================================================== --- trunk/resources/images/downloadalongtrack.svg (revision 16006) +++ trunk/resources/images/downloadalongtrack.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/exit.svg =================================================================== --- trunk/resources/images/exit.svg (revision 16006) +++ trunk/resources/images/exit.svg (revision 16006) @@ -0,0 +1,367 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/followline.svg =================================================================== --- trunk/resources/images/followline.svg (revision 16006) +++ trunk/resources/images/followline.svg (revision 16006) @@ -0,0 +1,10 @@ + + + + + + + Index: trunk/resources/images/help.svg =================================================================== --- trunk/resources/images/help.svg (revision 16006) +++ trunk/resources/images/help.svg (revision 16006) @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/help/home.svg =================================================================== --- trunk/resources/images/help/home.svg (revision 16006) +++ trunk/resources/images/help/home.svg (revision 16006) @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Go Home + + + go + seek + home + + + + + Rodney Dawes + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/joinareas.svg =================================================================== --- trunk/resources/images/joinareas.svg (revision 16006) +++ trunk/resources/images/joinareas.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + + + + + Index: trunk/resources/images/joinnodeway.svg =================================================================== --- trunk/resources/images/joinnodeway.svg (revision 16006) +++ trunk/resources/images/joinnodeway.svg (revision 16006) @@ -0,0 +1,5 @@ + + + + + Index: trunk/resources/images/lock.svg =================================================================== --- trunk/resources/images/lock.svg (revision 16006) +++ trunk/resources/images/lock.svg (revision 16006) @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/logo.svg =================================================================== --- trunk/resources/images/logo.svg (revision 16006) +++ trunk/resources/images/logo.svg (revision 16006) @@ -0,0 +1,208 @@ + + + JOSM Logotype 2019 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + JOSM Logotype 2019 + 2019-08-05 + + + Diamond00744 + + + + + Public Domain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/mapmode/addnote.svg =================================================================== --- trunk/resources/images/mapmode/addnote.svg (revision 16006) +++ trunk/resources/images/mapmode/addnote.svg (revision 16006) @@ -0,0 +1,10 @@ + + + + + + + + + + Index: trunk/resources/images/mapmode/addsegment.svg =================================================================== --- trunk/resources/images/mapmode/addsegment.svg (revision 16006) +++ trunk/resources/images/mapmode/addsegment.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/mapmode/parallel.svg =================================================================== --- trunk/resources/images/mapmode/parallel.svg (revision 16006) +++ trunk/resources/images/mapmode/parallel.svg (revision 16006) @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/markers/Bridge.svg =================================================================== --- trunk/resources/images/markers/Bridge.svg (revision 16006) +++ trunk/resources/images/markers/Bridge.svg (revision 16006) @@ -0,0 +1,3 @@ + + + Index: trunk/resources/images/markers/Crossing.svg =================================================================== --- trunk/resources/images/markers/Crossing.svg (revision 16006) +++ trunk/resources/images/markers/Crossing.svg (revision 16006) @@ -0,0 +1,3 @@ + + + Index: trunk/resources/images/markers/audio-tracer.svg =================================================================== --- trunk/resources/images/markers/audio-tracer.svg (revision 16006) +++ trunk/resources/images/markers/audio-tracer.svg (revision 16006) @@ -0,0 +1,3 @@ + + + Index: trunk/resources/images/mergenodes.svg =================================================================== --- trunk/resources/images/mergenodes.svg (revision 16006) +++ trunk/resources/images/mergenodes.svg (revision 16006) @@ -0,0 +1,5 @@ + + + + + Index: trunk/resources/images/mirror.svg =================================================================== --- trunk/resources/images/mirror.svg (revision 16006) +++ trunk/resources/images/mirror.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + + + + + + + Index: trunk/resources/images/misc/black_x.svg =================================================================== --- trunk/resources/images/misc/black_x.svg (revision 16006) +++ trunk/resources/images/misc/black_x.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/misc/close.svg =================================================================== --- trunk/resources/images/misc/close.svg (revision 16006) +++ trunk/resources/images/misc/close.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/misc/error.svg =================================================================== --- trunk/resources/images/misc/error.svg (revision 16006) +++ trunk/resources/images/misc/error.svg (revision 16006) @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + 2005-10-16 + + + Andreas Nilsson + + + + + stop + halt + error + + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/misc/green_check.svg =================================================================== --- trunk/resources/images/misc/green_check.svg (revision 16006) +++ trunk/resources/images/misc/green_check.svg (revision 16006) @@ -0,0 +1,11 @@ + + + + + + + + + + + Index: trunk/resources/images/misc/grey_x.svg =================================================================== --- trunk/resources/images/misc/grey_x.svg (revision 16006) +++ trunk/resources/images/misc/grey_x.svg (revision 16006) @@ -0,0 +1,10 @@ + + + + + + + + + + Index: trunk/resources/images/misc/minimized.svg =================================================================== --- trunk/resources/images/misc/minimized.svg (revision 16006) +++ trunk/resources/images/misc/minimized.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/misc/normal.svg =================================================================== --- trunk/resources/images/misc/normal.svg (revision 16006) +++ trunk/resources/images/misc/normal.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/misc/rectangle.svg =================================================================== --- trunk/resources/images/misc/rectangle.svg (revision 16006) +++ trunk/resources/images/misc/rectangle.svg (revision 16006) @@ -0,0 +1,7 @@ + + + + + + + Index: trunk/resources/images/multipoly_create.svg =================================================================== --- trunk/resources/images/multipoly_create.svg (revision 16006) +++ trunk/resources/images/multipoly_create.svg (revision 16006) @@ -0,0 +1,12 @@ + + + + + Index: trunk/resources/images/new.svg =================================================================== --- trunk/resources/images/new.svg (revision 16006) +++ trunk/resources/images/new.svg (revision 16006) @@ -0,0 +1,366 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + New Document + + + text + plaintext + regular + document + + + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + Luca Ferretti + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/no_upload.svg =================================================================== --- trunk/resources/images/no_upload.svg (revision 16006) +++ trunk/resources/images/no_upload.svg (revision 16006) @@ -0,0 +1,39 @@ + + + + + + + + + Index: trunk/resources/images/oauth/oauth-logo.svg =================================================================== --- trunk/resources/images/oauth/oauth-logo.svg (revision 16006) +++ trunk/resources/images/oauth/oauth-logo.svg (revision 16006) @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/oauth/oauth-small.svg =================================================================== --- trunk/resources/images/oauth/oauth-small.svg (revision 16006) +++ trunk/resources/images/oauth/oauth-small.svg (revision 16006) @@ -0,0 +1,6 @@ + + + + + + Index: trunk/resources/images/ortho.svg =================================================================== --- trunk/resources/images/ortho.svg (revision 16006) +++ trunk/resources/images/ortho.svg (revision 16006) @@ -0,0 +1,11 @@ + + + + + + Index: trunk/resources/images/paste.svg =================================================================== --- trunk/resources/images/paste.svg (revision 16006) +++ trunk/resources/images/paste.svg (revision 16006) @@ -0,0 +1,390 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Paste + + + edit + paste + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/preferences/separator.svg =================================================================== --- trunk/resources/images/preferences/separator.svg (revision 16006) +++ trunk/resources/images/preferences/separator.svg (revision 16006) @@ -0,0 +1,5 @@ + + + + + Index: trunk/resources/images/presets/accommodation/alpine_hut.svg =================================================================== --- trunk/resources/images/presets/accommodation/alpine_hut.svg (revision 16006) +++ trunk/resources/images/presets/accommodation/alpine_hut.svg (revision 16006) @@ -0,0 +1,135 @@ + + + + + Map icon for baisc_hut + + + + image/svg+xml + + + Map icon for baisc_hut + 2012-04-05 + + + Rudolf + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/accommodation/apartment.svg =================================================================== --- trunk/resources/images/presets/accommodation/apartment.svg (revision 16006) +++ trunk/resources/images/presets/accommodation/apartment.svg (revision 16006) @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/accommodation/basic_hut.svg =================================================================== --- trunk/resources/images/presets/accommodation/basic_hut.svg (revision 16006) +++ trunk/resources/images/presets/accommodation/basic_hut.svg (revision 16006) @@ -0,0 +1,114 @@ + + + + + Map icon for baisc_hut + + + + image/svg+xml + + + Map icon for baisc_hut + 2012-04-05 + + + Rudolf + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/accommodation/camp_pitch.svg =================================================================== --- trunk/resources/images/presets/accommodation/camp_pitch.svg (revision 16006) +++ trunk/resources/images/presets/accommodation/camp_pitch.svg (revision 16006) @@ -0,0 +1,117 @@ + + + + + + + + + + + + image/svg+xml + + + + + Jörg Ostertag + + + + + + + + + + Jörg Ostertag + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/accommodation/camping.svg =================================================================== --- trunk/resources/images/presets/accommodation/camping.svg (revision 16006) +++ trunk/resources/images/presets/accommodation/camping.svg (revision 16006) @@ -0,0 +1,122 @@ + + + + + + + + + + + + image/svg+xml + + + + + Jörg Ostertag + + + + + + + + + + Jörg Ostertag + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/accommodation/caravan.svg =================================================================== --- trunk/resources/images/presets/accommodation/caravan.svg (revision 16006) +++ trunk/resources/images/presets/accommodation/caravan.svg (revision 16006) @@ -0,0 +1,114 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/accommodation/chalet.svg =================================================================== --- trunk/resources/images/presets/accommodation/chalet.svg (revision 16006) +++ trunk/resources/images/presets/accommodation/chalet.svg (revision 16006) @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/accommodation/guest_house.svg =================================================================== --- trunk/resources/images/presets/accommodation/guest_house.svg (revision 16006) +++ trunk/resources/images/presets/accommodation/guest_house.svg (revision 16006) @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/accommodation/hostel.svg =================================================================== --- trunk/resources/images/presets/accommodation/hostel.svg (revision 16006) +++ trunk/resources/images/presets/accommodation/hostel.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/accommodation/hotel.svg =================================================================== --- trunk/resources/images/presets/accommodation/hotel.svg (revision 16006) +++ trunk/resources/images/presets/accommodation/hotel.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/accommodation/motel.svg =================================================================== --- trunk/resources/images/presets/accommodation/motel.svg (revision 16006) +++ trunk/resources/images/presets/accommodation/motel.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/accommodation/shelter.svg =================================================================== --- trunk/resources/images/presets/accommodation/shelter.svg (revision 16006) +++ trunk/resources/images/presets/accommodation/shelter.svg (revision 16006) @@ -0,0 +1,277 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/accommodation/shelter_lean_to.svg =================================================================== --- trunk/resources/images/presets/accommodation/shelter_lean_to.svg (revision 16006) +++ trunk/resources/images/presets/accommodation/shelter_lean_to.svg (revision 16006) @@ -0,0 +1,141 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/accommodation/shelter_picnic.svg =================================================================== --- trunk/resources/images/presets/accommodation/shelter_picnic.svg (revision 16006) +++ trunk/resources/images/presets/accommodation/shelter_picnic.svg (revision 16006) @@ -0,0 +1,150 @@ + + + + + Map icon for shelter + + + + image/svg+xml + + + Map icon for shelter + + + Rudolf + + + 2012-04-05 + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/accommodation/shelter_public_transport.svg =================================================================== --- trunk/resources/images/presets/accommodation/shelter_public_transport.svg (revision 16006) +++ trunk/resources/images/presets/accommodation/shelter_public_transport.svg (revision 16006) @@ -0,0 +1,126 @@ + + + + + Map icon for shelter + + + + image/svg+xml + + + Map icon for shelter + + + Rudolf + + + 2012-04-05 + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/accommodation/water.svg =================================================================== --- trunk/resources/images/presets/accommodation/water.svg (revision 16006) +++ trunk/resources/images/presets/accommodation/water.svg (revision 16006) @@ -0,0 +1,116 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/accommodation/wilderness_hut.svg =================================================================== --- trunk/resources/images/presets/accommodation/wilderness_hut.svg (revision 16006) +++ trunk/resources/images/presets/accommodation/wilderness_hut.svg (revision 16006) @@ -0,0 +1,142 @@ + + + + + Map icon for baisc_hut + + + + image/svg+xml + + + Map icon for baisc_hut + 2012-04-05 + + + Rudolf + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/attraction/animal.svg =================================================================== --- trunk/resources/images/presets/attraction/animal.svg (revision 16006) +++ trunk/resources/images/presets/attraction/animal.svg (revision 16006) @@ -0,0 +1,57 @@ + + + +image/svg+xml Index: trunk/resources/images/presets/barrier/block.svg =================================================================== --- trunk/resources/images/presets/barrier/block.svg (revision 16006) +++ trunk/resources/images/presets/barrier/block.svg (revision 16006) @@ -0,0 +1,92 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/bollard.svg =================================================================== --- trunk/resources/images/presets/barrier/bollard.svg (revision 16006) +++ trunk/resources/images/presets/barrier/bollard.svg (revision 16006) @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/cable_barrier.svg =================================================================== --- trunk/resources/images/presets/barrier/cable_barrier.svg (revision 16006) +++ trunk/resources/images/presets/barrier/cable_barrier.svg (revision 16006) @@ -0,0 +1,104 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/cattle_grid.svg =================================================================== --- trunk/resources/images/presets/barrier/cattle_grid.svg (revision 16006) +++ trunk/resources/images/presets/barrier/cattle_grid.svg (revision 16006) @@ -0,0 +1,122 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/chain.svg =================================================================== --- trunk/resources/images/presets/barrier/chain.svg (revision 16006) +++ trunk/resources/images/presets/barrier/chain.svg (revision 16006) @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/city_wall.svg =================================================================== --- trunk/resources/images/presets/barrier/city_wall.svg (revision 16006) +++ trunk/resources/images/presets/barrier/city_wall.svg (revision 16006) @@ -0,0 +1,104 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/cycle_barrier.svg =================================================================== --- trunk/resources/images/presets/barrier/cycle_barrier.svg (revision 16006) +++ trunk/resources/images/presets/barrier/cycle_barrier.svg (revision 16006) @@ -0,0 +1,122 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/douane.svg =================================================================== --- trunk/resources/images/presets/barrier/douane.svg (revision 16006) +++ trunk/resources/images/presets/barrier/douane.svg (revision 16006) @@ -0,0 +1,77 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/entrance.svg =================================================================== --- trunk/resources/images/presets/barrier/entrance.svg (revision 16006) +++ trunk/resources/images/presets/barrier/entrance.svg (revision 16006) @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/fence.svg =================================================================== --- trunk/resources/images/presets/barrier/fence.svg (revision 16006) +++ trunk/resources/images/presets/barrier/fence.svg (revision 16006) @@ -0,0 +1,111 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/gate.svg =================================================================== --- trunk/resources/images/presets/barrier/gate.svg (revision 16006) +++ trunk/resources/images/presets/barrier/gate.svg (revision 16006) @@ -0,0 +1,156 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/guard_rail.svg =================================================================== --- trunk/resources/images/presets/barrier/guard_rail.svg (revision 16006) +++ trunk/resources/images/presets/barrier/guard_rail.svg (revision 16006) @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/handrail.svg =================================================================== --- trunk/resources/images/presets/barrier/handrail.svg (revision 16006) +++ trunk/resources/images/presets/barrier/handrail.svg (revision 16006) @@ -0,0 +1,102 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/hedge.svg =================================================================== --- trunk/resources/images/presets/barrier/hedge.svg (revision 16006) +++ trunk/resources/images/presets/barrier/hedge.svg (revision 16006) @@ -0,0 +1,86 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + Index: trunk/resources/images/presets/barrier/jersey_barrier.svg =================================================================== --- trunk/resources/images/presets/barrier/jersey_barrier.svg (revision 16006) +++ trunk/resources/images/presets/barrier/jersey_barrier.svg (revision 16006) @@ -0,0 +1,111 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/kerb.svg =================================================================== --- trunk/resources/images/presets/barrier/kerb.svg (revision 16006) +++ trunk/resources/images/presets/barrier/kerb.svg (revision 16006) @@ -0,0 +1,88 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/kerb_pattern.svg =================================================================== --- trunk/resources/images/presets/barrier/kerb_pattern.svg (revision 16006) +++ trunk/resources/images/presets/barrier/kerb_pattern.svg (revision 16006) @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/kissing_gate.svg =================================================================== --- trunk/resources/images/presets/barrier/kissing_gate.svg (revision 16006) +++ trunk/resources/images/presets/barrier/kissing_gate.svg (revision 16006) @@ -0,0 +1,189 @@ + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/lift_gate.svg =================================================================== --- trunk/resources/images/presets/barrier/lift_gate.svg (revision 16006) +++ trunk/resources/images/presets/barrier/lift_gate.svg (revision 16006) @@ -0,0 +1,193 @@ + + + + + + + + + + + + image/svg+xml + + + + + SlowRider + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/retaining_wall.svg =================================================================== --- trunk/resources/images/presets/barrier/retaining_wall.svg (revision 16006) +++ trunk/resources/images/presets/barrier/retaining_wall.svg (revision 16006) @@ -0,0 +1,80 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + Index: trunk/resources/images/presets/barrier/sally_port.svg =================================================================== --- trunk/resources/images/presets/barrier/sally_port.svg (revision 16006) +++ trunk/resources/images/presets/barrier/sally_port.svg (revision 16006) @@ -0,0 +1,94 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/spikes.svg =================================================================== --- trunk/resources/images/presets/barrier/spikes.svg (revision 16006) +++ trunk/resources/images/presets/barrier/spikes.svg (revision 16006) @@ -0,0 +1,100 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/stile.svg =================================================================== --- trunk/resources/images/presets/barrier/stile.svg (revision 16006) +++ trunk/resources/images/presets/barrier/stile.svg (revision 16006) @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/swing_gate.svg =================================================================== --- trunk/resources/images/presets/barrier/swing_gate.svg (revision 16006) +++ trunk/resources/images/presets/barrier/swing_gate.svg (revision 16006) @@ -0,0 +1,196 @@ + + + + + + + + + + + + image/svg+xml + + + + + SlowRider + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/toll_station.svg =================================================================== --- trunk/resources/images/presets/barrier/toll_station.svg (revision 16006) +++ trunk/resources/images/presets/barrier/toll_station.svg (revision 16006) @@ -0,0 +1,255 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/turnstile.svg =================================================================== --- trunk/resources/images/presets/barrier/turnstile.svg (revision 16006) +++ trunk/resources/images/presets/barrier/turnstile.svg (revision 16006) @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + Index: trunk/resources/images/presets/barrier/wall.svg =================================================================== --- trunk/resources/images/presets/barrier/wall.svg (revision 16006) +++ trunk/resources/images/presets/barrier/wall.svg (revision 16006) @@ -0,0 +1,235 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/craft/beekeeper.svg =================================================================== --- trunk/resources/images/presets/craft/beekeeper.svg (revision 16006) +++ trunk/resources/images/presets/craft/beekeeper.svg (revision 16006) @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2007-04-10T15:46:42 + A simple apiary of the old classical design. + https://openclipart.org/detail/3866/apiary-by-doctormo + + + doctormo + + + + + apiary + bee + beehive + comb + hive + honey + remix problem + + + + + + + + + + + Index: trunk/resources/images/presets/craft/blacksmith.svg =================================================================== --- trunk/resources/images/presets/craft/blacksmith.svg (revision 16006) +++ trunk/resources/images/presets/craft/blacksmith.svg (revision 16006) @@ -0,0 +1,133 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/craft/carpenter.svg =================================================================== --- trunk/resources/images/presets/craft/carpenter.svg (revision 16006) +++ trunk/resources/images/presets/craft/carpenter.svg (revision 16006) @@ -0,0 +1,138 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/craft/electrician.svg =================================================================== --- trunk/resources/images/presets/craft/electrician.svg (revision 16006) +++ trunk/resources/images/presets/craft/electrician.svg (revision 16006) @@ -0,0 +1,97 @@ + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2013-08-22T20:43:34 + eco pictogram/icon plug + https://openclipart.org/detail/182129/eco-green-energy-by-dominiquechappard-182129 + + + dominiquechappard + + + + + ecology + energy + green + + + + + + + + + + + Index: trunk/resources/images/presets/craft/gardener.svg =================================================================== --- trunk/resources/images/presets/craft/gardener.svg (revision 16006) +++ trunk/resources/images/presets/craft/gardener.svg (revision 16006) @@ -0,0 +1,133 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/craft/hvac.svg =================================================================== --- trunk/resources/images/presets/craft/hvac.svg (revision 16006) +++ trunk/resources/images/presets/craft/hvac.svg (revision 16006) @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/craft/key_cutter.svg =================================================================== --- trunk/resources/images/presets/craft/key_cutter.svg (revision 16006) +++ trunk/resources/images/presets/craft/key_cutter.svg (revision 16006) @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2010-08-11T11:31:06 + + https://openclipart.org/detail/79417/simple-gold-key-by-milovanderlinden + + + milovanderlinden + + + + + gold + key + line art + + + + + + + + + + + Index: trunk/resources/images/presets/craft/locksmith.svg =================================================================== --- trunk/resources/images/presets/craft/locksmith.svg (revision 16006) +++ trunk/resources/images/presets/craft/locksmith.svg (revision 16006) @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2010-08-11T11:31:06 + + https://openclipart.org/detail/79417/simple-gold-key-by-milovanderlinden + + + milovanderlinden + + + + + gold + key + line art + + + + + + + + + + + Index: trunk/resources/images/presets/craft/metal_construction.svg =================================================================== --- trunk/resources/images/presets/craft/metal_construction.svg (revision 16006) +++ trunk/resources/images/presets/craft/metal_construction.svg (revision 16006) @@ -0,0 +1,99 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/craft/painter.svg =================================================================== --- trunk/resources/images/presets/craft/painter.svg (revision 16006) +++ trunk/resources/images/presets/craft/painter.svg (revision 16006) @@ -0,0 +1,481 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2011-06-06T12:56:53 + + https://openclipart.org/detail/142777/paint-rollers-by-maxim2 + + + maxim2 + + + + + Paint Rollers + tool + + + + + + + + + + + Index: trunk/resources/images/presets/craft/plumber.svg =================================================================== --- trunk/resources/images/presets/craft/plumber.svg (revision 16006) +++ trunk/resources/images/presets/craft/plumber.svg (revision 16006) @@ -0,0 +1,230 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2010-01-05T16:49:58 + A cartoonish pipe entrance. + https://openclipart.org/detail/28804/a-green-cartoon-pipe-by-purzen + + + purzen + + + + + bros + cartoon + colour + game + mario + outline + silhouette + super + unchecked + warp + + + + + + + + + + + Index: trunk/resources/images/presets/craft/pottery.svg =================================================================== --- trunk/resources/images/presets/craft/pottery.svg (revision 16006) +++ trunk/resources/images/presets/craft/pottery.svg (revision 16006) @@ -0,0 +1,84 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/craft/roofer.svg =================================================================== --- trunk/resources/images/presets/craft/roofer.svg (revision 16006) +++ trunk/resources/images/presets/craft/roofer.svg (revision 16006) @@ -0,0 +1,91 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/craft/sawmill.svg =================================================================== --- trunk/resources/images/presets/craft/sawmill.svg (revision 16006) +++ trunk/resources/images/presets/craft/sawmill.svg (revision 16006) @@ -0,0 +1,415 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/craft/shoemaker.svg =================================================================== --- trunk/resources/images/presets/craft/shoemaker.svg (revision 16006) +++ trunk/resources/images/presets/craft/shoemaker.svg (revision 16006) @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + Index: trunk/resources/images/presets/craft/stonemason.svg =================================================================== --- trunk/resources/images/presets/craft/stonemason.svg (revision 16006) +++ trunk/resources/images/presets/craft/stonemason.svg (revision 16006) @@ -0,0 +1,106 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/craft/tiler.svg =================================================================== --- trunk/resources/images/presets/craft/tiler.svg (revision 16006) +++ trunk/resources/images/presets/craft/tiler.svg (revision 16006) @@ -0,0 +1,94 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/craft/upholsterer.svg =================================================================== --- trunk/resources/images/presets/craft/upholsterer.svg (revision 16006) +++ trunk/resources/images/presets/craft/upholsterer.svg (revision 16006) @@ -0,0 +1,66 @@ + + + + + + + +image/svg+xmlOpenclipart Index: trunk/resources/images/presets/craft/window_construction.svg =================================================================== --- trunk/resources/images/presets/craft/window_construction.svg (revision 16006) +++ trunk/resources/images/presets/craft/window_construction.svg (revision 16006) @@ -0,0 +1,135 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/education/college.svg =================================================================== --- trunk/resources/images/presets/education/college.svg (revision 16006) +++ trunk/resources/images/presets/education/college.svg (revision 16006) @@ -0,0 +1,152 @@ + + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/education/driving_school.svg =================================================================== --- trunk/resources/images/presets/education/driving_school.svg (revision 16006) +++ trunk/resources/images/presets/education/driving_school.svg (revision 16006) @@ -0,0 +1,176 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/education/kindergarten.svg =================================================================== --- trunk/resources/images/presets/education/kindergarten.svg (revision 16006) +++ trunk/resources/images/presets/education/kindergarten.svg (revision 16006) @@ -0,0 +1,100 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/education/library.svg =================================================================== --- trunk/resources/images/presets/education/library.svg (revision 16006) +++ trunk/resources/images/presets/education/library.svg (revision 16006) @@ -0,0 +1,108 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/education/school.svg =================================================================== --- trunk/resources/images/presets/education/school.svg (revision 16006) +++ trunk/resources/images/presets/education/school.svg (revision 16006) @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/education/university.svg =================================================================== --- trunk/resources/images/presets/education/university.svg (revision 16006) +++ trunk/resources/images/presets/education/university.svg (revision 16006) @@ -0,0 +1,150 @@ + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/emergency/aed.svg =================================================================== --- trunk/resources/images/presets/emergency/aed.svg (revision 16006) +++ trunk/resources/images/presets/emergency/aed.svg (revision 16006) @@ -0,0 +1,19 @@ + + + + + + + + + + + + + Index: trunk/resources/images/presets/emergency/ambulance_station.svg =================================================================== --- trunk/resources/images/presets/emergency/ambulance_station.svg (revision 16006) +++ trunk/resources/images/presets/emergency/ambulance_station.svg (revision 16006) @@ -0,0 +1,76 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + Index: trunk/resources/images/presets/emergency/assembly_point.svg =================================================================== --- trunk/resources/images/presets/emergency/assembly_point.svg (revision 16006) +++ trunk/resources/images/presets/emergency/assembly_point.svg (revision 16006) @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/emergency/emergency_ward_entrance.svg =================================================================== --- trunk/resources/images/presets/emergency/emergency_ward_entrance.svg (revision 16006) +++ trunk/resources/images/presets/emergency/emergency_ward_entrance.svg (revision 16006) @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/emergency/fire_extinguisher.svg =================================================================== --- trunk/resources/images/presets/emergency/fire_extinguisher.svg (revision 16006) +++ trunk/resources/images/presets/emergency/fire_extinguisher.svg (revision 16006) @@ -0,0 +1,11 @@ + + + + + + + + + Index: trunk/resources/images/presets/emergency/fire_hose.svg =================================================================== --- trunk/resources/images/presets/emergency/fire_hose.svg (revision 16006) +++ trunk/resources/images/presets/emergency/fire_hose.svg (revision 16006) @@ -0,0 +1,87 @@ + + + +image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/emergency/siren.svg =================================================================== --- trunk/resources/images/presets/emergency/siren.svg (revision 16006) +++ trunk/resources/images/presets/emergency/siren.svg (revision 16006) @@ -0,0 +1,67 @@ + + + +image/svg+xml + + + Index: trunk/resources/images/presets/emergency/water_tank.svg =================================================================== --- trunk/resources/images/presets/emergency/water_tank.svg (revision 16006) +++ trunk/resources/images/presets/emergency/water_tank.svg (revision 16006) @@ -0,0 +1,9 @@ + + + + + + + + Index: trunk/resources/images/presets/food/bar.svg =================================================================== --- trunk/resources/images/presets/food/bar.svg (revision 16006) +++ trunk/resources/images/presets/food/bar.svg (revision 16006) @@ -0,0 +1,101 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/food/biergarten.svg =================================================================== --- trunk/resources/images/presets/food/biergarten.svg (revision 16006) +++ trunk/resources/images/presets/food/biergarten.svg (revision 16006) @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/food/cafe.svg =================================================================== --- trunk/resources/images/presets/food/cafe.svg (revision 16006) +++ trunk/resources/images/presets/food/cafe.svg (revision 16006) @@ -0,0 +1,77 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + Index: trunk/resources/images/presets/food/diet.svg =================================================================== --- trunk/resources/images/presets/food/diet.svg (revision 16006) +++ trunk/resources/images/presets/food/diet.svg (revision 16006) @@ -0,0 +1,109 @@ + + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/food/drinking_water.svg =================================================================== --- trunk/resources/images/presets/food/drinking_water.svg (revision 16006) +++ trunk/resources/images/presets/food/drinking_water.svg (revision 16006) @@ -0,0 +1,75 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/food/fast_food.svg =================================================================== --- trunk/resources/images/presets/food/fast_food.svg (revision 16006) +++ trunk/resources/images/presets/food/fast_food.svg (revision 16006) @@ -0,0 +1,87 @@ + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + Index: trunk/resources/images/presets/food/food_court.svg =================================================================== --- trunk/resources/images/presets/food/food_court.svg (revision 16006) +++ trunk/resources/images/presets/food/food_court.svg (revision 16006) @@ -0,0 +1,69 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + Index: trunk/resources/images/presets/food/ice_cream.svg =================================================================== --- trunk/resources/images/presets/food/ice_cream.svg (revision 16006) +++ trunk/resources/images/presets/food/ice_cream.svg (revision 16006) @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/food/pub.svg =================================================================== --- trunk/resources/images/presets/food/pub.svg (revision 16006) +++ trunk/resources/images/presets/food/pub.svg (revision 16006) @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2010-07-17T14:58:12 + Beer,Drink,cool,drunk,water,bujung,thirsty + https://openclipart.org/detail/73591/beer-by-aungkarns + + + aungkarns + + + + + Beer + Drink + bujung + cool + drunk + thirsty + water + + + + + + + + + + + Index: trunk/resources/images/presets/food/restaurant.svg =================================================================== --- trunk/resources/images/presets/food/restaurant.svg (revision 16006) +++ trunk/resources/images/presets/food/restaurant.svg (revision 16006) @@ -0,0 +1,57 @@ + + + + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/health/baby_hatch.svg =================================================================== --- trunk/resources/images/presets/health/baby_hatch.svg (revision 16006) +++ trunk/resources/images/presets/health/baby_hatch.svg (revision 16006) @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/health/clinic.svg =================================================================== --- trunk/resources/images/presets/health/clinic.svg (revision 16006) +++ trunk/resources/images/presets/health/clinic.svg (revision 16006) @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/health/dentist.svg =================================================================== --- trunk/resources/images/presets/health/dentist.svg (revision 16006) +++ trunk/resources/images/presets/health/dentist.svg (revision 16006) @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/health/doctors.svg =================================================================== --- trunk/resources/images/presets/health/doctors.svg (revision 16006) +++ trunk/resources/images/presets/health/doctors.svg (revision 16006) @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/health/hospital.svg =================================================================== --- trunk/resources/images/presets/health/hospital.svg (revision 16006) +++ trunk/resources/images/presets/health/hospital.svg (revision 16006) @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/health/pharmacy.svg =================================================================== --- trunk/resources/images/presets/health/pharmacy.svg (revision 16006) +++ trunk/resources/images/presets/health/pharmacy.svg (revision 16006) @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/health/veterinary.svg =================================================================== --- trunk/resources/images/presets/health/veterinary.svg (revision 16006) +++ trunk/resources/images/presets/health/veterinary.svg (revision 16006) @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/adit.svg =================================================================== --- trunk/resources/images/presets/landmark/adit.svg (revision 16006) +++ trunk/resources/images/presets/landmark/adit.svg (revision 16006) @@ -0,0 +1,171 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/beacon.svg =================================================================== --- trunk/resources/images/presets/landmark/beacon.svg (revision 16006) +++ trunk/resources/images/presets/landmark/beacon.svg (revision 16006) @@ -0,0 +1,90 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/boundary_stone.svg =================================================================== --- trunk/resources/images/presets/landmark/boundary_stone.svg (revision 16006) +++ trunk/resources/images/presets/landmark/boundary_stone.svg (revision 16006) @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/building.svg =================================================================== --- trunk/resources/images/presets/landmark/building.svg (revision 16006) +++ trunk/resources/images/presets/landmark/building.svg (revision 16006) @@ -0,0 +1,95 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/bunker.svg =================================================================== --- trunk/resources/images/presets/landmark/bunker.svg (revision 16006) +++ trunk/resources/images/presets/landmark/bunker.svg (revision 16006) @@ -0,0 +1,111 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/bunker_silo.svg =================================================================== --- trunk/resources/images/presets/landmark/bunker_silo.svg (revision 16006) +++ trunk/resources/images/presets/landmark/bunker_silo.svg (revision 16006) @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/cave_entrance.svg =================================================================== --- trunk/resources/images/presets/landmark/cave_entrance.svg (revision 16006) +++ trunk/resources/images/presets/landmark/cave_entrance.svg (revision 16006) @@ -0,0 +1,97 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/chimney.svg =================================================================== --- trunk/resources/images/presets/landmark/chimney.svg (revision 16006) +++ trunk/resources/images/presets/landmark/chimney.svg (revision 16006) @@ -0,0 +1,173 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/crane.svg =================================================================== --- trunk/resources/images/presets/landmark/crane.svg (revision 16006) +++ trunk/resources/images/presets/landmark/crane.svg (revision 16006) @@ -0,0 +1,92 @@ + + + + + + + + image/svg+xml + + + + + Christian Koerner + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/cross.svg =================================================================== --- trunk/resources/images/presets/landmark/cross.svg (revision 16006) +++ trunk/resources/images/presets/landmark/cross.svg (revision 16006) @@ -0,0 +1,93 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/cutline.svg =================================================================== --- trunk/resources/images/presets/landmark/cutline.svg (revision 16006) +++ trunk/resources/images/presets/landmark/cutline.svg (revision 16006) @@ -0,0 +1,46 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + Index: trunk/resources/images/presets/landmark/forest.svg =================================================================== --- trunk/resources/images/presets/landmark/forest.svg (revision 16006) +++ trunk/resources/images/presets/landmark/forest.svg (revision 16006) @@ -0,0 +1,705 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2008-05-26T12:05:38 + + https://openclipart.org/detail/17043/plain_tree-by-jean_victor_balin + + + jean_victor_balin + + + + + forest + garden + plant + tree + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/gasometer.svg =================================================================== --- trunk/resources/images/presets/landmark/gasometer.svg (revision 16006) +++ trunk/resources/images/presets/landmark/gasometer.svg (revision 16006) @@ -0,0 +1,107 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/glacier.svg =================================================================== --- trunk/resources/images/presets/landmark/glacier.svg (revision 16006) +++ trunk/resources/images/presets/landmark/glacier.svg (revision 16006) @@ -0,0 +1,95 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/hunting_stand.svg =================================================================== --- trunk/resources/images/presets/landmark/hunting_stand.svg (revision 16006) +++ trunk/resources/images/presets/landmark/hunting_stand.svg (revision 16006) @@ -0,0 +1,88 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/lighthouse.svg =================================================================== --- trunk/resources/images/presets/landmark/lighthouse.svg (revision 16006) +++ trunk/resources/images/presets/landmark/lighthouse.svg (revision 16006) @@ -0,0 +1,126 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/mine.svg =================================================================== --- trunk/resources/images/presets/landmark/mine.svg (revision 16006) +++ trunk/resources/images/presets/landmark/mine.svg (revision 16006) @@ -0,0 +1,76 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/mountain_pass.svg =================================================================== --- trunk/resources/images/presets/landmark/mountain_pass.svg (revision 16006) +++ trunk/resources/images/presets/landmark/mountain_pass.svg (revision 16006) @@ -0,0 +1,236 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/peak.svg =================================================================== --- trunk/resources/images/presets/landmark/peak.svg (revision 16006) +++ trunk/resources/images/presets/landmark/peak.svg (revision 16006) @@ -0,0 +1,69 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/landmark/pipeline.svg =================================================================== --- trunk/resources/images/presets/landmark/pipeline.svg (revision 16006) +++ trunk/resources/images/presets/landmark/pipeline.svg (revision 16006) @@ -0,0 +1,93 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/reef.svg =================================================================== --- trunk/resources/images/presets/landmark/reef.svg (revision 16006) +++ trunk/resources/images/presets/landmark/reef.svg (revision 16006) @@ -0,0 +1,77 @@ + +image/svg+xmlOpenclipart2012-09-11T16:16:42https://openclipart.org/detail/172292/corals-by-presquesage-172292presquesagecoralscoraux Index: trunk/resources/images/presets/landmark/reservoir_covered.svg =================================================================== --- trunk/resources/images/presets/landmark/reservoir_covered.svg (revision 16006) +++ trunk/resources/images/presets/landmark/reservoir_covered.svg (revision 16006) @@ -0,0 +1,109 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/ridge.svg =================================================================== --- trunk/resources/images/presets/landmark/ridge.svg (revision 16006) +++ trunk/resources/images/presets/landmark/ridge.svg (revision 16006) @@ -0,0 +1,69 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/landmark/saddle.svg =================================================================== --- trunk/resources/images/presets/landmark/saddle.svg (revision 16006) +++ trunk/resources/images/presets/landmark/saddle.svg (revision 16006) @@ -0,0 +1,70 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/landmark/silo.svg =================================================================== --- trunk/resources/images/presets/landmark/silo.svg (revision 16006) +++ trunk/resources/images/presets/landmark/silo.svg (revision 16006) @@ -0,0 +1,107 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/spring.svg =================================================================== --- trunk/resources/images/presets/landmark/spring.svg (revision 16006) +++ trunk/resources/images/presets/landmark/spring.svg (revision 16006) @@ -0,0 +1,103 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/storage_tank.svg =================================================================== --- trunk/resources/images/presets/landmark/storage_tank.svg (revision 16006) +++ trunk/resources/images/presets/landmark/storage_tank.svg (revision 16006) @@ -0,0 +1,107 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/survey_point.svg =================================================================== --- trunk/resources/images/presets/landmark/survey_point.svg (revision 16006) +++ trunk/resources/images/presets/landmark/survey_point.svg (revision 16006) @@ -0,0 +1,141 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/tower.svg =================================================================== --- trunk/resources/images/presets/landmark/tower.svg (revision 16006) +++ trunk/resources/images/presets/landmark/tower.svg (revision 16006) @@ -0,0 +1,100 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/tree_row.svg =================================================================== --- trunk/resources/images/presets/landmark/tree_row.svg (revision 16006) +++ trunk/resources/images/presets/landmark/tree_row.svg (revision 16006) @@ -0,0 +1,381 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2008-05-26T12:05:38 + + https://openclipart.org/detail/17043/plain_tree-by-jean_victor_balin + + + jean_victor_balin + + + + + forest + garden + plant + tree + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/trees.svg =================================================================== --- trunk/resources/images/presets/landmark/trees.svg (revision 16006) +++ trunk/resources/images/presets/landmark/trees.svg (revision 16006) @@ -0,0 +1,177 @@ + + + + + + + tree - RPG map elements + + + + mapsym + + + + + Open Clip Art Library + + + + + Nicu Buculei + + + + + Nicu Buculei + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/trees_broad_leaved.svg =================================================================== --- trunk/resources/images/presets/landmark/trees_broad_leaved.svg (revision 16006) +++ trunk/resources/images/presets/landmark/trees_broad_leaved.svg (revision 16006) @@ -0,0 +1,148 @@ + + + + + + + + + + + + mapsym + + + + + Open Clip Art Library + + + + + Nicu Buculei + + + + + Nicu Buculei + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/trees_conifer.svg =================================================================== --- trunk/resources/images/presets/landmark/trees_conifer.svg (revision 16006) +++ trunk/resources/images/presets/landmark/trees_conifer.svg (revision 16006) @@ -0,0 +1,149 @@ + + + + + + + + + + + + mapsym + + + + + Open Clip Art Library + + + + + Nicu Buculei + + + + + Nicu Buculei + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/valley.svg =================================================================== --- trunk/resources/images/presets/landmark/valley.svg (revision 16006) +++ trunk/resources/images/presets/landmark/valley.svg (revision 16006) @@ -0,0 +1,70 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/landmark/volcano.svg =================================================================== --- trunk/resources/images/presets/landmark/volcano.svg (revision 16006) +++ trunk/resources/images/presets/landmark/volcano.svg (revision 16006) @@ -0,0 +1,95 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/wastewater_plant.svg =================================================================== --- trunk/resources/images/presets/landmark/wastewater_plant.svg (revision 16006) +++ trunk/resources/images/presets/landmark/wastewater_plant.svg (revision 16006) @@ -0,0 +1,178 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/water_tower.svg =================================================================== --- trunk/resources/images/presets/landmark/water_tower.svg (revision 16006) +++ trunk/resources/images/presets/landmark/water_tower.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/landmark/water_well.svg =================================================================== --- trunk/resources/images/presets/landmark/water_well.svg (revision 16006) +++ trunk/resources/images/presets/landmark/water_well.svg (revision 16006) @@ -0,0 +1,139 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/water_works.svg =================================================================== --- trunk/resources/images/presets/landmark/water_works.svg (revision 16006) +++ trunk/resources/images/presets/landmark/water_works.svg (revision 16006) @@ -0,0 +1,102 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/watermill.svg =================================================================== --- trunk/resources/images/presets/landmark/watermill.svg (revision 16006) +++ trunk/resources/images/presets/landmark/watermill.svg (revision 16006) @@ -0,0 +1,114 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/windmill.svg =================================================================== --- trunk/resources/images/presets/landmark/windmill.svg (revision 16006) +++ trunk/resources/images/presets/landmark/windmill.svg (revision 16006) @@ -0,0 +1,116 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landmark/works.svg =================================================================== --- trunk/resources/images/presets/landmark/works.svg (revision 16006) +++ trunk/resources/images/presets/landmark/works.svg (revision 16006) @@ -0,0 +1,84 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/allotments.svg =================================================================== --- trunk/resources/images/presets/landuse/allotments.svg (revision 16006) +++ trunk/resources/images/presets/landuse/allotments.svg (revision 16006) @@ -0,0 +1,426 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/aquaculture.svg =================================================================== --- trunk/resources/images/presets/landuse/aquaculture.svg (revision 16006) +++ trunk/resources/images/presets/landuse/aquaculture.svg (revision 16006) @@ -0,0 +1,108 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/basin.svg =================================================================== --- trunk/resources/images/presets/landuse/basin.svg (revision 16006) +++ trunk/resources/images/presets/landuse/basin.svg (revision 16006) @@ -0,0 +1,87 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/brownfield.svg =================================================================== --- trunk/resources/images/presets/landuse/brownfield.svg (revision 16006) +++ trunk/resources/images/presets/landuse/brownfield.svg (revision 16006) @@ -0,0 +1,108 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/cemetery.svg =================================================================== --- trunk/resources/images/presets/landuse/cemetery.svg (revision 16006) +++ trunk/resources/images/presets/landuse/cemetery.svg (revision 16006) @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + Ulf Lamping + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/commercial.svg =================================================================== --- trunk/resources/images/presets/landuse/commercial.svg (revision 16006) +++ trunk/resources/images/presets/landuse/commercial.svg (revision 16006) @@ -0,0 +1,86 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/construction.svg =================================================================== --- trunk/resources/images/presets/landuse/construction.svg (revision 16006) +++ trunk/resources/images/presets/landuse/construction.svg (revision 16006) @@ -0,0 +1,84 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/farmland.svg =================================================================== --- trunk/resources/images/presets/landuse/farmland.svg (revision 16006) +++ trunk/resources/images/presets/landuse/farmland.svg (revision 16006) @@ -0,0 +1,255 @@ + + + + + + Wheat + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + Wheat + 2011-06-11T04:11:17 + Black and white wheat icon + https://openclipart.org/detail/144535/wheat-black-and-white-by-serioustux + + + SeriousTux + + + + + b&w + black and white + grain + wheat + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/farmyard.svg =================================================================== --- trunk/resources/images/presets/landuse/farmyard.svg (revision 16006) +++ trunk/resources/images/presets/landuse/farmyard.svg (revision 16006) @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/flowerbed.svg =================================================================== --- trunk/resources/images/presets/landuse/flowerbed.svg (revision 16006) +++ trunk/resources/images/presets/landuse/flowerbed.svg (revision 16006) @@ -0,0 +1,30 @@ + + + + + + + + + Index: trunk/resources/images/presets/landuse/garages.svg =================================================================== --- trunk/resources/images/presets/landuse/garages.svg (revision 16006) +++ trunk/resources/images/presets/landuse/garages.svg (revision 16006) @@ -0,0 +1,106 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/graveyard.svg =================================================================== --- trunk/resources/images/presets/landuse/graveyard.svg (revision 16006) +++ trunk/resources/images/presets/landuse/graveyard.svg (revision 16006) @@ -0,0 +1,96 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/greenfield.svg =================================================================== --- trunk/resources/images/presets/landuse/greenfield.svg (revision 16006) +++ trunk/resources/images/presets/landuse/greenfield.svg (revision 16006) @@ -0,0 +1,108 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/greenhouse_horticulture.svg =================================================================== --- trunk/resources/images/presets/landuse/greenhouse_horticulture.svg (revision 16006) +++ trunk/resources/images/presets/landuse/greenhouse_horticulture.svg (revision 16006) @@ -0,0 +1,164 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/landfill.svg =================================================================== --- trunk/resources/images/presets/landuse/landfill.svg (revision 16006) +++ trunk/resources/images/presets/landuse/landfill.svg (revision 16006) @@ -0,0 +1,185 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/meadow.svg =================================================================== --- trunk/resources/images/presets/landuse/meadow.svg (revision 16006) +++ trunk/resources/images/presets/landuse/meadow.svg (revision 16006) @@ -0,0 +1,452 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2009-01-20T22:49:54 + + https://openclipart.org/detail/21212/grass-texture-by-rg1024-21212 + + + rg1024 + + + + + color + grass + green + nature + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/military.svg =================================================================== --- trunk/resources/images/presets/landuse/military.svg (revision 16006) +++ trunk/resources/images/presets/landuse/military.svg (revision 16006) @@ -0,0 +1,141 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/mud.svg =================================================================== --- trunk/resources/images/presets/landuse/mud.svg (revision 16006) +++ trunk/resources/images/presets/landuse/mud.svg (revision 16006) @@ -0,0 +1,196 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/orchard.svg =================================================================== --- trunk/resources/images/presets/landuse/orchard.svg (revision 16006) +++ trunk/resources/images/presets/landuse/orchard.svg (revision 16006) @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2009-05-26T15:57:28 + Simple tree with fruits (apple tree?) by jmrivera. From OCAL 0.18 release. + https://openclipart.org/detail/26259/tree-with-fruits-by-anonymous-26259 + + + Anonymous + + + + + apple + basic + cartoon + colour + fruit + green + nature + plant + red + simple + tree + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/plant_nursery.svg =================================================================== --- trunk/resources/images/presets/landuse/plant_nursery.svg (revision 16006) +++ trunk/resources/images/presets/landuse/plant_nursery.svg (revision 16006) @@ -0,0 +1,147 @@ + + + + + + + tree - RPG map elements + + + + mapsym + + + + + Open Clip Art Library + + + + + Nicu Buculei + + + + + Nicu Buculei + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/railway.svg =================================================================== --- trunk/resources/images/presets/landuse/railway.svg (revision 16006) +++ trunk/resources/images/presets/landuse/railway.svg (revision 16006) @@ -0,0 +1,43 @@ + + + + + + + image/svg+xml + + + + + Purodha Blissenbach + + + http://commons.mediawiki.org/wiki/Image:Zusatzzeichen_1024-15.svg + Symbol: Eisenbahnzug + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/reservoir.svg =================================================================== --- trunk/resources/images/presets/landuse/reservoir.svg (revision 16006) +++ trunk/resources/images/presets/landuse/reservoir.svg (revision 16006) @@ -0,0 +1,81 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/salt_pond.svg =================================================================== --- trunk/resources/images/presets/landuse/salt_pond.svg (revision 16006) +++ trunk/resources/images/presets/landuse/salt_pond.svg (revision 16006) @@ -0,0 +1,123 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/sand.svg =================================================================== --- trunk/resources/images/presets/landuse/sand.svg (revision 16006) +++ trunk/resources/images/presets/landuse/sand.svg (revision 16006) @@ -0,0 +1,446 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/scree.svg =================================================================== --- trunk/resources/images/presets/landuse/scree.svg (revision 16006) +++ trunk/resources/images/presets/landuse/scree.svg (revision 16006) @@ -0,0 +1,156 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/scrub.svg =================================================================== --- trunk/resources/images/presets/landuse/scrub.svg (revision 16006) +++ trunk/resources/images/presets/landuse/scrub.svg (revision 16006) @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2007-12-07T09:16:35 + Part of the fantasy RPG map elements collection: plant + https://openclipart.org/detail/9463/rpg-map-symbols:-plant-by-nicubunu + + + nicubunu + + + + + bush + cartography + fantasy + geography + land + map + plant + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/shingle.svg =================================================================== --- trunk/resources/images/presets/landuse/shingle.svg (revision 16006) +++ trunk/resources/images/presets/landuse/shingle.svg (revision 16006) @@ -0,0 +1,158 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/vineyard.svg =================================================================== --- trunk/resources/images/presets/landuse/vineyard.svg (revision 16006) +++ trunk/resources/images/presets/landuse/vineyard.svg (revision 16006) @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + Simple Fruit Grapes + 2007-11-15T00:18:12 + + https://openclipart.org/detail/8531/simple-fruit-grapes-by-gerald_g + + + Gerald_G + + + + + food + fruit + grape + + + + + + + + + + + Index: trunk/resources/images/presets/landuse/wetland.svg =================================================================== --- trunk/resources/images/presets/landuse/wetland.svg (revision 16006) +++ trunk/resources/images/presets/landuse/wetland.svg (revision 16006) @@ -0,0 +1,196 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/advertising_column.svg =================================================================== --- trunk/resources/images/presets/leisure/advertising_column.svg (revision 16006) +++ trunk/resources/images/presets/leisure/advertising_column.svg (revision 16006) @@ -0,0 +1,146 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/bandstand.svg =================================================================== --- trunk/resources/images/presets/leisure/bandstand.svg (revision 16006) +++ trunk/resources/images/presets/leisure/bandstand.svg (revision 16006) @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/bbq.svg =================================================================== --- trunk/resources/images/presets/leisure/bbq.svg (revision 16006) +++ trunk/resources/images/presets/leisure/bbq.svg (revision 16006) @@ -0,0 +1,132 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/beach_resort.svg =================================================================== --- trunk/resources/images/presets/leisure/beach_resort.svg (revision 16006) +++ trunk/resources/images/presets/leisure/beach_resort.svg (revision 16006) @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2010-08-29T20:47:21 + umbrella outline + https://openclipart.org/detail/82753/umbrella-by-mireille + + + mireille + + + + + art line + black and white + outline + umbrella + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/bench.svg =================================================================== --- trunk/resources/images/presets/leisure/bench.svg (revision 16006) +++ trunk/resources/images/presets/leisure/bench.svg (revision 16006) @@ -0,0 +1,127 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/billboard.svg =================================================================== --- trunk/resources/images/presets/leisure/billboard.svg (revision 16006) +++ trunk/resources/images/presets/leisure/billboard.svg (revision 16006) @@ -0,0 +1,274 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + JOSM + + Index: trunk/resources/images/presets/leisure/bird_hide.svg =================================================================== --- trunk/resources/images/presets/leisure/bird_hide.svg (revision 16006) +++ trunk/resources/images/presets/leisure/bird_hide.svg (revision 16006) @@ -0,0 +1,111 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/brothel.svg =================================================================== --- trunk/resources/images/presets/leisure/brothel.svg (revision 16006) +++ trunk/resources/images/presets/leisure/brothel.svg (revision 16006) @@ -0,0 +1,112 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/casino.svg =================================================================== --- trunk/resources/images/presets/leisure/casino.svg (revision 16006) +++ trunk/resources/images/presets/leisure/casino.svg (revision 16006) @@ -0,0 +1,75 @@ + + + + + + + + image/svg+xml + + Hotel has a casino + + + + + + + Hotel has a casino + + + + + Index: trunk/resources/images/presets/leisure/cinema.svg =================================================================== --- trunk/resources/images/presets/leisure/cinema.svg (revision 16006) +++ trunk/resources/images/presets/leisure/cinema.svg (revision 16006) @@ -0,0 +1,227 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/common.svg =================================================================== --- trunk/resources/images/presets/leisure/common.svg (revision 16006) +++ trunk/resources/images/presets/leisure/common.svg (revision 16006) @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/dive_centre.svg =================================================================== --- trunk/resources/images/presets/leisure/dive_centre.svg (revision 16006) +++ trunk/resources/images/presets/leisure/dive_centre.svg (revision 16006) @@ -0,0 +1,67 @@ + + + +image/svg+xml Index: trunk/resources/images/presets/leisure/dogpark.svg =================================================================== --- trunk/resources/images/presets/leisure/dogpark.svg (revision 16006) +++ trunk/resources/images/presets/leisure/dogpark.svg (revision 16006) @@ -0,0 +1,125 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/firepit.svg =================================================================== --- trunk/resources/images/presets/leisure/firepit.svg (revision 16006) +++ trunk/resources/images/presets/leisure/firepit.svg (revision 16006) @@ -0,0 +1,875 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2006-10-24T11:35:21 + This fire is of the commemorative parties of São João, June Holiday's. +\n +\nFogueira comemorativa das festas de São João. Festejos de Junho. +\n +\nProduced with Inkscape 0.44+Devel and the shadow is blur tool. + https://openclipart.org/detail/876/fire-june-holidays-by-valessiobrito + + + valessiobrito + + + + + camp + campfire + commemorative + evening + fire + flame + heat + holiday + light source + party + warm + wood + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/fitness_station.svg =================================================================== --- trunk/resources/images/presets/leisure/fitness_station.svg (revision 16006) +++ trunk/resources/images/presets/leisure/fitness_station.svg (revision 16006) @@ -0,0 +1,93 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/garden.svg =================================================================== --- trunk/resources/images/presets/leisure/garden.svg (revision 16006) +++ trunk/resources/images/presets/leisure/garden.svg (revision 16006) @@ -0,0 +1,143 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/hackerspace.svg =================================================================== --- trunk/resources/images/presets/leisure/hackerspace.svg (revision 16006) +++ trunk/resources/images/presets/leisure/hackerspace.svg (revision 16006) @@ -0,0 +1,102 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/horse_riding.svg =================================================================== --- trunk/resources/images/presets/leisure/horse_riding.svg (revision 16006) +++ trunk/resources/images/presets/leisure/horse_riding.svg (revision 16006) @@ -0,0 +1,76 @@ + + + +image/svg+xml + + + + + + + Index: trunk/resources/images/presets/leisure/nature_reserve.svg =================================================================== --- trunk/resources/images/presets/leisure/nature_reserve.svg (revision 16006) +++ trunk/resources/images/presets/leisure/nature_reserve.svg (revision 16006) @@ -0,0 +1,156 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/nightclub.svg =================================================================== --- trunk/resources/images/presets/leisure/nightclub.svg (revision 16006) +++ trunk/resources/images/presets/leisure/nightclub.svg (revision 16006) @@ -0,0 +1,220 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/outdoor_seating.svg =================================================================== --- trunk/resources/images/presets/leisure/outdoor_seating.svg (revision 16006) +++ trunk/resources/images/presets/leisure/outdoor_seating.svg (revision 16006) @@ -0,0 +1,6 @@ + + + + Index: trunk/resources/images/presets/leisure/park.svg =================================================================== --- trunk/resources/images/presets/leisure/park.svg (revision 16006) +++ trunk/resources/images/presets/leisure/park.svg (revision 16006) @@ -0,0 +1,167 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/picnic.svg =================================================================== --- trunk/resources/images/presets/leisure/picnic.svg (revision 16006) +++ trunk/resources/images/presets/leisure/picnic.svg (revision 16006) @@ -0,0 +1,82 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/playground.svg =================================================================== --- trunk/resources/images/presets/leisure/playground.svg (revision 16006) +++ trunk/resources/images/presets/leisure/playground.svg (revision 16006) @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/resort.svg =================================================================== --- trunk/resources/images/presets/leisure/resort.svg (revision 16006) +++ trunk/resources/images/presets/leisure/resort.svg (revision 16006) @@ -0,0 +1,528 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/sauna.svg =================================================================== --- trunk/resources/images/presets/leisure/sauna.svg (revision 16006) +++ trunk/resources/images/presets/leisure/sauna.svg (revision 16006) @@ -0,0 +1,137 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/stripclub.svg =================================================================== --- trunk/resources/images/presets/leisure/stripclub.svg (revision 16006) +++ trunk/resources/images/presets/leisure/stripclub.svg (revision 16006) @@ -0,0 +1,73 @@ + + + +image/svg+xml + + + + + + + + Index: trunk/resources/images/presets/leisure/theater.svg =================================================================== --- trunk/resources/images/presets/leisure/theater.svg (revision 16006) +++ trunk/resources/images/presets/leisure/theater.svg (revision 16006) @@ -0,0 +1,113 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/theme_park.svg =================================================================== --- trunk/resources/images/presets/leisure/theme_park.svg (revision 16006) +++ trunk/resources/images/presets/leisure/theme_park.svg (revision 16006) @@ -0,0 +1,335 @@ + + + + + + + + + + + + + festive + party + recreation + + + + + Jean-Victor Balin (balin_j@epita.fr) + + + + + Jean-Victor Balin (balin_j@epita.fr) + + + + + Jean-Victor Balin (balin_j@epita.fr) + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/water_park.svg =================================================================== --- trunk/resources/images/presets/leisure/water_park.svg (revision 16006) +++ trunk/resources/images/presets/leisure/water_park.svg (revision 16006) @@ -0,0 +1,111 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/leisure/zoo.svg =================================================================== --- trunk/resources/images/presets/leisure/zoo.svg (revision 16006) +++ trunk/resources/images/presets/leisure/zoo.svg (revision 16006) @@ -0,0 +1,105 @@ + + + + + + + + + + + + mammal + + animal + + + + + Nicu Buculei + + + + + Nicu Buculei + + + + + Nicu Buculei + + + + image/svg+xml + + + en + + + + + + + + + + + Index: trunk/resources/images/presets/misc/angles.svg =================================================================== --- trunk/resources/images/presets/misc/angles.svg (revision 16006) +++ trunk/resources/images/presets/misc/angles.svg (revision 16006) @@ -0,0 +1,48 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + 0, N + 45, NE + 90, E + 135, SE + 180, S + 225, SW + 270, W + 315, NW + 22, NNE + + 67, ENE + 112, ESE + 157, SSE + 202, SSW + 247, WSW + 292, WNW + 337, NNW + + Index: trunk/resources/images/presets/misc/boundaries.svg =================================================================== --- trunk/resources/images/presets/misc/boundaries.svg (revision 16006) +++ trunk/resources/images/presets/misc/boundaries.svg (revision 16006) @@ -0,0 +1,73 @@ + + + + + +image/svg+xmlOpenclipart2008-05-18T09:25:46https://openclipart.org/detail/16816/administrative-map-of-bulgaria-by-ivakivakbulgariamap Index: trunk/resources/images/presets/misc/cemetery_sector.svg =================================================================== --- trunk/resources/images/presets/misc/cemetery_sector.svg (revision 16006) +++ trunk/resources/images/presets/misc/cemetery_sector.svg (revision 16006) @@ -0,0 +1,180 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/cliff.svg =================================================================== --- trunk/resources/images/presets/misc/cliff.svg (revision 16006) +++ trunk/resources/images/presets/misc/cliff.svg (revision 16006) @@ -0,0 +1,106 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/cliff_pattern.svg =================================================================== --- trunk/resources/images/presets/misc/cliff_pattern.svg (revision 16006) +++ trunk/resources/images/presets/misc/cliff_pattern.svg (revision 16006) @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/construction.svg =================================================================== --- trunk/resources/images/presets/misc/construction.svg (revision 16006) +++ trunk/resources/images/presets/misc/construction.svg (revision 16006) @@ -0,0 +1,66 @@ + + + + + + + advertising + + + + + caution + security + warning + signs_and_symbols + sign + + + + + yves GUILLOU + + + + + yves GUILLOU + + + + + yves GUILLOU + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/contact.svg =================================================================== --- trunk/resources/images/presets/misc/contact.svg (revision 16006) +++ trunk/resources/images/presets/misc/contact.svg (revision 16006) @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + Cartoon Globe + 2006-12-26T00:00:00 + Colored globe. + https://openclipart.org/detail/3437/-by--3437 + + + lunanaut + + + + + color + earth + globe + planet + + + + + + + + + + + Index: trunk/resources/images/presets/misc/danger.svg =================================================================== --- trunk/resources/images/presets/misc/danger.svg (revision 16006) +++ trunk/resources/images/presets/misc/danger.svg (revision 16006) @@ -0,0 +1,65 @@ + + + + + + + advertising + + + + + caution + security + warning + signs_and_symbols + sign + + + + + yves GUILLOU + + + + + yves GUILLOU + + + + + yves GUILLOU + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/deprecated.svg =================================================================== --- trunk/resources/images/presets/misc/deprecated.svg (revision 16006) +++ trunk/resources/images/presets/misc/deprecated.svg (revision 16006) @@ -0,0 +1,113 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/description.svg =================================================================== --- trunk/resources/images/presets/misc/description.svg (revision 16006) +++ trunk/resources/images/presets/misc/description.svg (revision 16006) @@ -0,0 +1,102 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/dyke.svg =================================================================== --- trunk/resources/images/presets/misc/dyke.svg (revision 16006) +++ trunk/resources/images/presets/misc/dyke.svg (revision 16006) @@ -0,0 +1,83 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/embankment.svg =================================================================== --- trunk/resources/images/presets/misc/embankment.svg (revision 16006) +++ trunk/resources/images/presets/misc/embankment.svg (revision 16006) @@ -0,0 +1,245 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/entrance_emergency.svg =================================================================== --- trunk/resources/images/presets/misc/entrance_emergency.svg (revision 16006) +++ trunk/resources/images/presets/misc/entrance_emergency.svg (revision 16006) @@ -0,0 +1,101 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/entrance_exit.svg =================================================================== --- trunk/resources/images/presets/misc/entrance_exit.svg (revision 16006) +++ trunk/resources/images/presets/misc/entrance_exit.svg (revision 16006) @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/entrance_main.svg =================================================================== --- trunk/resources/images/presets/misc/entrance_main.svg (revision 16006) +++ trunk/resources/images/presets/misc/entrance_main.svg (revision 16006) @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/entrance_service.svg =================================================================== --- trunk/resources/images/presets/misc/entrance_service.svg (revision 16006) +++ trunk/resources/images/presets/misc/entrance_service.svg (revision 16006) @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/entrance_yes.svg =================================================================== --- trunk/resources/images/presets/misc/entrance_yes.svg (revision 16006) +++ trunk/resources/images/presets/misc/entrance_yes.svg (revision 16006) @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/fixme.svg =================================================================== --- trunk/resources/images/presets/misc/fixme.svg (revision 16006) +++ trunk/resources/images/presets/misc/fixme.svg (revision 16006) @@ -0,0 +1,115 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/fixme_annotation.svg =================================================================== --- trunk/resources/images/presets/misc/fixme_annotation.svg (revision 16006) +++ trunk/resources/images/presets/misc/fixme_annotation.svg (revision 16006) @@ -0,0 +1,115 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/flag.svg =================================================================== --- trunk/resources/images/presets/misc/flag.svg (revision 16006) +++ trunk/resources/images/presets/misc/flag.svg (revision 16006) @@ -0,0 +1,104 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/fountain.svg =================================================================== --- trunk/resources/images/presets/misc/fountain.svg (revision 16006) +++ trunk/resources/images/presets/misc/fountain.svg (revision 16006) @@ -0,0 +1,79 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/grave.svg =================================================================== --- trunk/resources/images/presets/misc/grave.svg (revision 16006) +++ trunk/resources/images/presets/misc/grave.svg (revision 16006) @@ -0,0 +1,100 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/grit_bin.svg =================================================================== --- trunk/resources/images/presets/misc/grit_bin.svg (revision 16006) +++ trunk/resources/images/presets/misc/grit_bin.svg (revision 16006) @@ -0,0 +1,248 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/housenumber.svg =================================================================== --- trunk/resources/images/presets/misc/housenumber.svg (revision 16006) +++ trunk/resources/images/presets/misc/housenumber.svg (revision 16006) @@ -0,0 +1,88 @@ + + + + + Pancarte + + + + + + + + + + + + + +image/svg+xmlOpenclipartPancarte Index: trunk/resources/images/presets/misc/housenumber_small.svg =================================================================== --- trunk/resources/images/presets/misc/housenumber_small.svg (revision 16006) +++ trunk/resources/images/presets/misc/housenumber_small.svg (revision 16006) @@ -0,0 +1,88 @@ + + + + + Pancarte + + + + + + + + + + + + + +image/svg+xmlOpenclipartPancarte Index: trunk/resources/images/presets/misc/information/board.svg =================================================================== --- trunk/resources/images/presets/misc/information/board.svg (revision 16006) +++ trunk/resources/images/presets/misc/information/board.svg (revision 16006) @@ -0,0 +1,124 @@ + + + +image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/presets/misc/information/guidepost.svg =================================================================== --- trunk/resources/images/presets/misc/information/guidepost.svg (revision 16006) +++ trunk/resources/images/presets/misc/information/guidepost.svg (revision 16006) @@ -0,0 +1,91 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/information/information.svg =================================================================== --- trunk/resources/images/presets/misc/information/information.svg (revision 16006) +++ trunk/resources/images/presets/misc/information/information.svg (revision 16006) @@ -0,0 +1,122 @@ + + + + + + + + information sign + + + + info + icon + information + sign + + + + + Open Clip Art Library + + + + + mo + + + + + mo + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/information/informationoffice.svg =================================================================== --- trunk/resources/images/presets/misc/information/informationoffice.svg (revision 16006) +++ trunk/resources/images/presets/misc/information/informationoffice.svg (revision 16006) @@ -0,0 +1,72 @@ + + + +image/svg+xml + + + + + + + + Index: trunk/resources/images/presets/misc/information/map.svg =================================================================== --- trunk/resources/images/presets/misc/information/map.svg (revision 16006) +++ trunk/resources/images/presets/misc/information/map.svg (revision 16006) @@ -0,0 +1,127 @@ + + + +image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/presets/misc/interpolation.svg =================================================================== --- trunk/resources/images/presets/misc/interpolation.svg (revision 16006) +++ trunk/resources/images/presets/misc/interpolation.svg (revision 16006) @@ -0,0 +1,92 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/kiln.svg =================================================================== --- trunk/resources/images/presets/misc/kiln.svg (revision 16006) +++ trunk/resources/images/presets/misc/kiln.svg (revision 16006) @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/manhole.svg =================================================================== --- trunk/resources/images/presets/misc/manhole.svg (revision 16006) +++ trunk/resources/images/presets/misc/manhole.svg (revision 16006) @@ -0,0 +1,104 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/monitoring_station.svg =================================================================== --- trunk/resources/images/presets/misc/monitoring_station.svg (revision 16006) +++ trunk/resources/images/presets/misc/monitoring_station.svg (revision 16006) @@ -0,0 +1,250 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/multipolygon.svg =================================================================== --- trunk/resources/images/presets/misc/multipolygon.svg (revision 16006) +++ trunk/resources/images/presets/misc/multipolygon.svg (revision 16006) @@ -0,0 +1,80 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/name.svg =================================================================== --- trunk/resources/images/presets/misc/name.svg (revision 16006) +++ trunk/resources/images/presets/misc/name.svg (revision 16006) @@ -0,0 +1,100 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/no_icon.svg =================================================================== --- trunk/resources/images/presets/misc/no_icon.svg (revision 16006) +++ trunk/resources/images/presets/misc/no_icon.svg (revision 16006) @@ -0,0 +1,91 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/note.svg =================================================================== --- trunk/resources/images/presets/misc/note.svg (revision 16006) +++ trunk/resources/images/presets/misc/note.svg (revision 16006) @@ -0,0 +1,117 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/note_annotation.svg =================================================================== --- trunk/resources/images/presets/misc/note_annotation.svg (revision 16006) +++ trunk/resources/images/presets/misc/note_annotation.svg (revision 16006) @@ -0,0 +1,113 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/note_fixme_annotation.svg =================================================================== --- trunk/resources/images/presets/misc/note_fixme_annotation.svg (revision 16006) +++ trunk/resources/images/presets/misc/note_fixme_annotation.svg (revision 16006) @@ -0,0 +1,155 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/pipeline_marker.svg =================================================================== --- trunk/resources/images/presets/misc/pipeline_marker.svg (revision 16006) +++ trunk/resources/images/presets/misc/pipeline_marker.svg (revision 16006) @@ -0,0 +1,176 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + GAS + A + 1,2 + 3,4 + + Index: trunk/resources/images/presets/misc/relations.svg =================================================================== --- trunk/resources/images/presets/misc/relations.svg (revision 16006) +++ trunk/resources/images/presets/misc/relations.svg (revision 16006) @@ -0,0 +1,91 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/rock.svg =================================================================== --- trunk/resources/images/presets/misc/rock.svg (revision 16006) +++ trunk/resources/images/presets/misc/rock.svg (revision 16006) @@ -0,0 +1,69 @@ + + + +image/svg+xml + + Index: trunk/resources/images/presets/misc/route.svg =================================================================== --- trunk/resources/images/presets/misc/route.svg (revision 16006) +++ trunk/resources/images/presets/misc/route.svg (revision 16006) @@ -0,0 +1,99 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/stone.svg =================================================================== --- trunk/resources/images/presets/misc/stone.svg (revision 16006) +++ trunk/resources/images/presets/misc/stone.svg (revision 16006) @@ -0,0 +1,64 @@ + + + +image/svg+xml + + Index: trunk/resources/images/presets/misc/street_cabinet.svg =================================================================== --- trunk/resources/images/presets/misc/street_cabinet.svg (revision 16006) +++ trunk/resources/images/presets/misc/street_cabinet.svg (revision 16006) @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/streetlamp.svg =================================================================== --- trunk/resources/images/presets/misc/streetlamp.svg (revision 16006) +++ trunk/resources/images/presets/misc/streetlamp.svg (revision 16006) @@ -0,0 +1,99 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/tomb.svg =================================================================== --- trunk/resources/images/presets/misc/tomb.svg (revision 16006) +++ trunk/resources/images/presets/misc/tomb.svg (revision 16006) @@ -0,0 +1,107 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/valve.svg =================================================================== --- trunk/resources/images/presets/misc/valve.svg (revision 16006) +++ trunk/resources/images/presets/misc/valve.svg (revision 16006) @@ -0,0 +1,57 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + Index: trunk/resources/images/presets/misc/watering_place.svg =================================================================== --- trunk/resources/images/presets/misc/watering_place.svg (revision 16006) +++ trunk/resources/images/presets/misc/watering_place.svg (revision 16006) @@ -0,0 +1,47 @@ + +image/svg+xml + + + Index: trunk/resources/images/presets/money/atm.svg =================================================================== --- trunk/resources/images/presets/money/atm.svg (revision 16006) +++ trunk/resources/images/presets/money/atm.svg (revision 16006) @@ -0,0 +1,174 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/money/bank.svg =================================================================== --- trunk/resources/images/presets/money/bank.svg (revision 16006) +++ trunk/resources/images/presets/money/bank.svg (revision 16006) @@ -0,0 +1,80 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/money/dollar.svg =================================================================== --- trunk/resources/images/presets/money/dollar.svg (revision 16006) +++ trunk/resources/images/presets/money/dollar.svg (revision 16006) @@ -0,0 +1,6 @@ + + + + + + Index: trunk/resources/images/presets/money/exchange.svg =================================================================== --- trunk/resources/images/presets/money/exchange.svg (revision 16006) +++ trunk/resources/images/presets/money/exchange.svg (revision 16006) @@ -0,0 +1,262 @@ + + + + + + + EPS converted from http://aiga.org + + + symbol + mapsym + + + + + Open Clip Art Library + + + + + Jean-Victor Balin + + + + + Jean-Victor Balin + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/money/money_transfer.svg =================================================================== --- trunk/resources/images/presets/money/money_transfer.svg (revision 16006) +++ trunk/resources/images/presets/money/money_transfer.svg (revision 16006) @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/bay.svg =================================================================== --- trunk/resources/images/presets/nautical/bay.svg (revision 16006) +++ trunk/resources/images/presets/nautical/bay.svg (revision 16006) @@ -0,0 +1,100 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/beach.svg =================================================================== --- trunk/resources/images/presets/nautical/beach.svg (revision 16006) +++ trunk/resources/images/presets/nautical/beach.svg (revision 16006) @@ -0,0 +1,100 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/boatyard.svg =================================================================== --- trunk/resources/images/presets/nautical/boatyard.svg (revision 16006) +++ trunk/resources/images/presets/nautical/boatyard.svg (revision 16006) @@ -0,0 +1,96 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/breakwater.svg =================================================================== --- trunk/resources/images/presets/nautical/breakwater.svg (revision 16006) +++ trunk/resources/images/presets/nautical/breakwater.svg (revision 16006) @@ -0,0 +1,111 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/cape.svg =================================================================== --- trunk/resources/images/presets/nautical/cape.svg (revision 16006) +++ trunk/resources/images/presets/nautical/cape.svg (revision 16006) @@ -0,0 +1,100 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/coast_line.svg =================================================================== --- trunk/resources/images/presets/nautical/coast_line.svg (revision 16006) +++ trunk/resources/images/presets/nautical/coast_line.svg (revision 16006) @@ -0,0 +1,105 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/dam.svg =================================================================== --- trunk/resources/images/presets/nautical/dam.svg (revision 16006) +++ trunk/resources/images/presets/nautical/dam.svg (revision 16006) @@ -0,0 +1,117 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/ferry.svg =================================================================== --- trunk/resources/images/presets/nautical/ferry.svg (revision 16006) +++ trunk/resources/images/presets/nautical/ferry.svg (revision 16006) @@ -0,0 +1,118 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/groyne.svg =================================================================== --- trunk/resources/images/presets/nautical/groyne.svg (revision 16006) +++ trunk/resources/images/presets/nautical/groyne.svg (revision 16006) @@ -0,0 +1,194 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/lock_gate.svg =================================================================== --- trunk/resources/images/presets/nautical/lock_gate.svg (revision 16006) +++ trunk/resources/images/presets/nautical/lock_gate.svg (revision 16006) @@ -0,0 +1,139 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/marina.svg =================================================================== --- trunk/resources/images/presets/nautical/marina.svg (revision 16006) +++ trunk/resources/images/presets/nautical/marina.svg (revision 16006) @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2010-08-29T18:52:55 + Ancla azul + https://openclipart.org/detail/82687/ancla-by-rastrojo + + + rastrojo + + + + + anchor + ancla + barco + mar + sail + sea + ship + vela + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/marine_fuel.svg =================================================================== --- trunk/resources/images/presets/nautical/marine_fuel.svg (revision 16006) +++ trunk/resources/images/presets/nautical/marine_fuel.svg (revision 16006) @@ -0,0 +1,109 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/penstock.svg =================================================================== --- trunk/resources/images/presets/nautical/penstock.svg (revision 16006) +++ trunk/resources/images/presets/nautical/penstock.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/presets/nautical/pier.svg =================================================================== --- trunk/resources/images/presets/nautical/pier.svg (revision 16006) +++ trunk/resources/images/presets/nautical/pier.svg (revision 16006) @@ -0,0 +1,139 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/slipway.svg =================================================================== --- trunk/resources/images/presets/nautical/slipway.svg (revision 16006) +++ trunk/resources/images/presets/nautical/slipway.svg (revision 16006) @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/strait.svg =================================================================== --- trunk/resources/images/presets/nautical/strait.svg (revision 16006) +++ trunk/resources/images/presets/nautical/strait.svg (revision 16006) @@ -0,0 +1,111 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/tidal_channel.svg =================================================================== --- trunk/resources/images/presets/nautical/tidal_channel.svg (revision 16006) +++ trunk/resources/images/presets/nautical/tidal_channel.svg (revision 16006) @@ -0,0 +1,121 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/turning.svg =================================================================== --- trunk/resources/images/presets/nautical/turning.svg (revision 16006) +++ trunk/resources/images/presets/nautical/turning.svg (revision 16006) @@ -0,0 +1,85 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/water.svg =================================================================== --- trunk/resources/images/presets/nautical/water.svg (revision 16006) +++ trunk/resources/images/presets/nautical/water.svg (revision 16006) @@ -0,0 +1,94 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/waterfall.svg =================================================================== --- trunk/resources/images/presets/nautical/waterfall.svg (revision 16006) +++ trunk/resources/images/presets/nautical/waterfall.svg (revision 16006) @@ -0,0 +1,99 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/waterway_canal.svg =================================================================== --- trunk/resources/images/presets/nautical/waterway_canal.svg (revision 16006) +++ trunk/resources/images/presets/nautical/waterway_canal.svg (revision 16006) @@ -0,0 +1,99 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/waterway_ditch.svg =================================================================== --- trunk/resources/images/presets/nautical/waterway_ditch.svg (revision 16006) +++ trunk/resources/images/presets/nautical/waterway_ditch.svg (revision 16006) @@ -0,0 +1,99 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/waterway_drain.svg =================================================================== --- trunk/resources/images/presets/nautical/waterway_drain.svg (revision 16006) +++ trunk/resources/images/presets/nautical/waterway_drain.svg (revision 16006) @@ -0,0 +1,98 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/waterway_river.svg =================================================================== --- trunk/resources/images/presets/nautical/waterway_river.svg (revision 16006) +++ trunk/resources/images/presets/nautical/waterway_river.svg (revision 16006) @@ -0,0 +1,82 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/waterway_riverbank.svg =================================================================== --- trunk/resources/images/presets/nautical/waterway_riverbank.svg (revision 16006) +++ trunk/resources/images/presets/nautical/waterway_riverbank.svg (revision 16006) @@ -0,0 +1,93 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/waterway_stream.svg =================================================================== --- trunk/resources/images/presets/nautical/waterway_stream.svg (revision 16006) +++ trunk/resources/images/presets/nautical/waterway_stream.svg (revision 16006) @@ -0,0 +1,80 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/nautical/weir.svg =================================================================== --- trunk/resources/images/presets/nautical/weir.svg (revision 16006) +++ trunk/resources/images/presets/nautical/weir.svg (revision 16006) @@ -0,0 +1,78 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/presets/office/accountant.svg =================================================================== --- trunk/resources/images/presets/office/accountant.svg (revision 16006) +++ trunk/resources/images/presets/office/accountant.svg (revision 16006) @@ -0,0 +1,113 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/advertising_agency.svg =================================================================== --- trunk/resources/images/presets/office/advertising_agency.svg (revision 16006) +++ trunk/resources/images/presets/office/advertising_agency.svg (revision 16006) @@ -0,0 +1,148 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/architect.svg =================================================================== --- trunk/resources/images/presets/office/architect.svg (revision 16006) +++ trunk/resources/images/presets/office/architect.svg (revision 16006) @@ -0,0 +1,138 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/association.svg =================================================================== --- trunk/resources/images/presets/office/association.svg (revision 16006) +++ trunk/resources/images/presets/office/association.svg (revision 16006) @@ -0,0 +1,152 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/educational_institution.svg =================================================================== --- trunk/resources/images/presets/office/educational_institution.svg (revision 16006) +++ trunk/resources/images/presets/office/educational_institution.svg (revision 16006) @@ -0,0 +1,158 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/employment_agency.svg =================================================================== --- trunk/resources/images/presets/office/employment_agency.svg (revision 16006) +++ trunk/resources/images/presets/office/employment_agency.svg (revision 16006) @@ -0,0 +1,131 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/foundation.svg =================================================================== --- trunk/resources/images/presets/office/foundation.svg (revision 16006) +++ trunk/resources/images/presets/office/foundation.svg (revision 16006) @@ -0,0 +1,150 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/government.svg =================================================================== --- trunk/resources/images/presets/office/government.svg (revision 16006) +++ trunk/resources/images/presets/office/government.svg (revision 16006) @@ -0,0 +1,103 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/insurance.svg =================================================================== --- trunk/resources/images/presets/office/insurance.svg (revision 16006) +++ trunk/resources/images/presets/office/insurance.svg (revision 16006) @@ -0,0 +1,119 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/it.svg =================================================================== --- trunk/resources/images/presets/office/it.svg (revision 16006) +++ trunk/resources/images/presets/office/it.svg (revision 16006) @@ -0,0 +1,158 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/lawyer.svg =================================================================== --- trunk/resources/images/presets/office/lawyer.svg (revision 16006) +++ trunk/resources/images/presets/office/lawyer.svg (revision 16006) @@ -0,0 +1,108 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/newspaper.svg =================================================================== --- trunk/resources/images/presets/office/newspaper.svg (revision 16006) +++ trunk/resources/images/presets/office/newspaper.svg (revision 16006) @@ -0,0 +1,198 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/notary.svg =================================================================== --- trunk/resources/images/presets/office/notary.svg (revision 16006) +++ trunk/resources/images/presets/office/notary.svg (revision 16006) @@ -0,0 +1,171 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/ong.svg =================================================================== --- trunk/resources/images/presets/office/ong.svg (revision 16006) +++ trunk/resources/images/presets/office/ong.svg (revision 16006) @@ -0,0 +1,192 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/political_party.svg =================================================================== --- trunk/resources/images/presets/office/political_party.svg (revision 16006) +++ trunk/resources/images/presets/office/political_party.svg (revision 16006) @@ -0,0 +1,128 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/private_company.svg =================================================================== --- trunk/resources/images/presets/office/private_company.svg (revision 16006) +++ trunk/resources/images/presets/office/private_company.svg (revision 16006) @@ -0,0 +1,193 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/real_state.svg =================================================================== --- trunk/resources/images/presets/office/real_state.svg (revision 16006) +++ trunk/resources/images/presets/office/real_state.svg (revision 16006) @@ -0,0 +1,125 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/religion.svg =================================================================== --- trunk/resources/images/presets/office/religion.svg (revision 16006) +++ trunk/resources/images/presets/office/religion.svg (revision 16006) @@ -0,0 +1,102 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/research.svg =================================================================== --- trunk/resources/images/presets/office/research.svg (revision 16006) +++ trunk/resources/images/presets/office/research.svg (revision 16006) @@ -0,0 +1,123 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/tax_advisor.svg =================================================================== --- trunk/resources/images/presets/office/tax_advisor.svg (revision 16006) +++ trunk/resources/images/presets/office/tax_advisor.svg (revision 16006) @@ -0,0 +1,126 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/office/telecommunication.svg =================================================================== --- trunk/resources/images/presets/office/telecommunication.svg (revision 16006) +++ trunk/resources/images/presets/office/telecommunication.svg (revision 16006) @@ -0,0 +1,132 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/place/capital.svg =================================================================== --- trunk/resources/images/presets/place/capital.svg (revision 16006) +++ trunk/resources/images/presets/place/capital.svg (revision 16006) @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/place/city.svg =================================================================== --- trunk/resources/images/presets/place/city.svg (revision 16006) +++ trunk/resources/images/presets/place/city.svg (revision 16006) @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/place/farm.svg =================================================================== --- trunk/resources/images/presets/place/farm.svg (revision 16006) +++ trunk/resources/images/presets/place/farm.svg (revision 16006) @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/place/hamlet.svg =================================================================== --- trunk/resources/images/presets/place/hamlet.svg (revision 16006) +++ trunk/resources/images/presets/place/hamlet.svg (revision 16006) @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/place/island.svg =================================================================== --- trunk/resources/images/presets/place/island.svg (revision 16006) +++ trunk/resources/images/presets/place/island.svg (revision 16006) @@ -0,0 +1,118 @@ + + + + + + + + Island, palm, and the sun + + + + + vacation + palm + sun + plants + island + plant + + + + + Claygirl + + + + + Claygirl + + + + + Claygirl + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/place/islet.svg =================================================================== --- trunk/resources/images/presets/place/islet.svg (revision 16006) +++ trunk/resources/images/presets/place/islet.svg (revision 16006) @@ -0,0 +1,104 @@ + + + + + + + + Island, palm, and the sun + + + + + vacation + palm + sun + plants + island + plant + + + + + Claygirl + + + + + Claygirl + + + + + Claygirl + + + + image/svg+xml + + + en + + + + + + + + + + + + + + Index: trunk/resources/images/presets/place/isolated_dwelling.svg =================================================================== --- trunk/resources/images/presets/place/isolated_dwelling.svg (revision 16006) +++ trunk/resources/images/presets/place/isolated_dwelling.svg (revision 16006) @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/place/locality.svg =================================================================== --- trunk/resources/images/presets/place/locality.svg (revision 16006) +++ trunk/resources/images/presets/place/locality.svg (revision 16006) @@ -0,0 +1,116 @@ + + + + + + + Island, palm, and the sun + + + + + vacation + palm + sun + plants + island + plant + + + + + Claygirl + + + + + Claygirl + + + + + Claygirl + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/place/neighbourhood.svg =================================================================== --- trunk/resources/images/presets/place/neighbourhood.svg (revision 16006) +++ trunk/resources/images/presets/place/neighbourhood.svg (revision 16006) @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/place/quarter.svg =================================================================== --- trunk/resources/images/presets/place/quarter.svg (revision 16006) +++ trunk/resources/images/presets/place/quarter.svg (revision 16006) @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/place/square.svg =================================================================== --- trunk/resources/images/presets/place/square.svg (revision 16006) +++ trunk/resources/images/presets/place/square.svg (revision 16006) @@ -0,0 +1,128 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/place/suburb.svg =================================================================== --- trunk/resources/images/presets/place/suburb.svg (revision 16006) +++ trunk/resources/images/presets/place/suburb.svg (revision 16006) @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/place/town.svg =================================================================== --- trunk/resources/images/presets/place/town.svg (revision 16006) +++ trunk/resources/images/presets/place/town.svg (revision 16006) @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/place/village.svg =================================================================== --- trunk/resources/images/presets/place/village.svg (revision 16006) +++ trunk/resources/images/presets/place/village.svg (revision 16006) @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/bay.svg =================================================================== --- trunk/resources/images/presets/power/bay.svg (revision 16006) +++ trunk/resources/images/presets/power/bay.svg (revision 16006) @@ -0,0 +1,269 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/busbar.svg =================================================================== --- trunk/resources/images/presets/power/busbar.svg (revision 16006) +++ trunk/resources/images/presets/power/busbar.svg (revision 16006) @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/cable.svg =================================================================== --- trunk/resources/images/presets/power/cable.svg (revision 16006) +++ trunk/resources/images/presets/power/cable.svg (revision 16006) @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/cable_distribution_cabinet.svg =================================================================== --- trunk/resources/images/presets/power/cable_distribution_cabinet.svg (revision 16006) +++ trunk/resources/images/presets/power/cable_distribution_cabinet.svg (revision 16006) @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/catenary_mast.svg =================================================================== --- trunk/resources/images/presets/power/catenary_mast.svg (revision 16006) +++ trunk/resources/images/presets/power/catenary_mast.svg (revision 16006) @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/compensator.svg =================================================================== --- trunk/resources/images/presets/power/compensator.svg (revision 16006) +++ trunk/resources/images/presets/power/compensator.svg (revision 16006) @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/converter.svg =================================================================== --- trunk/resources/images/presets/power/converter.svg (revision 16006) +++ trunk/resources/images/presets/power/converter.svg (revision 16006) @@ -0,0 +1,266 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/generator.svg =================================================================== --- trunk/resources/images/presets/power/generator.svg (revision 16006) +++ trunk/resources/images/presets/power/generator.svg (revision 16006) @@ -0,0 +1,245 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/insulator.svg =================================================================== --- trunk/resources/images/presets/power/insulator.svg (revision 16006) +++ trunk/resources/images/presets/power/insulator.svg (revision 16006) @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/line.svg =================================================================== --- trunk/resources/images/presets/power/line.svg (revision 16006) +++ trunk/resources/images/presets/power/line.svg (revision 16006) @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/plant.svg =================================================================== --- trunk/resources/images/presets/power/plant.svg (revision 16006) +++ trunk/resources/images/presets/power/plant.svg (revision 16006) @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/pole.svg =================================================================== --- trunk/resources/images/presets/power/pole.svg (revision 16006) +++ trunk/resources/images/presets/power/pole.svg (revision 16006) @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/pole_switch.svg =================================================================== --- trunk/resources/images/presets/power/pole_switch.svg (revision 16006) +++ trunk/resources/images/presets/power/pole_switch.svg (revision 16006) @@ -0,0 +1,121 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/pole_transformer.svg =================================================================== --- trunk/resources/images/presets/power/pole_transformer.svg (revision 16006) +++ trunk/resources/images/presets/power/pole_transformer.svg (revision 16006) @@ -0,0 +1,233 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/portal.svg =================================================================== --- trunk/resources/images/presets/power/portal.svg (revision 16006) +++ trunk/resources/images/presets/power/portal.svg (revision 16006) @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/power.svg =================================================================== --- trunk/resources/images/presets/power/power.svg (revision 16006) +++ trunk/resources/images/presets/power/power.svg (revision 16006) @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/power_source-biofuel.svg =================================================================== --- trunk/resources/images/presets/power/power_source-biofuel.svg (revision 16006) +++ trunk/resources/images/presets/power/power_source-biofuel.svg (revision 16006) @@ -0,0 +1,168 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/power_source-coal.svg =================================================================== --- trunk/resources/images/presets/power/power_source-coal.svg (revision 16006) +++ trunk/resources/images/presets/power/power_source-coal.svg (revision 16006) @@ -0,0 +1,168 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/power_source-gas.svg =================================================================== --- trunk/resources/images/presets/power/power_source-gas.svg (revision 16006) +++ trunk/resources/images/presets/power/power_source-gas.svg (revision 16006) @@ -0,0 +1,168 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/power_source-geothermal.svg =================================================================== --- trunk/resources/images/presets/power/power_source-geothermal.svg (revision 16006) +++ trunk/resources/images/presets/power/power_source-geothermal.svg (revision 16006) @@ -0,0 +1,152 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/power_source-nuclear.svg =================================================================== --- trunk/resources/images/presets/power/power_source-nuclear.svg (revision 16006) +++ trunk/resources/images/presets/power/power_source-nuclear.svg (revision 16006) @@ -0,0 +1,158 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/power_source-oil.svg =================================================================== --- trunk/resources/images/presets/power/power_source-oil.svg (revision 16006) +++ trunk/resources/images/presets/power/power_source-oil.svg (revision 16006) @@ -0,0 +1,168 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/power_source-sun.svg =================================================================== --- trunk/resources/images/presets/power/power_source-sun.svg (revision 16006) +++ trunk/resources/images/presets/power/power_source-sun.svg (revision 16006) @@ -0,0 +1,178 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/power_source-waste.svg =================================================================== --- trunk/resources/images/presets/power/power_source-waste.svg (revision 16006) +++ trunk/resources/images/presets/power/power_source-waste.svg (revision 16006) @@ -0,0 +1,168 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/power_source-water.svg =================================================================== --- trunk/resources/images/presets/power/power_source-water.svg (revision 16006) +++ trunk/resources/images/presets/power/power_source-water.svg (revision 16006) @@ -0,0 +1,152 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/power_source-wind.svg =================================================================== --- trunk/resources/images/presets/power/power_source-wind.svg (revision 16006) +++ trunk/resources/images/presets/power/power_source-wind.svg (revision 16006) @@ -0,0 +1,168 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/substation.svg =================================================================== --- trunk/resources/images/presets/power/substation.svg (revision 16006) +++ trunk/resources/images/presets/power/substation.svg (revision 16006) @@ -0,0 +1,318 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/switch.svg =================================================================== --- trunk/resources/images/presets/power/switch.svg (revision 16006) +++ trunk/resources/images/presets/power/switch.svg (revision 16006) @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/switchgear.svg =================================================================== --- trunk/resources/images/presets/power/switchgear.svg (revision 16006) +++ trunk/resources/images/presets/power/switchgear.svg (revision 16006) @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/terminal.svg =================================================================== --- trunk/resources/images/presets/power/terminal.svg (revision 16006) +++ trunk/resources/images/presets/power/terminal.svg (revision 16006) @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/tower.svg =================================================================== --- trunk/resources/images/presets/power/tower.svg (revision 16006) +++ trunk/resources/images/presets/power/tower.svg (revision 16006) @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/transformer.svg =================================================================== --- trunk/resources/images/presets/power/transformer.svg (revision 16006) +++ trunk/resources/images/presets/power/transformer.svg (revision 16006) @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/power/transformer_tower.svg =================================================================== --- trunk/resources/images/presets/power/transformer_tower.svg (revision 16006) +++ trunk/resources/images/presets/power/transformer_tower.svg (revision 16006) @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/religion/bahai.svg =================================================================== --- trunk/resources/images/presets/religion/bahai.svg (revision 16006) +++ trunk/resources/images/presets/religion/bahai.svg (revision 16006) @@ -0,0 +1,77 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/religion/buddhism.svg =================================================================== --- trunk/resources/images/presets/religion/buddhism.svg (revision 16006) +++ trunk/resources/images/presets/religion/buddhism.svg (revision 16006) @@ -0,0 +1,115 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/religion/church.svg =================================================================== --- trunk/resources/images/presets/religion/church.svg (revision 16006) +++ trunk/resources/images/presets/religion/church.svg (revision 16006) @@ -0,0 +1,129 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/religion/confucian.svg =================================================================== --- trunk/resources/images/presets/religion/confucian.svg (revision 16006) +++ trunk/resources/images/presets/religion/confucian.svg (revision 16006) @@ -0,0 +1,69 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + Index: trunk/resources/images/presets/religion/hinduism.svg =================================================================== --- trunk/resources/images/presets/religion/hinduism.svg (revision 16006) +++ trunk/resources/images/presets/religion/hinduism.svg (revision 16006) @@ -0,0 +1,74 @@ + + + +image/svg+xml Index: trunk/resources/images/presets/religion/jainism.svg =================================================================== --- trunk/resources/images/presets/religion/jainism.svg (revision 16006) +++ trunk/resources/images/presets/religion/jainism.svg (revision 16006) @@ -0,0 +1,436 @@ + + + + + + + + + + image/svg+xml + + Ahimsa + 23.I.2007 + + + Andriy Makukha + + + + + Public domain + + + + + ahimsa + jain + jainism + non-violence + symbol + + + Ahimsa - jain non-violence symbol. The wheel inside symbolises Dharmacakra - the Wheel of Life. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/religion/jewish.svg =================================================================== --- trunk/resources/images/presets/religion/jewish.svg (revision 16006) +++ trunk/resources/images/presets/religion/jewish.svg (revision 16006) @@ -0,0 +1,160 @@ + + + + + + + + The Official Flag of Israel + This is an SVG representation of Israel's official flag, based on the exact measurements and color recommendations of the Israeli government. + + + country + starofdavid + israel + place + flag + judaism + + + + + Open Clip Art Library + + + + + Brian G. Hinkle + + + + + Brian G. Hinkle + + + 04/12/05 + image/svg+xml + + + English + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/religion/muslim.svg =================================================================== --- trunk/resources/images/presets/religion/muslim.svg (revision 16006) +++ trunk/resources/images/presets/religion/muslim.svg (revision 16006) @@ -0,0 +1,119 @@ + + + + + + + + + Pakistan + + + + + asia + united_nations_member + flag + sign + + + + + Lauris Kaplinski + + + + + Lauris Kaplinski + + + + + Lauris Kaplinski + + + + image/svg+xml + + + en + + + + + + + + + + + + + + Index: trunk/resources/images/presets/religion/religion.svg =================================================================== --- trunk/resources/images/presets/religion/religion.svg (revision 16006) +++ trunk/resources/images/presets/religion/religion.svg (revision 16006) @@ -0,0 +1,192 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/religion/shinto.svg =================================================================== --- trunk/resources/images/presets/religion/shinto.svg (revision 16006) +++ trunk/resources/images/presets/religion/shinto.svg (revision 16006) @@ -0,0 +1,105 @@ + + + + + + image/svg+xml + + + 日本の地図記号 - 神社 + + + + + + + + + + + 日本の地図記号 - 神社 + + + + + + Index: trunk/resources/images/presets/religion/sikhism.svg =================================================================== --- trunk/resources/images/presets/religion/sikhism.svg (revision 16006) +++ trunk/resources/images/presets/religion/sikhism.svg (revision 16006) @@ -0,0 +1,79 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/religion/taoism.svg =================================================================== --- trunk/resources/images/presets/religion/taoism.svg (revision 16006) +++ trunk/resources/images/presets/religion/taoism.svg (revision 16006) @@ -0,0 +1,90 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/religion/tenrikyo.svg =================================================================== --- trunk/resources/images/presets/religion/tenrikyo.svg (revision 16006) +++ trunk/resources/images/presets/religion/tenrikyo.svg (revision 16006) @@ -0,0 +1,392 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/religion/wayside_cross.svg =================================================================== --- trunk/resources/images/presets/religion/wayside_cross.svg (revision 16006) +++ trunk/resources/images/presets/religion/wayside_cross.svg (revision 16006) @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/religion/wayside_shrine.svg =================================================================== --- trunk/resources/images/presets/religion/wayside_shrine.svg (revision 16006) +++ trunk/resources/images/presets/religion/wayside_shrine.svg (revision 16006) @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Ulf Lamping + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/changing_table.svg =================================================================== --- trunk/resources/images/presets/service/changing_table.svg (revision 16006) +++ trunk/resources/images/presets/service/changing_table.svg (revision 16006) @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/clock.svg =================================================================== --- trunk/resources/images/presets/service/clock.svg (revision 16006) +++ trunk/resources/images/presets/service/clock.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/service/community_centre.svg =================================================================== --- trunk/resources/images/presets/service/community_centre.svg (revision 16006) +++ trunk/resources/images/presets/service/community_centre.svg (revision 16006) @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2012-01-31T19:44:46 + Representation of four people holding hands and forming a circle + https://openclipart.org/detail/167580/community-circle-by-josephluis + + + josephluis + + + + + being + circle + community + doll + hands + holding + human + man + mankind + men + people + + + + + + + + + + + Index: trunk/resources/images/presets/service/courthouse.svg =================================================================== --- trunk/resources/images/presets/service/courthouse.svg (revision 16006) +++ trunk/resources/images/presets/service/courthouse.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/service/elevator.svg =================================================================== --- trunk/resources/images/presets/service/elevator.svg (revision 16006) +++ trunk/resources/images/presets/service/elevator.svg (revision 16006) @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/embassy.svg =================================================================== --- trunk/resources/images/presets/service/embassy.svg (revision 16006) +++ trunk/resources/images/presets/service/embassy.svg (revision 16006) @@ -0,0 +1,71 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + Index: trunk/resources/images/presets/service/emergency_access_point.svg =================================================================== --- trunk/resources/images/presets/service/emergency_access_point.svg (revision 16006) +++ trunk/resources/images/presets/service/emergency_access_point.svg (revision 16006) @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/excrement_bags.svg =================================================================== --- trunk/resources/images/presets/service/excrement_bags.svg (revision 16006) +++ trunk/resources/images/presets/service/excrement_bags.svg (revision 16006) @@ -0,0 +1,101 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/fire_hydrant.svg =================================================================== --- trunk/resources/images/presets/service/fire_hydrant.svg (revision 16006) +++ trunk/resources/images/presets/service/fire_hydrant.svg (revision 16006) @@ -0,0 +1,164 @@ + + + + + + + + + + + image/svg+xml + + + + + malenki + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/firebrigade.svg =================================================================== --- trunk/resources/images/presets/service/firebrigade.svg (revision 16006) +++ trunk/resources/images/presets/service/firebrigade.svg (revision 16006) @@ -0,0 +1,137 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/internet_cafe.svg =================================================================== --- trunk/resources/images/presets/service/internet_cafe.svg (revision 16006) +++ trunk/resources/images/presets/service/internet_cafe.svg (revision 16006) @@ -0,0 +1,97 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + @ + + Index: trunk/resources/images/presets/service/network-wireless.svg =================================================================== --- trunk/resources/images/presets/service/network-wireless.svg (revision 16006) +++ trunk/resources/images/presets/service/network-wireless.svg (revision 16006) @@ -0,0 +1,230 @@ + + + + + + + + + + + + + image/svg+xml + + Network Wireless + December 2008 + + + Luca Ferretti <elle.uca@libero.it> + + + + + network + wireless + antenna + + + An antenna with EM waves + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/photo_booth.svg =================================================================== --- trunk/resources/images/presets/service/photo_booth.svg (revision 16006) +++ trunk/resources/images/presets/service/photo_booth.svg (revision 16006) @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/police.svg =================================================================== --- trunk/resources/images/presets/service/police.svg (revision 16006) +++ trunk/resources/images/presets/service/police.svg (revision 16006) @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/police_non_public.svg =================================================================== --- trunk/resources/images/presets/service/police_non_public.svg (revision 16006) +++ trunk/resources/images/presets/service/police_non_public.svg (revision 16006) @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/post_box.svg =================================================================== --- trunk/resources/images/presets/service/post_box.svg (revision 16006) +++ trunk/resources/images/presets/service/post_box.svg (revision 16006) @@ -0,0 +1,102 @@ + + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/post_office.svg =================================================================== --- trunk/resources/images/presets/service/post_office.svg (revision 16006) +++ trunk/resources/images/presets/service/post_office.svg (revision 16006) @@ -0,0 +1,105 @@ + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/prison.svg =================================================================== --- trunk/resources/images/presets/service/prison.svg (revision 16006) +++ trunk/resources/images/presets/service/prison.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/service/ranger_station.svg =================================================================== --- trunk/resources/images/presets/service/ranger_station.svg (revision 16006) +++ trunk/resources/images/presets/service/ranger_station.svg (revision 16006) @@ -0,0 +1,75 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/presets/service/recycling/recycling.svg =================================================================== --- trunk/resources/images/presets/service/recycling/recycling.svg (revision 16006) +++ trunk/resources/images/presets/service/recycling/recycling.svg (revision 16006) @@ -0,0 +1,12 @@ + + + + Index: trunk/resources/images/presets/service/recycling/recycling_centre.svg =================================================================== --- trunk/resources/images/presets/service/recycling/recycling_centre.svg (revision 16006) +++ trunk/resources/images/presets/service/recycling/recycling_centre.svg (revision 16006) @@ -0,0 +1,12 @@ + + + + Index: trunk/resources/images/presets/service/recycling/recycling_container.svg =================================================================== --- trunk/resources/images/presets/service/recycling/recycling_container.svg (revision 16006) +++ trunk/resources/images/presets/service/recycling/recycling_container.svg (revision 16006) @@ -0,0 +1,12 @@ + + + + Index: trunk/resources/images/presets/service/recycling/sanitary_dump_station.svg =================================================================== --- trunk/resources/images/presets/service/recycling/sanitary_dump_station.svg (revision 16006) +++ trunk/resources/images/presets/service/recycling/sanitary_dump_station.svg (revision 16006) @@ -0,0 +1,87 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/presets/service/recycling/waste_basket.svg =================================================================== --- trunk/resources/images/presets/service/recycling/waste_basket.svg (revision 16006) +++ trunk/resources/images/presets/service/recycling/waste_basket.svg (revision 16006) @@ -0,0 +1,82 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/recycling/waste_disposal.svg =================================================================== --- trunk/resources/images/presets/service/recycling/waste_disposal.svg (revision 16006) +++ trunk/resources/images/presets/service/recycling/waste_disposal.svg (revision 16006) @@ -0,0 +1,116 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/shower.svg =================================================================== --- trunk/resources/images/presets/service/shower.svg (revision 16006) +++ trunk/resources/images/presets/service/shower.svg (revision 16006) @@ -0,0 +1,87 @@ + +image/svg+xml Index: trunk/resources/images/presets/service/studio.svg =================================================================== --- trunk/resources/images/presets/service/studio.svg (revision 16006) +++ trunk/resources/images/presets/service/studio.svg (revision 16006) @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + + + + + + + + + Index: trunk/resources/images/presets/service/surveillance.svg =================================================================== --- trunk/resources/images/presets/service/surveillance.svg (revision 16006) +++ trunk/resources/images/presets/service/surveillance.svg (revision 16006) @@ -0,0 +1,109 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/telephone.svg =================================================================== --- trunk/resources/images/presets/service/telephone.svg (revision 16006) +++ trunk/resources/images/presets/service/telephone.svg (revision 16006) @@ -0,0 +1,136 @@ + + + + + + + lutte incendie + + + office + + telephone + symbol + + + + + yves GUILLOU + + + + + yves GUILLOU + + + + + yves GUILLOU + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/toilets.svg =================================================================== --- trunk/resources/images/presets/service/toilets.svg (revision 16006) +++ trunk/resources/images/presets/service/toilets.svg (revision 16006) @@ -0,0 +1,108 @@ + + + + + + + + image/svg+xml + + + + + Bone Killian <vitki@bonius.com> + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/service/townhall.svg =================================================================== --- trunk/resources/images/presets/service/townhall.svg (revision 16006) +++ trunk/resources/images/presets/service/townhall.svg (revision 16006) @@ -0,0 +1,77 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + Index: trunk/resources/images/presets/shop/alcohol.svg =================================================================== --- trunk/resources/images/presets/shop/alcohol.svg (revision 16006) +++ trunk/resources/images/presets/shop/alcohol.svg (revision 16006) @@ -0,0 +1,290 @@ + + + + + + + + + + + + beverage + + + + + Open Clip Art Library + + + + + Architetto Francesco Rollandin + + + + + Architetto Francesco Rollandin + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/antique.svg =================================================================== --- trunk/resources/images/presets/shop/antique.svg (revision 16006) +++ trunk/resources/images/presets/shop/antique.svg (revision 16006) @@ -0,0 +1,391 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2009-05-01T00:45:54 + A Gramophone icon by Andrew Fitzsimon. Etiquette Icon set. From 0.18 OCAL database. + https://openclipart.org/detail/25563/gramophone-by-anonymous-25563 + + + Anonymous + + + + + etiquette + gramophone + icon + music + sound + + + + + + + + + + + Index: trunk/resources/images/presets/shop/art.svg =================================================================== --- trunk/resources/images/presets/shop/art.svg (revision 16006) +++ trunk/resources/images/presets/shop/art.svg (revision 16006) @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/bag.svg =================================================================== --- trunk/resources/images/presets/shop/bag.svg (revision 16006) +++ trunk/resources/images/presets/shop/bag.svg (revision 16006) @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/beauty.svg =================================================================== --- trunk/resources/images/presets/shop/beauty.svg (revision 16006) +++ trunk/resources/images/presets/shop/beauty.svg (revision 16006) @@ -0,0 +1,103 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/bed.svg =================================================================== --- trunk/resources/images/presets/shop/bed.svg (revision 16006) +++ trunk/resources/images/presets/shop/bed.svg (revision 16006) @@ -0,0 +1,75 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/presets/shop/beverages.svg =================================================================== --- trunk/resources/images/presets/shop/beverages.svg (revision 16006) +++ trunk/resources/images/presets/shop/beverages.svg (revision 16006) @@ -0,0 +1,377 @@ + + + + + + + + + + + + beverage + + + + + Open Clip Art Library + + + + + Architetto Francesco Rollandin + + + + + Architetto Francesco Rollandin + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/bicycle.svg =================================================================== --- trunk/resources/images/presets/shop/bicycle.svg (revision 16006) +++ trunk/resources/images/presets/shop/bicycle.svg (revision 16006) @@ -0,0 +1,93 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/body.svg =================================================================== --- trunk/resources/images/presets/shop/body.svg (revision 16006) +++ trunk/resources/images/presets/shop/body.svg (revision 16006) @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2008-11-03T14:42:04 + + https://openclipart.org/detail/19935/buddy-by-sheikh_tuhin-19935 + + + sheikh_tuhin + + + + + gents + how i did it + male symbol + man + person + silhouette + + + + + + + + + + + Index: trunk/resources/images/presets/shop/book.svg =================================================================== --- trunk/resources/images/presets/shop/book.svg (revision 16006) +++ trunk/resources/images/presets/shop/book.svg (revision 16006) @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + Book + 2007-12-03T18:49:27 + A simple SVG book based on a drawing made on Gimp by Sam Switzer. + https://openclipart.org/detail/9358/book-by-crazyterabyte + + + CrazyTerabyte + + + + + book + how i did it + remix + + + + + + + + + + + Index: trunk/resources/images/presets/shop/boutique.svg =================================================================== --- trunk/resources/images/presets/shop/boutique.svg (revision 16006) +++ trunk/resources/images/presets/shop/boutique.svg (revision 16006) @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/carpet.svg =================================================================== --- trunk/resources/images/presets/shop/carpet.svg (revision 16006) +++ trunk/resources/images/presets/shop/carpet.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + + + + image/svg+xml + + + + + + + Index: trunk/resources/images/presets/shop/charity.svg =================================================================== --- trunk/resources/images/presets/shop/charity.svg (revision 16006) +++ trunk/resources/images/presets/shop/charity.svg (revision 16006) @@ -0,0 +1,172 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/chemist.svg =================================================================== --- trunk/resources/images/presets/shop/chemist.svg (revision 16006) +++ trunk/resources/images/presets/shop/chemist.svg (revision 16006) @@ -0,0 +1,395 @@ + + + + + + + + + + + + + Red Toothbrush with Toothpaste + + + tool + dental + toothbrush + + + + + Open Clip Art Project + + + + + Gerald G. + + + + + Public Domain + + + 2005/05/11 + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/clothes.svg =================================================================== --- trunk/resources/images/presets/shop/clothes.svg (revision 16006) +++ trunk/resources/images/presets/shop/clothes.svg (revision 16006) @@ -0,0 +1,137 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/computer.svg =================================================================== --- trunk/resources/images/presets/shop/computer.svg (revision 16006) +++ trunk/resources/images/presets/shop/computer.svg (revision 16006) @@ -0,0 +1,2118 @@ + + + + + + + workstation + Workstation based on "Andy Fitzsimon's Computer". + + + hash + + hardware + workstation + desktop + computer + pc + + + + + HASH(0x89c79d4) + + + + + HASH(0x89c79d4) + + + + + HASH(0x89c79d4) + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/convenience.svg =================================================================== --- trunk/resources/images/presets/shop/convenience.svg (revision 16006) +++ trunk/resources/images/presets/shop/convenience.svg (revision 16006) @@ -0,0 +1,130 @@ + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/copyshop.svg =================================================================== --- trunk/resources/images/presets/shop/copyshop.svg (revision 16006) +++ trunk/resources/images/presets/shop/copyshop.svg (revision 16006) @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/cosmetics.svg =================================================================== --- trunk/resources/images/presets/shop/cosmetics.svg (revision 16006) +++ trunk/resources/images/presets/shop/cosmetics.svg (revision 16006) @@ -0,0 +1,133 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/curtain.svg =================================================================== --- trunk/resources/images/presets/shop/curtain.svg (revision 16006) +++ trunk/resources/images/presets/shop/curtain.svg (revision 16006) @@ -0,0 +1,94 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/diy_store.svg =================================================================== --- trunk/resources/images/presets/shop/diy_store.svg (revision 16006) +++ trunk/resources/images/presets/shop/diy_store.svg (revision 16006) @@ -0,0 +1,388 @@ + + + + + + telephone lutte incendie + lutte incendie + + + office + + telephone + symbol + + + + + yves GUILLOU + + + + + yves GUILLOU + + + + + yves GUILLOU + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/doors.svg =================================================================== --- trunk/resources/images/presets/shop/doors.svg (revision 16006) +++ trunk/resources/images/presets/shop/doors.svg (revision 16006) @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/e-cigarette.svg =================================================================== --- trunk/resources/images/presets/shop/e-cigarette.svg (revision 16006) +++ trunk/resources/images/presets/shop/e-cigarette.svg (revision 16006) @@ -0,0 +1,147 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/electronics.svg =================================================================== --- trunk/resources/images/presets/shop/electronics.svg (revision 16006) +++ trunk/resources/images/presets/shop/electronics.svg (revision 16006) @@ -0,0 +1,512 @@ + + + + + + + + + Television + + + television + screen + tv + + + + + Open Clip Art Library + + + + + Alexander D. Thorp. + + + + + Alexander D. Thorp. + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/erotic.svg =================================================================== --- trunk/resources/images/presets/shop/erotic.svg (revision 16006) +++ trunk/resources/images/presets/shop/erotic.svg (revision 16006) @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2008-08-11T22:08:25 + + https://openclipart.org/detail/18379/heart-by-sivvus + + + sivvus + + + + + colour + heart + love + red + valentine + + + + + + + + + + + Index: trunk/resources/images/presets/shop/fabric.svg =================================================================== --- trunk/resources/images/presets/shop/fabric.svg (revision 16006) +++ trunk/resources/images/presets/shop/fabric.svg (revision 16006) @@ -0,0 +1,233 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/florist.svg =================================================================== --- trunk/resources/images/presets/shop/florist.svg (revision 16006) +++ trunk/resources/images/presets/shop/florist.svg (revision 16006) @@ -0,0 +1,129 @@ + + + + + + + flower + + + + flower + + + + + Open Clip Art Library + + + + + peterm + + + + + peterm + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/frame.svg =================================================================== --- trunk/resources/images/presets/shop/frame.svg (revision 16006) +++ trunk/resources/images/presets/shop/frame.svg (revision 16006) @@ -0,0 +1,102 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/funeral_directors.svg =================================================================== --- trunk/resources/images/presets/shop/funeral_directors.svg (revision 16006) +++ trunk/resources/images/presets/shop/funeral_directors.svg (revision 16006) @@ -0,0 +1,90 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/furniture.svg =================================================================== --- trunk/resources/images/presets/shop/furniture.svg (revision 16006) +++ trunk/resources/images/presets/shop/furniture.svg (revision 16006) @@ -0,0 +1,73 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/garden_centre.svg =================================================================== --- trunk/resources/images/presets/shop/garden_centre.svg (revision 16006) +++ trunk/resources/images/presets/shop/garden_centre.svg (revision 16006) @@ -0,0 +1,232 @@ + + + + + + + FlowerAndPot + A Large cheery Flower in a worryingly small pot... + + + + flowerpot + petal + flower + teracotta + leaf + + + + + Open Clip Art Library + + + + + Daniel Steele + + + + + Daniel Steele + + + 2005/06/28 + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/gas.svg =================================================================== --- trunk/resources/images/presets/shop/gas.svg (revision 16006) +++ trunk/resources/images/presets/shop/gas.svg (revision 16006) @@ -0,0 +1,99 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/groceries/bakery.svg =================================================================== --- trunk/resources/images/presets/shop/groceries/bakery.svg (revision 16006) +++ trunk/resources/images/presets/shop/groceries/bakery.svg (revision 16006) @@ -0,0 +1,93 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/groceries/butcher.svg =================================================================== --- trunk/resources/images/presets/shop/groceries/butcher.svg (revision 16006) +++ trunk/resources/images/presets/shop/groceries/butcher.svg (revision 16006) @@ -0,0 +1,265 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/groceries/cheese.svg =================================================================== --- trunk/resources/images/presets/shop/groceries/cheese.svg (revision 16006) +++ trunk/resources/images/presets/shop/groceries/cheese.svg (revision 16006) @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/groceries/coffee.svg =================================================================== --- trunk/resources/images/presets/shop/groceries/coffee.svg (revision 16006) +++ trunk/resources/images/presets/shop/groceries/coffee.svg (revision 16006) @@ -0,0 +1,109 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/groceries/confectionery.svg =================================================================== --- trunk/resources/images/presets/shop/groceries/confectionery.svg (revision 16006) +++ trunk/resources/images/presets/shop/groceries/confectionery.svg (revision 16006) @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/groceries/dairy.svg =================================================================== --- trunk/resources/images/presets/shop/groceries/dairy.svg (revision 16006) +++ trunk/resources/images/presets/shop/groceries/dairy.svg (revision 16006) @@ -0,0 +1,101 @@ + + + +image/svg+xml Index: trunk/resources/images/presets/shop/groceries/deli.svg =================================================================== --- trunk/resources/images/presets/shop/groceries/deli.svg (revision 16006) +++ trunk/resources/images/presets/shop/groceries/deli.svg (revision 16006) @@ -0,0 +1,101 @@ + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2010-04-15T15:08:15 + + https://openclipart.org/detail/48169/lobster-by-hextrust + + + hextrust + + + + + crustacean + delicious + fish + healthy + kitchen + snack + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/groceries/farm.svg =================================================================== --- trunk/resources/images/presets/shop/groceries/farm.svg (revision 16006) +++ trunk/resources/images/presets/shop/groceries/farm.svg (revision 16006) @@ -0,0 +1,103 @@ + + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/groceries/greengrocer.svg =================================================================== --- trunk/resources/images/presets/shop/groceries/greengrocer.svg (revision 16006) +++ trunk/resources/images/presets/shop/groceries/greengrocer.svg (revision 16006) @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/groceries/pastry.svg =================================================================== --- trunk/resources/images/presets/shop/groceries/pastry.svg (revision 16006) +++ trunk/resources/images/presets/shop/groceries/pastry.svg (revision 16006) @@ -0,0 +1,111 @@ + + + + + Cake + + + + + + + + image/svg+xml + + Cake + + + Casey Leonard + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/groceries/seafood.svg =================================================================== --- trunk/resources/images/presets/shop/groceries/seafood.svg (revision 16006) +++ trunk/resources/images/presets/shop/groceries/seafood.svg (revision 16006) @@ -0,0 +1,90 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/groceries/tea.svg =================================================================== --- trunk/resources/images/presets/shop/groceries/tea.svg (revision 16006) +++ trunk/resources/images/presets/shop/groceries/tea.svg (revision 16006) @@ -0,0 +1,470 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/hairdresser.svg =================================================================== --- trunk/resources/images/presets/shop/hairdresser.svg (revision 16006) +++ trunk/resources/images/presets/shop/hairdresser.svg (revision 16006) @@ -0,0 +1,73 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/hardware.svg =================================================================== --- trunk/resources/images/presets/shop/hardware.svg (revision 16006) +++ trunk/resources/images/presets/shop/hardware.svg (revision 16006) @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/hearing_aids.svg =================================================================== --- trunk/resources/images/presets/shop/hearing_aids.svg (revision 16006) +++ trunk/resources/images/presets/shop/hearing_aids.svg (revision 16006) @@ -0,0 +1,150 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/hifi.svg =================================================================== --- trunk/resources/images/presets/shop/hifi.svg (revision 16006) +++ trunk/resources/images/presets/shop/hifi.svg (revision 16006) @@ -0,0 +1,121 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/houseware.svg =================================================================== --- trunk/resources/images/presets/shop/houseware.svg (revision 16006) +++ trunk/resources/images/presets/shop/houseware.svg (revision 16006) @@ -0,0 +1,105 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/interior_decoration.svg =================================================================== --- trunk/resources/images/presets/shop/interior_decoration.svg (revision 16006) +++ trunk/resources/images/presets/shop/interior_decoration.svg (revision 16006) @@ -0,0 +1,243 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/jewelry.svg =================================================================== --- trunk/resources/images/presets/shop/jewelry.svg (revision 16006) +++ trunk/resources/images/presets/shop/jewelry.svg (revision 16006) @@ -0,0 +1,375 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/kiosk.svg =================================================================== --- trunk/resources/images/presets/shop/kiosk.svg (revision 16006) +++ trunk/resources/images/presets/shop/kiosk.svg (revision 16006) @@ -0,0 +1,456 @@ + + + + + + + + + a news paper + + + icon + + 11 + education + work + books + office + mimeicon + book + news + + + + + Aubanel MONNIER + + + + + Aubanel MONNIER + + + + + Aubanel MONNIER + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Dec 29, 2004 - The Inkscape developers have set a goalfor the release of Inkscape 0.41 for mid-late January. There are some noteworthy new features that would be worth getting out to users, and with some major internal changes that will be taking place soon, a good stable release is needed prior to starting such an undertaking. + Dec 29, 2004 - The Inkscape developers have set a goalfor the release of Inkscape 0.41 for mid-late January. There are some noteworthy new features that would be worth getting out to users, and with some major internal changes that will be taking place soon, a good stable release is needed prior to starting such an undertaking. + + N + E + WS + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/kitchen.svg =================================================================== --- trunk/resources/images/presets/shop/kitchen.svg (revision 16006) +++ trunk/resources/images/presets/shop/kitchen.svg (revision 16006) @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2008-05-26T12:09:59 + + https://openclipart.org/detail/17057/toque-by-jean_victor_balin + + + jean_victor_balin + + + + + hat + kitchen + outline + toque + + + + + + + + + + + Index: trunk/resources/images/presets/shop/laundry.svg =================================================================== --- trunk/resources/images/presets/shop/laundry.svg (revision 16006) +++ trunk/resources/images/presets/shop/laundry.svg (revision 16006) @@ -0,0 +1,164 @@ + + + + + + + + + image/svg+xml + + + + + Ulf Lamping + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/lottery.svg =================================================================== --- trunk/resources/images/presets/shop/lottery.svg (revision 16006) +++ trunk/resources/images/presets/shop/lottery.svg (revision 16006) @@ -0,0 +1,284 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $ + + Index: trunk/resources/images/presets/shop/mall.svg =================================================================== --- trunk/resources/images/presets/shop/mall.svg (revision 16006) +++ trunk/resources/images/presets/shop/mall.svg (revision 16006) @@ -0,0 +1,299 @@ + + + +containerArchitetto Francesco RollandinArchitetto Francesco RollandinArchitetto Francesco Rollandinimage/svg+xmlen Index: trunk/resources/images/presets/shop/marketplace.svg =================================================================== --- trunk/resources/images/presets/shop/marketplace.svg (revision 16006) +++ trunk/resources/images/presets/shop/marketplace.svg (revision 16006) @@ -0,0 +1,277 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/massage.svg =================================================================== --- trunk/resources/images/presets/shop/massage.svg (revision 16006) +++ trunk/resources/images/presets/shop/massage.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + + + + image/svg+xml + + + + + + + Index: trunk/resources/images/presets/shop/medical_supply.svg =================================================================== --- trunk/resources/images/presets/shop/medical_supply.svg (revision 16006) +++ trunk/resources/images/presets/shop/medical_supply.svg (revision 16006) @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2011-03-14T10:50:30 + Simple wheelchair icon. Based on Gerald_G's "Girl_in_wheelchair". + https://openclipart.org/detail/127375/plain-wheelchair-by-tulvur + + + tulvur + + + + + Gerald G Girl in wheelchair + plain + simple + wheelchair + + + + + + + + + + + Index: trunk/resources/images/presets/shop/mobile_phone.svg =================================================================== --- trunk/resources/images/presets/shop/mobile_phone.svg (revision 16006) +++ trunk/resources/images/presets/shop/mobile_phone.svg (revision 16006) @@ -0,0 +1,87 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/music.svg =================================================================== --- trunk/resources/images/presets/shop/music.svg (revision 16006) +++ trunk/resources/images/presets/shop/music.svg (revision 16006) @@ -0,0 +1,514 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + CD-DVD, Compact disc + 2013-06-14T15:31:08 + CD-DVD, Compact disc + https://openclipart.org/detail/179327/cd-dvd-compact-disc-by-keistutis-179327 + + + Keistutis + + + + + CD-DVD + Compact disc + + + + + + + + + + + Index: trunk/resources/images/presets/shop/musical_instrument.svg =================================================================== --- trunk/resources/images/presets/shop/musical_instrument.svg (revision 16006) +++ trunk/resources/images/presets/shop/musical_instrument.svg (revision 16006) @@ -0,0 +1,140 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/news.svg =================================================================== --- trunk/resources/images/presets/shop/news.svg (revision 16006) +++ trunk/resources/images/presets/shop/news.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/shop/optician.svg =================================================================== --- trunk/resources/images/presets/shop/optician.svg (revision 16006) +++ trunk/resources/images/presets/shop/optician.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/shop/outdoor.svg =================================================================== --- trunk/resources/images/presets/shop/outdoor.svg (revision 16006) +++ trunk/resources/images/presets/shop/outdoor.svg (revision 16006) @@ -0,0 +1,510 @@ + + + +clothingArchitetto Francesco RollandinArchitetto Francesco RollandinArchitetto Francesco Rollandinimage/svg+xmlen Index: trunk/resources/images/presets/shop/paint.svg =================================================================== --- trunk/resources/images/presets/shop/paint.svg (revision 16006) +++ trunk/resources/images/presets/shop/paint.svg (revision 16006) @@ -0,0 +1,94 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/party.svg =================================================================== --- trunk/resources/images/presets/shop/party.svg (revision 16006) +++ trunk/resources/images/presets/shop/party.svg (revision 16006) @@ -0,0 +1,309 @@ + + + + + + + + + + + + + festive + party + recreation + + + + + Jean-Victor Balin (balin_j@epita.fr) + + + + + Jean-Victor Balin (balin_j@epita.fr) + + + + + Jean-Victor Balin (balin_j@epita.fr) + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/pawnbroker.svg =================================================================== --- trunk/resources/images/presets/shop/pawnbroker.svg (revision 16006) +++ trunk/resources/images/presets/shop/pawnbroker.svg (revision 16006) @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/perfumery.svg =================================================================== --- trunk/resources/images/presets/shop/perfumery.svg (revision 16006) +++ trunk/resources/images/presets/shop/perfumery.svg (revision 16006) @@ -0,0 +1,174 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/pet.svg =================================================================== --- trunk/resources/images/presets/shop/pet.svg (revision 16006) +++ trunk/resources/images/presets/shop/pet.svg (revision 16006) @@ -0,0 +1,115 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/pet_grooming.svg =================================================================== --- trunk/resources/images/presets/shop/pet_grooming.svg (revision 16006) +++ trunk/resources/images/presets/shop/pet_grooming.svg (revision 16006) @@ -0,0 +1,122 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/photo.svg =================================================================== --- trunk/resources/images/presets/shop/photo.svg (revision 16006) +++ trunk/resources/images/presets/shop/photo.svg (revision 16006) @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/present.svg =================================================================== --- trunk/resources/images/presets/shop/present.svg (revision 16006) +++ trunk/resources/images/presets/shop/present.svg (revision 16006) @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + chocolate present + 2009-09-24T23:42:21 + Brown present. + http://openclipart.org/detail/27531/chocolate-present-by-secretlondon + + + secretlondon + + + + + bow + brown + chocolate + christmas + clip art + clipart + gift + image + media + present + public domain + remix + svg + + + + + + + + + + + Index: trunk/resources/images/presets/shop/scuba_diving.svg =================================================================== --- trunk/resources/images/presets/shop/scuba_diving.svg (revision 16006) +++ trunk/resources/images/presets/shop/scuba_diving.svg (revision 16006) @@ -0,0 +1,67 @@ + + + +image/svg+xml Index: trunk/resources/images/presets/shop/shoes.svg =================================================================== --- trunk/resources/images/presets/shop/shoes.svg (revision 16006) +++ trunk/resources/images/presets/shop/shoes.svg (revision 16006) @@ -0,0 +1,126 @@ + + + + + + tennis shoes + tennis shoes + + + sports + clothing + shoes + + + + + Open Clip Art Library + + + + + Jarno Vasamaa + + + + + Jarno Vasamaa + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/stationery.svg =================================================================== --- trunk/resources/images/presets/shop/stationery.svg (revision 16006) +++ trunk/resources/images/presets/shop/stationery.svg (revision 16006) @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2009-04-30T08:04:27 + Paperclip icon by Francesco 'Architetto' Rollandin. + https://openclipart.org/detail/25518/architetto----clips-by-anonymous-25518 + + + Anonymous + + + + + clip + icon + office + paper + paperclip + + + + + + + + + + + Index: trunk/resources/images/presets/shop/supermarket.svg =================================================================== --- trunk/resources/images/presets/shop/supermarket.svg (revision 16006) +++ trunk/resources/images/presets/shop/supermarket.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/shop/tailor.svg =================================================================== --- trunk/resources/images/presets/shop/tailor.svg (revision 16006) +++ trunk/resources/images/presets/shop/tailor.svg (revision 16006) @@ -0,0 +1,207 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/tattoo.svg =================================================================== --- trunk/resources/images/presets/shop/tattoo.svg (revision 16006) +++ trunk/resources/images/presets/shop/tattoo.svg (revision 16006) @@ -0,0 +1,83 @@ + + + +image/svg+xml Index: trunk/resources/images/presets/shop/ticket.svg =================================================================== --- trunk/resources/images/presets/shop/ticket.svg (revision 16006) +++ trunk/resources/images/presets/shop/ticket.svg (revision 16006) @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/tobacco.svg =================================================================== --- trunk/resources/images/presets/shop/tobacco.svg (revision 16006) +++ trunk/resources/images/presets/shop/tobacco.svg (revision 16006) @@ -0,0 +1,44 @@ + + + + + + + image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/presets/shop/toys.svg =================================================================== --- trunk/resources/images/presets/shop/toys.svg (revision 16006) +++ trunk/resources/images/presets/shop/toys.svg (revision 16006) @@ -0,0 +1,704 @@ + + + + + + + Rubik's Cube + + + + toy + entertainment + rubik + + + + + Petri Lummemäki + + + + + Petri Lummemäki + + + + + Petri Lummemäki + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/travel_agency.svg =================================================================== --- trunk/resources/images/presets/shop/travel_agency.svg (revision 16006) +++ trunk/resources/images/presets/shop/travel_agency.svg (revision 16006) @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2013-07-28T07:52:50 + A blue suitcase, ready for traveling. + https://openclipart.org/detail/181231/suitcase-by-cprostire-181231 + + + cprostire + + + + + bag + baggage + luggage + travel + + + + + + + + + + + Index: trunk/resources/images/presets/shop/vacuum_cleaner.svg =================================================================== --- trunk/resources/images/presets/shop/vacuum_cleaner.svg (revision 16006) +++ trunk/resources/images/presets/shop/vacuum_cleaner.svg (revision 16006) @@ -0,0 +1,157 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/variety_store.svg =================================================================== --- trunk/resources/images/presets/shop/variety_store.svg (revision 16006) +++ trunk/resources/images/presets/shop/variety_store.svg (revision 16006) @@ -0,0 +1,87 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/vehicle.svg =================================================================== --- trunk/resources/images/presets/shop/vehicle.svg (revision 16006) +++ trunk/resources/images/presets/shop/vehicle.svg (revision 16006) @@ -0,0 +1,97 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/video.svg =================================================================== --- trunk/resources/images/presets/shop/video.svg (revision 16006) +++ trunk/resources/images/presets/shop/video.svg (revision 16006) @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2010-09-06T16:13:50 + CD icon + https://openclipart.org/detail/83899/cd-icon-by-jhnri4 + + + jhnri4 + + + + + black and white + cd + compact disc + how i did it + icon + + + + + + + + + + + Index: trunk/resources/images/presets/shop/video_games.svg =================================================================== --- trunk/resources/images/presets/shop/video_games.svg (revision 16006) +++ trunk/resources/images/presets/shop/video_games.svg (revision 16006) @@ -0,0 +1,112 @@ + + + +image/svg+xml + + + + + + + + + + Index: trunk/resources/images/presets/shop/watches.svg =================================================================== --- trunk/resources/images/presets/shop/watches.svg (revision 16006) +++ trunk/resources/images/presets/shop/watches.svg (revision 16006) @@ -0,0 +1,71 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/shop/weapons.svg =================================================================== --- trunk/resources/images/presets/shop/weapons.svg (revision 16006) +++ trunk/resources/images/presets/shop/weapons.svg (revision 16006) @@ -0,0 +1,186 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/shop/wine.svg =================================================================== --- trunk/resources/images/presets/shop/wine.svg (revision 16006) +++ trunk/resources/images/presets/shop/wine.svg (revision 16006) @@ -0,0 +1,489 @@ + + + +image/svg+xmlOpenclipart2009-04-20T20:21:02Wine bottle by Francesco 'Architetto' Rollandin.https://openclipart.org/detail/25195/architetto----botiglia-di-vino-by-anonymous-25195Anonymousalcoholbeveragebottlecolordrinkfoodglassgoldengreenpurplewine Index: trunk/resources/images/presets/sightseeing/archaeological.svg =================================================================== --- trunk/resources/images/presets/sightseeing/archaeological.svg (revision 16006) +++ trunk/resources/images/presets/sightseeing/archaeological.svg (revision 16006) @@ -0,0 +1,148 @@ + + + + + + + + + image/svg+xml + + + + + Ulf Lamping + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sightseeing/arts_centre.svg =================================================================== --- trunk/resources/images/presets/sightseeing/arts_centre.svg (revision 16006) +++ trunk/resources/images/presets/sightseeing/arts_centre.svg (revision 16006) @@ -0,0 +1,130 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sightseeing/attraction.svg =================================================================== --- trunk/resources/images/presets/sightseeing/attraction.svg (revision 16006) +++ trunk/resources/images/presets/sightseeing/attraction.svg (revision 16006) @@ -0,0 +1,91 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sightseeing/battlefield.svg =================================================================== --- trunk/resources/images/presets/sightseeing/battlefield.svg (revision 16006) +++ trunk/resources/images/presets/sightseeing/battlefield.svg (revision 16006) @@ -0,0 +1,56 @@ + + + + + + + Part of the Flat Icon Collection (Wed Aug 25 23:23:49 2004) + + + + hash + + application + computer + icons + theme + + + + + Danny Allen + + + + + Danny Allen + + + + + Danny Allen + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sightseeing/castle.svg =================================================================== --- trunk/resources/images/presets/sightseeing/castle.svg (revision 16006) +++ trunk/resources/images/presets/sightseeing/castle.svg (revision 16006) @@ -0,0 +1,82 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + Index: trunk/resources/images/presets/sightseeing/fort.svg =================================================================== --- trunk/resources/images/presets/sightseeing/fort.svg (revision 16006) +++ trunk/resources/images/presets/sightseeing/fort.svg (revision 16006) @@ -0,0 +1,148 @@ + + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/sightseeing/memorial.svg =================================================================== --- trunk/resources/images/presets/sightseeing/memorial.svg (revision 16006) +++ trunk/resources/images/presets/sightseeing/memorial.svg (revision 16006) @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + Ulf Lamping + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sightseeing/monument.svg =================================================================== --- trunk/resources/images/presets/sightseeing/monument.svg (revision 16006) +++ trunk/resources/images/presets/sightseeing/monument.svg (revision 16006) @@ -0,0 +1,123 @@ + + + + + + + + + + + + image/svg+xml + + + + + Ulf Lamping + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sightseeing/museum.svg =================================================================== --- trunk/resources/images/presets/sightseeing/museum.svg (revision 16006) +++ trunk/resources/images/presets/sightseeing/museum.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + + image/svg+xml + + + + + + + + + Index: trunk/resources/images/presets/sightseeing/palaeontological_site.svg =================================================================== --- trunk/resources/images/presets/sightseeing/palaeontological_site.svg (revision 16006) +++ trunk/resources/images/presets/sightseeing/palaeontological_site.svg (revision 16006) @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2013-01-27T07:14:26 + + https://openclipart.org/detail/174552/ammonite-by-gosc-174552 + + + Gosc + + + + + Ammonit + Ammonshorn + Fossil + Paläontologie + ammonite + animal + biology + black and white + cephalopoda + ceratite + contour + evolution + extinct + fossil + geology + line art + outline + palaeontology + paleontology + shell + + + + + + + + + + + Index: trunk/resources/images/presets/sightseeing/peak_viewpoint.svg =================================================================== --- trunk/resources/images/presets/sightseeing/peak_viewpoint.svg (revision 16006) +++ trunk/resources/images/presets/sightseeing/peak_viewpoint.svg (revision 16006) @@ -0,0 +1,97 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + Index: trunk/resources/images/presets/sightseeing/ruins.svg =================================================================== --- trunk/resources/images/presets/sightseeing/ruins.svg (revision 16006) +++ trunk/resources/images/presets/sightseeing/ruins.svg (revision 16006) @@ -0,0 +1,116 @@ + + + + + + + + + image/svg+xml + + + + + Ulf Lamping + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sightseeing/viewpoint.svg =================================================================== --- trunk/resources/images/presets/sightseeing/viewpoint.svg (revision 16006) +++ trunk/resources/images/presets/sightseeing/viewpoint.svg (revision 16006) @@ -0,0 +1,103 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: trunk/resources/images/presets/social_facility/assisted_living.svg =================================================================== --- trunk/resources/images/presets/social_facility/assisted_living.svg (revision 16006) +++ trunk/resources/images/presets/social_facility/assisted_living.svg (revision 16006) @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/social_facility/food_bank.svg =================================================================== --- trunk/resources/images/presets/social_facility/food_bank.svg (revision 16006) +++ trunk/resources/images/presets/social_facility/food_bank.svg (revision 16006) @@ -0,0 +1,230 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/social_facility/group_home.svg =================================================================== --- trunk/resources/images/presets/social_facility/group_home.svg (revision 16006) +++ trunk/resources/images/presets/social_facility/group_home.svg (revision 16006) @@ -0,0 +1,244 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/social_facility/nursing_home.svg =================================================================== --- trunk/resources/images/presets/social_facility/nursing_home.svg (revision 16006) +++ trunk/resources/images/presets/social_facility/nursing_home.svg (revision 16006) @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/social_facility/outreach.svg =================================================================== --- trunk/resources/images/presets/social_facility/outreach.svg (revision 16006) +++ trunk/resources/images/presets/social_facility/outreach.svg (revision 16006) @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/social_facility/shelter.svg =================================================================== --- trunk/resources/images/presets/social_facility/shelter.svg (revision 16006) +++ trunk/resources/images/presets/social_facility/shelter.svg (revision 16006) @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/10pin.svg =================================================================== --- trunk/resources/images/presets/sport/10pin.svg (revision 16006) +++ trunk/resources/images/presets/sport/10pin.svg (revision 16006) @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/9pin.svg =================================================================== --- trunk/resources/images/presets/sport/9pin.svg (revision 16006) +++ trunk/resources/images/presets/sport/9pin.svg (revision 16006) @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/archery.svg =================================================================== --- trunk/resources/images/presets/sport/archery.svg (revision 16006) +++ trunk/resources/images/presets/sport/archery.svg (revision 16006) @@ -0,0 +1,142 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/athletics.svg =================================================================== --- trunk/resources/images/presets/sport/athletics.svg (revision 16006) +++ trunk/resources/images/presets/sport/athletics.svg (revision 16006) @@ -0,0 +1,70 @@ + + + +image/svg+xml + + + + + Index: trunk/resources/images/presets/sport/baseball.svg =================================================================== --- trunk/resources/images/presets/sport/baseball.svg (revision 16006) +++ trunk/resources/images/presets/sport/baseball.svg (revision 16006) @@ -0,0 +1,216 @@ + + + + + + + Baseball + Baseball + + + sports + toy + baseball + ball + entertainment + + + + + Open Clip Art Library + + + + + Anthony Liekens + + + + + Anthony Liekens + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/basketball.svg =================================================================== --- trunk/resources/images/presets/sport/basketball.svg (revision 16006) +++ trunk/resources/images/presets/sport/basketball.svg (revision 16006) @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/beachvolleyball.svg =================================================================== --- trunk/resources/images/presets/sport/beachvolleyball.svg (revision 16006) +++ trunk/resources/images/presets/sport/beachvolleyball.svg (revision 16006) @@ -0,0 +1,75 @@ + + + +image/svg+xml + + + + + + + + Index: trunk/resources/images/presets/sport/billiards.svg =================================================================== --- trunk/resources/images/presets/sport/billiards.svg (revision 16006) +++ trunk/resources/images/presets/sport/billiards.svg (revision 16006) @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + 8 + + + + + + image/svg+xml + + + + + Openclipart + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/boule.svg =================================================================== --- trunk/resources/images/presets/sport/boule.svg (revision 16006) +++ trunk/resources/images/presets/sport/boule.svg (revision 16006) @@ -0,0 +1,127 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/canoe.svg =================================================================== --- trunk/resources/images/presets/sport/canoe.svg (revision 16006) +++ trunk/resources/images/presets/sport/canoe.svg (revision 16006) @@ -0,0 +1,65 @@ + + + +image/svg+xml Index: trunk/resources/images/presets/sport/chess.svg =================================================================== --- trunk/resources/images/presets/sport/chess.svg (revision 16006) +++ trunk/resources/images/presets/sport/chess.svg (revision 16006) @@ -0,0 +1,305 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/climbing.svg =================================================================== --- trunk/resources/images/presets/sport/climbing.svg (revision 16006) +++ trunk/resources/images/presets/sport/climbing.svg (revision 16006) @@ -0,0 +1,115 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/cricket.svg =================================================================== --- trunk/resources/images/presets/sport/cricket.svg (revision 16006) +++ trunk/resources/images/presets/sport/cricket.svg (revision 16006) @@ -0,0 +1,175 @@ + + + + + + + Cricket Bat + + + + + sports + cricket + recreation + + + + + Chris Goerner + + + + + Chris Goerner + + + + + Chris Goerner + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/croquet.svg =================================================================== --- trunk/resources/images/presets/sport/croquet.svg (revision 16006) +++ trunk/resources/images/presets/sport/croquet.svg (revision 16006) @@ -0,0 +1,103 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/cycling.svg =================================================================== --- trunk/resources/images/presets/sport/cycling.svg (revision 16006) +++ trunk/resources/images/presets/sport/cycling.svg (revision 16006) @@ -0,0 +1,371 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Part of Hotel Icons Collection + + + icon + symbol + hotel + + + + + Open Clip Art Library + + + + + Gerald G. + + + + + Gerald G. + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/dog_racing.svg =================================================================== --- trunk/resources/images/presets/sport/dog_racing.svg (revision 16006) +++ trunk/resources/images/presets/sport/dog_racing.svg (revision 16006) @@ -0,0 +1,93 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/equestrian.svg =================================================================== --- trunk/resources/images/presets/sport/equestrian.svg (revision 16006) +++ trunk/resources/images/presets/sport/equestrian.svg (revision 16006) @@ -0,0 +1,76 @@ + + + +image/svg+xml + + + + + + + Index: trunk/resources/images/presets/sport/field_hockey.svg =================================================================== --- trunk/resources/images/presets/sport/field_hockey.svg (revision 16006) +++ trunk/resources/images/presets/sport/field_hockey.svg (revision 16006) @@ -0,0 +1,113 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/fishing.svg =================================================================== --- trunk/resources/images/presets/sport/fishing.svg (revision 16006) +++ trunk/resources/images/presets/sport/fishing.svg (revision 16006) @@ -0,0 +1,127 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/fitness_centre.svg =================================================================== --- trunk/resources/images/presets/sport/fitness_centre.svg (revision 16006) +++ trunk/resources/images/presets/sport/fitness_centre.svg (revision 16006) @@ -0,0 +1,128 @@ + + + + + + + + + image/svg+xml + + + en + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/football.svg =================================================================== --- trunk/resources/images/presets/sport/football.svg (revision 16006) +++ trunk/resources/images/presets/sport/football.svg (revision 16006) @@ -0,0 +1,752 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + molumen + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/golf.svg =================================================================== --- trunk/resources/images/presets/sport/golf.svg (revision 16006) +++ trunk/resources/images/presets/sport/golf.svg (revision 16006) @@ -0,0 +1,63 @@ + + + +image/svg+xml Index: trunk/resources/images/presets/sport/golf/bunker.svg =================================================================== --- trunk/resources/images/presets/sport/golf/bunker.svg (revision 16006) +++ trunk/resources/images/presets/sport/golf/bunker.svg (revision 16006) @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/golf/driving_range.svg =================================================================== --- trunk/resources/images/presets/sport/golf/driving_range.svg (revision 16006) +++ trunk/resources/images/presets/sport/golf/driving_range.svg (revision 16006) @@ -0,0 +1,156 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/golf/fairway.svg =================================================================== --- trunk/resources/images/presets/sport/golf/fairway.svg (revision 16006) +++ trunk/resources/images/presets/sport/golf/fairway.svg (revision 16006) @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + Index: trunk/resources/images/presets/sport/golf/golf.svg =================================================================== --- trunk/resources/images/presets/sport/golf/golf.svg (revision 16006) +++ trunk/resources/images/presets/sport/golf/golf.svg (revision 16006) @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/golf/green.svg =================================================================== --- trunk/resources/images/presets/sport/golf/green.svg (revision 16006) +++ trunk/resources/images/presets/sport/golf/green.svg (revision 16006) @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/golf/hole.svg =================================================================== --- trunk/resources/images/presets/sport/golf/hole.svg (revision 16006) +++ trunk/resources/images/presets/sport/golf/hole.svg (revision 16006) @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/golf/lateral_water_hazard.svg =================================================================== --- trunk/resources/images/presets/sport/golf/lateral_water_hazard.svg (revision 16006) +++ trunk/resources/images/presets/sport/golf/lateral_water_hazard.svg (revision 16006) @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/golf/pin.svg =================================================================== --- trunk/resources/images/presets/sport/golf/pin.svg (revision 16006) +++ trunk/resources/images/presets/sport/golf/pin.svg (revision 16006) @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/presets/sport/golf/rough.svg =================================================================== --- trunk/resources/images/presets/sport/golf/rough.svg (revision 16006) +++ trunk/resources/images/presets/sport/golf/rough.svg (revision 16006) @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/golf/tee.svg =================================================================== --- trunk/resources/images/presets/sport/golf/tee.svg (revision 16006) +++ trunk/resources/images/presets/sport/golf/tee.svg (revision 16006) @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/golf/water_hazard.svg =================================================================== --- trunk/resources/images/presets/sport/golf/water_hazard.svg (revision 16006) +++ trunk/resources/images/presets/sport/golf/water_hazard.svg (revision 16006) @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/gymnastics.svg =================================================================== --- trunk/resources/images/presets/sport/gymnastics.svg (revision 16006) +++ trunk/resources/images/presets/sport/gymnastics.svg (revision 16006) @@ -0,0 +1,91 @@ + + + + + + + + + +Created by potrace 1.11, written by Peter Selinger 2001-2013 + + + image/svg+xml + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/handball.svg =================================================================== --- trunk/resources/images/presets/sport/handball.svg (revision 16006) +++ trunk/resources/images/presets/sport/handball.svg (revision 16006) @@ -0,0 +1,108 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/ice_hockey.svg =================================================================== --- trunk/resources/images/presets/sport/ice_hockey.svg (revision 16006) +++ trunk/resources/images/presets/sport/ice_hockey.svg (revision 16006) @@ -0,0 +1,113 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/ice_skating.svg =================================================================== --- trunk/resources/images/presets/sport/ice_skating.svg (revision 16006) +++ trunk/resources/images/presets/sport/ice_skating.svg (revision 16006) @@ -0,0 +1,223 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/karting.svg =================================================================== --- trunk/resources/images/presets/sport/karting.svg (revision 16006) +++ trunk/resources/images/presets/sport/karting.svg (revision 16006) @@ -0,0 +1,124 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/miniature_golf.svg =================================================================== --- trunk/resources/images/presets/sport/miniature_golf.svg (revision 16006) +++ trunk/resources/images/presets/sport/miniature_golf.svg (revision 16006) @@ -0,0 +1,71 @@ + + + +image/svg+xml Index: trunk/resources/images/presets/sport/motocross.svg =================================================================== --- trunk/resources/images/presets/sport/motocross.svg (revision 16006) +++ trunk/resources/images/presets/sport/motocross.svg (revision 16006) @@ -0,0 +1,113 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/motor.svg =================================================================== --- trunk/resources/images/presets/sport/motor.svg (revision 16006) +++ trunk/resources/images/presets/sport/motor.svg (revision 16006) @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2012-05-07T08:05:23 + Tango Icon Gear / Shape + https://openclipart.org/detail/169903/gear-by-hank0071 + + + hank0071 + + + + + gear + icon + system + + + + + + + + + + + Index: trunk/resources/images/presets/sport/multi.svg =================================================================== --- trunk/resources/images/presets/sport/multi.svg (revision 16006) +++ trunk/resources/images/presets/sport/multi.svg (revision 16006) @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/pelota.svg =================================================================== --- trunk/resources/images/presets/sport/pelota.svg (revision 16006) +++ trunk/resources/images/presets/sport/pelota.svg (revision 16006) @@ -0,0 +1,112 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/pitch.svg =================================================================== --- trunk/resources/images/presets/sport/pitch.svg (revision 16006) +++ trunk/resources/images/presets/sport/pitch.svg (revision 16006) @@ -0,0 +1,649 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/raceway.svg =================================================================== --- trunk/resources/images/presets/sport/raceway.svg (revision 16006) +++ trunk/resources/images/presets/sport/raceway.svg (revision 16006) @@ -0,0 +1,81 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/racquetball.svg =================================================================== --- trunk/resources/images/presets/sport/racquetball.svg (revision 16006) +++ trunk/resources/images/presets/sport/racquetball.svg (revision 16006) @@ -0,0 +1,419 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Part of Hotel Icons Collection + + + icon + symbol + hotel + + + + + Open Clip Art Library + + + + + Gerald G. + + + + + Gerald G. + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/range.svg =================================================================== --- trunk/resources/images/presets/sport/range.svg (revision 16006) +++ trunk/resources/images/presets/sport/range.svg (revision 16006) @@ -0,0 +1,99 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/rc_car.svg =================================================================== --- trunk/resources/images/presets/sport/rc_car.svg (revision 16006) +++ trunk/resources/images/presets/sport/rc_car.svg (revision 16006) @@ -0,0 +1,123 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/riding.svg =================================================================== --- trunk/resources/images/presets/sport/riding.svg (revision 16006) +++ trunk/resources/images/presets/sport/riding.svg (revision 16006) @@ -0,0 +1,105 @@ + + + + + + + + SVG Road Signs + UK roadsigns + + + transport + roadsign + + + + + John Cliff + + + + + John Cliff + + + + + John Cliff + + + + image/svg+xml + + + en + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/roller_skating.svg =================================================================== --- trunk/resources/images/presets/sport/roller_skating.svg (revision 16006) +++ trunk/resources/images/presets/sport/roller_skating.svg (revision 16006) @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/rowing.svg =================================================================== --- trunk/resources/images/presets/sport/rowing.svg (revision 16006) +++ trunk/resources/images/presets/sport/rowing.svg (revision 16006) @@ -0,0 +1,109 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/running.svg =================================================================== --- trunk/resources/images/presets/sport/running.svg (revision 16006) +++ trunk/resources/images/presets/sport/running.svg (revision 16006) @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2010-08-04T12:55:11 + Separate entries of sport pictogram from my set + https://openclipart.org/detail/77317/running-pictogram-by-shokunin + + + shokunin + + + + + box + boxing + fence + gym + gymnastics + jump + jumping + lifting + man + pictogram + run + running + silhouette + sports + sports2010 + weight + + + + + + + + + + + Index: trunk/resources/images/presets/sport/scuba_diving.svg =================================================================== --- trunk/resources/images/presets/sport/scuba_diving.svg (revision 16006) +++ trunk/resources/images/presets/sport/scuba_diving.svg (revision 16006) @@ -0,0 +1,72 @@ + + + +image/svg+xml Index: trunk/resources/images/presets/sport/skateboard.svg =================================================================== --- trunk/resources/images/presets/sport/skateboard.svg (revision 16006) +++ trunk/resources/images/presets/sport/skateboard.svg (revision 16006) @@ -0,0 +1,129 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/skiing.svg =================================================================== --- trunk/resources/images/presets/sport/skiing.svg (revision 16006) +++ trunk/resources/images/presets/sport/skiing.svg (revision 16006) @@ -0,0 +1,371 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Part of Hotel Icons Collection + + + icon + symbol + hotel + + + + + Open Clip Art Library + + + + + Gerald G. + + + + + Gerald G. + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/soccer.svg =================================================================== --- trunk/resources/images/presets/sport/soccer.svg (revision 16006) +++ trunk/resources/images/presets/sport/soccer.svg (revision 16006) @@ -0,0 +1,185 @@ + + + + + + + + + + + + + Soccer Ball. + + + sports + toy + ball + soccer + + + + + Open Clip Art Project + + + + + Gerald G. + + + + + Public Domain + + + 2005-04-22 + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/sports_centre.svg =================================================================== --- trunk/resources/images/presets/sport/sports_centre.svg (revision 16006) +++ trunk/resources/images/presets/sport/sports_centre.svg (revision 16006) @@ -0,0 +1,222 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/stadium.svg =================================================================== --- trunk/resources/images/presets/sport/stadium.svg (revision 16006) +++ trunk/resources/images/presets/sport/stadium.svg (revision 16006) @@ -0,0 +1,143 @@ + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/swimming.svg =================================================================== --- trunk/resources/images/presets/sport/swimming.svg (revision 16006) +++ trunk/resources/images/presets/sport/swimming.svg (revision 16006) @@ -0,0 +1,367 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Part of Hotel Icons Collection + + + icon + symbol + hotel + + + + + Open Clip Art Library + + + + + Gerald G. + + + + + Gerald G. + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/table_tennis.svg =================================================================== --- trunk/resources/images/presets/sport/table_tennis.svg (revision 16006) +++ trunk/resources/images/presets/sport/table_tennis.svg (revision 16006) @@ -0,0 +1,128 @@ + + + + + + + + + table tennis + + + + sports + table + tennis + ping pong + + + + + Open Clip Art Library + + + + + Omar Abo-Namous + + + + + Omar Abo-Namous + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/tennis.svg =================================================================== --- trunk/resources/images/presets/sport/tennis.svg (revision 16006) +++ trunk/resources/images/presets/sport/tennis.svg (revision 16006) @@ -0,0 +1,365 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Part of Hotel Icons Collection + + + icon + symbol + hotel + + + + + Open Clip Art Library + + + + + Gerald G. + + + + + Gerald G. + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/track.svg =================================================================== --- trunk/resources/images/presets/sport/track.svg (revision 16006) +++ trunk/resources/images/presets/sport/track.svg (revision 16006) @@ -0,0 +1,168 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/sport/volleyball.svg =================================================================== --- trunk/resources/images/presets/sport/volleyball.svg (revision 16006) +++ trunk/resources/images/presets/sport/volleyball.svg (revision 16006) @@ -0,0 +1,264 @@ + + + + + + + + + Volley Ball + + + sports + ball + volley + + + + + Open Clip Art Library + + + + + Angelo Gelmi + + + + + Angelo Gelmi + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Volley-Ball + + + Index: trunk/resources/images/presets/telecom/connection_point.svg =================================================================== --- trunk/resources/images/presets/telecom/connection_point.svg (revision 16006) +++ trunk/resources/images/presets/telecom/connection_point.svg (revision 16006) @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/telecom/exchange.svg =================================================================== --- trunk/resources/images/presets/telecom/exchange.svg (revision 16006) +++ trunk/resources/images/presets/telecom/exchange.svg (revision 16006) @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/telecom/service_device.svg =================================================================== --- trunk/resources/images/presets/telecom/service_device.svg (revision 16006) +++ trunk/resources/images/presets/telecom/service_device.svg (revision 16006) @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/telecom/telecom.svg =================================================================== --- trunk/resources/images/presets/telecom/telecom.svg (revision 16006) +++ trunk/resources/images/presets/telecom/telecom.svg (revision 16006) @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/telecom/telecom_cabinet.svg =================================================================== --- trunk/resources/images/presets/telecom/telecom_cabinet.svg (revision 16006) +++ trunk/resources/images/presets/telecom/telecom_cabinet.svg (revision 16006) @@ -0,0 +1,10 @@ + + + + + + + T + + + Index: trunk/resources/images/presets/transport/aerialway/cable_car.svg =================================================================== --- trunk/resources/images/presets/transport/aerialway/cable_car.svg (revision 16006) +++ trunk/resources/images/presets/transport/aerialway/cable_car.svg (revision 16006) @@ -0,0 +1,120 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/aerialway/chair_lift.svg =================================================================== --- trunk/resources/images/presets/transport/aerialway/chair_lift.svg (revision 16006) +++ trunk/resources/images/presets/transport/aerialway/chair_lift.svg (revision 16006) @@ -0,0 +1,106 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/aerialway/drag_lift.svg =================================================================== --- trunk/resources/images/presets/transport/aerialway/drag_lift.svg (revision 16006) +++ trunk/resources/images/presets/transport/aerialway/drag_lift.svg (revision 16006) @@ -0,0 +1,97 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/aerialway/gondola.svg =================================================================== --- trunk/resources/images/presets/transport/aerialway/gondola.svg (revision 16006) +++ trunk/resources/images/presets/transport/aerialway/gondola.svg (revision 16006) @@ -0,0 +1,104 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/aerialway/goods.svg =================================================================== --- trunk/resources/images/presets/transport/aerialway/goods.svg (revision 16006) +++ trunk/resources/images/presets/transport/aerialway/goods.svg (revision 16006) @@ -0,0 +1,96 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/aerialway/magic_carpet.svg =================================================================== --- trunk/resources/images/presets/transport/aerialway/magic_carpet.svg (revision 16006) +++ trunk/resources/images/presets/transport/aerialway/magic_carpet.svg (revision 16006) @@ -0,0 +1,205 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/aerialway/mixed_lift.svg =================================================================== --- trunk/resources/images/presets/transport/aerialway/mixed_lift.svg (revision 16006) +++ trunk/resources/images/presets/transport/aerialway/mixed_lift.svg (revision 16006) @@ -0,0 +1,131 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/aerialway/pylon.svg =================================================================== --- trunk/resources/images/presets/transport/aerialway/pylon.svg (revision 16006) +++ trunk/resources/images/presets/transport/aerialway/pylon.svg (revision 16006) @@ -0,0 +1,128 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/aerialway/station.svg =================================================================== --- trunk/resources/images/presets/transport/aerialway/station.svg (revision 16006) +++ trunk/resources/images/presets/transport/aerialway/station.svg (revision 16006) @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/aerialway/zip_line.svg =================================================================== --- trunk/resources/images/presets/transport/aerialway/zip_line.svg (revision 16006) +++ trunk/resources/images/presets/transport/aerialway/zip_line.svg (revision 16006) @@ -0,0 +1,140 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/airport.svg =================================================================== --- trunk/resources/images/presets/transport/airport.svg (revision 16006) +++ trunk/resources/images/presets/transport/airport.svg (revision 16006) @@ -0,0 +1,133 @@ + + + + + + AIGA_Symbol_Signs + EPS converted from http://aiga.org + + + symbol + mapsym + + + + + Open Clip Art Library + + + + + Jean-Victor Balin + + + + + Jean-Victor Balin + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/airport/airfield.svg =================================================================== --- trunk/resources/images/presets/transport/airport/airfield.svg (revision 16006) +++ trunk/resources/images/presets/transport/airport/airfield.svg (revision 16006) @@ -0,0 +1,112 @@ + + + + + + + + military airplane + + + + army + military + mig + vehicles + fly + air force + fighter + airplane + bomber + + + + + Open Clip Art Library + + + + + mo + + + + + mo + + + 20 09 2005 + image/svg+xml + + + en + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/airport/airmark_beacon.svg =================================================================== --- trunk/resources/images/presets/transport/airport/airmark_beacon.svg (revision 16006) +++ trunk/resources/images/presets/transport/airport/airmark_beacon.svg (revision 16006) @@ -0,0 +1,133 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/airport/apron.svg =================================================================== --- trunk/resources/images/presets/transport/airport/apron.svg (revision 16006) +++ trunk/resources/images/presets/transport/airport/apron.svg (revision 16006) @@ -0,0 +1,175 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/airport/gate.svg =================================================================== --- trunk/resources/images/presets/transport/airport/gate.svg (revision 16006) +++ trunk/resources/images/presets/transport/airport/gate.svg (revision 16006) @@ -0,0 +1,83 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/airport/hangar.svg =================================================================== --- trunk/resources/images/presets/transport/airport/hangar.svg (revision 16006) +++ trunk/resources/images/presets/transport/airport/hangar.svg (revision 16006) @@ -0,0 +1,76 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + Index: trunk/resources/images/presets/transport/airport/helipad.svg =================================================================== --- trunk/resources/images/presets/transport/airport/helipad.svg (revision 16006) +++ trunk/resources/images/presets/transport/airport/helipad.svg (revision 16006) @@ -0,0 +1,248 @@ + + + + + + + EPS converted from http://aiga.org + + + symbol + mapsym + + + + + Open Clip Art Library + + + + + Jean-Victor Balin + + + + + Jean-Victor Balin + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/airport/holding_position.svg =================================================================== --- trunk/resources/images/presets/transport/airport/holding_position.svg (revision 16006) +++ trunk/resources/images/presets/transport/airport/holding_position.svg (revision 16006) @@ -0,0 +1,115 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/airport/navigationaid.svg =================================================================== --- trunk/resources/images/presets/transport/airport/navigationaid.svg (revision 16006) +++ trunk/resources/images/presets/transport/airport/navigationaid.svg (revision 16006) @@ -0,0 +1,130 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/airport/papi.svg =================================================================== --- trunk/resources/images/presets/transport/airport/papi.svg (revision 16006) +++ trunk/resources/images/presets/transport/airport/papi.svg (revision 16006) @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/airport/parking_position.svg =================================================================== --- trunk/resources/images/presets/transport/airport/parking_position.svg (revision 16006) +++ trunk/resources/images/presets/transport/airport/parking_position.svg (revision 16006) @@ -0,0 +1,100 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/airport/runway.svg =================================================================== --- trunk/resources/images/presets/transport/airport/runway.svg (revision 16006) +++ trunk/resources/images/presets/transport/airport/runway.svg (revision 16006) @@ -0,0 +1,150 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/airport/taxiway.svg =================================================================== --- trunk/resources/images/presets/transport/airport/taxiway.svg (revision 16006) +++ trunk/resources/images/presets/transport/airport/taxiway.svg (revision 16006) @@ -0,0 +1,94 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/airport/terminal.svg =================================================================== --- trunk/resources/images/presets/transport/airport/terminal.svg (revision 16006) +++ trunk/resources/images/presets/transport/airport/terminal.svg (revision 16006) @@ -0,0 +1,190 @@ + + + + + + AIGA_Symbol_Signs + EPS converted from http://aiga.org + + + symbol + mapsym + + + + + Open Clip Art Library + + + + + Jean-Victor Balin + + + + + Jean-Victor Balin + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/airport/vasi.svg =================================================================== --- trunk/resources/images/presets/transport/airport/vasi.svg (revision 16006) +++ trunk/resources/images/presets/transport/airport/vasi.svg (revision 16006) @@ -0,0 +1,122 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/airport/windsock.svg =================================================================== --- trunk/resources/images/presets/transport/airport/windsock.svg (revision 16006) +++ trunk/resources/images/presets/transport/airport/windsock.svg (revision 16006) @@ -0,0 +1,92 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/presets/transport/bridge/bridge.svg =================================================================== --- trunk/resources/images/presets/transport/bridge/bridge.svg (revision 16006) +++ trunk/resources/images/presets/transport/bridge/bridge.svg (revision 16006) @@ -0,0 +1,98 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/bridge/bridge_movable.svg =================================================================== --- trunk/resources/images/presets/transport/bridge/bridge_movable.svg (revision 16006) +++ trunk/resources/images/presets/transport/bridge/bridge_movable.svg (revision 16006) @@ -0,0 +1,109 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/bridge/bridge_outline.svg =================================================================== --- trunk/resources/images/presets/transport/bridge/bridge_outline.svg (revision 16006) +++ trunk/resources/images/presets/transport/bridge/bridge_outline.svg (revision 16006) @@ -0,0 +1,97 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/bridge/bridge_support.svg =================================================================== --- trunk/resources/images/presets/transport/bridge/bridge_support.svg (revision 16006) +++ trunk/resources/images/presets/transport/bridge/bridge_support.svg (revision 16006) @@ -0,0 +1,102 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/bus.svg =================================================================== --- trunk/resources/images/presets/transport/bus.svg (revision 16006) +++ trunk/resources/images/presets/transport/bus.svg (revision 16006) @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/bus_old.svg =================================================================== --- trunk/resources/images/presets/transport/bus_old.svg (revision 16006) +++ trunk/resources/images/presets/transport/bus_old.svg (revision 16006) @@ -0,0 +1,181 @@ + + + + + + + EPS converted from http://aiga.org + + + symbol + mapsym + + + + + Open Clip Art Library + + + + + Jean-Victor Balin + + + + + Jean-Victor Balin + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/bus_small.svg =================================================================== --- trunk/resources/images/presets/transport/bus_small.svg (revision 16006) +++ trunk/resources/images/presets/transport/bus_small.svg (revision 16006) @@ -0,0 +1,94 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/passage/arcade.svg =================================================================== --- trunk/resources/images/presets/transport/passage/arcade.svg (revision 16006) +++ trunk/resources/images/presets/transport/passage/arcade.svg (revision 16006) @@ -0,0 +1,81 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/passage/colonnade.svg =================================================================== --- trunk/resources/images/presets/transport/passage/colonnade.svg (revision 16006) +++ trunk/resources/images/presets/transport/passage/colonnade.svg (revision 16006) @@ -0,0 +1,80 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/passage/tunnel.svg =================================================================== --- trunk/resources/images/presets/transport/passage/tunnel.svg (revision 16006) +++ trunk/resources/images/presets/transport/passage/tunnel.svg (revision 16006) @@ -0,0 +1,90 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/passage/tunnel_avalanche_protector.svg =================================================================== --- trunk/resources/images/presets/transport/passage/tunnel_avalanche_protector.svg (revision 16006) +++ trunk/resources/images/presets/transport/passage/tunnel_avalanche_protector.svg (revision 16006) @@ -0,0 +1,93 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/passage/tunnel_building_passage.svg =================================================================== --- trunk/resources/images/presets/transport/passage/tunnel_building_passage.svg (revision 16006) +++ trunk/resources/images/presets/transport/passage/tunnel_building_passage.svg (revision 16006) @@ -0,0 +1,92 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/passage/tunnel_culvert.svg =================================================================== --- trunk/resources/images/presets/transport/passage/tunnel_culvert.svg (revision 16006) +++ trunk/resources/images/presets/transport/passage/tunnel_culvert.svg (revision 16006) @@ -0,0 +1,99 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/platform.svg =================================================================== --- trunk/resources/images/presets/transport/platform.svg (revision 16006) +++ trunk/resources/images/presets/transport/platform.svg (revision 16006) @@ -0,0 +1,87 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/presets/transport/platform_bus.svg =================================================================== --- trunk/resources/images/presets/transport/platform_bus.svg (revision 16006) +++ trunk/resources/images/presets/transport/platform_bus.svg (revision 16006) @@ -0,0 +1,185 @@ + + + + + + + EPS converted from http://aiga.org + + + symbol + mapsym + + + + + Open Clip Art Library + + + + + Jean-Victor Balin + + + + + Jean-Victor Balin + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/platform_rail.svg =================================================================== --- trunk/resources/images/presets/transport/platform_rail.svg (revision 16006) +++ trunk/resources/images/presets/transport/platform_rail.svg (revision 16006) @@ -0,0 +1,189 @@ + + + + + + + EPS converted from http://aiga.org + + + symbol + mapsym + + + + + Open Clip Art Library + + + + + Jean-Victor Balin + + + + + Jean-Victor Balin + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/abandoned_rail.svg =================================================================== --- trunk/resources/images/presets/transport/railway/abandoned_rail.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/abandoned_rail.svg (revision 16006) @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/buffer_stop.svg =================================================================== --- trunk/resources/images/presets/transport/railway/buffer_stop.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/buffer_stop.svg (revision 16006) @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/bus_guideway.svg =================================================================== --- trunk/resources/images/presets/transport/railway/bus_guideway.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/bus_guideway.svg (revision 16006) @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/crossing.svg =================================================================== --- trunk/resources/images/presets/transport/railway/crossing.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/crossing.svg (revision 16006) @@ -0,0 +1,84 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/disused_rail.svg =================================================================== --- trunk/resources/images/presets/transport/railway/disused_rail.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/disused_rail.svg (revision 16006) @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/funicular.svg =================================================================== --- trunk/resources/images/presets/transport/railway/funicular.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/funicular.svg (revision 16006) @@ -0,0 +1,129 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/level_crossing.svg =================================================================== --- trunk/resources/images/presets/transport/railway/level_crossing.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/level_crossing.svg (revision 16006) @@ -0,0 +1,98 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/light_rail.svg =================================================================== --- trunk/resources/images/presets/transport/railway/light_rail.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/light_rail.svg (revision 16006) @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/milestone.svg =================================================================== --- trunk/resources/images/presets/transport/railway/milestone.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/milestone.svg (revision 16006) @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/monorail.svg =================================================================== --- trunk/resources/images/presets/transport/railway/monorail.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/monorail.svg (revision 16006) @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/narrow_gauge_rail.svg =================================================================== --- trunk/resources/images/presets/transport/railway/narrow_gauge_rail.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/narrow_gauge_rail.svg (revision 16006) @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/preserved.svg =================================================================== --- trunk/resources/images/presets/transport/railway/preserved.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/preserved.svg (revision 16006) @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/rail.svg =================================================================== --- trunk/resources/images/presets/transport/railway/rail.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/rail.svg (revision 16006) @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/railway_construction.svg =================================================================== --- trunk/resources/images/presets/transport/railway/railway_construction.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/railway_construction.svg (revision 16006) @@ -0,0 +1,166 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/railway_crossing.svg =================================================================== --- trunk/resources/images/presets/transport/railway/railway_crossing.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/railway_crossing.svg (revision 16006) @@ -0,0 +1,97 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/signal.svg =================================================================== --- trunk/resources/images/presets/transport/railway/signal.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/signal.svg (revision 16006) @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/subway.svg =================================================================== --- trunk/resources/images/presets/transport/railway/subway.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/subway.svg (revision 16006) @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/switch.svg =================================================================== --- trunk/resources/images/presets/transport/railway/switch.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/switch.svg (revision 16006) @@ -0,0 +1,98 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/tram.svg =================================================================== --- trunk/resources/images/presets/transport/railway/tram.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/tram.svg (revision 16006) @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway/turntable.svg =================================================================== --- trunk/resources/images/presets/transport/railway/turntable.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway/turntable.svg (revision 16006) @@ -0,0 +1,129 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway_halt.svg =================================================================== --- trunk/resources/images/presets/transport/railway_halt.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway_halt.svg (revision 16006) @@ -0,0 +1,143 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/railway_station.svg =================================================================== --- trunk/resources/images/presets/transport/railway_station.svg (revision 16006) +++ trunk/resources/images/presets/transport/railway_station.svg (revision 16006) @@ -0,0 +1,172 @@ + + + + + + + EPS converted from http://aiga.org + + + symbol + mapsym + + + + + Open Clip Art Library + + + + + Jean-Victor Balin + + + + + Jean-Victor Balin + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/share_taxi.svg =================================================================== --- trunk/resources/images/presets/transport/share_taxi.svg (revision 16006) +++ trunk/resources/images/presets/transport/share_taxi.svg (revision 16006) @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/station.svg =================================================================== --- trunk/resources/images/presets/transport/station.svg (revision 16006) +++ trunk/resources/images/presets/transport/station.svg (revision 16006) @@ -0,0 +1,161 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/stop_position.svg =================================================================== --- trunk/resources/images/presets/transport/stop_position.svg (revision 16006) +++ trunk/resources/images/presets/transport/stop_position.svg (revision 16006) @@ -0,0 +1,86 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/taxi.svg =================================================================== --- trunk/resources/images/presets/transport/taxi.svg (revision 16006) +++ trunk/resources/images/presets/transport/taxi.svg (revision 16006) @@ -0,0 +1,205 @@ + + + + + + + EPS converted from http://aiga.org + + + symbol + mapsym + + + + + Open Clip Art Library + + + + + Jean-Victor Balin + + + + + Jean-Victor Balin + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/ticket-machine.svg =================================================================== --- trunk/resources/images/presets/transport/ticket-machine.svg (revision 16006) +++ trunk/resources/images/presets/transport/ticket-machine.svg (revision 16006) @@ -0,0 +1,116 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/train.svg =================================================================== --- trunk/resources/images/presets/transport/train.svg (revision 16006) +++ trunk/resources/images/presets/transport/train.svg (revision 16006) @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/tram.svg =================================================================== --- trunk/resources/images/presets/transport/tram.svg (revision 16006) +++ trunk/resources/images/presets/transport/tram.svg (revision 16006) @@ -0,0 +1,170 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/trolleybus.svg =================================================================== --- trunk/resources/images/presets/transport/trolleybus.svg (revision 16006) +++ trunk/resources/images/presets/transport/trolleybus.svg (revision 16006) @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/underground.svg =================================================================== --- trunk/resources/images/presets/transport/underground.svg (revision 16006) +++ trunk/resources/images/presets/transport/underground.svg (revision 16006) @@ -0,0 +1,260 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/combined_foot_cycleway.svg =================================================================== --- trunk/resources/images/presets/transport/way/combined_foot_cycleway.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/combined_foot_cycleway.svg (revision 16006) @@ -0,0 +1,159 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/cycle_lane_track.svg =================================================================== --- trunk/resources/images/presets/transport/way/cycle_lane_track.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/cycle_lane_track.svg (revision 16006) @@ -0,0 +1,156 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/dedicated_bridleway.svg =================================================================== --- trunk/resources/images/presets/transport/way/dedicated_bridleway.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/dedicated_bridleway.svg (revision 16006) @@ -0,0 +1,98 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/dedicated_cycleway.svg =================================================================== --- trunk/resources/images/presets/transport/way/dedicated_cycleway.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/dedicated_cycleway.svg (revision 16006) @@ -0,0 +1,140 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/dedicated_footway.svg =================================================================== --- trunk/resources/images/presets/transport/way/dedicated_footway.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/dedicated_footway.svg (revision 16006) @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/path.svg =================================================================== --- trunk/resources/images/presets/transport/way/path.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/path.svg (revision 16006) @@ -0,0 +1,82 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/segregated_foot_cycleway.svg =================================================================== --- trunk/resources/images/presets/transport/way/segregated_foot_cycleway.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/segregated_foot_cycleway.svg (revision 16006) @@ -0,0 +1,168 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/steps.svg =================================================================== --- trunk/resources/images/presets/transport/way/steps.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/steps.svg (revision 16006) @@ -0,0 +1,120 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/track.svg =================================================================== --- trunk/resources/images/presets/transport/way/track.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/track.svg (revision 16006) @@ -0,0 +1,117 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/tracktype_grade1.svg =================================================================== --- trunk/resources/images/presets/transport/way/tracktype_grade1.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/tracktype_grade1.svg (revision 16006) @@ -0,0 +1,94 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/tracktype_grade2.svg =================================================================== --- trunk/resources/images/presets/transport/way/tracktype_grade2.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/tracktype_grade2.svg (revision 16006) @@ -0,0 +1,94 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/tracktype_grade3.svg =================================================================== --- trunk/resources/images/presets/transport/way/tracktype_grade3.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/tracktype_grade3.svg (revision 16006) @@ -0,0 +1,94 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/tracktype_grade4.svg =================================================================== --- trunk/resources/images/presets/transport/way/tracktype_grade4.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/tracktype_grade4.svg (revision 16006) @@ -0,0 +1,94 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/tracktype_grade5.svg =================================================================== --- trunk/resources/images/presets/transport/way/tracktype_grade5.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/tracktype_grade5.svg (revision 16006) @@ -0,0 +1,94 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_bicycle_road.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_bicycle_road.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_bicycle_road.svg (revision 16006) @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_construction.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_construction.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_construction.svg (revision 16006) @@ -0,0 +1,154 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_escape.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_escape.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_escape.svg (revision 16006) @@ -0,0 +1,257 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_living_street.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_living_street.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_living_street.svg (revision 16006) @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_motorway.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_motorway.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_motorway.svg (revision 16006) @@ -0,0 +1,152 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_motorway_link.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_motorway_link.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_motorway_link.svg (revision 16006) @@ -0,0 +1,165 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_pedestrian.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_pedestrian.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_pedestrian.svg (revision 16006) @@ -0,0 +1,148 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_primary.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_primary.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_primary.svg (revision 16006) @@ -0,0 +1,114 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_primary_link.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_primary_link.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_primary_link.svg (revision 16006) @@ -0,0 +1,131 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_residential.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_residential.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_residential.svg (revision 16006) @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_road.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_road.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_road.svg (revision 16006) @@ -0,0 +1,153 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_secondary.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_secondary.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_secondary.svg (revision 16006) @@ -0,0 +1,114 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_secondary_link.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_secondary_link.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_secondary_link.svg (revision 16006) @@ -0,0 +1,135 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_service.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_service.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_service.svg (revision 16006) @@ -0,0 +1,100 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_service_parking_aisle.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_service_parking_aisle.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_service_parking_aisle.svg (revision 16006) @@ -0,0 +1,100 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_tertiary.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_tertiary.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_tertiary.svg (revision 16006) @@ -0,0 +1,114 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_tertiary_link.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_tertiary_link.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_tertiary_link.svg (revision 16006) @@ -0,0 +1,130 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_trunk.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_trunk.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_trunk.svg (revision 16006) @@ -0,0 +1,111 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_trunk_link.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_trunk_link.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_trunk_link.svg (revision 16006) @@ -0,0 +1,194 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/transport/way/way_unclassified.svg =================================================================== --- trunk/resources/images/presets/transport/way/way_unclassified.svg (revision 16006) +++ trunk/resources/images/presets/transport/way/way_unclassified.svg (revision 16006) @@ -0,0 +1,114 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/asl.svg =================================================================== --- trunk/resources/images/presets/vehicle/asl.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/asl.svg (revision 16006) @@ -0,0 +1,155 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/bicycle_rental.svg =================================================================== --- trunk/resources/images/presets/vehicle/bicycle_rental.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/bicycle_rental.svg (revision 16006) @@ -0,0 +1,219 @@ + + + + + + AIGA_Symbol_Signs + EPS converted from http://aiga.org + + + symbol + mapsym + + + + + Open Clip Art Library + + + + + Jean-Victor Balin + + + + + Jean-Victor Balin + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/bicycle_repair_station.svg =================================================================== --- trunk/resources/images/presets/vehicle/bicycle_repair_station.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/bicycle_repair_station.svg (revision 16006) @@ -0,0 +1,150 @@ + + + Bicycle repair station + + + + image/svg+xml + + Bicycle repair station + + + Bryce Nesbitt + + + + + Unrestricted + + + Wrench plus bicycle symbol + + + BeaOriginal + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/bump.svg =================================================================== --- trunk/resources/images/presets/vehicle/bump.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/bump.svg (revision 16006) @@ -0,0 +1,122 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/car_parts.svg =================================================================== --- trunk/resources/images/presets/vehicle/car_parts.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/car_parts.svg (revision 16006) @@ -0,0 +1,152 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/car_pooling.svg =================================================================== --- trunk/resources/images/presets/vehicle/car_pooling.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/car_pooling.svg (revision 16006) @@ -0,0 +1,108 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/car_rental.svg =================================================================== --- trunk/resources/images/presets/vehicle/car_rental.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/car_rental.svg (revision 16006) @@ -0,0 +1,207 @@ + + + + + + AIGA_Symbol_Signs + EPS converted from http://aiga.org + + + symbol + mapsym + + + + + Open Clip Art Library + + + + + Jean-Victor Balin + + + + + Jean-Victor Balin + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/car_sharing.svg =================================================================== --- trunk/resources/images/presets/vehicle/car_sharing.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/car_sharing.svg (revision 16006) @@ -0,0 +1,192 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/car_wash.svg =================================================================== --- trunk/resources/images/presets/vehicle/car_wash.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/car_wash.svg (revision 16006) @@ -0,0 +1,167 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/charging_station.svg =================================================================== --- trunk/resources/images/presets/vehicle/charging_station.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/charging_station.svg (revision 16006) @@ -0,0 +1,82 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/chicane.svg =================================================================== --- trunk/resources/images/presets/vehicle/chicane.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/chicane.svg (revision 16006) @@ -0,0 +1,124 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/choker.svg =================================================================== --- trunk/resources/images/presets/vehicle/choker.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/choker.svg (revision 16006) @@ -0,0 +1,124 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/compressed_air.svg =================================================================== --- trunk/resources/images/presets/vehicle/compressed_air.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/compressed_air.svg (revision 16006) @@ -0,0 +1,119 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/crossing.svg =================================================================== --- trunk/resources/images/presets/vehicle/crossing.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/crossing.svg (revision 16006) @@ -0,0 +1,137 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/crossing_island.svg =================================================================== --- trunk/resources/images/presets/vehicle/crossing_island.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/crossing_island.svg (revision 16006) @@ -0,0 +1,115 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/crossing_ref_zebra.svg =================================================================== --- trunk/resources/images/presets/vehicle/crossing_ref_zebra.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/crossing_ref_zebra.svg (revision 16006) @@ -0,0 +1,116 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/crossing_traffic_signals.svg =================================================================== --- trunk/resources/images/presets/vehicle/crossing_traffic_signals.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/crossing_traffic_signals.svg (revision 16006) @@ -0,0 +1,99 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/crossing_unmarked.svg =================================================================== --- trunk/resources/images/presets/vehicle/crossing_unmarked.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/crossing_unmarked.svg (revision 16006) @@ -0,0 +1,102 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/cushion.svg =================================================================== --- trunk/resources/images/presets/vehicle/cushion.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/cushion.svg (revision 16006) @@ -0,0 +1,128 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/dip.svg =================================================================== --- trunk/resources/images/presets/vehicle/dip.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/dip.svg (revision 16006) @@ -0,0 +1,122 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/emergency_phone.svg =================================================================== --- trunk/resources/images/presets/vehicle/emergency_phone.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/emergency_phone.svg (revision 16006) @@ -0,0 +1,76 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/ford.svg =================================================================== --- trunk/resources/images/presets/vehicle/ford.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/ford.svg (revision 16006) @@ -0,0 +1,89 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/fuel.svg =================================================================== --- trunk/resources/images/presets/vehicle/fuel.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/fuel.svg (revision 16006) @@ -0,0 +1,91 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/hump.svg =================================================================== --- trunk/resources/images/presets/vehicle/hump.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/hump.svg (revision 16006) @@ -0,0 +1,122 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/island.svg =================================================================== --- trunk/resources/images/presets/vehicle/island.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/island.svg (revision 16006) @@ -0,0 +1,106 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/junction.svg =================================================================== --- trunk/resources/images/presets/vehicle/junction.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/junction.svg (revision 16006) @@ -0,0 +1,144 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/milestone.svg =================================================================== --- trunk/resources/images/presets/vehicle/milestone.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/milestone.svg (revision 16006) @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/motorbike.svg =================================================================== --- trunk/resources/images/presets/vehicle/motorbike.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/motorbike.svg (revision 16006) @@ -0,0 +1,107 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/motorway_junction.svg =================================================================== --- trunk/resources/images/presets/vehicle/motorway_junction.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/motorway_junction.svg (revision 16006) @@ -0,0 +1,246 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/parking/bicycle.svg =================================================================== --- trunk/resources/images/presets/vehicle/parking/bicycle.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/parking/bicycle.svg (revision 16006) @@ -0,0 +1,168 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/parking/handicapped.svg =================================================================== --- trunk/resources/images/presets/vehicle/parking/handicapped.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/parking/handicapped.svg (revision 16006) @@ -0,0 +1,85 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/parking/motorbike.svg =================================================================== --- trunk/resources/images/presets/vehicle/parking/motorbike.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/parking/motorbike.svg (revision 16006) @@ -0,0 +1,98 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/parking/multi-storey.svg =================================================================== --- trunk/resources/images/presets/vehicle/parking/multi-storey.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/parking/multi-storey.svg (revision 16006) @@ -0,0 +1,78 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/parking/park_ride.svg =================================================================== --- trunk/resources/images/presets/vehicle/parking/park_ride.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/parking/park_ride.svg (revision 16006) @@ -0,0 +1,97 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/parking/parking.svg =================================================================== --- trunk/resources/images/presets/vehicle/parking/parking.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/parking/parking.svg (revision 16006) @@ -0,0 +1,74 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/parking/parking_space.svg =================================================================== --- trunk/resources/images/presets/vehicle/parking/parking_space.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/parking/parking_space.svg (revision 16006) @@ -0,0 +1,106 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/parking/underground.svg =================================================================== --- trunk/resources/images/presets/vehicle/parking/underground.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/parking/underground.svg (revision 16006) @@ -0,0 +1,91 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/passing_place.svg =================================================================== --- trunk/resources/images/presets/vehicle/passing_place.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/passing_place.svg (revision 16006) @@ -0,0 +1,233 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/repair_shop.svg =================================================================== --- trunk/resources/images/presets/vehicle/repair_shop.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/repair_shop.svg (revision 16006) @@ -0,0 +1,82 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/rest_area.svg =================================================================== --- trunk/resources/images/presets/vehicle/rest_area.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/rest_area.svg (revision 16006) @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/bicycle-designated.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/bicycle-designated.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/bicycle-designated.svg (revision 16006) @@ -0,0 +1,94 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/bicycle.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/bicycle.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/bicycle.svg (revision 16006) @@ -0,0 +1,98 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/city_limit.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/city_limit.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/city_limit.svg (revision 16006) @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/dead_end.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/dead_end.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/dead_end.svg (revision 16006) @@ -0,0 +1,72 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/foot-designated.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/foot-designated.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/foot-designated.svg (revision 16006) @@ -0,0 +1,103 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/foot.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/foot.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/foot.svg (revision 16006) @@ -0,0 +1,92 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/give_way.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/give_way.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/give_way.svg (revision 16006) @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/goods.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/goods.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/goods.svg (revision 16006) @@ -0,0 +1,105 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/horse-designated.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/horse-designated.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/horse-designated.svg (revision 16006) @@ -0,0 +1,104 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/horse.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/horse.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/horse.svg (revision 16006) @@ -0,0 +1,99 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/maxheight.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/maxheight.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/maxheight.svg (revision 16006) @@ -0,0 +1,110 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/maxlength.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/maxlength.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/maxlength.svg (revision 16006) @@ -0,0 +1,130 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/maxspeed.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/maxspeed.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/maxspeed.svg (revision 16006) @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/maxspeed_none.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/maxspeed_none.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/maxspeed_none.svg (revision 16006) @@ -0,0 +1,98 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/maxweight.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/maxweight.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/maxweight.svg (revision 16006) @@ -0,0 +1,98 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/maxwidth.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/maxwidth.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/maxwidth.svg (revision 16006) @@ -0,0 +1,98 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/mini_roundabout_left.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/mini_roundabout_left.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/mini_roundabout_left.svg (revision 16006) @@ -0,0 +1,125 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/mini_roundabout_right.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/mini_roundabout_right.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/mini_roundabout_right.svg (revision 16006) @@ -0,0 +1,124 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/minspeed.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/minspeed.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/minspeed.svg (revision 16006) @@ -0,0 +1,88 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/motorbike.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/motorbike.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/motorbike.svg (revision 16006) @@ -0,0 +1,103 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/motorcar.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/motorcar.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/motorcar.svg (revision 16006) @@ -0,0 +1,98 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/psv.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/psv.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/psv.svg (revision 16006) @@ -0,0 +1,133 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/restrictions.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/restrictions.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/restrictions.svg (revision 16006) @@ -0,0 +1,96 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/roundabout_left.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/roundabout_left.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/roundabout_left.svg (revision 16006) @@ -0,0 +1,114 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/roundabout_right.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/roundabout_right.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/roundabout_right.svg (revision 16006) @@ -0,0 +1,113 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/speed_camera.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/speed_camera.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/speed_camera.svg (revision 16006) @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/stop.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/stop.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/stop.svg (revision 16006) @@ -0,0 +1,237 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/toll_gantry.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/toll_gantry.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/toll_gantry.svg (revision 16006) @@ -0,0 +1,181 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_left_turn.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_left_turn.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_left_turn.svg (revision 16006) @@ -0,0 +1,8 @@ + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_left_turn_red.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_left_turn_red.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_left_turn_red.svg (revision 16006) @@ -0,0 +1,65 @@ + + + +image/svg+xml Index: trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_right_turn.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_right_turn.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_right_turn.svg (revision 16006) @@ -0,0 +1,81 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_right_turn_red.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_right_turn_red.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_right_turn_red.svg (revision 16006) @@ -0,0 +1,65 @@ + + + +image/svg+xml Index: trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_straight_on.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_straight_on.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_straight_on.svg (revision 16006) @@ -0,0 +1,85 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_straight_on_red.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_straight_on_red.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_straight_on_red.svg (revision 16006) @@ -0,0 +1,68 @@ + + + +image/svg+xml Index: trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_u_turn.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_u_turn.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/turn_restrictions/no_u_turn.svg (revision 16006) @@ -0,0 +1,80 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/turn_restrictions/only_left_turn.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/turn_restrictions/only_left_turn.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/turn_restrictions/only_left_turn.svg (revision 16006) @@ -0,0 +1,78 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/turn_restrictions/only_right_turn.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/turn_restrictions/only_right_turn.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/turn_restrictions/only_right_turn.svg (revision 16006) @@ -0,0 +1,71 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/restriction/turn_restrictions/only_straight_on.svg =================================================================== --- trunk/resources/images/presets/vehicle/restriction/turn_restrictions/only_straight_on.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/restriction/turn_restrictions/only_straight_on.svg (revision 16006) @@ -0,0 +1,81 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/rumble_strip.svg =================================================================== --- trunk/resources/images/presets/vehicle/rumble_strip.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/rumble_strip.svg (revision 16006) @@ -0,0 +1,170 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/services.svg =================================================================== --- trunk/resources/images/presets/vehicle/services.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/services.svg (revision 16006) @@ -0,0 +1,274 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/table.svg =================================================================== --- trunk/resources/images/presets/vehicle/table.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/table.svg (revision 16006) @@ -0,0 +1,149 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/traffic_calming.svg =================================================================== --- trunk/resources/images/presets/vehicle/traffic_calming.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/traffic_calming.svg (revision 16006) @@ -0,0 +1,146 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/traffic_mirror.svg =================================================================== --- trunk/resources/images/presets/vehicle/traffic_mirror.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/traffic_mirror.svg (revision 16006) @@ -0,0 +1,270 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/traffic_signals.svg =================================================================== --- trunk/resources/images/presets/vehicle/traffic_signals.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/traffic_signals.svg (revision 16006) @@ -0,0 +1,113 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/traffic_signals_crossing.svg =================================================================== --- trunk/resources/images/presets/vehicle/traffic_signals_crossing.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/traffic_signals_crossing.svg (revision 16006) @@ -0,0 +1,194 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/traffic_signals_crossing_island.svg =================================================================== --- trunk/resources/images/presets/vehicle/traffic_signals_crossing_island.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/traffic_signals_crossing_island.svg (revision 16006) @@ -0,0 +1,172 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/traffic_signals_crossing_ref_zebra.svg =================================================================== --- trunk/resources/images/presets/vehicle/traffic_signals_crossing_ref_zebra.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/traffic_signals_crossing_ref_zebra.svg (revision 16006) @@ -0,0 +1,173 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/traffic_signals_crossing_traffic_signals.svg =================================================================== --- trunk/resources/images/presets/vehicle/traffic_signals_crossing_traffic_signals.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/traffic_signals_crossing_traffic_signals.svg (revision 16006) @@ -0,0 +1,136 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/turning_circle.svg =================================================================== --- trunk/resources/images/presets/vehicle/turning_circle.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/turning_circle.svg (revision 16006) @@ -0,0 +1,233 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/turning_loop.svg =================================================================== --- trunk/resources/images/presets/vehicle/turning_loop.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/turning_loop.svg (revision 16006) @@ -0,0 +1,236 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/tyres.svg =================================================================== --- trunk/resources/images/presets/vehicle/tyres.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/tyres.svg (revision 16006) @@ -0,0 +1,133 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + Index: trunk/resources/images/presets/vehicle/waypoints.svg =================================================================== --- trunk/resources/images/presets/vehicle/waypoints.svg (revision 16006) +++ trunk/resources/images/presets/vehicle/waypoints.svg (revision 16006) @@ -0,0 +1,106 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/redo.svg =================================================================== --- trunk/resources/images/redo.svg (revision 16006) +++ trunk/resources/images/redo.svg (revision 16006) @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Edit Undo + + + edit + undo + revert + + + + + Andreas Nilsson +Lapo Calamandrei + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/reorder.svg =================================================================== --- trunk/resources/images/reorder.svg (revision 16006) +++ trunk/resources/images/reorder.svg (revision 16006) @@ -0,0 +1,5 @@ + + + + + Index: trunk/resources/images/selectall.svg =================================================================== --- trunk/resources/images/selectall.svg (revision 16006) +++ trunk/resources/images/selectall.svg (revision 16006) @@ -0,0 +1,9 @@ + + + + + Index: trunk/resources/images/session.svg =================================================================== --- trunk/resources/images/session.svg (revision 16006) +++ trunk/resources/images/session.svg (revision 16006) @@ -0,0 +1,660 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/statusline/angle.svg =================================================================== --- trunk/resources/images/statusline/angle.svg (revision 16006) +++ trunk/resources/images/statusline/angle.svg (revision 16006) @@ -0,0 +1,5 @@ + + + + + Index: trunk/resources/images/statusline/dist.svg =================================================================== --- trunk/resources/images/statusline/dist.svg (revision 16006) +++ trunk/resources/images/statusline/dist.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/statusline/easting.svg =================================================================== --- trunk/resources/images/statusline/easting.svg (revision 16006) +++ trunk/resources/images/statusline/easting.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + Index: trunk/resources/images/statusline/heading.svg =================================================================== --- trunk/resources/images/statusline/heading.svg (revision 16006) +++ trunk/resources/images/statusline/heading.svg (revision 16006) @@ -0,0 +1,5 @@ + + + + + Index: trunk/resources/images/statusline/lat.svg =================================================================== --- trunk/resources/images/statusline/lat.svg (revision 16006) +++ trunk/resources/images/statusline/lat.svg (revision 16006) @@ -0,0 +1,5 @@ + + + + + Index: trunk/resources/images/statusline/lon.svg =================================================================== --- trunk/resources/images/statusline/lon.svg (revision 16006) +++ trunk/resources/images/statusline/lon.svg (revision 16006) @@ -0,0 +1,5 @@ + + + + + Index: trunk/resources/images/statusline/northing.svg =================================================================== --- trunk/resources/images/statusline/northing.svg (revision 16006) +++ trunk/resources/images/statusline/northing.svg (revision 16006) @@ -0,0 +1,14 @@ + + + + Index: trunk/resources/images/svpDown.svg =================================================================== --- trunk/resources/images/svpDown.svg (revision 16006) +++ trunk/resources/images/svpDown.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/svpLeft.svg =================================================================== --- trunk/resources/images/svpLeft.svg (revision 16006) +++ trunk/resources/images/svpLeft.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/svpRight.svg =================================================================== --- trunk/resources/images/svpRight.svg (revision 16006) +++ trunk/resources/images/svpRight.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/svpUp.svg =================================================================== --- trunk/resources/images/svpUp.svg (revision 16006) +++ trunk/resources/images/svpUp.svg (revision 16006) @@ -0,0 +1,4 @@ + + + + Index: trunk/resources/images/undo.svg =================================================================== --- trunk/resources/images/undo.svg (revision 16006) +++ trunk/resources/images/undo.svg (revision 16006) @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Edit Undo + + + edit + undo + revert + + + + + Andreas Nilsson +Lapo Calamandrei + + + + + + + + + + + + + + + + + + + + + + Index: trunk/resources/images/unjoinnodeway.svg =================================================================== --- trunk/resources/images/unjoinnodeway.svg (revision 16006) +++ trunk/resources/images/unjoinnodeway.svg (revision 16006) @@ -0,0 +1,5 @@ + + + + + Index: trunk/resources/images/unselectall.svg =================================================================== --- trunk/resources/images/unselectall.svg (revision 16006) +++ trunk/resources/images/unselectall.svg (revision 16006) @@ -0,0 +1,9 @@ + + + + + Index: trunk/resources/images/viewport-follow.svg =================================================================== --- trunk/resources/images/viewport-follow.svg (revision 16006) +++ trunk/resources/images/viewport-follow.svg (revision 16006) @@ -0,0 +1,7 @@ + + + + + + Index: trunk/resources/images/way-select.svg =================================================================== --- trunk/resources/images/way-select.svg (revision 16006) +++ trunk/resources/images/way-select.svg (revision 16006) @@ -0,0 +1,7 @@ + + + + + + + Index: trunk/resources/styles/standard/elemstyles.mapcss =================================================================== --- trunk/resources/styles/standard/elemstyles.mapcss (revision 16006) +++ trunk/resources/styles/standard/elemstyles.mapcss (revision 16006) @@ -0,0 +1,5224 @@ +/* +Main JOSM map paint style. + +Originally in XML format, migrated to MapCSS. +Documentation of MapCSS format: + + https://josm.openstreetmap.de/wiki/Help/Styles/MapCSSImplementation + +*/ + +meta { + icon: "logo_32x32x8.png"; +} + +canvas { + default-points: false; +} +node { + text: auto; +} + +/*************************/ +/* create style settings */ +/*************************/ + +setting::hide_icons { + type: boolean; + label: tr("Hide icons at low zoom"); + default: true; +} + +setting::shrink_nodes { + type: boolean; + label: tr("Less obtrusive node symbols at low zoom"); + default: true; +} + +setting::hide_tagged_waynodes { + type: boolean; + label: tr("Hide tagged waynodes at low zoom"); + default: true; +} + +setting::highway_labels { + type: boolean; + label: tr("Display street labels (at high zoom)"); + default: true; +} + +setting::alt_turn_icons { + type: boolean; + label: tr("Use alternative turn restriction icon set"); + default: false; +} + +setting::place_fill_colour { + type: boolean; + label: tr("Display fill colour of areas with place=*"); + default: false; +} + +setting::partial_fill { + type: boolean; + label: tr("Areas are drawn with fill only around their inner edges"); + default: true; +} + +/*********************/ +/* turn restrictions */ +/*********************/ + +relation[restriction=no_left_turn][!setting("alt_turn_icons")] { + icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn_red.svg"; + set icon_z17; + text: auto; +} +relation[restriction=no_left_turn][setting("alt_turn_icons")] { + icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn.svg"; + set icon_z17; + text: auto; +} +relation[restriction=no_right_turn][!setting("alt_turn_icons")] { + icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn_red.svg"; + set icon_z17; + text: auto; +} +relation[restriction=no_right_turn][setting("alt_turn_icons")] { + icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn.svg"; + set icon_z17; + text: auto; +} +relation[restriction=no_straight_on][!setting("alt_turn_icons")] { + icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on_red.svg"; + set icon_z17; + text: auto; +} +relation[restriction=no_straight_on][setting("alt_turn_icons")] { + icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on.svg"; + set icon_z17; + text: auto; +} +relation[restriction=no_u_turn] { + icon-image: "presets/vehicle/restriction/turn_restrictions/no_u_turn.svg"; + set icon_z17; + text: auto; +} +relation[restriction=only_left_turn] { + icon-image: "presets/vehicle/restriction/turn_restrictions/only_left_turn.svg"; + set icon_z17; + text: auto; +} +relation[restriction=only_right_turn] { + icon-image: "presets/vehicle/restriction/turn_restrictions/only_right_turn.svg"; + set icon_z17; + text: auto; +} +relation[restriction=only_straight_on] { + icon-image: "presets/vehicle/restriction/turn_restrictions/only_straight_on.svg"; + set icon_z17; + text: auto; +} +node[restriction] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; + text: auto; +} + +/******************/ +/* bridge, tunnel */ +/******************/ + +way[bridge=yes]::core_bridge, +way[bridge=aqueduct]::core_bridge, +way[bridge=boardwalk]::core_bridge, +way[bridge=cantilever]::core_bridge, +way[bridge=covered]::core_bridge, +way[bridge=low_water_crossing]::core_bridge, +way[bridge=movable]::core_bridge, +way[bridge=trestle]::core_bridge, +way[bridge=viaduct]::core_bridge { + major-z-index: 2; + object-z-index: -1; + width: +4; + color: bridge#0000FF; + opacity: 0.9; +} +way[tunnel=yes]::core_tunnel, +way[tunnel=culvert]::core_tunnel, +way[tunnel=flooded]::core_tunnel, +way[tunnel=building_passage]::core_tunnel, +way[tunnel=avalanche_protector]::core_tunnel { + major-z-index: 2; + object-z-index: -1; + width: +5; + color: tunnel#964B00; + opacity: 0.9; +} +node[oneway], +node[bridge], +node[tunnel?], +node[tunnel?!], +node[cutting?!], +node[embankment?!] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} + +/****************************/ +/* access restrictions tags */ +/****************************/ + +way[access?!]::core_access { + z-index: -1; + width: +2; + color: no#ff8080; + dashes: 2,2; +} +way[access=permissive]::core_access { + z-index: -1; + width: +2; + color: permissive#80ff80; + dashes: 2,2; +} +way[access=private]::core_access { + z-index: -1; + width: +2; + color: private#ff8080; + dashes: 2,2; +} +way[access=destination]::core_access { + z-index: -1; + width: +2; + color: destination#8080ff; + dashes: 2,2; +} +node[traffic_sign][access?!] { + icon-image: "presets/vehicle/restriction/restrictions.svg"; + set icon_z17; +} +node[traffic_sign][access=permissive][!is_prop_set(icon-image)], +node[traffic_sign][access=private][!is_prop_set(icon-image)], +node[traffic_sign][access=destination][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +node[traffic_sign][bicycle?!] { + icon-image: "presets/vehicle/restriction/bicycle.svg"; + set icon_z17; +} +node[traffic_sign][bicycle=designated] { + icon-image: "presets/vehicle/restriction/bicycle-designated.svg"; + set icon_z17; +} +node[traffic_sign][foot?!] { + icon-image: "presets/vehicle/restriction/foot.svg"; + set icon_z17; +} +node[traffic_sign][foot=designated] { + icon-image: "presets/vehicle/restriction/foot-designated.svg"; + set icon_z17; +} +node[traffic_sign][goods?!], +node[traffic_sign][hgv?!] { + icon-image: "presets/vehicle/restriction/goods.svg"; + set icon_z17; +} +node[traffic_sign][horse?!] { + icon-image: "presets/vehicle/restriction/horse.svg"; + set icon_z17; +} +node[traffic_sign][horse=designated] { + icon-image: "presets/vehicle/restriction/horse-designated.svg"; + set icon_z17; +} +node[traffic_sign][motorcycle?!] { + icon-image: "presets/vehicle/restriction/motorbike.svg"; + set icon_z17; +} +node[traffic_sign][motorcar?!] { + icon-image: "presets/vehicle/restriction/motorcar.svg"; + set icon_z17; +} +node[traffic_sign][psv?!] { + icon-image: "presets/vehicle/restriction/psv.svg"; + set icon_z17; +} +node[traffic_sign][motorboat?!][!is_prop_set(icon-image)], +node[traffic_sign][boat?!][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +node[noexit=yes] { + icon-image: "presets/vehicle/restriction/dead_end.svg"; + set icon_z17; +} +node[traffic_sign][maxweight] { + icon-image: "presets/vehicle/restriction/maxweight.svg"; + set icon_z17; +} +node[traffic_sign][maxheight] { + icon-image: "presets/vehicle/restriction/maxheight.svg"; + set icon_z17; +} +node[traffic_sign][maxwidth] { + icon-image: "presets/vehicle/restriction/maxwidth.svg"; + set icon_z17; +} +node[traffic_sign][maxlength] { + icon-image: "presets/vehicle/restriction/maxlength.svg"; + set icon_z17; +} +node[traffic_sign][minspeed] { + icon-image: "presets/vehicle/restriction/minspeed.svg"; + set icon_z17; +} +node[traffic_sign][maxstay][!is_prop_set(icon-image)], +node[traffic_sign][toll][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} + +/*************************************/ +/* low rendering priority properties */ +/*************************************/ + +area[changing_table=yes], +area[changing_table=limited] { + fill-color: changing_table#f7efb7; /* same as amenity */ +} +node[changing_table=yes], +node[changing_table=limited] { + icon-image: "presets/service/changing_table.svg"; + set icon_z17; +} + +/*****************************/ +/* building/entrance/address */ +/*****************************/ + +node["addr:housenumber"] { + icon-image: "presets/misc/housenumber_small.svg"; + set icon_z17; +} +way["addr:interpolation"=odd] { + width: 1; + color: address#1C86EE; + dashes: 15,4; +} +way["addr:interpolation"=even] { + width: 1; + color: address#1C86EE; + dashes: 4,4; +} +way["addr:interpolation"=all], +way["addr:interpolation"=alphabetic] { + width: 1; + color: address#1C86EE; + dashes: 2,2; +} +area[building][!building?!][building!=y][building!=1] { + fill-color: building#cb9999; +} +area[building=roof], +area[building][!building?!][wall?!], +area[building:part][!building:part?!] { + fill-color: buildingpart#dcbbbb; +} +node[building][!building?!] { + icon-image: "presets/landmark/building.svg"; + set icon_z17; +} +node[building=garage] { + icon-image: "presets/landuse/garages.svg"; + set icon_z17; +} +node[building=garages] { + icon-image: "presets/landuse/garages.svg"; + set icon_z17; +} +node[building=transformer_tower] { + icon-image: "presets/power/transformer_tower.svg"; + set icon_z17; +} +node[entrance=yes], +node[entrance=home], +node[entrance=staircase] { + icon-image: "presets/misc/entrance_yes.svg"; + set icon_z17; +} +node[entrance=main] { + icon-image: "presets/misc/entrance_main.svg"; + set icon_z17; +} +node[entrance=service] { + icon-image: "presets/misc/entrance_service.svg"; + set icon_z17; +} +node[entrance=exit] { + icon-image: "presets/misc/entrance_exit.svg"; + set icon_z17; +} +node[entrance=emergency] { + icon-image: "presets/misc/entrance_emergency.svg"; + set icon_z17; +} +node[building=entrance], +node[building:part] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} + +/****************/ +/* barrier tags */ +/****************/ + +way[barrier=bollard] { + width: 2; + color: barrier#F0F050; + dashes: 3,9; +} +node[barrier=bollard] { + icon-image: "presets/barrier/bollard.svg"; + set icon_z17; +} +node[barrier=gate] { + icon-image: "presets/barrier/gate.svg"; + set icon_z17; +} +way[barrier=yes], +way[barrier=hedge], +way[barrier=fence], +way[barrier=handrail], +way[barrier=wall], +way[barrier=guard_rail], +way[barrier=cable_barrier], +way[barrier=city_wall], +way[barrier=retaining_wall], +way[barrier=block], +way[barrier=chain], +way[barrier=ditch], +way[barrier=jersey_barrier], +way[barrier=kerb] { + width: 2; + color: barrier#F0F050; +} +way[barrier=kerb] { + repeat-image: "presets/barrier/kerb_pattern.svg"; + repeat-image-align: top; +} +way[barrier=retaining_wall] { + repeat-image: "presets/misc/cliff_pattern.svg"; + repeat-image-align: top; +} +node[barrier=hedge], +node[barrier=wall], +node[barrier=guard_rail], +node[barrier=cable_barrier], +node[barrier=city_wall], +node[barrier=retaining_wall], +node[barrier=ditch] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} +node[barrier=kerb] { + icon-image: "presets/barrier/kerb.svg"; + set icon_z17; +} +node[barrier=block] { + icon-image: "presets/barrier/block.svg"; + set icon_z17; +} +node[barrier=chain] { + icon-image: "presets/barrier/chain.svg"; + set icon_z17; +} +node[barrier=stile] { + icon-image: "presets/barrier/stile.svg"; + set icon_z17; +} +node[barrier=turnstile] { + icon-image: "presets/barrier/turnstile.svg"; + set icon_z17; +} +node[barrier=cycle_barrier] { + icon-image: "presets/barrier/cycle_barrier.svg"; + set icon_z17; +} +node[barrier=lift_gate] { + icon-image: "presets/barrier/lift_gate.svg"; + set icon_z17; +} +node[barrier=swing_gate] { + icon-image: "presets/barrier/swing_gate.svg"; + set icon_z17; +} +area[barrier=toll_booth]:closed { + fill-color: barrier#F0F050; +} +node[barrier=toll_booth] { + icon-image: "presets/barrier/toll_station.svg"; + set icon_z17; +} +node[barrier=entrance] { + icon-image: "presets/barrier/entrance.svg"; + set icon_z17; +} +node[barrier=cattle_grid] { + icon-image: "presets/barrier/cattle_grid.svg"; + set icon_z17; +} +node[barrier=border_control] { + icon-image: "presets/barrier/douane.svg"; + set icon_z17; +} +node[barrier=sally_port] { + icon-image: "presets/barrier/sally_port.svg"; + set icon_z17; +} +node[barrier=spikes] { + icon-image: "presets/barrier/spikes.svg"; + set icon_z17; +} +node[barrier=jersey_barrier] { + icon-image: "presets/barrier/jersey_barrier.svg"; + set icon_z17; +} +node[barrier=kissing_gate] { + icon-image: "presets/barrier/kissing_gate.svg"; + set icon_z17; +} +node[barrier=bump_gate][!is_prop_set(icon-image)], +node[barrier=bus_trap][!is_prop_set(icon-image)], +node[barrier=hampshire_gate][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} + +/****************/ +/* highway tags */ +/****************/ + +way[motorroad=yes]::core_motorroad { + major-z-index: 2; + z-index: -1; + width: +4; + color: motorroad#3377ff; +} +way[highway=motorway] { + width: 3; + z-index: 0.13; /* #15483 */ + color: motorway#809bc0; +} +way[highway=motorway_link] { + width: 3; + z-index: 0.12; + color: motorway#809bc0; +} +way[highway=trunk] { + width: 3; + z-index: 0.11; + color: trunk#7fc97f; +} +way[highway=trunk_link] { + width: 3; + z-index: 0.10; + color: trunk#7fc97f; +} +way[highway=primary] { + width: 3; + z-index: 0.09; + color: primary#fb805f; +} +way[highway=primary_link] { + width: 3; + z-index: 0.08; + color: primary#fb805f; +} +way[highway=secondary] { + width: 3; + z-index: 0.07; + color: secondary#fdbf6f; +} +way[highway=secondary_link] { + width: 3; + z-index: 0.06; + color: secondary#fdbf6f; +} +way[highway=tertiary] { + width: 2; + z-index: 0.05; + color: tertiary#f7f496; +} +way[highway=tertiary_link] { + width: 2; + z-index: 0.04; + color: tertiary#f7f496; +} +way[highway=unclassified] { + width: 2; + z-index: 0.03; + color: street#c0c0c0; +} +way[highway=escape] { + width: 3; + color: street#c0c0c0; + dashes: 3,3; +} +way[highway=road] { + width: 2; + casing-width: 0.5; + casing-color: #ff9696; + color: highway_road#770000; +} +way[highway=track][area?], relation[type=multipolygon][highway=track] { + fill-color: highway_track#6e541c; +} +way[highway=track] { + width: 2; + color: highway_track#6e541c; +} +way[highway=residential] { + width: 2; + z-index: 0.02; + color: street#c0c0c0; +} +way[highway=living_street] { + width: 2; + z-index: 0.01; + dashes: 9,9; + dashes-background-color: livingdashed#00ff00; + color: street#c0c0c0; +} +way[highway=service][area?], relation[type=multipolygon][highway=service] { + fill-color: service#809bc0; +} +way[highway=service][!area?] { + width: 1; + color: service#809bc0; +} +way[highway=bridleway] { + width: 1; + color: horse#a18559; +} +way[highway=cycleway] { + width: 1; + color: bicycle#b100ff; +} +way[highway=footway][area?], relation[type=multipolygon][highway=footway] { + fill-color: foot#00ff00; +} +way[highway=footway][!area?] { + width: 1; + color: foot#00ff00; +} +way[highway=path][bicycle!=designated][bicycle!=official][foot!=designated][foot!=official] { + width: 1; + dashes: 9,9; + color: foot#00ff00; +} +/* display path with bicycle/foot=designated/official as if it was cycleway/footway */ +way[highway=path][bicycle=designated], +way[highway=path][bicycle=official] { + width: 1; + color: bicycle#b100ff; + set cyclecolor; +} +way[highway=path][foot=designated], +way[highway=path][foot=official] { + width: 1; + color: foot#00ff00; +} +way[highway=path][bicycle=designated][foot=designated], +way[highway=path][bicycle=official][foot=official], +way[highway=cycleway][foot=designated] { + width: 1; + color: bicycle#b100ff; + set cyclecolor; + dashes: 14,14; + dashes-background-color: foot#00ff00; +} +way[highway=footway][bicycle=designated] { + width: 1; + color: foot#00ff00; + dashes: 14,14; + dashes-background-color: bicycle#b100ff; +} +way[highway=cycleway][foot=yes], +way[highway=path][bicycle=designated][foot=yes], +way[highway=path][bicycle=official][foot=yes] { + width: 1; + color: bicycle#b100ff; + set cyclecolor; + dashes: 21,7; + dashes-background-color: foot#00ff00; +} +way[highway=footway][bicycle=yes], +way[highway=path][bicycle=yes][foot=designated], +way[highway=path][bicycle=yes][foot=official] { + width: 1; + color: foot#00ff00; + dashes: 21,7; + dashes-background-color: bicycle#b100ff; +} +way[highway=pedestrian][area?], relation[type=multipolygon][highway=pedestrian] { + width: 3; + color: foot#00ff00; + fill-color: foot#00ff00; +} +way[highway=pedestrian] { + width: 3; + color: foot#00ff00; +} +way[highway=steps] { + width: 3; + color: foot#00ff00; + dashes: 2,2; +} +way[highway=bus_guideway] { + width: 1; + color: rail#404040; + dashes: 9,9; +} +way[highway=raceway] { + width: 1; + color: raceway#ff80ff; +} +way[highway=raceway][area?], relation[type=multipolygon][highway=raceway] { + fill-color: raceway#ff80ff; +} +area[junction=yes] { + fill-color: junction#c0c0c0; +} +node[junction=yes] { + icon-image: "presets/vehicle/junction.svg"; + set icon_z17; +} +node[highway=traffic_mirror] { + icon-image: "presets/vehicle/traffic_mirror.svg"; + set icon_z17; +} +node[highway=milestone] { + icon-image: "presets/vehicle/milestone.svg"; + set icon_z17; +} +node[direction=clockwise] { + icon-image: "presets/vehicle/restriction/roundabout_left.svg"; + set icon_z17; +} +node[highway=mini_roundabout] { + icon-image: "presets/vehicle/restriction/mini_roundabout_left.svg"; + set icon_z17; +} +node:righthandtraffic[highway=mini_roundabout] { + icon-image: "presets/vehicle/restriction/mini_roundabout_right.svg"; + set icon_z17; +} +node[highway=stop] { + icon-image: "presets/vehicle/restriction/stop.svg"; + set icon_z17; +} +node[highway=give_way] { + icon-image: "presets/vehicle/restriction/give_way.svg"; + set icon_z17; +} +node[cycleway=asl] { + icon-image: "presets/vehicle/asl.svg"; + set icon_z17; +} +node[highway=traffic_signals] { + icon-image: "presets/vehicle/traffic_signals.svg"; + set icon_z17; +} +node[highway=traffic_signals][crossing][crossing!=no] { + icon-image: "presets/vehicle/traffic_signals_crossing.svg"; + set icon_z17; +} +node[highway=traffic_signals][crossing:island=yes] { + icon-image: "presets/vehicle/traffic_signals_crossing_island.svg"; + set icon_z17; +} +node[highway=traffic_signals][crossing_ref=zebra] { + icon-image: "presets/vehicle/traffic_signals_crossing_ref_zebra.svg"; + set icon_z17; +} +node[highway=traffic_signals][crossing=traffic_signals] { + icon-image: "presets/vehicle/traffic_signals_crossing_traffic_signals.svg"; + set icon_z17; +} +node[highway=street_lamp] { + icon-image: "presets/misc/streetlamp.svg"; + set icon_z17; +} +node[highway=speed_camera] { + icon-image: "presets/vehicle/restriction/speed_camera.svg"; + set icon_z17; +} +relation[type=enforcement] >[role="device"] node { + icon-image: "presets/vehicle/restriction/speed_camera.svg"; + set icon_z17; +} +node[highway=toll_gantry] { + icon-image: "presets/vehicle/restriction/toll_gantry.svg"; + set icon_z17; +} +node[traffic_sign=city_limit] { + icon-image: "presets/vehicle/restriction/city_limit.svg"; + set icon_z17; +} +node[highway=crossing][crossing!=no] { + icon-image: "presets/vehicle/crossing.svg"; + set icon_z17; +} +node[highway=crossing][crossing:island=yes] { + icon-image: "presets/vehicle/crossing_island.svg"; + set icon_z17; +} +node[highway=crossing][crossing=unmarked] { + icon-image: "presets/vehicle/crossing_unmarked.svg"; + set icon_z17; +} +node[highway=crossing][crossing_ref=zebra] { + icon-image: "presets/vehicle/crossing_ref_zebra.svg"; + set icon_z17; +} +node[highway=crossing][crossing=traffic_signals] { + icon-image: "presets/vehicle/crossing_traffic_signals.svg"; + set icon_z17; +} +node[highway=motorway_junction] { + icon-image: "presets/vehicle/motorway_junction.svg"; + set icon_z17; + text: eval(cond(has_tag_key(ref), concat(tag(name), " (", tag(ref), ")"), tag(name))); +} +area[highway=services] { + fill-color: services#c0c0c0; +} +node[highway=services] { + icon-image: "presets/vehicle/services.svg"; + set icon_z17; +} +area[highway=rest_area] { + fill-color: services#c0c0c0; +} +node[highway=rest_area] { + icon-image: "presets/vehicle/rest_area.svg"; + set icon_z17; +} +node[ford=stepping_stones], +node[ford?] { + icon-image: "presets/vehicle/ford.svg"; + set icon_z17; +} +way[ford=stepping_stones]::core_ford, +way[ford?]::core_ford { + z-index: 1; + width: 2; + color: water#0000ff; + dashes: 9,9; + dashes-offset: 9; +} +area[highway=platform]:closed { + fill-color: highway_platform#c0c0c0; +} +way[highway=platform] { + width: 2; + color: highway_platform#c0c0c0; +} +node[highway=turning_circle] { + icon-image: "presets/vehicle/turning_circle.svg"; + set icon_z17; +} +node[highway=turning_loop] { + icon-image: "presets/vehicle/turning_loop.svg"; + set icon_z17; +} +node[highway=passing_place] { + icon-image: "presets/vehicle/passing_place.svg"; + set icon_z17; +} +area[highway=elevator] { + fill-color: elevator#a6bace; +} +node[highway=elevator] { + icon-image: "presets/service/elevator.svg"; + set icon_z17; +} +way[highway=construction] { + width: 2; + color: construction#ffff00; + dashes: 9,9; +} +node[highway=construction] { + icon-image: "presets/misc/construction.svg"; + set icon_z17; +} +area[highway=emergency_access_point] { + fill-color: emergency_access_point#c0c0c0; +} +node[highway=emergency_access_point] { + icon-image: "presets/service/emergency_access_point.svg"; + set icon_z17; +} +node[highway=motorway], node[highway=motorway_link], +node[highway=trunk], node[highway=trunk_link], +node[highway=primary], node[highway=primary_link], +node[highway=secondary], node[highway=secondary_link], +node[highway=tertiary], node[highway=tertiary_link], +node[highway=unclassified], +node[highway=road], +node[highway=unsurfaced], +node[highway=track], +node[highway=residential], +node[highway=living_street], +node[highway=service], +node[highway=bridleway], +node[highway=cycleway], +node[highway=footway], +node[highway=path], +node[highway=pedestrian], +node[highway=bus_guideway], +node[highway=platform] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} + +/************************/ +/* traffic_calming tags */ +/************************/ + +node[traffic_calming] { + icon-image: "presets/vehicle/traffic_calming.svg"; + set icon_z17; +} +node[traffic_calming=chicane] { + icon-image: "presets/vehicle/chicane.svg"; + set icon_z17; +} +node[traffic_calming=choker] { + icon-image: "presets/vehicle/choker.svg"; + set icon_z17; +} +node[traffic_calming=island] { + icon-image: "presets/vehicle/island.svg"; + set icon_z17; +} +node[traffic_calming=bump] { + icon-image: "presets/vehicle/bump.svg"; + set icon_z17; +} +node[traffic_calming=hump] { + icon-image: "presets/vehicle/hump.svg"; + set icon_z17; +} +node[traffic_calming=table] { + icon-image: "presets/vehicle/table.svg"; + set icon_z17; +} +node[traffic_calming=cushion] { + icon-image: "presets/vehicle/cushion.svg"; + set icon_z17; +} +node[traffic_calming=rumble_strip] { + icon-image: "presets/vehicle/rumble_strip.svg"; + set icon_z17; +} +node[traffic_calming=dip] { + icon-image: "presets/vehicle/dip.svg"; + set icon_z17; +} +/****************/ +/* junction tag */ +/****************/ + +node[junction=roundabout] { + icon-image: "presets/vehicle/restriction/roundabout_left.svg"; + set icon_z17; +} +node:righthandtraffic[junction=roundabout] { + icon-image: "presets/vehicle/restriction/roundabout_right.svg"; + set icon_z17; +} + +/*****************/ +/* cycleway tags */ +/*****************/ + + /* prepare lane */ +way[oneway?][cycleway=lane]:righthandtraffic::core_cycleway, +way[oneway=-1][cycleway=opposite_lane]:righthandtraffic::core_cycleway { + set laneRight; + set righthandtr; +} +way[oneway?][cycleway=opposite_lane]:righthandtraffic::core_cycleway, +way[oneway=-1][cycleway=lane]:righthandtraffic::core_cycleway { + set laneLeft; + set righthandtr; +} +way[oneway?][cycleway=lane]!.righthandtr::core_cycleway, +way[oneway=-1][cycleway=opposite_lane]!.righthandtr::core_cycleway { + set laneLeft; +} +way[oneway?][cycleway=opposite_lane]!.righthandtr::core_cycleway, +way[oneway=-1][cycleway=lane]!.righthandtr::core_cycleway { + set laneRight; +} +way[cycleway:left=lane]::core_cycleway { + set laneLeft; +} +way[cycleway:right=lane]::core_cycleway { + set laneRight; +} +way[oneway=no][cycleway=lane]::core_cycleway, +way[!oneway][cycleway=lane]::core_cycleway { + set laneLeft; + set laneRight; +} + + /* prepare shared_lane */ +way[oneway?][cycleway=shared_lane]:righthandtraffic::core_cycleway { + set shared_laneRight; + set righthandtr; +} +way[oneway=-1][cycleway=shared_lane]:righthandtraffic::core_cycleway { + set shared_laneLeft; + set righthandtr; +} +way[oneway?][cycleway=shared_lane]!.righthandtr::core_cycleway { + set shared_laneLeft; +} +way[oneway=-1][cycleway=shared_lane]!.righthandtr::core_cycleway { + set shared_laneRight; +} +way[cycleway:left=shared_lane]::core_cycleway { + set shared_laneLeft; +} +way[cycleway:right=shared_lane]::core_cycleway { + set shared_laneRight; +} +way[oneway=no][cycleway=shared_lane]::core_cycleway, +way[!oneway][cycleway=shared_lane]::core_cycleway { + set shared_laneLeft; + set shared_laneRight; +} + + /* prepare track */ +way[oneway?][cycleway=track]:righthandtraffic::core_cycleway, +way[oneway=-1][cycleway=opposite_track]:righthandtraffic::core_cycleway { + set trackRight; + set righthandtr; +} +way[oneway?][cycleway=opposite_track]:righthandtraffic::core_cycleway, +way[oneway=-1][cycleway=track]:righthandtraffic::core_cycleway { + set trackLeft; + set righthandtr; +} +way[oneway?][cycleway=track]!.righthandtr::core_cycleway, +way[oneway=-1][cycleway=opposite_track]!.righthandtr::core_cycleway { + set trackLeft; +} +way[oneway?][cycleway=opposite_track]!.righthandtr::core_cycleway, +way[oneway=-1][cycleway=track]!.righthandtr::core_cycleway { + set trackRight; +} +way[cycleway:left=track]::core_cycleway { + set trackLeft; +} +way[cycleway:right=track]::core_cycleway { + set trackRight; +} +way[oneway=no][cycleway=track]::core_cycleway, +way[!oneway][cycleway=track]::core_cycleway { + set trackLeft; + set trackRight; +} + + /* render lane */ +way.laneRight::core_cycleway { + width: 2; + color: bicycle#b100ff; + dashes: 6, 10; + offset: 0 - (prop("width", "default") / 2) - 2; + major-z-index: 2.1; + modifier: true; +} +way[prop("laneLeft","core_cycleway")]::core_cycleway2 { + width: 2; + color: bicycle#b100ff; + dashes: 6, 10; + offset: (prop("width", "default") / 2) + 2; + major-z-index: 2.1; + modifier: true; +} + /* render shared_lane */ +way.shared_laneRight::core_cycleway { + width: 2; + color: bicycle#b100ff; + dashes: 6, 3; + offset: 0 - (prop("width", "default") / 2) - 2; + major-z-index: 2.1; + modifier: true; +} +way[prop("shared_laneLeft","core_cycleway")]::core_cycleway2 { + width: 2; + color: bicycle#b100ff; + dashes: 6, 3; + offset: (prop("width", "default") / 2) + 2; + major-z-index: 2.1; + modifier: true; +} + /* render track */ +way.trackRight::core_cycleway { + width: 2; + color: bicycle#b100ff; + dashes: 25, 8; + offset: 0 - (prop("width", "default") / 2) - 2; + major-z-index: 2.1; + modifier: true; +} +way[prop("trackLeft","core_cycleway")]::core_cycleway2 { + width: 2; + color: bicycle#b100ff; + dashes: 25, 8; + offset: (prop("width", "default") / 2) + 2; + major-z-index: 2.1; + modifier: true; +} + /* render opposite */ +way[oneway:bicycle=no][oneway][oneway!=no]::core_cycleway, +way[cycleway=opposite][oneway][oneway!=no]::core_cycleway { + z-index: 1; + width: +0; + color: bicycle#b100ff; + dashes: 4,10; +} +node[cycleway=lane ], node[cycleway=opposite_lane ], +node[cycleway=track], node[cycleway=opposite_track], +node[cycleway=opposite] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} + +/******************/ +/* tracktype tags */ +/******************/ + +way[highway=track][tracktype=grade1] { + dashes: 8,1; +} +way[highway=track][tracktype=grade2] { + dashes: 6,2; +} +way[highway=track][tracktype=grade3] { + dashes: 4,3; +} +way[highway=track][tracktype=grade4] { + dashes: 4,5; +} +way[highway=track][tracktype=grade5] { + dashes: 4,7; +} + +/**************/ +/* piste tags */ +/**************/ + +way[route=ski]::core_piste { + z-index: -1; + modifier: false; + width: 6; + color: ski#809bc0; +} +area[piste:difficulty=easy][!highway][area=yes]::core_piste { + fill-color: piste_easy#0000ff; +} +way[piste:difficulty=easy]::core_piste { + z-index: -1; /* below line style from highway=* tag */ + modifier: false; /* suppress default line if there is no style on default layer */ + width: 6; + color: piste_easy#0000ff; +} +area[piste:difficulty=intermediate][!highway][area=yes]::core_piste { + fill-color: piste_intermediate#ff0000; +} +way[piste:difficulty=intermediate]::core_piste { + z-index: -1; + modifier: false; + width: 6; + color: piste_intermediate#ff0000; +} +area[piste:difficulty=advanced][!highway][area=yes]::core_piste { + fill-color: piste_advanced#606060; +} +way[piste:difficulty=advanced]::core_piste { + z-index: -1; + modifier: false; + width: 6; + color: piste_advanced#606060; +} +area[piste:difficulty=expert][!highway][area=yes]::core_piste { + fill-color: piste_expert#606060; +} +way[piste:difficulty=expert]::core_piste { + z-index: -1; + modifier: false; + width: 6; + color: piste_expert#606060; +} +area[piste:difficulty=freeride][!highway][area=yes]::core_piste { + fill-color: piste_freeride#ffff00; +} +way[piste:difficulty=freeride]::core_piste { + z-index: -1; + modifier: false; + width: 6; + color: piste_freeride#ffff00; +} +area[piste:difficulty=novice][!highway][area=yes]::core_piste { + fill-color: piste_novice#00ff00; +} +way[piste:difficulty=novice]::core_piste { + z-index: -1; + modifier: false; + width: 6; + color: piste_novice#00ff00; +} +node[piste:type=downhill], +node[piste:type=nordic], +node[piste:type=skitour], +node[piste:type=sled], +node[piste:type=sleigh], +node[piste:type=snow_park] { + icon-image: "presets/sport/skiing.svg"; + set icon_z17; +} + +/**************/ +/* power tags */ +/**************/ + +node[power=portal] { + icon-image: "presets/power/portal.svg"; + set icon_z17; +} +node[power=tower] { + icon-image: "presets/power/tower.svg"; + set icon_z17; +} +node[power=pole] { + icon-image: "presets/power/pole.svg"; + set icon_z17; +} +node[power=pole][switch] { + icon-image: "presets/power/pole_switch.svg"; + set icon_z17; +} +node[power=pole][transformer=distribution] { + icon-image: "presets/power/pole_transformer.svg"; + set icon_z17; +} +node[power=catenary_mast] { + icon-image: "presets/power/catenary_mast.svg"; + set icon_z17; +} +node[power=insulator] { + icon-image: "presets/power/insulator.svg"; + set icon_z17; +} +way[power=portal], +way[power=line], +way[power=minor_line] { + width: 1; + color: power#eeeeee; +} +way[power=cable] { + width: 1; + color: power#eeeeee; + dashes: 9,9; +} +node[power=plant], +node[power=sub_station], +node[power=line], +node[power=cable], +node[power=minor_line] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} +area[power=plant], +area[power=substation], +area[power=compensator], +area[power=converter], +area[power=switchgear], +area[power=generator] { + fill-color: power#eeeeee; +} +node[man_made=street_cabinet] { + icon-image: "presets/misc/street_cabinet.svg"; + set icon_z17; +} +node[man_made=street_cabinet][street_cabinet=power] { + icon-image: "presets/power/cable_distribution_cabinet.svg"; + set icon_z17; +} +node[power=generator] { + icon-image: "presets/power/generator.svg"; + set icon_z17; +} +node[power=substation] { + icon-image: "presets/power/substation.svg"; + set icon_z17; +} +node[power=transformer] { + icon-image: "presets/power/transformer.svg"; + set icon_z17; +} +node[power=terminal] { + icon-image: "presets/power/terminal.svg"; + set icon_z17; +} +node[power=switch] { + icon-image: "presets/power/switch.svg"; + set icon_z17; +} +node[power=converter] { + icon-image: "presets/power/converter.svg"; + set icon_z17; +} +node[power=compensator] { + icon-image: "presets/power/compensator.svg"; + set icon_z17; +} + + +/*************************/ +/* generator:source tags */ +/*************************/ + +area[generator:source=nuclear], +area[generator:source=wind], +area[generator:source=hydro], +area[generator:source=tidal], +area[generator:source=wave], +area[generator:source=osmotic], +area[generator:source=geothermal], +area[generator:source=solar], +area[generator:source=coal], +area[generator:source=gas], +area[generator:source=biomass], +area[generator:source=biofuel], +area[generator:source=biogas], +area[generator:source=oil], +area[generator:source=diesel], +area[generator:source=gasoline], +area[generator:source=waste] { + fill-color: power#eeeeee; +} +node[generator:source=nuclear] { + icon-image: "presets/power/power_source-nuclear.svg"; + set icon_z17; +} +node[generator:source=wind] { + icon-image: "presets/power/power_source-wind.svg"; + set icon_z17; +} +node[generator:source=hydro], +node[generator:source=tidal], +node[generator:source=wave], +node[generator:source=osmotic] { + icon-image: "presets/power/power_source-water.svg"; + set icon_z17; +} +node[generator:source=geothermal] { + icon-image: "presets/power/power_source-geothermal.svg"; + set icon_z17; +} +node[generator:source=solar] { + icon-image: "presets/power/power_source-sun.svg"; + set icon_z17; +} +node[generator:source=coal] { + icon-image: "presets/power/power_source-coal.svg"; + set icon_z17; +} +node[generator:source=gas] { + icon-image: "presets/power/power_source-gas.svg"; + set icon_z17; +} +node[generator:source=biomass], +node[generator:source=biofuel], +node[generator:source=biogas] { + icon-image: "presets/power/power_source-biofuel.svg"; + set icon_z17; +} +node[generator:source=oil], +node[generator:source=diesel], +node[generator:source=gasoline] { + icon-image: "presets/power/power_source-oil.svg"; + set icon_z17; +} +node[generator:source=waste] { + icon-image: "presets/power/power_source-waste.svg"; + set icon_z17; +} +node[power_source] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} +/*****************/ +/* man_made tags */ +/*****************/ + +area[man_made=beacon], +area[man_made=bridge], +area[bridge:support], +area[man_made=chimney], +area[man_made=kiln], +area[man_made=gasometer], +area[man_made=silo], +area[man_made=storage_tank], +area[man_made=bunker_silo], +area[man_made=lighthouse], +area[man_made=monitoring_station], +area[man_made=mineshaft] { + fill-color: manmade#d8d8d8; +} +node[man_made=beacon] { + icon-image: "presets/landmark/beacon.svg"; + set icon_z17; +} +node[man_made=bridge] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} +node[bridge:support] { + icon-image: "presets/transport/bridge/bridge_support.svg"; + set icon_z17; +} +node[man_made=chimney] { + icon-image: "presets/landmark/chimney.svg"; + set icon_z17; +} +node[man_made=kiln] { + icon-image: "presets/misc/kiln.svg"; + set icon_z17; +} +node[man_made=flagpole] { + icon-image: "presets/misc/flag.svg"; + set icon_z17; +} +node[man_made=cross] { + icon-image: "presets/landmark/cross.svg"; + set icon_z17; +} +node[man_made=gasometer] { + icon-image: "presets/landmark/gasometer.svg"; + set icon_z17; +} +node[man_made=silo] { + icon-image: "presets/landmark/silo.svg"; + set icon_z17; +} +node[man_made=storage_tank] { + icon-image: "presets/landmark/storage_tank.svg"; + set icon_z17; +} +node[man_made=bunker_silo] { + icon-image: "presets/landmark/bunker_silo.svg"; + set icon_z17; +} +area[man_made=groyne]:closed { + fill-color: manmade#d8d8d8; +} +way[man_made=groyne] { + width: 2; + color: manmade#d8d8d8; +} +area[man_made=breakwater]:closed { + fill-color: manmade#d8d8d8; +} +way[man_made=breakwater] { + width: 2; + color: manmade#d8d8d8; +} +way[man_made=dyke]::man_made_dyke { + width: 4; + color: dyke#0aa846; + z-index: -2; + object-z-index: -1; /* below highway=* */ + modifier: false; /* don't draw default way if there is no line on default layer */ +} +node[man_made=lighthouse] { + icon-image: "presets/landmark/lighthouse.svg"; + set icon_z17; +} +node[man_made=monitoring_station] { + icon-image: "presets/misc/monitoring_station.svg"; + set icon_z17; +} +node[man_made=mineshaft] { + icon-image: "presets/landmark/mine.svg"; + set icon_z17; +} +area[man_made=crane]:closed { + fill-color: manmade#d8d8d8; +} +way[man_made=crane] { + width: 2; + color: manmade#d8d8d8; +} +node[man_made=crane] { + icon-image: "presets/landmark/crane.svg"; + set icon_z17; +} +node[man_made=adit] { + icon-image: "presets/landmark/adit.svg"; + set icon_z17; +} +area[man_made=pier]:closed { + fill-color: pier#660000; +} +way[man_made=pier] { + width: 2; + color: pier#660000; +} +node[man_made=pier] { + icon-image: "presets/nautical/pier.svg"; + set icon_z17; +} +way[embankment?][!highway][!railway][!waterway], +way[man_made=embankment][!highway][!railway][!waterway] { + repeat-image: "presets/misc/embankment-pattern.png"; + repeat-image-align: top; + width: 1; + color: embankment#c14d00; +} +way[embankment?][highway], +way[embankment?][railway], +way[embankment?][waterway] { + repeat-image: "presets/misc/embankment-pattern-centered.png"; +} +way[man_made=embankment][highway], +way[man_made=embankment][railway], +way[man_made=embankment][waterway] { + repeat-image: "presets/misc/embankment-pattern.png"; + repeat-image-align: top; + repeat-image-offset: -1; +} +way[man_made=pipeline][!waterway] { + width: 2; + color: pipeline#660000; +} +node[marker] { + icon-image: "presets/misc/pipeline_marker.svg"; + set icon_z17; +} +node[pipeline=valve] { + icon-image: "presets/misc/valve.svg"; + set icon_z17; +} +node[man_made=manhole] { + icon-image: "presets/misc/manhole.svg"; + set icon_z17; +} +node[man_made=breakwater], +node[man_made=groyne], +node[man_made=embankment], +node[man_made=pipeline] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} +node[man_made=petroleum_well][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +area[man_made=reservoir_covered], +area[man_made=tower], +area[man_made=wastewater_plant], +area[man_made=watermill], +area[man_made=water_tower], +area[man_made=water_well], +area[man_made=windmill], +area[man_made=works], +area[man_made=water_works] { + fill-color: manmade#d8d8d8; +} +node[man_made=reservoir_covered] { + icon-image: "presets/landmark/reservoir_covered.svg"; + set icon_z17; +} +node[man_made=surveillance] { + icon-image: "presets/service/surveillance.svg"; + set icon_z17; +} +node[man_made=survey_point] { + icon-image: "presets/landmark/survey_point.svg"; + set icon_z17; +} +node[man_made=tower] { + icon-image: "presets/landmark/tower.svg"; + set icon_z17; +} +node[man_made=wastewater_plant] { + icon-image: "presets/landmark/wastewater_plant.svg"; + set icon_z17; +} +node[man_made=watermill] { + icon-image: "presets/landmark/watermill.svg"; + set icon_z17; +} +node[man_made=water_tower] { + icon-image: "presets/landmark/water_tower.svg"; + set icon_z17; +} +node[man_made=water_well] { + icon-image: "presets/landmark/water_well.svg"; + set icon_z17; +} +node[man_made=windmill] { + icon-image: "presets/landmark/windmill.svg"; + set icon_z17; +} +node[man_made=works] { + icon-image: "presets/landmark/works.svg"; + set icon_z17; +} +node[man_made=water_works] { + icon-image: "presets/landmark/water_works.svg"; + set icon_z17; +} +way[man_made=cutline]::man_made_cutline { + width: 4; + color: cutline#bbff7c; + z-index: -2; + object-z-index: -1; /* below highway=* */ + modifier: false; /* don't draw default way if there is no line on default layer */ +} +node[man_made=cutline] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} + +/****************/ +/* telecom tags */ +/****************/ + +area[telecom=exchange], +area[telecom=connection_point], +area[telecom=service_device] { + fill-color: telecom#d8d8d8; /* same as man_made */ +} +node[telecom=exchange] { + icon-image: "presets/telecom/exchange.svg"; + set icon_z17; +} +node[telecom=connection_point] { + icon-image: "presets/telecom/connection_point.svg"; + set icon_z17; +} +node[telecom=service_device] { + icon-image: "presets/telecom/service_device.svg"; + set icon_z17; +} +node[man_made=street_cabinet][street_cabinet=telecom] { + icon-image: "presets/telecom/telecom_cabinet.svg"; + set icon_z17; +} + +/***************/ +/* office tags */ +/***************/ + +area[office=accountant], +area[office=advertising_agency], +area[office=architect], +area[office=association], +area[office=company], +area[office=educational_institution], +area[office=employment_agency], +area[office=estate_agent], +area[office=foundation], +area[office=government], +area[office=insurance], +area[office=it], +area[office=lawyer], +area[office=newspaper], +area[office=ngo], +area[office=notary], +area[office=political_party], +area[office=religion], +area[office=research], +area[office=tax_advisor], +area[office=telecommunication] { + fill-color: office#de5696; +} +node[office=accountant] { + icon-image: "presets/office/accountant.svg"; + set icon_z17; +} +node[office=advertising_agency] { + icon-image: "presets/office/advertising_agency.svg"; + set icon_z17; +} +node[office=architect] { + icon-image: "presets/office/architect.svg"; + set icon_z17; +} +node[office=association] { + icon-image: "presets/office/association.svg"; + set icon_z17; +} +node[office=company] { + icon-image: "presets/office/private_company.svg"; + set icon_z17; +} +node[office=educational_institution] { + icon-image: "presets/office/educational_institution.svg"; + set icon_z17; +} +node[office=employment_agency] { + icon-image: "presets/office/employment_agency.svg"; + set icon_z17; +} +node[office=estate_agent] { + icon-image: "presets/office/real_state.svg"; + set icon_z17; +} +node[office=foundation] { + icon-image: "presets/office/foundation.svg"; + set icon_z17; +} +node[office=insurance] { + icon-image: "presets/office/insurance.svg"; + set icon_z17; +} +node[office=it] { + icon-image: "presets/office/it.svg"; + set icon_z17; +} +node[office=lawyer] { + icon-image: "presets/office/lawyer.svg"; + set icon_z17; +} +node[office=newspaper] { + icon-image: "presets/office/newspaper.svg"; + set icon_z17; +} +node[office=ngo] { + icon-image: "presets/office/ong.svg"; + set icon_z17; +} +node[office=notary] { + icon-image: "presets/office/notary.svg"; + set icon_z17; +} +node[office=political_party] { + icon-image: "presets/office/political_party.svg"; + set icon_z17; +} +node[office=religion] { + icon-image: "presets/office/religion.svg"; + set icon_z17; +} +node[office=research] { + icon-image: "presets/office/research.svg"; + set icon_z17; +} +node[office=tax_advisor] { + icon-image: "presets/office/tax_advisor.svg"; + set icon_z17; +} +node[office=telecommunication] { + icon-image: "presets/office/telecommunication.svg"; + set icon_z17; +} +node[office=government] { + icon-image: "presets/office/government.svg"; + set icon_z17; +} + +/****************/ +/* leisure tags */ +/****************/ + +area[leisure=bandstand], +area[leisure=sports_centre], +area[leisure=fitness_centre], +area[leisure=stadium], +area[leisure=horse_riding], +area[leisure=hackerspace], +area[leisure=outdoor_seating], +area[leisure=resort], +area[leisure=beach_resort], +area[leisure=water_park] { + fill-color: leisure#c7f1a3; +} +node[leisure=bandstand] { + icon-image: "presets/leisure/bandstand.svg"; + set icon_z17; +} +node[leisure=sports_centre] { + icon-image: "presets/sport/sports_centre.svg"; + set icon_z17; +} +node[leisure=fitness_centre] { + icon-image: "presets/sport/fitness_centre.svg"; + set icon_z17; +} +node[leisure=stadium] { + icon-image: "presets/sport/stadium.svg"; + set icon_z17; +} +node[leisure=horse_riding] { + icon-image: "presets/leisure/horse_riding.svg"; + set icon_z17; +} +node[leisure=hackerspace] { + icon-image: "presets/leisure/hackerspace.svg"; + set icon_z17; +} +node[leisure=outdoor_seating] { + icon-image: "presets/leisure/outdoor_seating.svg"; + set icon_z17; +} +node[leisure=resort] { + icon-image: "presets/leisure/resort.svg"; + set icon_z17; +} +node[leisure=beach_resort] { + icon-image: "presets/leisure/beach_resort.svg"; + set icon_z17; +} +node[leisure=water_park] { + icon-image: "presets/leisure/water_park.svg"; + set icon_z17; +} +way[leisure=track] { + width: 2; + color: leisuretrack#d4f4b9; +} +way[leisure=track][area?], +relation[leisure=track][!area?!]:closed { + fill-color: leisuretrack#d4f4b9; +} +node[leisure=track] { + icon-image: "presets/sport/track.svg"; + set icon_z17; +} +area[leisure=pitch] { + fill-color: pitch#baee8d; +} +node[leisure=pitch] { + icon-image: "presets/sport/pitch.svg"; + set icon_z17; +} +area[leisure=marina] { + fill-color: marina#0070cf; +} +node[leisure=marina] { + icon-image: "presets/nautical/marina.svg"; + set icon_z17; +} +way[leisure=slipway] { + width: 2; + color: leisure#c7f1a3; +} +node[leisure=slipway] { + icon-image: "presets/nautical/slipway.svg"; + set icon_z17; +} +area[leisure=fishing], +area[leisure=bird_hide], +area[leisure=nature_reserve], +area[leisure=park], +area[leisure=playground], +area[leisure=garden], +area[leisure=firepit] { + fill-color: leisure#c7f1a3; +} +node[leisure=fishing] { + icon-image: "presets/sport/fishing.svg"; + set icon_z17; +} +node[leisure=bird_hide] { + icon-image: "presets/leisure/bird_hide.svg"; + set icon_z17; +} +node[leisure=park] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} +node[leisure=playground] { + icon-image: "presets/leisure/playground.svg"; + set icon_z17; +} +node[leisure=garden] { + icon-image: "presets/leisure/garden.svg"; + set icon_z17; +} +node[leisure=common] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} +node[leisure=firepit] { + icon-image: "presets/leisure/firepit.svg"; + set icon_z17; +} +node[leisure=picnic_table] { + icon-image: "presets/leisure/picnic.svg"; + set icon_z17; +} +area[leisure=swimming_pool] { + fill-color: swimming_pool#51c4ef; +} +node[leisure=swimming_pool] { + icon-image: "presets/sport/swimming.svg"; + set icon_z17; +} +area[leisure=fitness_station], +area[leisure=miniature_golf], +area[leisure=dog_park], +area[leisure=ice_rink], +area[leisure=sauna] { + fill-color: leisure#c7f1a3; +} +node[leisure=fitness_station] { + icon-image: "presets/leisure/fitness_station.svg"; + set icon_z17; +} +node[leisure=miniature_golf] { + icon-image: "presets/sport/miniature_golf.svg"; + set icon_z17; +} +node[leisure=dog_park] { + icon-image: "presets/leisure/dogpark.svg"; + set icon_z17; +} +node[leisure=ice_rink] { + icon-image: "presets/sport/ice_hockey.svg"; + set icon_z17; +} +node[leisure=sauna] { + icon-image: "presets/leisure/sauna.svg"; + set icon_z17; +} +area[leisure=golf_course] { + fill-color: leisure#c7f1a3; +} +node[leisure=golf_course] { + icon-image: "presets/sport/golf/golf.svg"; + set icon_z17; +} + +/*************/ +/* golf tags */ +/*************/ +area[golf=tee] { + fill-color: golf#c7f1a3; +} +node[golf=tee] { + icon-image: "presets/sport/golf/tee.svg"; + set icon_z17; +} +way[golf=hole] { + width: 1; + dashes: 10,10; + color: golf_hole#808080; +} +node[golf=pin] { + icon-image: "presets/sport/golf/pin.svg"; + set icon_z17; +} +area[golf=bunker] { + fill-color: golf_bunker#ffab00; +} +area[golf=water_hazard], +area[golf=lateral_water_hazard] { + fill-color: golf_water_hazard#0000ff; +} +area[golf=green] { + fill-color: golf_green#00e700; +} +area[golf=fairway] { + fill-color: golf_fairway#009a00; +} +area[golf=rough] { + fill-color: golf_rough#006700; +} +area[golf=driving_range] { + fill-color: golf_driving_range#c7f1a3; +} +node[golf=driving_range] { + icon-image: "presets/sport/golf/driving_range.svg"; + set icon_z17; +} + +/********************/ +/* advertising tags */ +/********************/ + +node[advertising=column] { + icon-image: "presets/leisure/advertising_column.svg"; + set icon_z17; +} +area[advertising=column] { + fill-color: advertising#880000; +} +node[advertising=billboard] { + icon-image: "presets/leisure/billboard.svg"; + set icon_z17; +} +way[advertising=billboard] { + width: 2; + color: advertising#880000; +} + +/*************/ +/* shop tags */ +/*************/ + +area[shop=supermarket], +area[shop=convenience], +area[shop=bakery], +area[shop=butcher], +area[shop=bicycle], +area[shop=doityourself], +area[shop=dry_cleaning], +area[shop=laundry], +area[shop=outdoor], +area[shop=kiosk], +area[shop=alcohol], +area[shop=beverages], +area[shop=books], +area[shop=boutique], +area[shop=car], +area[shop=car_repair], +area[shop=tyres], +area[shop=chemist], +area[shop=tobacco], +area[shop=e-cigarette], +area[shop=clothes], +area[shop=computer], +area[shop=confectionery], +area[shop=pastry], +area[shop=copyshop], +area[shop=curtain], +area[shop=cycle_repair], +area[shop=department_store], +area[shop=deli], +area[shop=doors], +area[shop=electronics], +area[shop=erotic], +area[shop=furniture], +area[shop=fabric], +area[shop=florist], +area[shop=frame], +area[shop=gas], +area[shop=gift], +area[shop=greengrocer], +area[shop=garden_centre], +area[shop=hairdresser], +area[shop=hardware], +area[shop=hearing_aids], +area[shop=hifi], +area[shop=houseware], +area[shop=jewelry], +area[shop=kitchen], +area[shop=mall], +area[shop=massage], +area[shop=mobile_phone], +area[shop=watches], +area[shop=motorcycle], +area[shop=musical_instrument], +area[shop=newsagent], +area[shop=optician], +area[shop=medical_supply], +area[shop=paint], +area[shop=party], +area[shop=pawnbroker], +area[shop=seafood], +area[shop=dairy], +area[shop=cheese], +area[shop=shoes], +area[shop=sports], +area[shop=stationery], +area[shop=tailor], +area[shop=travel_agency], +area[shop=scuba_diving], +area[shop=toys], +area[shop=vacuum_cleaner], +area[shop=variety_store], +area[shop=charity], +area[shop=video], +area[shop=bookmaker], +area[shop=lottery], +area[shop=pet], +area[shop=pet_grooming], +area[shop=photo], +area[shop=ticket], +area[shop=carpet], +area[shop=interior_decoration], +area[shop=car_parts], +area[shop=video_games], +area[shop=bed], +area[shop=beauty], +area[shop=cosmetics], +area[shop=perfumery], +area[shop=tea], +area[shop=coffee], +area[shop=antiques], +area[shop=music], +area[shop=weapons], +area[shop=funeral_directors], +area[shop=wine], +area[shop=farm], +area[shop=tattoo], +area[shop=art], +area[shop=bag] { + fill-color: shop#00005f; +} +node[shop=supermarket] { + icon-image: "presets/shop/supermarket.svg"; + set icon_z17; +} +node[shop=convenience] { + icon-image: "presets/shop/convenience.svg"; + set icon_z17; +} +node[shop=bakery] { + icon-image: "presets/shop/groceries/bakery.svg"; + set icon_z17; +} +node[shop=butcher] { + icon-image: "presets/shop/groceries/butcher.svg"; + set icon_z17; +} +node[shop=bicycle] { + icon-image: "presets/shop/bicycle.svg"; + set icon_z17; +} +node[shop=doityourself] { + icon-image: "presets/shop/diy_store.svg"; + set icon_z17; +} +node[shop=dry_cleaning], +node[shop=laundry] { + icon-image: "presets/shop/laundry.svg"; + set icon_z17; +} +node[shop=outdoor] { + icon-image: "presets/shop/outdoor.svg"; + set icon_z17; +} +node[shop=kiosk] { + icon-image: "presets/shop/kiosk.svg"; + set icon_z17; +} +node[shop=beverages] { + icon-image: "presets/shop/beverages.svg"; + set icon_z17; +} +node[shop=alcohol] { + icon-image: "presets/shop/alcohol.svg"; + set icon_z17; +} +node[shop=books] { + icon-image: "presets/shop/book.svg"; + set icon_z17; +} +node[shop=boutique] { + icon-image: "presets/shop/boutique.svg"; + set icon_z17; +} +node[shop=car] { + icon-image: "presets/shop/vehicle.svg"; + set icon_z17; +} +node[shop=car_repair] { + icon-image: "presets/vehicle/repair_shop.svg"; + set icon_z17; +} +node[shop=tyres] { + icon-image: "presets/vehicle/tyres.svg"; + set icon_z17; +} +node[shop=chemist] { + icon-image: "presets/shop/chemist.svg"; + set icon_z17; +} +node[shop=tobacco] { + icon-image: "presets/shop/tobacco.svg"; + set icon_z17; +} +node[shop=e-cigarette] { + icon-image: "presets/shop/e-cigarette.svg"; + set icon_z17; +} +node[shop=clothes] { + icon-image: "presets/shop/clothes.svg"; + set icon_z17; +} +node[shop=computer] { + icon-image: "presets/shop/computer.svg"; + set icon_z17; +} +node[shop=confectionery] { + icon-image: "presets/shop/groceries/confectionery.svg"; + set icon_z17; +} +node[shop=pastry] { + icon-image: "presets/shop/groceries/pastry.svg"; + set icon_z17; +} +node[shop=copyshop] { + icon-image: "presets/shop/copyshop.svg"; + set icon_z17; +} +node[shop=curtain] { + icon-image: "presets/shop/curtain.svg"; + set icon_z17; +} +node[shop=cycle_repair] { + icon-image: "presets/shop/bicycle.svg"; + set icon_z17; +} +node[shop=department_store] { + icon-image: "presets/shop/mall.svg"; + set icon_z17; +} +node[shop=deli] { + icon-image: "presets/shop/groceries/deli.svg"; + set icon_z17; +} +node[shop=doors] { + icon-image: "presets/shop/doors.svg"; + set icon_z17; +} +node[shop=electronics] { + icon-image: "presets/shop/electronics.svg"; + set icon_z17; +} +node[shop=erotic] { + icon-image: "presets/shop/erotic.svg"; + set icon_z17; +} +node[shop=furniture] { + icon-image: "presets/shop/furniture.svg"; + set icon_z17; +} +node[shop=fabric] { + icon-image: "presets/shop/fabric.svg"; + set icon_z17; +} +node[shop=florist] { + icon-image: "presets/shop/florist.svg"; + set icon_z17; +} +node[shop=frame] { + icon-image: "presets/shop/frame.svg"; + set icon_z17; +} +node[shop=gas] { + icon-image: "presets/shop/gas.svg"; + set icon_z17; +} +node[shop=gift] { + icon-image: "presets/shop/present.svg"; + set icon_z17; +} +node[shop=greengrocer] { + icon-image: "presets/shop/groceries/greengrocer.svg"; + set icon_z17; +} +node[shop=garden_centre] { + icon-image: "presets/shop/garden_centre.svg"; + set icon_z17; +} +node[shop=hairdresser] { + icon-image: "presets/shop/hairdresser.svg"; + set icon_z17; +} +node[shop=hardware] { + icon-image: "presets/shop/hardware.svg"; + set icon_z17; +} +node[shop=hearing_aids] { + icon-image: "presets/shop/hearing_aids.svg"; + set icon_z17; +} +node[shop=hifi] { + icon-image: "presets/shop/hifi.svg"; + set icon_z17; +} +node[shop=houseware] { + icon-image: "presets/shop/houseware.svg"; + set icon_z17; +} +node[shop=jewelry] { + icon-image: "presets/shop/jewelry.svg"; + set icon_z17; +} +node[shop=kitchen] { + icon-image: "presets/shop/kitchen.svg"; + set icon_z17; +} +node[shop=mall] { + icon-image: "presets/shop/mall.svg"; + set icon_z17; +} +node[shop=massage] { + icon-image: "presets/shop/massage.svg"; + set icon_z17; +} +node[shop=mobile_phone] { + icon-image: "presets/shop/mobile_phone.svg"; + set icon_z17; +} +node[shop=watches] { + icon-image: "presets/shop/watches.svg"; + set icon_z17; +} +node[shop=motorcycle] { + icon-image: "presets/vehicle/motorbike.svg"; + set icon_z17; +} +node[shop=musical_instrument] { + icon-image: "presets/shop/musical_instrument.svg"; + set icon_z17; +} +node[shop=newsagent] { + icon-image: "presets/shop/news.svg"; + set icon_z17; +} +node[shop=optician] { + icon-image: "presets/shop/optician.svg"; + set icon_z17; +} +node[shop=medical_supply] { + icon-image: "presets/shop/medical_supply.svg"; + set icon_z17; +} +node[shop=paint] { + icon-image: "presets/shop/paint.svg"; + set icon_z17; +} +node[shop=party] { + icon-image: "presets/shop/party.svg"; + set icon_z17; +} +node[shop=pawnbroker] { + icon-image: "presets/shop/pawnbroker.svg"; + set icon_z17; +} +node[shop=seafood] { + icon-image: "presets/shop/groceries/seafood.svg"; + set icon_z17; +} +node[shop=dairy] { + icon-image: "presets/shop/groceries/dairy.svg"; + set icon_z17; +} +node[shop=cheese] { + icon-image: "presets/shop/groceries/cheese.svg"; + set icon_z17; +} +node[shop=shoes] { + icon-image: "presets/shop/shoes.svg"; + set icon_z17; +} +node[shop=sports] { + icon-image: "presets/sport/multi.svg"; + set icon_z17; +} +node[shop=stationery] { + icon-image: "presets/shop/stationery.svg"; + set icon_z17; +} +node[shop=tailor] { + icon-image: "presets/shop/tailor.svg"; + set icon_z17; +} +node[shop=travel_agency] { + icon-image: "presets/shop/travel_agency.svg"; + set icon_z17; +} +node[shop=scuba_diving] { + icon-image: "presets/shop/scuba_diving.svg"; + set icon_z17; +} +node[shop=toys] { + icon-image: "presets/shop/toys.svg"; + set icon_z17; +} +node[shop=vacuum_cleaner] { + icon-image: "presets/shop/vacuum_cleaner.svg"; + set icon_z17; +} +node[shop=variety_store] { + icon-image: "presets/shop/variety_store.svg"; + set icon_z17; +} +node[shop=charity] { + icon-image: "presets/shop/charity.svg"; + set icon_z17; +} +node[shop=video] { + icon-image: "presets/shop/video.svg"; + set icon_z17; +} +node[shop=bookmaker] { + icon-image: "presets/shop/lottery.svg"; + set icon_z17; +} +node[shop=lottery] { + icon-image: "presets/shop/lottery.svg"; + set icon_z17; +} +node[shop=pet] { + icon-image: "presets/shop/pet.svg"; + set icon_z17; +} +node[shop=pet_grooming] { + icon-image: "presets/shop/pet_grooming.svg"; + set icon_z17; +} +node[shop=photo] { + icon-image: "presets/shop/photo.svg"; + set icon_z17; +} +node[shop=ticket] { + icon-image: "presets/shop/ticket.svg"; + set icon_z17; +} +node[shop=carpet] { + icon-image: "presets/shop/carpet.svg"; + set icon_z17; +} +node[shop=interior_decoration] { + icon-image: "presets/shop/interior_decoration.svg"; + set icon_z17; +} +node[shop=car_parts] { + icon-image: "presets/vehicle/car_parts.svg"; + set icon_z17; +} +node[shop=video_games] { + icon-image: "presets/shop/video_games.svg"; + set icon_z17; +} +node[shop=bed] { + icon-image: "presets/shop/bed.svg"; + set icon_z17; +} +node[shop=beauty] { + icon-image: "presets/shop/beauty.svg"; + set icon_z17; +} +node[shop=cosmetics] { + icon-image: "presets/shop/cosmetics.svg"; + set icon_z17; +} +node[shop=perfumery] { + icon-image: "presets/shop/perfumery.svg"; + set icon_z17; +} +node[shop=tea] { + icon-image: "presets/shop/groceries/tea.svg"; + set icon_z17; +} +node[shop=coffee] { + icon-image: "presets/shop/groceries/coffee.svg"; + set icon_z17; +} +node[shop=antiques] { + icon-image: "presets/shop/antique.svg"; + set icon_z17; +} +node[shop=music] { + icon-image: "presets/shop/music.svg"; + set icon_z17; +} +node[shop=weapons] { + icon-image: "presets/shop/weapons.svg"; + set icon_z17; +} +node[shop=funeral_directors] { + icon-image: "presets/shop/funeral_directors.svg"; + set icon_z17; +} +node[shop=wine] { + icon-image: "presets/shop/wine.svg"; + set icon_z17; +} +node[shop=farm] { + icon-image: "presets/shop/groceries/farm.svg"; + set icon_z17; +} +node[shop=tattoo] { + icon-image: "presets/shop/tattoo.svg"; + set icon_z17; +} +node[shop=art] { + icon-image: "presets/shop/art.svg"; + set icon_z17; +} +node[shop=bag] { + icon-image: "presets/shop/bag.svg"; + set icon_z17; +} + +/******************/ +/* emergency tags */ +/******************/ +area[emergency=ambulance_station], +area[emergency=water_tank] { + fill-color: emergency#eeeeee; +} +node[emergency=ambulance_station] { + icon-image: "presets/emergency/ambulance_station.svg"; + set icon_z17; +} +node[emergency=water_tank] { + icon-image: "presets/emergency/water_tank.svg"; + set icon_z17; +} +node[emergency=emergency_ward_entrance] { + icon-image: "presets/emergency/emergency_ward_entrance.svg"; + set icon_z17; +} +node[emergency=phone] { + icon-image: "presets/vehicle/emergency_phone.svg"; + set icon_z17; +} +node[emergency=defibrillator] { + icon-image: "presets/emergency/aed.svg"; + set icon_z17; +} +node[emergency=fire_hydrant] { + icon-image: "presets/service/fire_hydrant.svg"; + set icon_z17; +} +node[emergency=fire_extinguisher] { + icon-image: "presets/emergency/fire_extinguisher.svg"; + set icon_z17; +} +node[emergency=fire_hose] { + icon-image: "presets/emergency/fire_hose.svg"; + set icon_z17; +} +node[emergency=assembly_point] { + icon-image: "presets/emergency/assembly_point.svg"; + set icon_z17; +} +node[emergency=siren] { + icon-image: "presets/emergency/siren.svg"; + set icon_z17; +} + +/****************/ +/* police tags */ +/****************/ + +area[police=barracks], +area[police=car_pound], +area[police=checkpoint], +area[police=detention], +area[police=naval_base], +area[police=offices], +area[police=range], +area[police=storage], +area[police=training_area], +area[police=yes] { + fill-color: police#ecba52; +} +node[police=barracks], +node[police=car_pound], +node[police=checkpoint], +node[police=detention], +node[police=naval_base], +node[police=offices], +node[police=range], +node[police=storage], +node[police=training_node], +node[police=yes] { + icon-image: "presets/service/police_non_public.svg"; + set icon_z17; +} + +/****************/ +/* amenity tags */ +/****************/ + +area[amenity=pub], +area[amenity=biergarten], +area[amenity=nightclub], +area[amenity=stripclub], +area[amenity=casino], +area[amenity=brothel], +area[amenity=cafe], +area[amenity=restaurant], +area[amenity=food_court], +area[amenity=fast_food], +area[amenity=bar], +area[amenity=ice_cream] { + fill-color: amenity#ecba52; +} +node[amenity=pub] { + icon-image: "presets/food/pub.svg"; + set icon_z17; +} +node[amenity=biergarten] { + icon-image: "presets/food/biergarten.svg"; + set icon_z17; +} +node[amenity=nightclub] { + icon-image: "presets/leisure/nightclub.svg"; + set icon_z17; +} +node[amenity=stripclub] { + icon-image: "presets/leisure/stripclub.svg"; + set icon_z17; +} +node[amenity=casino] { + icon-image: "presets/leisure/casino.svg"; + set icon_z17; +} +node[amenity=brothel] { + icon-image: "presets/leisure/brothel.svg"; + set icon_z17; +} +node[amenity=cafe] { + icon-image: "presets/food/cafe.svg"; + set icon_z17; +} +node[amenity=restaurant] { + icon-image: "presets/food/restaurant.svg"; + set icon_z17; +} +node[amenity=food_court] { + icon-image: "presets/food/food_court.svg"; + set icon_z17; +} +node[amenity=fast_food] { + icon-image: "presets/food/fast_food.svg"; + set icon_z17; +} +node[amenity=bar] { + icon-image: "presets/food/bar.svg"; + set icon_z17; +} +node[amenity=ice_cream] { + icon-image: "presets/food/ice_cream.svg"; + set icon_z17; +} +area[amenity=bicycle_parking]:closed { + fill-color: amenity_traffic#f7efb7; +} +way[amenity=bicycle_parking] { + width: 2; + color: amenity_traffic#f7efb7; +} +area[amenity=parking_space] { + fill-color: parking_space#f7efb8; +} +area[amenity=parking], +area[amenity=motorcycle_parking], +area[amenity=bicycle_rental], +area[amenity=bicycle_repair_station], +area[amenity=car_rental], +area[amenity=car_pooling], +area[amenity=car_sharing], +area[amenity=car_wash], +area[amenity=taxi], +area[amenity=fuel] { + fill-color: amenity_traffic#f7efb7; +} +node[amenity=parking_space] { + icon-image: "presets/vehicle/parking/parking_space.svg"; + set icon_z17; +} +node[amenity=parking] { + icon-image: "presets/vehicle/parking/parking.svg"; + set icon_z17; +} +node[amenity=parking_entrance] { + icon-image: "presets/vehicle/parking/parking.svg"; + set icon_z17; +} +node[amenity=parking_entrance][parking=multi-storey], +node[amenity=parking][parking=multi-storey] { + icon-image: "presets/vehicle/parking/multi-storey.svg"; + set icon_z17; +} +node[amenity=parking_entrance][parking=underground], +node[amenity=parking][parking=underground] { + icon-image: "presets/vehicle/parking/underground.svg"; + set icon_z17; +} +node[amenity=motorcycle_parking] { + icon-image: "presets/vehicle/parking/motorbike.svg"; + set icon_z17; +} +node[amenity=bicycle_parking] { + icon-image: "presets/vehicle/parking/bicycle.svg"; + set icon_z17; +} +node[park_ride][park_ride!=no] { + icon-image: "presets/vehicle/parking/park_ride.svg"; + set icon_z17; +} +node[amenity=parking_space][wheelchair?] { + icon-image: "presets/vehicle/parking/handicapped.svg"; + set icon_z17; +} +node[amenity=bicycle_rental] { + icon-image: "presets/vehicle/bicycle_rental.svg"; + set icon_z17; +} +node[amenity=bicycle_repair_station] { + icon-image: "presets/vehicle/bicycle_repair_station.svg"; + set icon_z17; +} +node[amenity=car_rental] { + icon-image: "presets/vehicle/car_rental.svg"; + set icon_z17; +} +node[amenity=car_pooling] { + icon-image: "presets/vehicle/car_pooling.svg"; + set icon_z17; +} +node[amenity=car_sharing] { + icon-image: "presets/vehicle/car_sharing.svg"; + set icon_z17; +} +node[amenity=car_wash] { + icon-image: "presets/vehicle/car_wash.svg"; + set icon_z17; +} +node[amenity=taxi] { + icon-image: "presets/transport/taxi.svg"; + set icon_z17; +} +node[amenity=fuel] { + icon-image: "presets/vehicle/fuel.svg"; + set icon_z17; +} +node[amenity=charging_station] { + icon-image: "presets/vehicle/charging_station.svg"; + set icon_z17; +} +node[amenity=grit_bin] { + icon-image: "presets/misc/grit_bin.svg"; + set icon_z17; +} +node[amenity=telephone] { + icon-image: "presets/service/telephone.svg"; + set icon_z17; +} +node[amenity=clock] { + icon-image: "presets/service/clock.svg"; + set icon_z17; +} +node[amenity=photo_booth] { + icon-image: "presets/service/photo_booth.svg"; + set icon_z17; +} +area[amenity=toilets], +area[amenity=shower], +area[amenity=internet_cafe], +area[amenity=recycling], +area[amenity=sanitary_dump_station] { + fill-color: amenity_light#f7efb7; +} +node[amenity=toilets] { + icon-image: "presets/service/toilets.svg"; + set icon_z17; +} +node[amenity=shower] { + icon-image: "presets/service/shower.svg"; + set icon_z17; +} +node[amenity=internet_cafe] { + icon-image: "presets/service/internet_cafe.svg"; + set icon_z17; +} +node[amenity=recycling] { + icon-image: "presets/service/recycling/recycling.svg"; + set icon_z17; +} +node[amenity=recycling][recycling_type=container] { + icon-image: "presets/service/recycling/recycling_container.svg"; +} +node[amenity=recycling][recycling_type=centre] { + icon-image: "presets/service/recycling/recycling_centre.svg"; +} +node[amenity=waste_basket] { + icon-image: "presets/service/recycling/waste_basket.svg"; + set icon_z17; +} +node[amenity=waste_disposal] { + icon-image: "presets/service/recycling/waste_disposal.svg"; + set icon_z17; +} +node[amenity=sanitary_dump_station] { + icon-image: "presets/service/recycling/sanitary_dump_station.svg"; + set icon_z17; +} +area[amenity=townhall], +area[amenity=embassy], +area[amenity=community_centre] { + fill-color: amenity_light#f7efb7; +} +node[amenity=townhall] { + icon-image: "presets/service/townhall.svg"; + set icon_z17; +} +node[amenity=embassy] { + icon-image: "presets/service/embassy.svg"; + set icon_z17; +} +node[amenity=community_centre] { + icon-image: "presets/service/community_centre.svg"; + set icon_z17; +} +area[amenity=water_point], +area[amenity=fountain] { + fill-color: light_water#00005f; +} +node[amenity=drinking_water] { + icon-image: "presets/food/drinking_water.svg"; + set icon_z17; +} +node[amenity=water_point] { + icon-image: "presets/accommodation/water.svg"; + set icon_z17; +} +node[amenity=fountain] { + icon-image: "presets/misc/fountain.svg"; + set icon_z17; +} +area[amenity=place_of_worship], +area[amenity=grave_yard], +area[amenity=crematorium], +area[amenity=post_office], +area[amenity=studio], +area[landuse=school], +area[amenity=school], +area[amenity=university], +area[amenity=college], +area[amenity=kindergarten], +area[amenity=driving_school] { + fill-color: amenity_light#f7efb7; +} +node[amenity=place_of_worship] { + icon-image: "presets/religion/religion.svg"; + set icon_z17; +} +node[amenity=place_of_worship][religion=bahai] { + icon-image: "presets/religion/bahai.svg"; + set icon_z17; +} +node[amenity=place_of_worship][religion=buddhist] { + icon-image: "presets/religion/buddhism.svg"; + set icon_z17; +} +node[amenity=place_of_worship][religion=caodaism][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +node[amenity=place_of_worship][religion=christian] { + icon-image: "presets/religion/church.svg"; + set icon_z17; +} +node[amenity=place_of_worship][religion=confucian] { + icon-image: "presets/religion/confucian.svg"; + set icon_z17; +} +node[amenity=place_of_worship][religion=hindu] { + icon-image: "presets/religion/hinduism.svg"; + set icon_z17; +} +node[amenity=place_of_worship][religion=jain] { + icon-image: "presets/religion/jainism.svg"; + set icon_z17; +} +node[amenity=place_of_worship][religion=jewish] { + icon-image: "presets/religion/jewish.svg"; + set icon_z17; +} +node[amenity=place_of_worship][religion=muslim] { + icon-image: "presets/religion/muslim.svg"; + set icon_z17; +} +node[amenity=place_of_worship][religion=shinto] { + icon-image: "presets/religion/shinto.svg"; + set icon_z17; +} +node[amenity=place_of_worship][religion=sikh] { + icon-image: "presets/religion/sikhism.svg"; + set icon_z17; +} +node[amenity=place_of_worship][religion=spiritualist][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +node[amenity=place_of_worship][religion=taoist] { + icon-image: "presets/religion/taoism.svg"; + set icon_z17; +} +node[amenity=place_of_worship][religion=tenrikyo] { + icon-image: "presets/religion/tenrikyo.svg"; + set icon_z17; +} +node[amenity=place_of_worship][religion=unitarian_universalist][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +node[amenity=place_of_worship][religion=zoroastrian][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +node[amenity=grave_yard] { + icon-image: "presets/landuse/graveyard.svg"; + set icon_z17; +} +node[amenity=crematorium][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +node[amenity=post_office] { + icon-image: "presets/service/post_office.svg"; + set icon_z17; +} +node[amenity=post_box] { + icon-image: "presets/service/post_box.svg"; + set icon_z17; +} +node[amenity=studio] { + icon-image: "presets/service/studio.svg"; + set icon_z17; +} +node[amenity=school] { + icon-image: "presets/education/school.svg"; + set icon_z17; +} +node[amenity=university] { + icon-image: "presets/education/university.svg"; + set icon_z17; +} +node[amenity=college] { + icon-image: "presets/education/college.svg"; + set icon_z17; +} +node[amenity=kindergarten] { + icon-image: "presets/education/kindergarten.svg"; + set icon_z17; +} +node[amenity=driving_school] { + icon-image: "presets/education/driving_school.svg"; + set icon_z17; +} +area[amenity=pharmacy], +area[amenity=hospital], +area[amenity=clinic], +area[amenity=nursing_home], +area[amenity=social_facility], +area[amenity=baby_hatch], +area[amenity=doctors], +area[amenity=dentist], +area[amenity=veterinary] { + fill-color: health#eeeeee; +} +node[amenity=pharmacy] { + icon-image: "presets/health/pharmacy.svg"; + set icon_z17; +} +node[amenity=hospital] { + icon-image: "presets/health/hospital.svg"; + set icon_z17; +} +node[amenity=clinic] { + icon-image: "presets/health/clinic.svg"; + set icon_z17; +} +node[amenity=social_facility][social_facility=nursing_home], +node[amenity=nursing_home] { + icon-image: "presets/social_facility/nursing_home.svg"; + set icon_z17; +} +node[amenity=social_facility][social_facility=group_home] { + icon-image: "presets/social_facility/group_home.svg"; + set icon_z17; +} +node[amenity=social_facility][social_facility=assisted_living] { + icon-image: "presets/social_facility/assisted_living.svg"; + set icon_z17; +} +node[amenity=social_facility][social_facility=outreach] { + icon-image: "presets/social_facility/outreach.svg"; + set icon_z17; +} +node[amenity=social_facility][social_facility=shelter] { + icon-image: "presets/social_facility/shelter.svg"; + set icon_z17; +} +node[amenity=social_facility][social_facility=food_bank] { + icon-image: "presets/social_facility/food_bank.svg"; + set icon_z17; +} +node[amenity=baby_hatch] { + icon-image: "presets/health/baby_hatch.svg"; + set icon_z17; +} +node[amenity=doctors] { + icon-image: "presets/health/doctors.svg"; + set icon_z17; +} +node[amenity=dentist] { + icon-image: "presets/health/dentist.svg"; + set icon_z17; +} +node[amenity=veterinary] { + icon-image: "presets/health/veterinary.svg"; + set icon_z17; +} +area[amenity=library], +area[amenity=police], +area[amenity=ranger_station], +area[amenity=fire_station], +area[amenity=bus_station], +area[amenity=ferry_terminal], +area[amenity=theatre], +area[amenity=cinema], +area[amenity=dive_centre], +area[amenity=arts_centre], +area[amenity=courthouse], +area[amenity=prison], +area[amenity=bank], +area[amenity=bureau_de_change], +area[amenity=money_transfer], +area[amenity=bbq], +area[amenity=watering_place] { + fill-color: amenity_light#f7efb7; +} +node[amenity=library] { + icon-image: "presets/education/library.svg"; + set icon_z17; +} +node[amenity=police] { + icon-image: "presets/service/police.svg"; + set icon_z17; +} +node[amenity=ranger_station] { + icon-image: "presets/service/ranger_station.svg"; + set icon_z17; +} +node[amenity=fire_station] { + icon-image: "presets/service/firebrigade.svg"; + set icon_z17; +} +node[amenity=bus_station] { + icon-image: "presets/transport/bus_old.svg"; + set icon_z17; +} +node[amenity=ferry_terminal] { + icon-image: "presets/nautical/ferry.svg"; + set icon_z17; +} +node[amenity=theatre] { + icon-image: "presets/leisure/theater.svg"; + set icon_z17; +} +node[amenity=cinema] { + icon-image: "presets/leisure/cinema.svg"; + set icon_z17; +} +node[amenity=dive_centre] { + icon-image: "presets/leisure/dive_centre.svg"; + set icon_z17; +} +node[amenity=arts_centre] { + icon-image: "presets/sightseeing/arts_centre.svg"; + set icon_z17; +} +node[amenity=courthouse] { + icon-image: "presets/service/courthouse.svg"; + set icon_z17; +} +node[amenity=prison] { + icon-image: "presets/service/prison.svg"; + set icon_z17; +} +node[amenity=bank] { + icon-image: "presets/money/bank.svg"; + set icon_z17; +} +node[amenity=bureau_de_change] { + icon-image: "presets/money/exchange.svg"; + set icon_z17; +} +node[amenity=money_transfer] { + icon-image: "presets/money/money_transfer.svg"; + set icon_z17; +} +node[amenity=atm] { + icon-image: "presets/money/atm.svg"; + set icon_z17; +} +way[amenity=bench] { + width: 2; + color: amenity_light#f7efb7; +} +node[amenity=bench] { + icon-image: "presets/leisure/bench.svg"; + set icon_z17; +} +node[amenity=bbq] { + icon-image: "presets/leisure/bbq.svg"; + set icon_z17; +} +node[amenity=compressed_air] { + icon-image: "presets/vehicle/compressed_air.svg"; + set icon_z17; +} +node[amenity=watering_place] { + icon-image: "presets/misc/watering_place.svg"; + set icon_z17; +} +area[amenity=shelter], +area[amenity=marketplace], +area[amenity=wlan] { + fill-color: amenity_light#f7efb7; +} +node[amenity=shelter] { + icon-image: "presets/accommodation/shelter.svg"; + set icon_z17; +} +node[amenity=shelter][shelter_type=public_transport] { + icon-image: "presets/accommodation/shelter_public_transport.svg"; + set icon_z17; +} +node[amenity=shelter][shelter_type=picnic_shelter] { + icon-image: "presets/accommodation/shelter_picnic.svg"; + set icon_z17; +} +node[amenity=shelter][shelter_type=basic_hut] { + icon-image: "presets/accommodation/basic_hut.svg"; + set icon_z17; +} +node[amenity=shelter][shelter_type=lean_to] { + icon-image: "presets/accommodation/shelter_lean_to.svg"; + set icon_z17; +} +node[amenity=hunting_stand] { + icon-image: "presets/landmark/hunting_stand.svg"; + set icon_z17; +} +node[amenity=marketplace] { + icon-image: "presets/shop/marketplace.svg"; + set icon_z17; +} +node[amenity=vending_machine] { + icon-image: "presets/transport/ticket-machine.svg"; + set icon_z17; +} +node[vending=excrement_bags] { + icon-image: "presets/service/excrement_bags.svg"; + set icon_z17; +} + +/**************/ +/* craft tags */ +/**************/ + +area[craft=carpenter], +area[craft=shoemaker], +area[craft=photographer], +area[craft=metal_construction], +area[craft=electrician], +area[craft=brewery], +area[craft=plumber], +area[craft=sawmill], +area[craft=gardener], +area[craft=winery], +area[craft=hvac], +area[craft=painter], +area[craft=stonemason], +area[craft=handicraft], +area[craft=pottery], +area[craft=key_cutter], +area[craft=caterer], +area[craft=roofer], +area[craft=beekeeper], +area[craft=blacksmith], +area[craft=locksmith], +area[craft=window_construction], +area[craft=upholsterer], +area[craft=tiler] { + fill-color: craft#999900; +} +node[craft=carpenter] { + icon-image: "presets/craft/carpenter.svg"; + set icon_z17; +} +node[craft=shoemaker] { + icon-image: "presets/craft/shoemaker.svg"; + set icon_z17; +} +node[craft=photographer][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +node[craft=metal_construction] { + icon-image: "presets/craft/metal_construction.svg"; + set icon_z17; +}node[craft=electrician] { + icon-image: "presets/craft/electrician.svg"; + set icon_z17; +} +node[craft=brewery][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +node[craft=plumber] { + icon-image: "presets/craft/plumber.svg"; + set icon_z17; +} +node[craft=sawmill] { + icon-image: "presets/craft/sawmill.svg"; + set icon_z17; +} +node[craft=gardener] { + icon-image: "presets/craft/gardener.svg"; + set icon_z17; +} +node[craft=winery][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +node[craft=hvac] { + icon-image: "presets/craft/hvac.svg"; + set icon_z17; +} +node[craft=painter] { + icon-image: "presets/craft/painter.svg"; + set icon_z17; +} +node[craft=stonemason] { + icon-image: "presets/craft/stonemason.svg"; + set icon_z17; +} +node[craft=handicraft][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +node[craft=pottery] { + icon-image: "presets/craft/pottery.svg"; + set icon_z17; +} +node[craft=key_cutter] { + icon-image: "presets/craft/key_cutter.svg"; + set icon_z17; +} +node[craft=caterer][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +node[craft=roofer] { + icon-image: "presets/craft/roofer.svg"; + set icon_z17; +} +node[craft=beekeeper] { + icon-image: "presets/craft/beekeeper.svg"; + set icon_z17; +} +node[craft=blacksmith] { + icon-image: "presets/craft/blacksmith.svg"; + set icon_z17; +} +node[craft=locksmith] { + icon-image: "presets/craft/locksmith.svg"; + set icon_z17; +} +node[craft=window_construction] { + icon-image: "presets/craft/window_construction.svg"; + set icon_z17; +} +node[craft=upholsterer] { + icon-image: "presets/craft/upholsterer.svg"; + set icon_z17; +} +node[craft=tiler] { + icon-image: "presets/craft/tiler.svg"; + set icon_z17; +} + +/****************/ +/* tourism tags */ +/****************/ + +area[tourism=hotel], +area[tourism=motel], +area[tourism=guest_house], +area[tourism=apartment], +area[tourism=hostel], +area[tourism=chalet], +area[tourism=alpine_hut], +area[tourism=wilderness_hut], +area[tourism=camp_site], +area[tourism=camp_pitch], +area[tourism=caravan_site] { + fill-color: hotel#feced0; +} +node[tourism=hotel] { + icon-image: "presets/accommodation/hotel.svg"; + set icon_z17; +} +node[tourism=motel] { + icon-image: "presets/accommodation/motel.svg"; + set icon_z17; +} +node[tourism=guest_house] { + icon-image: "presets/accommodation/guest_house.svg"; + set icon_z17; +} +node[tourism=apartment] { + icon-image: "presets/accommodation/apartment.svg"; + set icon_z17; +} +node[tourism=hostel] { + icon-image: "presets/accommodation/hostel.svg"; + set icon_z17; +} +node[tourism=chalet] { + icon-image: "presets/accommodation/chalet.svg"; + set icon_z17; +} +node[tourism=alpine_hut] { + icon-image: "presets/accommodation/alpine_hut.svg"; + set icon_z17; +} +node[tourism=wilderness_hut] { + icon-image: "presets/accommodation/wilderness_hut.svg"; + set icon_z17; +} +node[tourism=camp_site] { + icon-image: "presets/accommodation/camping.svg"; + set icon_z17; +} +node[tourism=camp_pitch] { + icon-image: "presets/accommodation/camp_pitch.svg"; + set icon_z17; +} +node[tourism=caravan_site] { + icon-image: "presets/accommodation/caravan.svg"; + set icon_z17; +} +area[tourism=attraction]:closed { + fill-color: tourism#e180a2; +} +way[tourism=attraction] { + width: 2; + color: tourism#e180a2; +} +node[tourism=attraction] { + icon-image: "presets/sightseeing/attraction.svg"; + set icon_z17; +} +area[tourism=picnic_site], +area[tourism=viewpoint], +area[tourism=theme_park], +area[tourism=zoo], +area[tourism=museum] { + fill-color: tourism#e180a2; +} +node[tourism=picnic_site] { + icon-image: "presets/leisure/picnic.svg"; + set icon_z17; +} +node[tourism=viewpoint] { + icon-image: "presets/sightseeing/viewpoint.svg"; + set icon_z17; +} +node[tourism=theme_park] { + icon-image: "presets/leisure/theme_park.svg"; + set icon_z17; +} +node[tourism=zoo] { + icon-image: "presets/leisure/zoo.svg"; + set icon_z17; +} +area[tourism=artwork]:closed { + fill-color: tourism#e180a2; +} +way[tourism=artwork] { + width: 2; + color: tourism#e180a2; +} +node[tourism=artwork] { + icon-image: "presets/sightseeing/arts_centre.svg"; + set icon_z17; +} +node[tourism=museum] { + icon-image: "presets/sightseeing/museum.svg"; + set icon_z17; +} + +/********************/ +/* attraction tags */ +/********************/ + +area[attraction=animal] { + fill-color: attraction#ffbfd3; + color: attraction#ffbfd3; /* color explizitly needed here to overwrite the color already set by (a lot of wrongly tagged) tourism=attraction */ +} +node[attraction=animal] { + icon-image: "presets/attraction/animal.svg"; + set icon_z17; +} + +/********************/ +/* information tags */ +/********************/ + +area[tourism=information] { + fill-color: tourism#e180a2; +} +node[tourism=information] { + icon-image: "presets/misc/information/information.svg"; + set icon_z17; +} +node[tourism=information][information=guidepost] { + icon-image: "presets/misc/information/guidepost.svg"; + set icon_z17; +} +area[tourism=information][information=office] { + fill-color: tourism#e180a2; +} +node[tourism=information][information=office] { + icon-image: "presets/misc/information/informationoffice.svg"; + set icon_z17; +} +node[tourism=information][information=map] { + icon-image: "presets/misc/information/map.svg"; + set icon_z17; +} +node[tourism=information][information=board] { + icon-image: "presets/misc/information/board.svg"; + set icon_z17; +} + +/*****************/ +/* historic tags */ +/*****************/ + +area[historic=castle], +area[historic=fort], +area[historic=monument], +area[historic=memorial], +area[historic=tomb], +area[historic=archaeological_site], +area[historic=ruins], +area[historic=battlefield], +area[geological=palaeontological_site], +area[historic=wayside_cross], +area[historic=wayside_shrine], +area[historic=boundary_stone] { + fill-color: historic#663300; +} +node[historic=fort] { + icon-image: "presets/sightseeing/fort.svg"; + set icon_z17; +} +node[historic=castle] { + icon-image: "presets/sightseeing/castle.svg"; + set icon_z17; +} +node[historic=monument] { + icon-image: "presets/sightseeing/monument.svg"; + set icon_z17; +} +node[historic=memorial] { + icon-image: "presets/sightseeing/memorial.svg"; + set icon_z17; +} +node[historic=archaeological_site] { + icon-image: "presets/sightseeing/archaeological.svg"; + set icon_z17; +} +node[historic=ruins] { + icon-image: "presets/sightseeing/ruins.svg"; + set icon_z17; +} +node[historic=battlefield] { + icon-image: "presets/sightseeing/battlefield.svg"; + set icon_z17; +} +node[geological=palaeontological_site] { + icon-image: "presets/sightseeing/palaeontological_site.svg"; + set icon_z17; +} +node[historic=wayside_cross] { + icon-image: "presets/religion/wayside_cross.svg"; + set icon_z17; +} +node[historic=wayside_shrine] { + icon-image: "presets/religion/wayside_shrine.svg"; + set icon_z17; +} +node[historic=boundary_stone] { + icon-image: "presets/landmark/boundary_stone.svg"; + set icon_z17; +} +area[cemetery=grave] { + fill-color: grave#663300; +} +node[cemetery=grave] { + icon-image: "presets/misc/grave.svg"; + set icon_z17; +} +area[cemetery=sector] { + fill-color: cemetery_sector#dbf8e6; +} +node[cemetery=sector] { + icon-image: "presets/misc/cemetery_sector.svg"; + set icon_z17; +} +node[historic=tomb] { + icon-image: "presets/misc/tomb.svg"; + set icon_z17; +} + +/****************/ +/* landuse tags */ +/****************/ + +area[landuse], +area[leisure], +area[amenity], +area[place], +area[natural], +area[man_made] { + z-index: -2; /* put areas that can have other areas inside (e.g. building) a little lower, see #9606 */ +} +area[landuse=farmland] { + fill-color: farmland#b8e0b1; +} +area[landuse=meadow] { + fill-color: meadow#b1e0b6; +} +area[landuse=vineyard], +area[landuse=orchard] { + fill-color: green#b1e0c2; +} +area[landuse=quarry] { + fill-color: quarry#888888; +} +area[landuse=landfill] { + fill-color: landfill#663300; +} +area[landuse=basin], +area[landuse=reservoir] { + fill-color: basin#0000bf; +} +area[landuse=forest] { + fill-color: forest#b1efc8; +} +area[landuse=allotments] { + fill-color: allotments#5dbf80; +} +area[landuse=greenhouse_horticulture], +area[landuse=plant_nursery] { + fill-color: green#b1e0c2; +} +area[landuse=salt_pond] { + fill-color: salt_pond#eeeeee; +} +area[landuse=aquaculture] { + fill-color: aquaculture#189dff; +} +area[landuse=flowerbed] { + fill-color: flowerbed#91c956; +} +area[landuse=grass] { + fill-color: grass#97ca96; +} +area[landuse=residential] { + fill-color: residential#f0f0f0; +} +area[landuse=garages] { + fill-color: garages#d6c8aa; +} +area[landuse=farmyard] { + fill-color: farmyard#f0f0f0; +} +area[landuse=retail], +area[landuse=commercial] { + fill-color: retail#ffc4ee; +} +area[landuse=industrial] { + fill-color: industrial#ecd8ff; +} +area[landuse=brownfield] { + fill-color: brownfield#ecba32; +} +area[landuse=greenfield] { + fill-color: greenfield#b1ec5c; +} +area[landuse=railway] { + fill-color: railland#888888; +} +area[landuse=construction] { + fill-color: construction#ffff00; +} +way[landuse=construction] { + width: 1; + color: construction#ffff00; + dashes: 9,9; +} +area[landuse=military] { + fill-color: military#b62c2c; +} +area[landuse=religious] { + fill-color: religious#ffd454; +} +area[landuse=cemetery] { + fill-color: cemetery#b1efc8; +} +area[landuse=village_green] { + fill-color: green#b1e0c2; +} +area[landuse=recreation_ground] { + fill-color: green#b1e0c2; +} +node[landuse] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} + +/*****************/ +/* military tags */ +/*****************/ + +area[military=airfield], +area[military=bunker], +area[military=barracks], +area[military=danger_area], +area[military=range] { + fill-color: military#b62c2c; +} +node[military=airfield] { + icon-image: "presets/transport/airport/airfield.svg"; + set icon_z17; +} +node[military=bunker] { + icon-image: "presets/landmark/bunker.svg"; + set icon_z17; +} +node[military=barracks][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +node[military=danger_area] { + icon-image: "presets/misc/danger.svg"; + set icon_z17; +} +node[military=range] { + icon-image: "presets/sport/range.svg"; + set icon_z17; +} + +/****************/ +/* railway tags */ +/****************/ + +area[railway=station] { + fill-color: railwaypoint#f7efb7; +} +node[railway=station] { + icon-image: "presets/transport/railway_station.svg"; + set icon_z17; +} +node[railway=halt] { + icon-image: "presets/transport/railway_halt.svg"; + set icon_z17; +} +node[railway=tram_stop] { + icon-image: "presets/transport/tram.svg"; + set icon_z17; +} +node[railway=subway_entrance] { + icon-image: "presets/transport/underground.svg"; + set icon_z17; +} +node[railway=crossing] { + icon-image: "presets/transport/railway/crossing.svg"; + set icon_z17; +} +node[railway=level_crossing] { + icon-image: "presets/transport/railway/level_crossing.svg"; + set icon_z17; +} +way[railway=rail] { + width: 2; + color: rail#404040; + dashes: 9,9; + dashes-background-color: raildashed#ffffff; +} +way[railway=rail][service=crossover], +way[railway=rail][service=siding] { + width: 1; +} +way[railway=rail][service=yard], +way[railway=rail][service=spur] { + width: 1; + color: railyard#552200; +} +/* draw tram and light_rail on top of other way (highway=*) or + as a standalone style */ +way[highway][railway=tram]::core_railway, +way[!highway][railway=tram] { + z-index: 1; + modifier: false; /* don't draw default way if there is no line on default layer */ + width: 1; + color: railover#202020; + dashes: 9,9; + casing-width: 1; + casing-color: otherrail#808080; + casing-linecap: round; + casing-dashes: 9,9; +} +way[highway][railway=tram][service=crossover]::core_railway, +way[!highway][railway=tram][service=crossover], +way[highway][railway=tram][service=siding]::core_railway, +way[!highway][railway=tram][service=siding], +way[highway][railway=tram][service=yard]::core_railway, +way[!highway][railway=tram][service=yard], +way[highway][railway=tram][service=spur]::core_railway, +way[!highway][railway=tram][service=spur] { + dashes: 6,6; + casing-dashes: 6,6; +} + +way[highway][railway=light_rail]::core_railway, +way[!highway][railway=light_rail] { + z-index: 1; + modifier: false; /* don't draw default way if there is no line on default layer */ + width: 2; + color: otherrail#808080; + dashes: 9,9; +} +way[railway=subway] { + width: 1; + color: subway#606060; + dashes: 9,9; +} +way[railway=preserved] { + width: 1; + color: oldrail#404040; + dashes: 9,9; +} +way[railway=light_rail][service=crossover], +way[railway=light_rail][service=siding], +way[railway=light_rail][service=yard], +way[railway=light_rail][service=spur], +way[railway=subway][service=crossover], +way[railway=subway][service=siding], +way[railway=subway][service=yard], +way[railway=subway][service=spur], +way[railway=preserved][service=crossover], +way[railway=preserved][service=siding], +way[railway=preserved][service=yard], +way[railway=preserved][service=spur] { + dashes: 6,6; +} +/* disused often appears together with highway=xy */ +/* -> draw on separate layer with higher z-index, but use */ +/* modifier: false; to suppress default line when used alone. */ +/* use default layer when used without highway=* to display bridge correctly */ +way[railway=disused][highway]::core_railway, +way[railway=disused][!highway], +way[railway=abandoned][highway]::core_railway, +way[railway=abandoned][!highway] { + width: 1; + modifier: false; + z-index: 1; + color: oldrail#404040; + dashes: 9,9; +} +way[railway=narrow_gauge], +way[railway=monorail] { + width: 1; + color: rail#404040; + dashes: 9,9; +} +way[railway=narrow_gauge][service=crossover], +way[railway=narrow_gauge][service=siding], +way[railway=narrow_gauge][service=yard], +way[railway=narrow_gauge][service=spur], +way[railway=monorail][service=crossover], +way[railway=monorail][service=siding], +way[railway=monorail][service=yard], +way[railway=monorail][service=spur] { + dashes: 6,6; +} +area[railway=turntable] { + fill-color: rail#404040; +} +node[railway=turntable] { + icon-image: "presets/transport/railway/turntable.svg"; + set icon_z17; +} +node[railway=buffer_stop] { + icon-image: "presets/transport/railway/buffer_stop.svg"; + set icon_z17; +} +area[railway=platform]:closed { + fill-color: rail#404040; +} +way[railway=platform] { + width: 2; + color: rail#404040; +} +way[railway=funicular] { + width: 1; + color: rail#404040; + dashes: 9,9; +} +node[railway=switch] { + icon-image: "presets/transport/railway/switch.svg"; + set icon_z17; +} +node[railway=railway_crossing] { + icon-image: "presets/transport/railway/railway_crossing.svg"; + set icon_z17; +} +node[railway=signal] { + icon-image: "presets/transport/railway/signal.svg"; + set icon_z17; +} +node[railway=milestone] { + icon-image: "presets/transport/railway/milestone.svg"; + set icon_z17; +} +node[railway=rail], node[railway=tram], node[railway=light_rail], +node[railway=subway], node[railway=preserved], +node[railway=disused], node[railway=abandoned], +node[railway=narrow_gauge], node[railway=monorail], +node[railway=platform], node[railway=funicular], +node[service=yard], node[service=siding], node[service=spur] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} +way[railway=construction][!highway] { + width: 1; + color: construction#ffff00; + dashes: 9,9; +} +way[railway=construction][construction=rail] { + width: 2; + color: rail#404040; + dashes: 9,9; + dashes-background-color: construction#ffff00; +} +way[railway=construction][construction=light_rail][highway]::core_railway, +way[railway=construction][construction=light_rail][!highway] { + z-index: 1; + width: 2; + dashes: 9,9; + color: construction#ffff00; +} +way[railway=construction][construction=tram][highway]::core_railway, +way[railway=construction][construction=tram][!highway] { + z-index: 1; + width: 1; + color: railover#202020; + dashes: 9,9; + casing-width: 1; + casing-color: construction#ffff00; + casing-linecap: round; + casing-dashes: 9,9; +} + +/****************/ +/* aeroway tags */ +/****************/ + +area[aeroway=aerodrome] { + fill-color: aeroway#660000; + width: 2; + dashes: 9,9; +} +node[aeroway=aerodrome][military!=airfield] { + icon-image: "presets/transport/airport.svg"; + set icon_z17; +} +area[aeroway=terminal] { + fill-color: terminal#bb0000; +} +node[aeroway=terminal] { + icon-image: "presets/transport/airport/terminal.svg"; + set icon_z17; +} +area[aeroway=helipad] { + fill-color: aeroway_dark#330000; +} +node[aeroway=helipad] { + icon-image: "presets/transport/airport/helipad.svg"; + set icon_z17; +} +area[aeroway=runway]:closed { + fill-color: aeroway_dark#330000; +} +way[aeroway=runway] { + width: 3; + color: aeroway_dark#330000; +} +area[aeroway=taxiway]:closed { + fill-color: aeroway#660000; +} +way[aeroway=taxiway] { + width: 2; + color: aeroway#660000; +} +way[aeroway=parking_position] { + width: 1; + color: aeroway#660000; +} +node[aeroway=parking_position] { + icon-image: "presets/transport/airport/parking_position.svg"; + set icon_z17; +} +area[aeroway=apron], +area[aeroway=hangar] { + fill-color: aeroway_light#990000; +} +node[aeroway=apron], +node[aeroway=runway], +node[aeroway=taxiway] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} +node[aeroway=holding_position] { + icon-image: "presets/transport/airport/holding_position.svg"; + set icon_z17; +} +node[aeroway=hangar] { + icon-image: "presets/transport/airport/hangar.svg"; + set icon_z17; +} +node[aeroway=gate] { + icon-image: "presets/transport/airport/gate.svg"; + set icon_z17; +} +node[airmark=beacon] { + icon-image: "presets/transport/airport/airmark_beacon.svg"; + set icon_z17; +} +node[aeroway=navigationaid] { + icon-image: "presets/transport/airport/navigationaid.svg"; + set icon_z17; +} +node[aeroway=navigationaid][navigationaid=papi] { + icon-image: "presets/transport/airport/papi.svg"; + set icon_z17; +} +node[aeroway=navigationaid][navigationaid=vasi] { + icon-image: "presets/transport/airport/vasi.svg"; + set icon_z17; +} +node[aeroway=windsock] { + icon-image: "presets/transport/airport/windsock.svg"; + set icon_z17; +} + +/******************/ +/* aerialway tags */ +/******************/ + +way[aerialway=cable_car], +way[aerialway=gondola] { + width: 1; + color: aerialway#663300; + dashes: 9,9; +} +way[aerialway=chair_lift] { + width: 1; + color: aerialway#663300; + dashes: 6,6; +} +way[aerialway=mixed_lift] { + width: 1; + color: aerialway#663300; + dashes: 6,6,9,6; +} +way[aerialway=j-bar], +way[aerialway=t-bar], +way[aerialway=platter], +way[aerialway=rope_tow], +way[aerialway=drag_lift] { + width: 1; + color: aerialway#663300; + dashes: 3,3; +} +way[aerialway=magic_carpet] { + width: 1; + color: aerialway#663300; + dashes: 3,3; +} +way[aerialway=goods] { + width: 1; + color: aerialway#663300; + dashes: 2,2; +} +way[aerialway=zip_line] { + width: 1; + color: aerialway#663300; + dashes: 3,3; +} +area[aerialway=station] { + fill-color: aerialway#663300; +} +node[aerialway=station] { + icon-image: "presets/transport/aerialway/station.svg"; + set icon_z17; +} +node[aerialway=pylon] { + icon-image: "presets/transport/aerialway/pylon.svg"; + set icon_z17; +} +node[aerialway=cable_car], +node[aerialway=gondola], +node[aerialway=chair_lift], +node[aerialway=mixed_lift], +node[aerialway=drag_lift], +node[aerialway=t-bar], +node[aerialway=j-bar], +node[aerialway=platter], +node[aerialway=magic_carpet], +node[aerialway=rope_tow], +node[aerialway=goods], +node[aerialway=zip_line] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} + +/*************************/ +/* public_transport tags */ +/*************************/ + +node[highway=bus_stop] { + icon-image: "presets/transport/bus_small.svg"; + set icon_z17; +} +node[public_transport=stop_position] { + icon-image: "presets/transport/stop_position.svg"; + set icon_z17; +} +node[public_transport=stop_position][share_taxi=yes] { + icon-image: "presets/transport/share_taxi.svg"; + set icon_z17; +} +node[public_transport=stop_position][bus=yes] { + icon-image: "presets/transport/bus.svg"; + set icon_z17; +} +node[public_transport=stop_position][train=yes] { + icon-image: "presets/transport/train.svg"; + set icon_z17; +} +node[public_transport=stop_position][light_rail=yes] { + icon-image: "presets/transport/railway/light_rail.svg"; + set icon_z17; +} +node[public_transport=stop_position][tram=yes] { + icon-image: "presets/transport/railway/tram.svg"; + set icon_z17; +} +node[public_transport=stop_position][subway=yes] { + icon-image: "presets/transport/railway/subway.svg"; + set icon_z17; +} +node[public_transport=stop_position][monorail=yes] { + icon-image: "presets/transport/railway/monorail.svg"; + set icon_z17; +} +node[public_transport=stop_position][trolleybus=yes] { + icon-image: "presets/transport/trolleybus.svg"; + set icon_z17; +} +node[public_transport=stop_position][funicular=yes] { + icon-image: "presets/transport/railway/funicular.svg"; + set icon_z17; +} +node[public_transport=stop_position][aerialway=yes] { + icon-image: "presets/transport/aerialway/station.svg"; + set icon_z17; +} +node[public_transport=stop_position][ferry=yes] { + icon-image: "presets/nautical/ferry.svg"; + set icon_z17; +} +area[public_transport=platform]:closed { + fill-color: service#809bc0; +} +way[public_transport=platform]!:closed { + width: 3; + color: service#809bc0; + dashes: 12,3; +} +node[public_transport=platform] { + icon-image: "presets/transport/platform.svg"; + set icon_z17; +} +area[public_transport=station] { + fill-color: railwaypoint#f7efb7; +} +node[public_transport=station] { + icon-image: "presets/transport/station.svg"; + set icon_z17; +} + +/**************/ +/* sport tags */ +/**************/ + +area[sport="9pin"], +area[sport="10pin"], +area[sport=soccer], +area[sport=australian_football], +area[sport=american_football], +area[sport=canadian_football], +area[sport=gaelic_games], +area[sport=rugby_league], +area[sport=rugby_union] { + fill-color: sport#bde3cb; +} +node[sport="9pin"] { + icon-image: "presets/sport/9pin.svg"; + set icon_z17; +} +node[sport="10pin"] { + icon-image: "presets/sport/10pin.svg"; + set icon_z17; +} +node[sport=soccer], +node[sport=gaelic_games] { + icon-image: "presets/sport/soccer.svg"; + set icon_z17; +} +node[sport=australian_football], +node[sport=american_football], +node[sport=canadian_football], +node[sport=rugby_league], +node[sport=rugby_union] { + icon-image: "presets/sport/football.svg"; + set icon_z17; +} +area[sport=baseball], +area[sport=basketball], +area[sport=boules], +area[sport=bowls], +area[sport=canoe], +area[sport=chess], +area[sport=climbing]:closed, +area[sport=cricket], +area[sport=croquet] { + fill-color: sport#bde3cb; +} +node[sport=baseball] { + icon-image: "presets/sport/baseball.svg"; + set icon_z17; +} +node[sport=basketball] { + icon-image: "presets/sport/basketball.svg"; + set icon_z17; +} +node[sport=boules] { + icon-image: "presets/sport/boule.svg"; + set icon_z17; +} +node[sport=bowls] { + icon-image: "presets/sport/boule.svg"; + set icon_z17; +} +node[sport=canoe] { + icon-image: "presets/sport/canoe.svg"; + set icon_z17; +} +node[sport=chess] { + icon-image: "presets/sport/chess.svg"; + set icon_z17; +} +node[sport=climbing] { + icon-image: "presets/sport/climbing.svg"; + set icon_z17; +} +node[sport=cricket] { + icon-image: "presets/sport/cricket.svg"; + set icon_z17; +} +node[sport=croquet] { + icon-image: "presets/sport/croquet.svg"; + set icon_z17; +} +area[sport=cycling], +area[sport=dog_racing], +area[sport=equestrian], +area[sport=golf], +area[sport=gymnastics], +area[sport=field_hockey], +area[sport=ice_hockey], +area[sport=horse_racing], +area[sport=karting][highway!=raceway], +area[sport=karting][highway=raceway][area=yes], +area[sport=motocross][highway!=raceway], +area[sport=motocross][highway=raceway][area=yes], +area[sport=motor][highway!=raceway], +area[sport=motor][highway=raceway][area=yes] { + fill-color: sport#bde3cb; +} +node[sport=cycling] { + icon-image: "presets/sport/cycling.svg"; + set icon_z17; +} +node[sport=dog_racing] { + icon-image: "presets/sport/dog_racing.svg"; + set icon_z17; +} +node[sport=equestrian] { + icon-image: "presets/sport/equestrian.svg"; + set icon_z17; +} +node[sport=golf] { + icon-image: "presets/sport/golf.svg"; + set icon_z17; +} +node[sport=gymnastics] { + icon-image: "presets/sport/gymnastics.svg"; + set icon_z17; +} +node[sport=field_hockey] { + icon-image: "presets/sport/field_hockey.svg"; + set icon_z17; +} +node[sport=ice_hockey] { + icon-image: "presets/sport/ice_hockey.svg"; + set icon_z17; +} +node[sport=horse_racing] { + icon-image: "presets/sport/riding.svg"; + set icon_z17; +} +node[sport=karting] { + icon-image: "presets/sport/karting.svg"; + set icon_z17; +} +node[sport=motocross] { + icon-image: "presets/sport/motocross.svg"; + set icon_z17; +} +node[sport=motor] { + icon-image: "presets/sport/motor.svg"; + set icon_z17; +} +area[sport=athletics] { + fill-color: sport_athletics#cfebd7; +} +node[sport=athletics] { + icon-image: "presets/sport/athletics.svg"; + set icon_z17; +} +area[sport=running] { + fill-color: sport_running#cfebd8; +} +node[sport=running] { + icon-image: "presets/sport/running.svg"; + set icon_z17; +} +area[sport=multi] { + fill-color: sport_multi#cfebd9; +} +node[sport=multi] { + icon-image: "presets/sport/multi.svg"; + set icon_z17; +} +area[sport=pelota], +area[sport=racquet], +area[sport=ice_skating], +area[sport=roller_skating], +area[sport=skateboard] { + fill-color: sport#bde3cb; +} +node[sport=pelota] { + icon-image: "presets/sport/pelota.svg"; + set icon_z17; +} +node[sport=racquet] { + icon-image: "presets/sport/racquetball.svg"; + set icon_z17; +} +node[sport=ice_skating] { + icon-image: "presets/sport/ice_skating.svg"; + set icon_z17; +} +node[sport=roller_skating] { + icon-image: "presets/sport/roller_skating.svg"; + set icon_z17; +} +node[sport=skating] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} +node[sport=skateboard] { + icon-image: "presets/sport/skateboard.svg"; + set icon_z17; +} +area[sport=swimming] { + fill-color: swimming_pool#51c4ef; +} +node[sport=swimming] { + icon-image: "presets/sport/swimming.svg"; + set icon_z17; +} +area[sport=table_tennis], +area[sport=tennis], +area[sport=paintball] { + fill-color: sport#bde3cb; +} +node[sport=table_tennis] { + icon-image: "presets/sport/table_tennis.svg"; + set icon_z17; +} +node[sport=tennis] { + icon-image: "presets/sport/tennis.svg"; + set icon_z17; +} +node[sport=paintball][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +area[sport=squash], +area[sport=shooting], +area[sport=volleyball], +area[sport=beachvolleyball], +area[sport=billiards], +area[sport=bowling], +area[sport=handball], +area[sport=rowing], +area[sport=sailing], +area[sport=scuba_diving], +area[sport=badminton] { + fill-color: sport#bde3cb; +} +node[sport=squash][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +node[sport=shooting] { + icon-image: "presets/sport/range.svg"; + set icon_z17; +} +node[sport=volleyball] { + icon-image: "presets/sport/volleyball.svg"; + set icon_z17; +} +node[sport=beachvolleyball] { + icon-image: "presets/sport/beachvolleyball.svg"; + set icon_z17; +} +node[sport=billiards] { + icon-image: "presets/sport/billiards.svg"; + set icon_z17; +} +node[sport=bowling] { + icon-image: "presets/sport/9pin.svg"; + set icon_z17; +} +node[sport=handball] { + icon-image: "presets/sport/handball.svg"; + set icon_z17; +} +node[sport=rowing] { + icon-image: "presets/sport/rowing.svg"; + set icon_z17; +} +node[sport=sailing][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +node[sport=scuba_diving] { + icon-image: "presets/sport/scuba_diving.svg"; + set icon_z17; +} +node[sport=badminton][!is_prop_set(icon-image)] { + icon-image: "presets/misc/no_icon.svg"; + set icon_z17; +} +area[sport=archery], +area[sport=fishing], +area[sport=model_aerodrome], +area[sport=rc_car] { + fill-color: sport#bde3cb; +} +node[sport=archery] { + icon-image: "presets/sport/archery.svg"; + set icon_z17; +} +node[sport=fishing] { + icon-image: "presets/sport/fishing.svg"; + set icon_z17; +} +node[sport=model_aerodrome] { + icon-image: "presets/transport/airport.svg"; + set icon_z17; +} +node[sport=rc_car] { + icon-image: "presets/sport/rc_car.svg"; + set icon_z17; +} + +/****************/ +/* natural tags */ +/****************/ + +area[natural=spring] { + fill-color: light_water#00005f; +} +node[natural=spring] { + icon-image: "presets/landmark/spring.svg"; + set icon_z17; +} +node[natural=saddle] { + icon-image: "presets/landmark/saddle.svg"; + set icon_z0; + set text_z0; +} +node[natural=peak] { + icon-image: "presets/landmark/peak.svg"; + set icon_z0; + set text_z0; +} +node[natural=peak][tourism=viewpoint] { + icon-image: "presets/sightseeing/peak_viewpoint.svg"; + set icon_z0; + set text_z0; +} +area[natural=glacier] { + fill-color: glacier#ffffff; +} +node[natural=volcano] { + icon-image: "presets/landmark/volcano.svg"; + set icon_z0; + set text_z0; +} +area[natural=cliff]:closed { + fill-color: natural#002f00; +} +way[natural=cliff] { + repeat-image: "presets/misc/cliff_pattern.svg"; + repeat-image-align: top; + width: 1; + color: #b2b2b2; +} +node[natural=cliff] { + icon-image: "presets/misc/cliff.svg"; + set icon_z17; +} +way[natural=ridge] { + width: 1; + color: natural#002f00; +} +way[natural=valley] { + width: 1; + color: natural#002f00; +} +area[natural=scree] { + fill-color: scree#c3c3c3; +} +area[natural=shingle] { + fill-color: shingle#c3c3c3; +} +area[natural=scrub] { + fill-color: scrub#007000; +} +area[natural=fell] { + fill-color: natural#002f00; +} +area[natural=heath] { + fill-color: heath#ffffc0; +} +way[natural=tree_row] { + width: 2; + color: woodarea#008000; +} +area[natural=wood] { + fill-color: woodarea#008000; +} +area[natural=grassland] { + fill-color: green#b1e0c2; +} +area[natural=wetland] { + fill-color: marsh#4f4ff3; +} +area[natural=water] { + fill-color: water#0000ff; +} +area[natural=water][intermittent=yes] { + width: 2; + dashes: 15, 5; +} +way[natural=coastline] { + width: 2; + color: water#0000ff; + right-casing-color: water#0000ff; + right-casing-width: 8; + right-casing-opacity: 0.35; +} +area[natural=mud] { + fill-color: mud#cba762; +} +area[natural=beach] { + fill-color: beach#f8dba2; +} +area[natural=sand] { + fill-color: sand#f8dba2; +} +area[natural=bare_rock] { + fill-color: bare_rock#f8f8c7; +} +area[natural=rock] { + fill-color: stone#f8f8c7; +} +node[natural=rock] { + icon-image: "presets/misc/rock.svg"; + set icon_z17; +} +area[natural=stone] { + fill-color: stone#f8f8c7; +} +node[natural=stone] { + icon-image: "presets/misc/stone.svg"; + set icon_z17; +} +area[natural=bay]:closed { + fill-color: natural#002f00; +} +way[natural=bay] { + width: 2; + color: natural#002f00; +} +node[natural=bay] { + icon-image: "presets/nautical/bay.svg"; + set icon_z17; +} +area[natural=strait]:closed { + fill-color: natural#002f00; +} +way[natural=strait] { + width: 2; + color: natural#002f00; +} +node[natural=strait] { + icon-image: "presets/nautical/strait.svg"; + set icon_z17; +} +area[natural=cape], +area[natural=cave_entrance] { + fill-color: natural#002f00; +} +node[natural=cape] { + icon-image: "presets/nautical/cape.svg"; + set icon_z17; +} +node[natural=cave_entrance] { + icon-image: "presets/landmark/cave_entrance.svg"; + set icon_z17; +} +area[natural=reef] { + fill-color: reef#80c9ff; +} +node[natural=reef] { + icon-image: "presets/landmark/reef.svg"; + set icon_z17; +} +node[natural=tree] { + icon-image: "presets/landmark/trees.svg"; + set icon_z17; +} +node[natural=tree][leaf_type=needleleaved] { + icon-image: "presets/landmark/trees_conifer.svg"; + set icon_z17; +} +node[natural=tree][leaf_type=broadleaved] { + icon-image: "presets/landmark/trees_broad_leaved.svg"; + set icon_z17; +} +node[natural=glacier], +node[natural=scree], +node[natural=shingle], +node[natural=scrub], +node[natural=fell], +node[natural=heath], +node[natural=tree_row], +node[natural=wood], +node[natural=grassland], +node[natural=wetland], +node[natural=water], +node[natural=coastline], +node[natural=mud], +node[natural=beach], +node[natural=sand], +node[natural=land], +node[natural=bare_rock], +node[natural=ridge], +node[natural=valley] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} +/*****************/ +/* waterway tags */ +/*****************/ + +way[waterway=river] { + width: 2; + color: water#0000ff; +} +area[waterway=riverbank] { + fill-color: riverbank#0000cf; + width: 1; + color: riverbank#0000cf; +} +way[waterway=pressurised], +way[waterway=canal] { + width: 2; + color: water#0000ff; +} +way[waterway=river][lock=yes], +way[waterway=canal][lock=yes] { + casing-width: 2; + casing-color: lock#303030; + casing-dashes: 5,20; +} +way[waterway=pressurised][tunnel] { + casing-width: 1; + casing-color: tunnel#964B00; +} +way[waterway=pressurised][man_made=pipeline] { + casing-width: 1; + casing-color: pipeline#660000; +} +way[waterway=stream] { + width: 1; + color: stream#6600cc; +} +way[waterway=ditch], +way[waterway=drain] { + width: 1; + color: water#0000ff; +} +way[waterway=tidal_channel] { + width: 1; + color: tidal_channel#0000ff; +} +way[waterway=river][intermittent=yes], +area[waterway=riverbank][intermittent=yes], +way[waterway=canal][intermittent=yes], +way[waterway=stream][intermittent=yes], +way[waterway=ditch][intermittent=yes], +way[waterway=drain][intermittent=yes], +way[waterway=tidal_channel][intermittent=yes] { + dashes: 15, 5; +} +area[waterway=dock] { + fill-color: dock#0000cf; +} +node[waterway=dock] { + icon-image: "presets/nautical/boatyard.svg"; + set icon_z17; +} +way[waterway=lock_gate] { + width: 3; + color: lock_gate#303030; +} +node[waterway=lock_gate] { + icon-image: "presets/nautical/lock_gate.svg"; + set icon_z17; +} +node[waterway=turning_point] { + icon-image: "presets/nautical/turning.svg"; + set icon_z17; +} +area[waterway=boatyard] { + fill-color: manmade#d8d8d8; +} +node[waterway=boatyard] { + icon-image: "presets/nautical/boatyard.svg"; + set icon_z17; +} +node[waterway=water_point], +node[waterway=waste_disposal], +node[waterway=mooring] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} +node[mooring] { + icon-image: "presets/nautical/marina.svg"; + set icon_z17; +} +area[waterway=fuel] { + fill-color: amenity_traffic#f7efb7; +} +node[waterway=fuel] { + icon-image: "presets/nautical/marine_fuel.svg"; + set icon_z17; +} +way[waterway=weir] { + width: 2; + color: manmade#d8d8d8; +} +node[waterway=weir] { + icon-image: "presets/nautical/weir.svg"; + set icon_z17; +} +area[waterway=dam]:closed { + fill-color: manmade#d8d8d8; +} +way[waterway=dam] { + width: 2; + color: manmade#d8d8d8; +} +node[waterway=dam] { + icon-image: "presets/nautical/dam.svg"; + set icon_z17; +} +/* it's not possible to have both line and area, line seems more likely */ +way[waterway=waterfall] { + width: 2; + color: manmade#d8d8d8; +} +node[waterway=waterfall] { + icon-image: "presets/nautical/waterfall.svg"; + set icon_z17; +} +node[waterway=river], node[waterway=riverbank], +node[waterway=canal], node[waterway=wadi], +node[waterway=stream], +node[waterway=ditch], node[waterway=drain] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} + +/**************/ +/* route tags */ +/**************/ + +way[route=ferry] { + width: 1; + color: ferry#809bc0; + dashes: 9,9; +} +node[route=bus], +node[route=ferry], +node[route=flight], +node[route=ncn], +node[route=subsea], +node[route=ski], +node[route=tour], +node[route=pub_crawl] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} + +/*******************/ +/* properties tags */ +/*******************/ + +node[mountain_pass?] { + icon-image: "presets/landmark/mountain_pass.svg"; + set icon_z0; + set text_z0; +} + +/*****************/ +/* boundary tags */ +/*****************/ + +relation[boundary=protected_area] > way::core_boundary, +relation[boundary=administrative] > way::core_boundary, +relation[boundary=postal_code] > way::core_boundary, +relation[boundary=political] > way::core_boundary, +relation[boundary=maritime] > way::core_boundary, +relation[boundary=national_park] > way::core_boundary, +way[boundary=protected_area]::core_boundary, +way[boundary=administrative]::core_boundary, +way[boundary=postal_code]::core_boundary, +way[boundary=political]::core_boundary, +way[boundary=maritime]::core_boundary, +way[boundary=national_park]::core_boundary { + z-index: 2; + modifier: false; + width: 1; + color: boundary#FF6600; + dashes: 9,9; +} +/* admin_level >=9 use the default width of 1 defined above */ +way[boundary=administrative][admin_level=7]::core_boundary, +relation[boundary=administrative][admin_level=7] > way::core_boundary, +way[boundary=administrative][admin_level=8]::core_boundary, +relation[boundary=administrative][admin_level=8] > way::core_boundary { + width: 2; +} +way[boundary=administrative][admin_level=5]::core_boundary, +relation[boundary=administrative][admin_level=5] > way::core_boundary, +way[boundary=administrative][admin_level=6]::core_boundary, +relation[boundary=administrative][admin_level=6] > way::core_boundary { + width: 3; +} +way[boundary=administrative][admin_level=3]::core_boundary, +relation[boundary=administrative][admin_level=3] > way::core_boundary, +way[boundary=administrative][admin_level=4]::core_boundary, +relation[boundary=administrative][admin_level=4] > way::core_boundary { + width: 4; +} +way[boundary=administrative][admin_level=1]::core_boundary, +relation[boundary=administrative][admin_level=1] > way::core_boundary, +way[boundary=administrative][admin_level=2]::core_boundary, +relation[boundary=administrative][admin_level=2] > way::core_boundary { + width: 5; +} +node[boundary=national], +node[boundary=administrative], +node[boundary=postal_code], +node[boundary=political], +node[boundary=national_park] { + icon-image: "presets/misc/deprecated.svg"; + set icon_z17; +} + +/******************/ +/* maxspeed nodes */ +/******************/ +node[traffic_sign][maxspeed=none][!is_prop_set(icon-image)] { + icon-image: "presets/vehicle/restriction/maxspeed_none.svg"; + set icon_z17; +} +node[traffic_sign][maxspeed=~/^[0-9]+$/][!is_prop_set(icon-image)] { + maxspeedprop: tag(maxspeed); + set maxspeedclass; +} +node[traffic_sign][maxspeed=signals][!is_prop_set(icon-image)] { + maxspeedprop: " ?"; + set maxspeedclass; +} +node[traffic_sign][maxspeed=~/^[0-9]+ mph/][!is_prop_set(icon-image)] { + maxspeedprop: get(split(" mph",tag(maxspeed)),0); + set maxspeedclass; +} +node[traffic_sign][maxspeed=~/[0-9]+ km\/h/][!is_prop_set(icon-image)] { + maxspeedprop: get(split(" km/h",tag(maxspeed)),0); + set maxspeedclass; +} +node[traffic_sign][maxspeed=~/[0-9]+ knots/][!is_prop_set(icon-image)] { + maxspeedprop: get(split(" knots",tag(maxspeed)),0); + set maxspeedclass; +} +node[prop(maxspeedclass, default)][!is_prop_set(icon-image, default)]::core_maxnodebg { + /* background (white) */ + symbol-shape: circle; + symbol-size: 17; + symbol-fill-color: white; + major-z-index: 4.2; +} +node[traffic_sign][maxspeed]["maxspeed:variable"]["maxspeed:variable"!="no"]::core_maxnodebg, +node[traffic_sign][maxspeed=signals]::core_maxnodebg { + /* background (black) */ + symbol-fill-color: black; +} +node[prop(maxspeedclass, default)]::core_maxnodefg { + /* foreground (black text and red circle) */ + symbol-shape: circle; + symbol-size: 15; + symbol-stroke-color: crimson; + symbol-stroke-width: 2; + text: prop(maxspeedprop, default); + font-size: 8; + font-weight: bold; + text-color: black; + text-anchor-horizontal: center; + text-anchor-vertical: center; + text-offset-x: 0; + text-offset-y: -1; + major-z-index: 4.2; +} +node[traffic_sign][maxspeed]["maxspeed:variable"]["maxspeed:variable"!="no"]::core_maxnodefg, +node[traffic_sign][maxspeed=signals]::core_maxnodefg { + /* foreground (white text) */ + text-color: white; +} +node|z-16[prop(maxspeedclass, default)][setting("hide_icons")]::core_maxnodebg { + symbol-shape: none; +} +node|z-16[prop(maxspeedclass, default)][setting("hide_icons")]::core_maxnodefg { + text: none; + symbol-shape: none; +} + +/**************/ +/* place tags */ +/**************/ + +area[setting("place_fill_colour")][place=continent], +area[setting("place_fill_colour")][place=country], +area[setting("place_fill_colour")][place=state], +area[setting("place_fill_colour")][place=region], +area[setting("place_fill_colour")][place=county], +area[setting("place_fill_colour")][place=city], +area[setting("place_fill_colour")][place=town], +area[setting("place_fill_colour")][place=village], +area[setting("place_fill_colour")][place=hamlet], +area[setting("place_fill_colour")][place=farm], +area[setting("place_fill_colour")][place=isolated_dwelling], +area[setting("place_fill_colour")][place=neighbourhood], +area[setting("place_fill_colour")][place=suburb], +area[setting("place_fill_colour")][place=locality], +area[place=island], +area[place=islet] { + fill-color: place#8de3cb; + set place; +} +node[place=continent], +node[place=country], +node[place=state], +node[place=region], +node[place=county], +node[place=city], +node[place=town], +node[place=suburb], +node[place=village], +node[place=quarter], +node[place=neighbourhood], +node[place=hamlet], +node[place=isolated_dwelling], +node[place=farm], +node[place=island], +node[place=islet] { + set icon_z0; + set text_z0; + font-weight: bold; + text-color:black; + text-halo-color: white; + text-halo-radius: 1; + set place; +} + +node[place=continent], +node[place=country], +node[place=state], +node[place=region], +node[place=county] { + icon-image: "presets/place/capital.svg"; + z-index: 2.9; +} +node[place=city] { + icon-image: "presets/place/city.svg"; + z-index: 2.8; +} +node[place=town] { + icon-image: "presets/place/town.svg"; + z-index: 2.7; +} +node[place=suburb] { + icon-image: "presets/place/suburb.svg"; + z-index: 2.6; +} +node[place=village] { + icon-image: "presets/place/village.svg"; + z-index: 2.5; +} +node[place=quarter] { + icon-image: "presets/place/quarter.svg"; + z-index: 2.5; +} +node[place=neighbourhood] { + icon-image: "presets/place/neighbourhood.svg"; + z-index: 2.4; +} +node[place=hamlet] { + icon-image: "presets/place/hamlet.svg"; + z-index: 2.3; +} +node[place=isolated_dwelling] { + icon-image: "presets/place/isolated_dwelling.svg"; + z-index: 2.2; +} +node[place=farm] { + icon-image: "presets/place/farm.svg"; + z-index: 2.1; +} +node|z15-[place=locality], +node|z-14[place=locality][!setting("hide_icons")] { + icon-image: "presets/place/locality.svg"; + font-weight: bold; + text-color: black; + text-halo-color: white; + text-halo-radius: 1; +} +node[place=island] { + icon-image: "presets/place/island.svg"; +} +node[place=islet] { + icon-image: "presets/place/islet.svg"; +} + +area[place=square] { + fill-color: place#8de3cb; +} +node[place=square] { + icon-image: "presets/place/square.svg"; + set icon_z17; +} + +/***************************/ +/* "work in progress" tags */ +/***************************/ + +node|z16-[fixme]::core_note_fixme, +node|z-15[fixme][!setting("hide_icons")]::core_note_fixme, +node|z16-[FIXME]::core_note_fixme, +node|z-15[FIXME][!setting("hide_icons")]::core_note_fixme { + object-z-index: 10; + icon-image: "presets/misc/fixme_annotation.svg"; +} +node|z16-[note]::core_note_fixme, +node|z-15[note][!setting("hide_icons")]::core_note_fixme { + object-z-index: 10; + icon-image: "presets/misc/note_annotation.svg"; +} +node|z16-[note][fixme]::core_note_fixme, +node|z-15[note][fixme][!setting("hide_icons")]::core_note_fixme, +node|z16-[note][FIXME]::core_note_fixme, +node|z-15[note][FIXME][!setting("hide_icons")]::core_note_fixme { + icon-image: "presets/misc/note_fixme_annotation.svg"; +} + +/****************************************/ +/* zoom levels and general node display */ +/****************************************/ + +/* +Summary of different zoom levels: + (any zoom) place=* (except locality and square) and a few natural icons with their text is shown + |z-14 tagged way nodes are hidden completely + |z-15 untagged way nodes are hidden completely + |z15 place=locality icon + |z16- fixme=* and note=* symbols; place=locality text + |z17- normal POI icons (without text), + street name along highway=* ways + |z18- text for normal POI icons is shown + + * text size and node size is adapted according to zoom level (see style source below), place labels (except locality and square) don't get smaller + * all these zoom features are modifiable via style settings + * maxspeed icons should not be distinguishable from POIs with "icon-image" property + +*/ + +node|z-16[setting("hide_icons")], +node|z17-[!is_prop_set("icon-image")][setting("hide_icons")]!.maxspeedclass, +node[!is_prop_set("icon-image")][!setting("hide_icons")]!.maxspeedclass { + symbol-size: 2; + symbol-shape: square; + symbol-stroke-color: node_standard#ffff00; + major-z-index: 4.95; /* put node squares above line text */ +} +way > node|z-15[setting("shrink_nodes")]!:tagged { + symbol-shape: none; +} +node:connection { + symbol-stroke-color: node_connection#ffff00; +} +node:tagged { + symbol-stroke-color: none; + symbol-fill-color: node_tagged#00ffff; +} +node:tagged[!is_prop_set("icon-image")]!.maxspeedclass { + symbol-fill-color: node_tagged_without_icon#00ffff; /* by default same color as above but user configurable */ +} +way > node|z-14[setting("shrink_nodes")][setting("hide_tagged_waynodes")]:tagged { /* todo: check which is faster: `way > node {...}` or `node!:unconnected {...}`, also at other occurrences in this file */ + symbol-shape: none; +} + +way > node|z16[setting("shrink_nodes")]!:tagged { symbol-size: 1; } + +node|z17[setting("shrink_nodes")] { symbol-size: 4; } +way > node|z17[setting("shrink_nodes")] { symbol-size: 2; } +node|z17[setting("shrink_nodes")]:connection { symbol-size: 4; } + +node|z18[setting("shrink_nodes")] { symbol-size: 4; } +way > node|z18[setting("shrink_nodes")] { symbol-size: 3; } +node|z18[setting("shrink_nodes")]:connection { symbol-size: 5; } + +node|z19-[setting("shrink_nodes")] { symbol-size: 4; } +way > node|z19-[setting("shrink_nodes")] { symbol-size: 4; } +node|z19-[setting("shrink_nodes")]:connection { symbol-size: 6; } + +node[!setting("shrink_nodes")] { symbol-size: 4; } +way > node[!setting("shrink_nodes")] { symbol-size: 4; } +node[!setting("shrink_nodes")]:connection { symbol-size: 6; } + +node:selected { + symbol-shape: square; + symbol-size: 6; + symbol-fill-color: node_selected#ff0000; + symbol-stroke-color: node_selected#ff0000; +} + +node|z-16[setting("hide_icons")].icon_z17!.icon_z0, +relation|z-16[type=restriction][setting("hide_icons")] { + icon-image: none; +} +node|z-17[setting("hide_icons")]!.text_z0 { + text: none; +} +node|z16-17[setting("hide_icons")][place=locality] { + text: auto; +} + +node|z-18,area|z-18 { font-size: 8; } +node|z19,area|z19 { font-size: 9; } +node|z20-,area|z20- { font-size: 11; } + +node.place, way.place, area.place { font-size: 11; } + + +/*******************/ +/* way text labels */ +/*******************/ + +way|z18-[highway=motorway][setting("highway_labels")], +way|z18-[highway=motorway_link][setting("highway_labels")], +way|z18-[highway=trunk][setting("highway_labels")], +way|z18-[highway=trunk_link][setting("highway_labels")], +way|z18-[highway=primary][setting("highway_labels")], +way|z18-[highway=primary_link][setting("highway_labels")], +way|z18-[highway=secondary][setting("highway_labels")], +way|z18-[highway=secondary_link][setting("highway_labels")], +way|z18-[highway=tertiary][setting("highway_labels")], +way|z18-[highway=tertiary_link][setting("highway_labels")], +way|z18-[highway=unclassified][setting("highway_labels")], +way|z18-[highway=residential][setting("highway_labels")], +way|z18-[highway=living_street][setting("highway_labels")], +way|z18-[highway=escape][setting("highway_labels")], +way|z18-[highway=pedestrian][!area?][setting("highway_labels")], +way|z18-[highway=steps][setting("highway_labels")], +way|z18-[highway=footway][setting("highway_labels")], +way|z18-[highway=path][setting("highway_labels")], +way|z18-[highway=service][setting("highway_labels")], +way|z18-[highway=track][setting("highway_labels")], +way|z18-[highway=cycleway][setting("highway_labels")], +way|z18-[highway=bridleway][setting("highway_labels")], +way|z18-[highway=bus_guideway][setting("highway_labels")], +way|z18-[highway=raceway][setting("highway_labels")], +way|z18-[highway=construction][setting("highway_labels")], +way|z18-[highway=road][setting("highway_labels")] { + text: auto; + text-color: black; + font-size: 10; + text-position: line; + text-halo-opacity: 1; + text-halo-radius: 1.5; +} +way|z18-[highway=motorway][setting("highway_labels")], +way|z18-[highway=motorway_link][setting("highway_labels")] { + text-halo-color: motorway#809bc0; +} +way|z18-[highway=trunk][setting("highway_labels")], +way|z18-[highway=trunk_link][setting("highway_labels")] { + text-halo-color: trunk#7fc97f; +} +way|z18-[highway=primary][setting("highway_labels")], +way|z18-[highway=primary_link][setting("highway_labels")] { + text-halo-color: primary#fb805f; +} +way|z18-[highway=secondary][setting("highway_labels")], +way|z18-[highway=secondary_link][setting("highway_labels")] { + text-halo-color: secondary#fdbf6f; +} +way|z18-[highway=tertiary][setting("highway_labels")], +way|z18-[highway=tertiary_link][setting("highway_labels")] { + text-halo-color: tertiary#f7f496; +} +way|z18-[highway=unclassified][setting("highway_labels")], +way|z18-[highway=residential][setting("highway_labels")], +way|z18-[highway=living_street][setting("highway_labels")], +way|z18-[highway=escape][setting("highway_labels")] { + text-halo-color: street#c0c0c0; +} +way|z18-[highway=pedestrian][!area?][setting("highway_labels")], +way|z18-[highway=steps][setting("highway_labels")], +way|z18-[highway=footway][setting("highway_labels")], +way|z18-[highway=path][setting("highway_labels")] { + text-halo-color: foot#00ff00; +} +way|z18-[highway=service][setting("highway_labels")] { + text-halo-color: service#809bc0; +} +way|z18-[highway=track][setting("highway_labels")] { + text-halo-color: highway_track#6e541c; +} +way|z18-[highway=cycleway][setting("highway_labels")], +way|z18-[highway=path][setting("highway_labels")].cyclecolor { + text-halo-color: bicycle#b100ff; +} +way|z18-[highway=bridleway][setting("highway_labels")] { + text-halo-color: horse#a18559; +} +way|z18-[highway=bus_guideway][setting("highway_labels")] { + text-halo-color: rail#404040; +} +way|z18-[highway=raceway][setting("highway_labels")] { + text-halo-color: raceway#ff80ff; +} +way|z18-[highway=construction][setting("highway_labels")] { + text-halo-color: construction#ffff00; +} +way|z18-[highway=road][setting("highway_labels")] { + text-halo-color: highway_road#770000; +} +way|z18-[highway][railway=platform][setting("highway_labels")] { + text-halo-color: rail#404040; +} +way|z18-[highway][public_transport=platform][setting("highway_labels")] { + text-halo-color: service#809bc0; +} +way|z19[highway][setting("highway_labels")] { + font-size: 11; +} +way|z20-[highway][setting("highway_labels")] { + font-size: 12; +} + +/*************/ +/* Area fill */ +/*************/ + +/* small extent for unclosed area (see below for closed) */ +area[setting("partial_fill")] { + fill-extent: 15; +} + +/* Turn partial fill off and use plain fill, when the partial fill covers about + 100% of the area. This reduces artifacts (typically for incomplete multipolygons). + Switching between full and partial fill while drawing an area might be irritating, + so only do this at low zoom. */ +area|z-13[setting("partial_fill")] { + fill-extent-threshold: 1.0; +} + +/* Larger extent for closed areas. + Turn partial fill off, when it covers more than about 50% of the area. This avoids + areas with small unfilled patches in the center. */ +area[setting("partial_fill")]:closed2 { + fill-extent: 25; + fill-extent-threshold: JOSM_pref("draw.area.extent_threshold", 0.5); +} + Index: trunk/resources/styles/standard/potlatch2.mapcss =================================================================== --- trunk/resources/styles/standard/potlatch2.mapcss (revision 16006) +++ trunk/resources/styles/standard/potlatch2.mapcss (revision 16006) @@ -0,0 +1,399 @@ +/* THIS FILE IS AUTO-GENERATED (SEE nodist/styles/potlatch2/README) */ +/* + + Potlatch 2 core stylesheet + + This stylesheet should contain commonly used features and only the most essential extra attributes + (e.g. oneway). It needs to remain simple (not too many nested styles or dash-type decorations) in + order not to kill performance on slower systems and those with a less effective Flash Player (i.e. + Linux). + + It is expected that experienced mappers will switch between this and other stylesheets as required. + +*/ + +meta { + title: "Potlatch 2"; + icon: "dialogs/mappaint/pl2_small.png"; +} + +canvas { + fill-color: #ffffea; +} + +node, area { + text-color: black; +} + +relation[restriction=no_left_turn] { + icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn.svg"; +} +relation[restriction=no_right_turn] { + icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn.svg"; +} +relation[restriction=no_straight_on] { + icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on.svg"; +} +relation[restriction=no_u_turn] { + icon-image: "presets/vehicle/restriction/turn_restrictions/no_u_turn.svg"; +} +relation[restriction=only_left_turn] { + icon-image: "presets/vehicle/restriction/turn_restrictions/only_left_turn.svg"; +} +relation[restriction=only_right_turn] { + icon-image: "presets/vehicle/restriction/turn_restrictions/only_right_turn.svg"; +} +relation[restriction=only_straight_on] { + icon-image: "presets/vehicle/restriction/turn_restrictions/only_straight_on.svg"; +} + +/**************** + * core_ways.css + ****************/ + +/* Roads */ + +way[highway=motorway],way[highway=motorway_link], +way[highway=trunk],way[highway=trunk_link], +way[highway=primary],way[highway=primary_link], +way[highway=secondary],way[highway=secondary_link], +way[highway=tertiary],way[highway=tertiary_link], +way[highway=residential],way[highway=unclassified] { z-index: 5; text: auto; text-color: black; font-size: 12; text-position: line; text-halo-color: white; text-halo-radius: 2; linecap: round; casing-linecap: round } +way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #809BC0; width: 7; casing-color: #1e375a; casing-width: 1; } +way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #7FC97F; width: 7; casing-color: #245424; casing-width: 1; } +way[highway=primary],way[highway=primary_link] { z-index: 8; color: #E46D71; width: 7; casing-color: #651316; casing-width: 1; } +way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #FDBF6F; width: 7; casing-color: #b16603; casing-width: 1; } +way[highway=tertiary],way[highway=tertiary_link] { z-index: 6; color: #FEFECB; width: 5; casing-color: #626202; casing-width: 1; } +way[highway=unclassified] { z-index: 6; color: #D0D0D0; width: 5; casing-width: 1; } +way[highway=residential] { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 1; } +way[highway=service][service!=parking_aisle] { z-index: 5; color: white; width: 3; casing-color: gray; casing-width: 1; } +way[highway=service][service=parking_aisle] { z-index: 5; color: white; width: 1; casing-color: #aaaaaa; casing-width: 1; } +way[highway=service][service=alley] { z-index: 5; color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 1; } +way[highway=road] { z-index: 5; color: gray; width: 5; casing-color: white; casing-width: 1; } +way[highway=living_street] { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 1; } + +/* Road areas */ + +way[highway=pedestrian]!:closed { z-index: 5; color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; casing-dashes: 2,4;} +area[highway=pedestrian]:closed { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } /* FIXME: dashed outline */ + +/* Paths */ + +way[highway=steps] { z-index: 5; color: #FF6644; width: 6; dashes: 2, 2; } +way[highway=footway] { z-index: 5; color: #FF6644; width: 2; dashes: 6, 3; prop_path : 1;} +way[highway=footway][bicycle=yes]::bike { z-index: 4; color: blue; width: 1; } +way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; prop_path : 1;} +way[highway=track] { z-index: 5; color: #996644; width: 2; dashes: 4, 2; prop_path : 1;} +way[highway=path] { z-index: 5; color: brown; width: 2; dashes: 2, 2; prop_path : 1;} +way[highway=cycleway] { z-index: 5; color: blue; width: 2; dashes: 4, 2; prop_path : 1;} +way[is_prop_set("prop_path")] { z-index: 5; text: auto; text-color: black; text-position: line; text-offset: 7; font-size: 12; } + +/* Under construction */ + +way[highway=proposed] { z-index: 5; color: #88ffff; width: 6; dashes: 8, 4; } +way[highway=construction] { z-index: 5; color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 1; casing-dashes: 8,4;} + +/* Railways */ + +way[railway=rail] { z-index: 6; color: black; width: 5; linecap: round; dashes: 0; } +way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; linecap: round; } + +way[construction=rail] { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;} +way[construction=rail]::inner { z-index: 7; color: white; width: 3; dashes: 6,18; } + +way[railway=platform] { z-index: 5; color:black; width: 2; } + +way[railway=subway] { z-index: 6; color: #444444; width: 5; } +way[railway=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 8,8; } + +way[construction=subway] { z-index: 6; color: #444444; width: 5; dashes: 4, 4; } +way[construction=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 4,12;} + +way[railway=disused][!highway],way[railway=abandoned][!highway] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; } +way[railway=disused][!highway]::dashes,way[railway=abandoned][!highway]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; } + +way[railway=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; } +way[construction=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; dashes: 6, 6; casing-dashes: 6, 6; } + +way[railway=light_rail] { z-index: 6; color: black; width: 4; } +way[railway=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,4; } + +way[construction=light_rail] { z-index: 6; color: black; width: 4; dashes: 8, 4, 4, 4; } +way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; } + +/* Waterways */ + +way[waterway=river], +way[waterway=canal], +way[waterway=stream] { z-index: 5; color: #3434ff; width: 2; text:auto; text-color: #3434ff; font-size:9; text-position: line; text-offset: 7;} +way[waterway=drain] {z-index: 5; color: #3434ff; width: 1; text:auto; text-color: #3434ff; text-position: line; text-offset: 3;} +way[waterway][tunnel=yes] {z-index: 5; dashes: 8,4;} + +/* Aeroways */ + +way[aeroway=aerodrome]:closed + { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066; casing-width: 1; } +way[aeroway=taxiway]!:closed { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; } +area[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; } + +way[aeroway=runway]!:closed { z-index: 9; color: black; width: 5; } +way[aeroway=runway]!:closed::aa { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } +way[aeroway=runway]!:closed::bb { z-index: 13; color: black; width: 3; } +way[aeroway=runway]!:closed::cc { z-index: 14; color: white; width: 1; dashes: 4, 16; } + +area[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; } +area[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;} + +/* Barriers */ + +way[barrier] {z-index: 5; color: #000000; width: 1} +way[barrier=fence] {z-index: 5; color: #000000; width: 1; dashes: 8,4,2,4; } + +/* Power */ + +way[power=line] {z-index: 5; color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 2; casing-dashes: 4, 38;} +way[power=minor_line] {z-index: 5; color: gray; width: 2; dashes: 2,4; casing-width: 3; casing-color: white; casing-dashes: 2,22;} +area[power=station]:closed { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; prop_area_small_name : 1;} +area[power=generator]:closed { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; prop_area_small_name : 1;} + +/* Leisure */ + +way[golf=hole] {z-index: 5; color: darkgreen; width: 5; casing-color: green; casing-width: 2; } +area[leisure=sports_centre]:closed { color: #66ddcc; fill-color: #66ddcc; prop_area_small_name : 1; } + + +/* Physical decoration */ + +way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: +3; } +way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: #444444; width: +6; } +way[tunnel=yes][!waterway]::bridge1 { z-index: 4; color: white; width: +2; } +way[tunnel=yes][!waterway]::bridge2 { z-index: 3; color: black; width: +6; dashes: 4,4; } + +/* Attribute decoration */ + +/*way[oneway=yes]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows; } +way[oneway=-1]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows-reversed; }*/ + +/**************** + * core_pois.css + ****************/ + +node { text-anchor-horizontal: center; text-anchor-vertical: below; } + +node[place] { icon-image: icons/place.png; font-family: DejaVu; text: auto; font-size: 10; font-weight: bold; z-index: 20; } +node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; } +node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; } +node[tourism=guesthouse] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; } +node[tourism=alpine_hut] { icon-image: icons/accommodation_alpinehut.n.16.png; z-index: 20; } +node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; } +node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; } +node[tourism=chalet] { icon-image: icons/accommodation_chalet.n.16.png; z-index: 20; } +node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; } +node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; } +node[tourism=motel] { icon-image: icons/accommodation_motel.n.16.png; z-index: 20; } +node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; } +node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; } +node[amenity=post_box] { icon-image: icons/amenity_post_box.n.16.png; z-index: 20; } +node[amenity=recycling] { icon-image: icons/amenity_recycling.n.16.png; z-index: 20; } +node[barrier=bollard] { icon-image: icons/barrier_bollard.n.16.png; z-index: 20; } +node[barrier=gate], node[highway=gate] { icon-image: icons/barrier_gate.n.16.png; z-index: 20; } +node[barrier=stile], node[highway=stile] { icon-image: icons/barrier_stile.n.16.png; z-index: 20; } +node[barrier=toll_booth] { icon-image: icons/barrier_toll_booth.n.16.png; z-index: 20; } +node[barrier=lift_gate] { icon-image: icons/barrier_lift_gate.n.16.png; z-index: 20; } +node[barrier=kissing_gate] { icon-image: icons/barrier_kissing_gate.16.png; z-index: 20; } +node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-index: 20; } +node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; } +node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; } +node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +area[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; } +node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; } +node[amenity=nightclub] { icon-image: icons/food_nightclub.n.16.png; text-offset: 0; text: auto; font-size: 10; z-index: 20; } +node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 0; text: auto; font-size: 10; z-index: 20; } +node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; } +node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; } +node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; } +node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; } +/* More Amenities */ +node[amenity=bench] { icon-image: icons/amenity_bench.n.16.png; z-index: 20; } +node[amenity=drinking_water] { icon-image: icons/food_drinkingtap.n.16.png; z-index: 20; } +node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; } +node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; } +node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; } +node[amenity=kindergarten] { icon-image: icons/education_nursery3.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[amenity=library] { icon-image: icons/amenity_library.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[amenity=place_of_worship] { icon-image: icons/place_of_worship_unknown.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; } +node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; } +node[amenity=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; } +node[amenity=townhall] { icon-image: icons/amenity_town_hall.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20; } +node[amenity=vending_machine] { icon-image: icons/shopping_vending_machine.n.16.png; z-index: 20; } +node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; } +node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; } +node[amenity=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; } +node[emergency=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; } +/* Shops */ +node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; } +node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; } +node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; z-index: 20; } +node[shop=book], node[shop=books] { icon-image: icons/shopping_book.n.16.png; z-index: 20; } +node[shop=butcher] { icon-image: icons/shopping_butcher.n.16.png; z-index: 20; } +node[shop=car_repair] { icon-image: icons/shopping_car_repair.n.16.png; z-index: 20; } +node[shop=car] { icon-image: icons/shopping_car.n.16.png; z-index: 20; } +node[shop=clothes] { icon-image: icons/shopping_clothes.n.16.png; z-index: 20; } +node[shop=confectionery] { icon-image: icons/shopping_confectionery.n.16.png; z-index: 20; } +node[shop=convenience] { icon-image: icons/shopping_convenience.n.16.png; z-index: 20; } +node[shop=department_store] { icon-image: icons/shopping_department_store.n.16.png; z-index: 20; } +node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; } +node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; } +node[shop=florist] { icon-image: icons/shopping_florist.n.16.png; z-index: 20; } +node[shop=garden_centre] { icon-image: icons/shopping_garden_centre.n.16.png; z-index: 20; } +node[shop=gift] { icon-image: icons/shopping_gift.n.16.png; z-index: 20; } +node[shop=greengrocer] { icon-image: icons/shopping_greengrocer.n.16.png; z-index: 20; } +node[shop=hairdresser] { icon-image: icons/shopping_hairdresser.n.16.png; z-index: 20; } +node[shop=hifi] { icon-image: icons/shopping_hifi.n.16.png; z-index: 20; } +node[shop=jewelry] { icon-image: icons/shopping_jewelry.n.16.png; z-index: 20; } +node[shop=kiosk] { icon-image: icons/shopping_kiosk.n.16.png; z-index: 20; } +node[shop=laundry] { icon-image: icons/shopping_laundrette.n.16.png; z-index: 20; } +node[amenity=marketplace] { icon-image: icons/shopping_marketplace.n.16.png; z-index: 20; } +node[shop=motorcycle] { icon-image: icons/shopping_motorcycle.n.16.png; z-index: 20; } +node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; } +node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; } +node[shop=toys] { icon-image: icons/shopping_toys.n.16.png; z-index: 20; } +/* More Touristy Items */ +node[tourism=artwork] { icon-image: icons/tourist_art_gallery2.n.16.png; z-index: 20; } +node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; } +node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; } +node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; } +node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[tourism=information] { icon-image: icons/tourist_information.png; z-index: 20; } +node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; } +node[historic=ruins] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; } +node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; } +node[tourism=theme_park] { icon-image: icons/tourist_theme_park.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; } +node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; } +/* Transport */ +node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-index: 20; } +node[aeroway=gate] { icon-image: icons/transport_airport_gate.n.16.png; z-index: 20; } +node[aeroway=terminal] { icon-image: icons/transport_airport_terminal.n.16.png; z-index: 20; } +node[aeroway=helipad] { icon-image: icons/transport_helicopter_pad.n.16.png; z-index: 20; } +node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; } +node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; } +node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; } +node[amenity=car_wash] { icon-image: icons/transport_car_wash.n.16.png; z-index: 20; } +node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset:0; text: capacity; font-size: 10; z-index: 20; } +node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; } +node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; } +node[amenity=bicycle_rental] { icon-image: icons/transport_rental_bicycle.n.16.png; z-index: 20; } +node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; } +node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; } +node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; } +node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; } +node[highway=mini_roundabout] { icon-image: icons/transport_miniroundabout_anticlockwise.n.16.png; z-index: 20; } +node[highway=crossing] { icon-image: icons/transport_zebracrossing.n.16.png; z-index: 20; } +/* Misc */ +node[leisure=playground] { icon-image: icons/amenity_playground.n.16.png; z-index: 20; } +node[leisure=sports_centre] { icon-image: icons/sport_leisure_centre.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } +/* node[landuse=cemetery], node[landuse=grave_yard] { i|||con-image: icons/?.png; z-index: 20; } */ +node[man_made=survey_point] { icon-image: icons/manmade_lighthouse.png; z-index: 20; } +node[man_made=tower] { icon-image: icons/manmade_tower.png; z-index: 20; } +/* Yes these power stations seem a little backward - but that's seemingly what the side menu uses ATM */ +node[power=station] { icon-image: icons/power_substation.n.16.png; z-index: 20; } +node[power=generator] { icon-image: icons/power_station.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } +/* P2 previously had these icons instead of "icon-image: cross" which is not standard MapCSS but a P2 keyword we won't implement, so keep the old icons */ +node[power=tower] { icon-image: icons/power_tower_high2.n.16.png; z-index: 20; } +node[power=pole] { icon-image: icons/power_tower_low.n.16.png; z-index: 20; } +node[waterway=weir] { icon-image: icons/transport_weir.n.16.png; z-index: 20; } +/* Natural */ +node[natural=peak] { icon-image: icons/natural_peak.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[natural=tree] { icon-image: icons/natural_tree.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } + +/* Addressing */ + +node[addr:housenumber], +node[addr:housename] { symbol-shape: circle; symbol-size: 8; symbol-fill-color: #B0E0E6; } +node[addr:housenumber]::hn_casing, +node[addr:housename]::hn_casing { z-index: -100; symbol-shape: circle; symbol-size: 10; symbol-fill-color: blue; } + +way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;} +/**************** + * core_landuse.css + ****************/ + +/* Landuse */ + +area[natural]:closed { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; } +area[natural=beach]:closed { color: #ffdd44; width: 1; fill-color: yellow; fill-opacity: 0.2; prop_area_small_name : 1;} +way[natural=coastline] { z-index: 5; color: black; width: 3; } +area[landuse]:closed { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; } +area[landuse=residential]:closed { color: #666666; width: 2; fill-color: #666666; fill-opacity: 0.15; } +area[landuse=retail]:closed { color: #cc2222; width: 2; fill-color: #aa4422; fill-opacity: 0.15; } +area[landuse=commercial]:closed { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; } +area[landuse=military]:closed { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; prop_area_small_name : 1; } +area[amenity]:closed, area[shop]:closed { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; } +/* way[sport] should not be rendered by itself, according to wiki. Can we make it an "if all else fails"? */ +area[leisure]:closed { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; } +area[tourism]:closed { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; prop_area_small_name : 1;} +area[historic]:closed, area[ruins]:closed { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; prop_area_small_name : 1;} +area[military]:closed { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; prop_area_small_name : 1;} +area[building]:closed { color: #bca9a9; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; } +area[natural=water]:closed, +area[waterway][waterway!=dam]:closed { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; prop_area_small_name : 1;} +way[waterway=dam]!:closed { z-index: 5; color: black; width: 3; } +area[waterway=dam]:closed { z-index: 5; color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1;} +area[man_made]:closed { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } +area[man_made=reservoir_covered]:closed { color: #3434ff; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } +area[landuse=reservoir]:closed { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; prop_area_small_name : 1;} +area[landuse=forest]:closed, area[natural=wood]:closed { color: green; width: 2; fill-color: green; fill-opacity: 0.2; prop_area_small_name : 1;} +area[leisure=park]:closed { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; prop_area_small_name : 1;} +area[leisure=garden]:closed { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; prop_area_small_name : 1;} +area[leisure=pitch]:closed { z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.2; prop_area_small_name : 1;} +area[landuse=recreation_ground]:closed { color: green; fill-color: green; prop_area_small_name : 1;} +area[amenity=parking]:closed { color: #bbaa66; width: 1; fill-color: #bbaa66; fill-opacity: 0.2; } +area[public_transport=pay_scale_area]:closed { color: gray; width: 1; fill-color: gray; fill-opacity: 0.1; } +way[man_made=pier] { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 1;} +way[man_made=pier][floating=yes] { z-index: 5; dashes: 4,2; casing-color: #444;} +area[leisure=marina]:closed { color: pink; fill-color: pink; fill-opacity: 0.4; prop_area_small_name : 1;} +way[leisure=slipway] { z-index: 5; color: grey; width: 3; casing-color: #3434ff; casing-width: 2; } +area[leisure=golf_course]:closed { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; prop_area_small_name : 1;} +way[boundary] { z-index: 5; color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} +/* Perhaps should be filled, on lower zooms. */ +way[boundary=national_park] { z-index: 5; color: #225500; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} +way[boundary=protected_area] { z-index: 5; color: #447744; width: 2; opacity: 0.6; dashes: 12,4, 4, 4; z-index: 4;} +way[boundary=administrative] { z-index: 5; color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;} +way[boundary=administrative][waterway] { z-index: 5; opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; } +area[landuse=cemetery]:closed { color: #664466; width: 2; fill-color: #664466; opacity: 0.2; prop_area_small_name : 1;} +/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ +/* Route relations */ + +relation[type=route] > way::route { z-index: -1; width: 13; color: blue; opacity: 0.3; linecap: none; } +relation[type=route][route=bicycle][network=ncn] > way::route { z-index: -1; width: 12; color: red; opacity: 0.3; linecap: none; } +relation[type=route][route=bicycle][network=rcn] > way::route { z-index: -1; width: 12; color: cyan; opacity: 0.3; linecap: none; } +relation[type=route][route=bicycle][network=lcn] > way::route { z-index: -1; width: 12; color: blue; opacity: 0.3; linecap: none; } +relation[type=route][route=mtb] > way::route { z-index: -1; width: 12; color: brown; opacity: 0.3; linecap: none; } +relation[type=route][route=foot] > way::route { z-index: -1; width: 10; color: #80ff80; opacity: 0.6; linecap: none; } + +/*@import("stylesheets/core_ways.css");*/ +/*@import("stylesheets/core_pois.css");*/ +/*@import("stylesheets/core_landuse.css");*/ +/*@import("stylesheets/core_relations.css");*/ +way[is_prop_set("prop_area_small_name")] {text-color: black; font-size: 10; text: auto; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;} +/*@import("stylesheets/core_interactive.css");*/ + +/* Rendering for licence status */ + +/*way[_status=no]::status { z-index: 0; width: eval('_width+7'); color: #AA0000; } +way[_status=partial]::status { z-index: 0; width: eval('_width+7'); color: #AA0000; opacity: 0.6; } +way[_status=unsure]::status { z-index: 0; width: eval('_width+7'); color: darkorange; opacity: 0.6; } +node[_status=no]::status { z-index: 0; i|||con-image: square; icon-width: eval('_width+7'); color: #AA0000; } +node[_status=partial]::status { z-index: 0; i|||con-image: square; icon-width: eval('_width+7'); color: #AA0000; opacity: 0.6; } +node[_status=unsure]::status { z-index: 0; i|||con-image: square; icon-width: eval('_width+7'); color: darkorange; opacity: 0.6; }*/