Changeset 3623 in josm
- Timestamp:
- Oct 21, 2010 1:21:48 AM (3 years ago)
- Location:
- trunk
- Files:
-
- 20 added
- 2 edited
-
data/defaultpresets.xml (modified) (15 diffs)
-
images/presets/aeroway_gate.png (added)
-
images/presets/apron.png (added)
-
images/presets/bay.png (added)
-
images/presets/beach.png (added)
-
images/presets/block.png (added)
-
images/presets/city_wall.png (added)
-
images/presets/cliff.png (added)
-
images/presets/coastline.png (added)
-
images/presets/dam.png (added)
-
images/presets/fence.png (added)
-
images/presets/groyne.png (added)
-
images/presets/hangar.png (added)
-
images/presets/hedge.png (added)
-
images/presets/measurement_station.png (added)
-
images/presets/mud.png (added)
-
images/presets/retaining_wall.png (added)
-
images/presets/runway.png (added)
-
images/presets/taxiway.png (added)
-
images/presets/wall.png (added)
-
images/presets/water_well.png (added)
-
styles/standard/elemstyles.xml (modified) (15 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/data/defaultpresets.xml
r3622 r3623 803 803 <key key="barrier" value="cycle_barrier" /> 804 804 </item> <!-- cycle_barrier --> 805 <item name="Block" icon="presets/ empty.png" type="node,way,closedway">805 <item name="Block" icon="presets/block.png" type="node,way,closedway"> 806 806 <key key="barrier" value="block" /> 807 807 </item> <!-- block --> … … 858 858 859 859 <!-- *** linear barriers *** --> 860 <item name="Hedge" icon="presets/ empty.png" type="way,closedway,relation">860 <item name="Hedge" icon="presets/hedge.png" type="way,closedway,relation"> 861 861 <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" /> 862 862 <key key="barrier" value="hedge" /> 863 863 </item> <!-- hedge --> 864 <item name="Fence" icon="presets/ empty.png" type="way,closedway">864 <item name="Fence" icon="presets/fence.png" type="way,closedway"> 865 865 <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" /> 866 866 <combo key="barrier" text="Fence" values="fence,wood_fence,wire_fence" default="" delete_if_empty="true" /> 867 867 </item> <!-- fence --> 868 <item name="Wall" icon="presets/ empty.png" type="way,closedway">868 <item name="Wall" icon="presets/wall.png" type="way,closedway"> 869 869 <key key="barrier" value="wall" /> 870 870 </item> <!-- wall --> 871 <item name="City Wall" icon="presets/ empty.png" type="way,closedway">871 <item name="City Wall" icon="presets/city_wall.png" type="way,closedway"> 872 872 <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" /> 873 873 <key key="barrier" value="city_wall" /> 874 874 </item> <!-- city_wall --> 875 <item name="Retaining Wall" icon="presets/ empty.png" type="way,closedway">875 <item name="Retaining Wall" icon="presets/retaining_wall.png" type="way,closedway"> 876 876 <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" /> 877 877 <key key="barrier" value="retaining_wall" /> … … 1052 1052 <text key="name" text="Name" default="" delete_if_empty="true" /> 1053 1053 </item> 1054 <item name="Dam" icon="presets/ empty.png" type="node,way,closedway">1054 <item name="Dam" icon="presets/dam.png" type="node,way,closedway"> 1055 1055 <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" /> 1056 1056 <label text="Edit Dam" /> … … 1060 1060 <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" /> 1061 1061 </item> 1062 <item name="Groyne" icon="presets/ empty.png" type="node,way,closedway">1062 <item name="Groyne" icon="presets/groyne.png" type="node,way,closedway"> 1063 1063 <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dgroyne" /> 1064 1064 <label text="Edit Groyne" /> … … 1097 1097 <text key="name" text="Name" default="" delete_if_empty="true" /> 1098 1098 </item> 1099 <item name="Coastline" icon="presets/ empty.png" type="node,way,closedway,relation">1099 <item name="Coastline" icon="presets/coastline.png" type="node,way,closedway,relation"> 1100 1100 <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" /> 1101 1101 <label text="Edit Coastline" /> … … 1121 1121 <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" default="" delete_if_empty="true" /> 1122 1122 </item> 1123 <item name="Mud" icon="presets/ empty.png" type="node,closedway,relation">1123 <item name="Mud" icon="presets/mud.png" type="node,closedway,relation"> 1124 1124 <label text="Edit Mud" /> 1125 1125 <key key="natural" value="mud" /> 1126 1126 <text key="name" text="Name" default="" delete_if_empty="true" /> 1127 1127 </item> 1128 <item name="Beach" icon=" styles/standard/rendering/beach.png" type="node,closedway,relation">1128 <item name="Beach" icon="presets/beach.png" type="node,closedway,relation"> 1129 1129 <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" /> 1130 1130 <label text="Edit Beach" /> … … 1132 1132 <text key="name" text="Name" default="" delete_if_empty="true" /> 1133 1133 </item> 1134 <item name="Bay" icon="presets/ empty.png" type="node,closedway,relation">1134 <item name="Bay" icon="presets/bay.png" type="node,closedway,relation"> 1135 1135 <label text="Edit Bay" /> 1136 1136 <key key="natural" value="bay" /> 1137 1137 <text key="name" text="Name" default="" delete_if_empty="true" /> 1138 1138 </item> 1139 <item name="Cliff" icon="presets/ empty.png" type="node,way,closedway,relation">1139 <item name="Cliff" icon="presets/cliff.png" type="node,way,closedway,relation"> 1140 1140 <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" /> 1141 1141 <label text="Edit Cliff" /> … … 1525 1525 <combo key="rental" text="Rental" values="yes,brand,no" default="" delete_if_empty="true" /> 1526 1526 <combo key="repair" text="Repair" values="yes,brand,oldtimer,no" default="" delete_if_empty="true" /> 1527 <combo key="inspection" text="Inspection" values="yes,DEKRA,GTÜ,MOT,TÜV,no" default="" delete_if_empty="true" /> 1527 1528 <combo key="parts" text="Parts" values="yes,brand,oldtimer,no" default="" delete_if_empty="true" /> 1528 1529 <combo key="clothes" text="Clothes" values="yes,brand,no" default="" delete_if_empty="true" /> … … 1680 1681 </item> 1681 1682 <separator/> 1682 <item name="Runway" icon="presets/ empty.png" type="way">1683 <item name="Runway" icon="presets/runway.png" type="way"> 1683 1684 <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" /> 1684 1685 <label text="Edit Runway" /> … … 1688 1689 </optional> 1689 1690 </item> 1690 <item name="Taxiway" icon="presets/ empty.png" type="way">1691 <item name="Taxiway" icon="presets/taxiway.png" type="way"> 1691 1692 <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" /> 1692 1693 <label text="Edit Taxiway" /> … … 1704 1705 </optional> 1705 1706 </item> 1706 <item name="Apron" icon="presets/ empty.png" type="closedway">1707 <item name="Apron" icon="presets/apron.png" type="closedway"> 1707 1708 <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" /> 1708 1709 <label text="Apron" /> 1709 1710 <key key="aeroway" value="apron" /> 1710 1711 </item> 1711 <item name="Hangar" icon="presets/ empty.png" type="closedway">1712 <item name="Hangar" icon="presets/hangar.png" type="node,closedway"> 1712 1713 <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" /> 1713 1714 <label text="Hangar" /> 1714 1715 <key key="building" value="hangar" /> 1715 1716 </item> 1716 <item name="Beacon" icon=" presets/empty.png" type="node">1717 <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node"> 1717 1718 <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" /> 1718 1719 <label text="Beacon" /> … … 1731 1732 <text key="name" text="Name" default="" delete_if_empty="true" /> 1732 1733 </item> 1733 <item name="Gate" name_context="airport" icon="presets/ empty.png" type="node">1734 <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node"> 1734 1735 <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" /> 1735 1736 <label text="Edit Terminal Gate" /> … … 2968 2969 <text key="name" text="Name" default="" delete_if_empty="true" /> 2969 2970 </item> 2970 <item name="Water Well" icon="presets/ empty.png" type="node">2971 <item name="Water Well" icon="presets/water_well.png" type="node"> 2971 2972 <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_well" /> 2972 2973 <label text="Edit Water Well" /> … … 2975 2976 </item> 2976 2977 <separator/> 2977 <item name="Lighthouse" icon=" presets/lighthouse.png" type="node,closedway">2978 <item name="Lighthouse" icon="styles/standard/misc/landmark/lighthouse.png" type="node,closedway"> 2978 2979 <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" /> 2979 2980 <label text="Edit Lighthouse" /> … … 2994 2995 <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" default="" delete_if_empty="true" /> 2995 2996 </item> 2997 <item name="Measurement Station" icon="presets/measurement_station.png" type="node,closedway"> 2998 <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/measurement_station" /> 2999 <label text="Edit Measurement Station" /> 3000 <space /> 3001 <key key="man_made" value="measurement_station" /> 3002 <text key="name" text="Name" default="" delete_if_empty="true" /> 3003 <text key="operator" text="Operator" default="" delete_if_empty="true" /> 3004 <combo key="measurement" text="Measurement" values="particulate_matter,seismic,water_level,weather" default="" delete_if_empty="true" /> 3005 <combo key="recording" text="Recording" values="manually,automated,remote,no" default="" delete_if_empty="true" /> 3006 <combo key="display" text="Display" values="analog,digital,no" default="" delete_if_empty="true" /> 3007 </item> 2996 3008 <item name="Survey Point" icon="presets/survey_point.png" type="node"> 2997 3009 <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" /> -
trunk/styles/standard/elemstyles.xml
r3622 r3623 488 488 <rule> 489 489 <condition k="barrier" v="block"/> 490 <icon annotate="true" src=" misc/no_icon.png"/>490 <icon annotate="true" src="vehicle/block.png"/> 491 491 <line width="3" colour="barrier#F0F050"/> 492 492 <area colour="barrier#F0F050" closed="true"/> … … 496 496 <rule> 497 497 <condition k="barrier" v="border_control"/> 498 <icon annotate="true" src=" misc/no_icon.png"/>498 <icon annotate="true" src="vehicle/border_control.png"/> 499 499 <scale_min>1</scale_min> 500 500 <scale_max>50000</scale_max> … … 1193 1193 <rule> 1194 1194 <condition k="waterway" v="dam"/> 1195 <icon annotate="true" src=" misc/no_icon.png"/>1195 <icon annotate="true" src="nautical/dam.png"/> 1196 1196 <line width="2" colour="manmade#d8d8d8"/> 1197 1197 <area colour="manmade#d8d8d8" closed="true"/> … … 1429 1429 <condition k="aeroway" v="runway"/> 1430 1430 <line width="3" colour="aeroway_dark#330000"/> 1431 <icon annotate="true" src="transport/airport .png"/>1431 <icon annotate="true" src="transport/airport/runway.png"/> 1432 1432 <scale_min>1</scale_min> 1433 1433 <scale_max>50000</scale_max> … … 1437 1437 <condition k="aeroway" v="taxiway"/> 1438 1438 <line width="2" colour="aeroway#660000"/> 1439 <icon annotate="true" src="transport/airport .png"/>1439 <icon annotate="true" src="transport/airport/taxiway.png"/> 1440 1440 <scale_min>1</scale_min> 1441 1441 <scale_max>50000</scale_max> … … 1445 1445 <condition k="aeroway" v="apron"/> 1446 1446 <area colour="aeroway_light#990000"/> 1447 <icon annotate="true" src="transport/airport.png"/> 1447 <icon annotate="true" src="transport/airport/apron.png"/> 1448 <scale_min>1</scale_min> 1449 <scale_max>50000</scale_max> 1450 </rule> 1451 1452 <rule> 1453 <condition k="aeroway" v="hangar"/> 1454 <area colour="aeroway_light#990000"/> 1455 <icon annotate="true" src="transport/airport/hangar.png"/> 1448 1456 <scale_min>1</scale_min> 1449 1457 <scale_max>50000</scale_max> … … 1452 1460 <rule> 1453 1461 <condition k="aeroway" v="gate"/> 1454 <icon annotate="true" src="transport/airport/ terminal.png"/>1462 <icon annotate="true" src="transport/airport/gate.png"/> 1455 1463 <scale_min>1</scale_min> 1456 1464 <scale_max>50000</scale_max> … … 1742 1750 <rule> 1743 1751 <condition k="man_made" v="groyne"/> 1744 <icon annotate="true" src=" misc/no_icon.png"/>1752 <icon annotate="true" src="nautical/groyne.png"/> 1745 1753 <area colour="manmade#d8d8d8"/> 1746 1754 <scale_min>1</scale_min> … … 1751 1759 <condition k="man_made" v="lighthouse"/> 1752 1760 <icon annotate="true" src="misc/landmark/lighthouse.png"/> 1761 <area colour="manmade#d8d8d8"/> 1762 <scale_min>1</scale_min> 1763 <scale_max>50000</scale_max> 1764 </rule> 1765 1766 <rule> 1767 <condition k="man_made" v="measurement_station"/> 1768 <icon annotate="true" src="misc/landmark/measurement_station.png"/> 1753 1769 <area colour="manmade#d8d8d8"/> 1754 1770 <scale_min>1</scale_min> … … 1854 1870 <rule> 1855 1871 <condition k="man_made" v="water_well"/> 1856 <icon annotate="true" src="misc/ no_icon.png"/>1872 <icon annotate="true" src="misc/landmark/water_well.png"/> 1857 1873 <area colour="manmade#d8d8d8"/> 1858 1874 <scale_min>1</scale_min> … … 3782 3798 <rule> 3783 3799 <condition k="natural" v="cliff"/> 3784 <icon src="misc/ no_icon.png"/>3800 <icon src="misc/cliff.png"/> 3785 3801 <line width="2" colour="natural#002f00"/> 3786 3802 <area colour="natural#002f00" closed="true"/> … … 3847 3863 <rule> 3848 3864 <condition k="natural" v="coastline"/> 3849 <icon src="misc/ no_icon.png"/>3865 <icon src="misc/coastline.png"/> 3850 3866 <line width="1" colour="water#0000ff"/> 3851 3867 <scale_min>1</scale_min> … … 3855 3871 <rule> 3856 3872 <condition k="natural" v="mud"/> 3857 <icon src="misc/ no_icon.png"/>3873 <icon src="misc/mud.png"/> 3858 3874 <area colour="mud#cba762"/> 3859 3875 <scale_min>1</scale_min> … … 3863 3879 <rule> 3864 3880 <condition k="natural" v="beach"/> 3865 <icon src="misc/ no_icon.png"/>3881 <icon src="misc/beach.png"/> 3866 3882 <area colour="beach#f8dba2"/> 3867 3883 <scale_min>1</scale_min> … … 3871 3887 <rule> 3872 3888 <condition k="natural" v="bay"/> 3873 <icon src="misc/ no_icon.png"/>3889 <icon src="misc/bay.png"/> 3874 3890 <area colour="natural#002f00"/> 3875 3891 <scale_min>1</scale_min>
Note: See TracChangeset
for help on using the changeset viewer.
