Changeset 9037 in josm for trunk/data


Ignore:
Timestamp:
2015-11-21T00:16:40+01:00 (4 years ago)
Author:
Don-vip
Message:

see #12102 - add pipeline=marker preset + deprecate type for pipelines and pipeline markers (replaced by substance), see #10907

Location:
trunk/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r9036 r9037  
    345345        </optional>
    346346    </chunk>
     347    <chunk id="operator_substance">
     348        <text key="operator" text="Operator" />
     349        <combo key="substance" text="Substance" values="water,gas,heat,oil,sewage" />
     350    </chunk>
     351    <chunk id="support">
     352        <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" values_context="mounting/support" />
     353    </chunk>
    347354  <!-- Link chunks -->
    348355  <chunk id="link_contact_address">
     
    13181325            <key key="traffic_sign" value="maxspeed" />
    13191326            <text key="maxspeed" text="Max. speed (km/h)" />
    1320         </item> <!-- City Limit -->
     1327        </item> <!-- Speed Limit -->
    13211328        <item name="Speed Camera" icon="presets/speed_camera.png" type="node" preset_name_label="true">
    13221329            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=speed_camera"
     
    47424749            <optional>
    47434750                <combo key="display" text="Display" values="analog,digital,sundial,unorthodox" />
    4744                 <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" values_context="mounting/support" />
     4751                <reference ref="support" />
    47454752                <combo key="visibility" text="Visibility/readability" values="house,street,area" display_values="house (up to 5m),street (up to 20m),area (more than 20m)" />
    47464753                <check key="date" text="Shows current date" />
     
    56325639            <space />
    56335640            <key key="man_made" value="pipeline" />
    5634             <text key="operator" text="Operator" />
    5635             <combo key="type" text="Type" values="water,gas,heat,oil,sewage" />
     5641            <reference ref="operator_substance" />
    56365642            <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" />
    56375643        </item> <!-- Pipeline -->
     5644        <item name="Pipeline Marker" type="node" preset_name_label="true">
     5645            <link href="http://wiki.openstreetmap.org/wiki/Tag:pipeline=marker" />
     5646            <space />
     5647            <key key="pipeline" value="marker" />
     5648            <text key="ref" text="Reference" />
     5649            <reference ref="operator_substance" />
     5650            <reference ref="support" />
     5651        </item> <!-- Pipeline Marker -->
    56385652        <item name="Crane" icon="presets/crane.png" type="node,closedway" preset_name_label="true">
    56395653            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane"
  • trunk/data/validator/deprecated.mapcss

    r9031 r9037  
    542542  fixAdd: "intermittent=yes";
    543543}
     544
     545*[type][man_made=pipeline],
     546*[type][pipeline=marker] {
     547  throwWarning: tr("{0} is deprecated", "{0.key}");
     548  suggestAlternative: "substance";
     549  fixChangeKey: "type => substance";
     550}
Note: See TracChangeset for help on using the changeset viewer.