- Timestamp:
- 2019-11-17T20:53:27+01:00 (4 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/data/defaultpresets.xml
r15522 r15526 4873 4873 <text key="pressure" text="Pressure (bar)" /> 4874 4874 </item> <!-- Pipeline --> 4875 <item name="Pipeline Marker" icon="presets/misc/pipeline_marker.svg" type="node" preset_name_label="true">4876 <link wiki="Tag:pipeline=marker" />4877 <space />4878 <key key="pipeline" value="marker" />4879 <text key="ref" text="Reference" />4880 <reference ref="operator_substance" />4881 <reference ref="support" />4882 </item> <!-- Pipeline Marker -->4883 4875 <item name="Pipeline Valve" icon="presets/misc/valve.svg" type="node" preset_name_label="true"> 4884 4876 <link wiki="Tag:pipeline=valve" /> … … 4892 4884 <reference ref="ref_operator" /> 4893 4885 </item> <!-- Pipeline Valve --> 4886 <item name="Marker" icon="presets/misc/pipeline_marker.svg" type="node" preset_name_label="true"> 4887 <link wiki="Key:marker" /> 4888 <space /> 4889 <combo key="marker" text="Type" values="aerial,ground,pedestal,plate,post,stone" match="key" /> 4890 <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" /> 4891 <optional> 4892 <reference ref="ref_operator" /> 4893 <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" values_context="marker /> 4894 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" /> 4895 <combo key="location" text="Location" values="underground,overground" values_context="pipeline" /> 4896 </optional> 4897 </item> <!-- Marker --> 4894 4898 <item name="Manhole" icon="presets/misc/manhole.svg" type="node" preset_name_label="true"> 4895 4899 <link wiki="Key:manhole" /> -
trunk/data/validator/combinations.mapcss
r15524 r15526 288 288 } 289 289 290 /* {0.key} together with {1.key}, #17630, #17604 */ 290 /* {0.key} together with {1.key}, #18267, #17630, #17604 */ 291 node[marker][cover], 292 node[marker][voltage], 293 node[marker][pressure], 294 node[marker][diameter], 295 node[marker][substance], 291 296 *[building:part][building], 292 297 *[addr:street][addr:place][outside("CZ,DK")] { -
trunk/data/validator/deprecated.mapcss
r15496 r15526 1819 1819 group: tr("deprecated tagging"); 1820 1820 } 1821 1822 /* #18267 */ 1823 node[pipeline=marker], 1824 node[power=marker], 1825 node[cable=marker] { 1826 throwWarning: tr("{0} is deprecated", "{0.tag}"); 1827 suggestAlternative: "marker=* + utility=*"; 1828 group: tr("deprecated tagging"); 1829 } -
trunk/styles/standard/elemstyles.mapcss
r15466 r15526 1504 1504 color: pipeline#660000; 1505 1505 } 1506 node[ pipeline=marker] {1506 node[marker] { 1507 1507 icon-image: "presets/misc/pipeline_marker.svg"; 1508 1508 set icon_z17;
Note:
See TracChangeset
for help on using the changeset viewer.