Changeset 17044 in josm


Ignore:
Timestamp:
2020-09-19T17:55:50+02:00 (4 years ago)
Author:
Klumbumbus
Message:
  • fix #19796 - Add more optional values to the presets of runway, taxiway, apron and helipad, small fixes (based on patch by gaben)
  • see #19820 - Add missing @since
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r17030 r17044  
    30613061            <optional>
    30623062                <text key="ref" text="Reference" />
     3063                <text key="length" text="Length (meters)" />
     3064                <combo key="width" text="Width (meters)" values="18,23,30,45,60" />
     3065                <text key="ele" text="Elevation (meters)" length="10" />
    30633066                <reference ref="surface" />
    30643067            </optional>
    … …  
    30693072            <optional>
    30703073                <text key="ref" text="Reference" />
     3074                <text key="width" text="Width (meters)" />
     3075                <reference ref="surface" />
    30713076            </optional>
    30723077        </item> <!-- Taxiway -->
    … …  
    30823087            <key key="aeroway" value="helipad" />
    30833088            <optional>
    3084                 <text key="ref" text="Reference" />
     3089                <reference ref="name_ref" />
    30853090                <text key="iata" text="IATA" />
    30863091                <text key="icao" text="ICAO" />
     3092                <text key="ele" text="Elevation (meters)" length="10" />
     3093                <reference ref="surface"/>
    30873094                <reference ref="wikipedia_wikidata" />
    30883095            </optional>
    … …  
    30913098            <link wiki="Tag:aeroway=apron" />
    30923099            <key key="aeroway" value="apron" />
     3100            <optional>
     3101                <reference ref="name_ref" />
     3102                <reference ref="surface"/>
     3103            </optional>
    30933104        </item> <!-- Apron -->
    30943105        <item name="Plane Parking Position" icon="presets/transport/airport/parking_position.svg" type="node,way" preset_name_label="true">
    … …  
    43494360            <reference ref="name_ref_operator" />
    43504361            <space />
    4351             <text key="water_tank:volume" text="Volume (in liters)" />
     4362            <text key="water_tank:volume" text="Volume (liters)" />
    43524363        </item> <!-- Water Tank -->
    43534364        <item name="Suction point" icon="presets/emergency/suction_point.svg" type="node" preset_name_label="true">
    … …  
    43784389            <combo key="siren:type" text="Type" values="pneumatic,electronic,mechanical" />
    43794390            <multiselect key="siren:purpose" text="Purpose" values="tornado;fire;air_raid;civil_defense" rows="5" values_searchable="true" />
    4380             <text key="siren:range" text="Range (in meters)" />
     4391            <text key="siren:range" text="Range (meters)" />
    43814392        </item> <!-- Siren -->
    43824393    </group> <!-- Emergency -->
    … …  
    44054416            <key key="social_facility" value="group_home" />
    44064417            <reference ref="name_operator" />
    4407             <combo key="social_facility:for" text="For" value="senior" default="senior" />
     4418            <combo key="social_facility:for" text="For" values="senior" default="senior" />
    44084419            <text key="capacity" text="Capacity" />
    44094420            <reference ref="link_contact_address" />
    … …  
    44154426            <key key="social_facility" value="assisted_living" />
    44164427            <reference ref="name_operator" />
    4417             <combo key="social_facility:for" text="For" value="senior" default="senior" />
     4428            <combo key="social_facility:for" text="For" values="senior" default="senior" />
    44184429            <text key="capacity" text="Capacity" />
    44194430            <reference ref="link_contact_address" />
    … …  
    54665477            <text key="name" text="Name" />
    54675478            <combo key="mineshaft_type" text="Function" values="winding,air" />
    5468             <text key="depth" text="Depth in meters" />
     5479            <text key="depth" text="Depth (meters)" />
    54695480            <text key="operator" text="Operator" />
    54705481            <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
    … …  
    54775488            <key key="man_made" value="adit" />
    54785489            <text key="name" text="Name" />
    5479             <text key="length" text="Length in meters" />
     5490            <text key="length" text="Length (meters)" />
    54805491            <text key="operator" text="Operator" />
    54815492            <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />

  • trunk/src/org/openstreetmap/josm/io/OnlineResource.java

    r17041 r17044  
    4343     * Replies the offline icon.
    4444     * @return the offline icon
     45     * @since 17041
    4546     */
    4647    public final String getOfflineIcon() {
Note: See TracChangeset for help on using the changeset viewer.