Ticket #21396: 21396.patch

File 21396.patch, 21.6 KB (added by taylor.smock, 3 years ago)

  • resources/data/validator/deprecated.mapcss 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/data/validator/deprecated.mapcss b/resources/data/validator/deprecated.mapcss
    a b  
    23902390  group: tr("deprecated tagging");
    23912391}
    23922392
     2393/* Replaced by type=connectivity */
     2394*[type="turnlanes:turns"] {
     2395  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2396  suggestAlternative: "type=connectivity";
     2397  group: tr("deprecated tagging");
     2398}
     2399
    23932400/* When tags are deprecated they should be added to ignoretags.cfg too. */

  • resources/data/validator/highway.mapcss 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/data/validator/highway.mapcss b/resources/data/validator/highway.mapcss
    a b  
    207207  assertNoMatch: "way highway=service area=yes";
    208208  assertNoMatch: "way highway=trunk";
    209209}
     210
     211/* #21396 comment 39 */
     212*[surface=~/^paving_stones:(\d+)$/] {
     213  throwWarning: tr("{0} with trailing number", "paving_stones");
     214  group: tr("questionable value (ending with a number)");
     215  suggestAlternative: "paving_stones:length";
     216  suggestAlternative: "paving_stones:width";
     217}
     218 No newline at end of file

  • resources/data/validator/ignoretags.cfg 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/data/validator/ignoretags.cfg b/resources/data/validator/ignoretags.cfg
    a b  
    103103E:duration
    104104E:interval
    105105E:maxspeed
     106E:maxspeed:type
    106107E:maxstay
    107108E:maxweight:signed
    108109E:opening_hours:signed
    … …  
    730731K:school=entrance
    731732E:voltage-high
    732733E:voltage-low
     734K:type=turnlanes:turns
     735K:service=driveway2
     736K:surface=paving_stones:30
    733737;
    734738; Tags not yet decided (to remove from this section when added or moved up when deprecated)
    735 ; see josm tickets: 17770 15309 15774 16315 16658 16793 19982
     739; see josm tickets: 17770 15309 15774 16315 16658 16793 19982 21396
    736740;
    737 K:service=irrigation
    738 K:man_made=tunnel
     741K:advertising=board
    739742K:amenity=childcare
    740 K:landuse=logging
    741 K:indoor=wall
    742 K:indoor=room
    743 K:indoor=corridor
    744 K:highway=corridor
     743K:amenity=loading_dock
     744K:amenity=parcel_locker
     745K:amenity=payment_terminal
     746K:barrier=sliding_gate
     747K:boundary=forest_compartment
     748K:craft=grinding_mill
    745749K:crossing=zebra
     750K:emergency=access_point
     751K:golf=cartpath
     752K:healthcare:speciality=general
    746753K:healthcare=alternative
     754K:healthcare=centre
     755K:healthcare=clinic
    747756K:healthcare=dentist
    748757K:healthcare=doctor
    749758K:healthcare=hospital
    750759K:healthcare=pharmacy
    751 K:healthcare=clinic
    752 K:healthcare=centre
    753760K:healthcare=physiotherapist
    754761K:healthcare=yes
    755 K:golf=cartpath
     762K:hedge=hedge_bank
     763K:highway=corridor
     764K:historic=bomb_crater
     765K:indoor=area
     766K:indoor=corridor
     767K:indoor=room
     768K:indoor=wall
     769K:landuse=logging
     770; See #21964/#21907 for WIP patch for leisure=sports_hall
     771K:leisure=sports_hall
     772K:man_made=courtyard
     773K:man_made=gantry
     774K:man_made=tunnel
    756775K:man_made=water_tap
     776K:military=trench
     777K:natural=crevasse
     778K:path=crossing
     779K:railway=proposed
    757780K:railway=tram_crossing
    758781K:railway=tram_level_crossing
     782K:road_marking=solid_stop_line
     783K:service=irrigation
     784
     785; These tags should probably have better software support, but maybe they can be in the appropriate section in this file.
     786; Examples: oneway:moped and cycleway:right:oneway.
     787F::oneway
     788S:oneway:

  • resources/data/validator/words.cfg 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/data/validator/words.cfg b/resources/data/validator/words.cfg
    a b  
    208208-descripion
    209209-desription
    210210-decription
     211+driveway
     212-driveway2
    211213+freight
    212214-frieght
    213215+full_name:fa

  • resources/data/defaultpresets.xml 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml
    a b  
    66
    77    <!-- Item chunks -->
    88    <chunk id="surface">
    9         <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,concrete:plates,concrete:lanes,paving_stones,sett,cobblestone,unhewn_cobblestone,grass_paver,compacted,fine_gravel,gravel,pebblestone,ground,mud,sand,grass,wood,metal" />
     9        <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,concrete:plates,concrete:lanes,paving_stones,sett,cobblestone,unhewn_cobblestone,grass_paver,compacted,fine_gravel,gravel,pebblestone,ground,mud,rock,sand,grass,wood,metal" />
    1010    </chunk>
    1111    <chunk id="surface_smoothness">
    1212        <reference ref="surface" />
    … …  
    5151    <chunk id="highway_yesno_incline">
    5252        <reference ref="highway_yesno" />
    5353        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
     54    </chunk>
     55    <chunk id="lit_common_no_times">
     56        <combo key="lit" text="Lit" values="yes,no,24/7,automatic,limited,disused"/>
    5457    </chunk>
    5558    <chunk id="highway_yesno_incline_oneway_lit_width">
    5659        <checkgroup columns="4">
    … …  
    5962            <check key="embankment" text="Embankment" disable_off="true" />
    6063            <check key="cutting" text="Cutting" disable_off="true" />
    6164            <check key="oneway" text="Oneway" />
    62             <check key="lit" text="Lit" />
    6365        </checkgroup>
     66        <reference ref="lit_common_no_times"/>
    6467        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    6568        <text key="width" text="Width (meters)" />
    6669    </chunk>
    … …  
    131134        <text key="height" text="Height (meters)" length="7" />
    132135        <combo key="animated" text="Animated" values="yes,winding_posters,screen,trivision_blades,revolving,digital_messages,digital_prices,no" values_sort="false" />
    133136        <check key="luminous" text="Luminous" />
    134         <check key="lit" text="Lit" />
     137        <reference ref="lit_common_no_times"/>
    135138    </chunk>
    136139    <chunk id="min_age">
    137140        <text key="min_age" text="Minimum age" />
    … …  
    346349        <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" values_searchable="true" />
    347350    </chunk>
    348351    <chunk id="other_religions"> <!-- religions which don't have an own preset -->
    349         <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
     352        <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,none,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
    350353    </chunk>
    351354    <chunk id="christian_denominations"> <!-- christian denominations -->
    352355        <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_searchable="true" />
    … …  
    675678                <reference ref="highway_yesno" />
    676679                <checkgroup columns="4">
    677680                    <check key="oneway" text="Oneway" default="on" />
    678                     <check key="lit" text="Lit" />
    679681                    <check key="toll" text="Toll" />
    680682                </checkgroup>
     683                <reference ref="lit_common_no_times"/>
    681684                <reference ref="placement_shoulder" />
    682685            </optional>
    683686            <reference ref="link_road_access_restrictions" />
    … …  
    697700                <reference ref="highway_yesno" />
    698701                <checkgroup columns="4">
    699702                    <check key="oneway" text="Oneway" default="on" />
    700                     <check key="lit" text="Lit" />
    701703                    <check key="toll" text="Toll" />
    702704                </checkgroup>
     705                <reference ref="lit_common_no_times"/>
    703706                <reference ref="placement_shoulder" />
    704707            </optional>
    705708            <reference ref="link_road_access_restrictions" />
    … …  
    721724                <reference ref="highway_yesno" />
    722725                <checkgroup columns="4">
    723726                    <check key="oneway" text="Oneway" default="on" />
    724                     <check key="lit" text="Lit" />
    725727                    <check key="toll" text="Toll" />
    726728                    <check key="motorroad" text="Motorroad" default="on" />
    727729                </checkgroup>
     730                <reference ref="lit_common_no_times"/>
    728731                <reference ref="placement_shoulder" />
    729732            </optional>
    730733            <reference ref="link_road_access_restrictions" />
    … …  
    745748                <reference ref="highway_yesno" />
    746749                <checkgroup columns="4">
    747750                    <check key="oneway" text="Oneway" default="on" />
    748                     <check key="lit" text="Lit" />
    749751                    <check key="toll" text="Toll" />
    750752                    <check key="motorroad" text="Motorroad" default="on" />
    751753                </checkgroup>
     754                <reference ref="lit_common_no_times"/>
    752755                <reference ref="placement_shoulder" />
    753756            </optional>
    754757            <reference ref="link_road_access_restrictions" />
    … …  
    885888                <checkgroup columns="4">
    886889                    <check key="oneway" text="Oneway" />
    887890                    <check key="oneway:bicycle" text="Oneway for bicycle" />
    888                     <check key="lit" text="Lit" />
    889891                </checkgroup>
     892                <reference ref="lit_common_no_times"/>
    890893                <text key="width" text="Width (meters)" />
    891894                <combo key="bus_bay" text="Bus bay" values="both,left,right" />
    892895                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
    … …  
    915918                <checkgroup columns="4">
    916919                    <check key="oneway" text="Oneway" />
    917920                    <check key="oneway:bicycle" text="Oneway for bicycle" />
    918                     <check key="lit" text="Lit" />
    919921                </checkgroup>
     922                <reference ref="lit_common_no_times"/>
    920923                <text key="width" text="Width (meters)" />
    921924                <combo key="bus_bay" text="Bus bay" values="both,left,right" />
    922925                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
    … …  
    952955                <reference ref="surface_smoothness" />
    953956                <check key="area" text="Area" />
    954957                <reference ref="highway_yesno_incline" />
    955                 <check key="lit" text="Lit" />
     958                <reference ref="lit_common_no_times"/>
    956959                <text key="width" text="Width (meters)" />
    957960            </optional>
    958961            <reference ref="link_road_access_restrictions" />
    … …  
    978981            <optional>
    979982                <reference ref="surface_smoothness" />
    980983                <check key="oneway" text="Oneway" />
    981                 <check key="lit" text="Lit" />
     984                <reference ref="lit_common_no_times"/>
    982985            </optional>
    983986            <reference ref="link_road_access_restrictions" />
    984987        </item> <!-- Parking Aisle -->
    … …  
    990993            <optional>
    991994                <reference ref="surface" />
    992995                <text key="width" text="Width (meters)" />
    993                 <check key="lit" text="Lit" />
     996                <reference ref="lit_common_no_times"/>
    994997            </optional>
    995998        </item> <!-- Escape -->
    996999        <item name="Raceway" icon="presets/sport/raceway.svg" type="way,closedway" preset_name_label="true">
    … …  
    18371840            <reference ref="highway_access_vehicle" />
    18381841            <reference ref="check_access_nomotor" />
    18391842            <reference ref="check_access_motor" />
     1843            <check key="locked" text="Usually locked"/>
    18401844            <preset_link preset_name="Access Restrictions" />
    18411845        </item> <!-- Gate -->
    18421846        <item name="Lift Gate" icon="presets/barrier/lift_gate.svg" type="node" preset_name_label="true">
    … …  
    18501854            <reference ref="highway_access_vehicle" />
    18511855            <reference ref="check_access_nomotor" />
    18521856            <reference ref="check_access_motor" />
     1857            <check key="locked" text="Usually locked"/>
    18531858            <preset_link preset_name="Access Restrictions" />
    18541859        </item> <!-- Lift Gate -->
    18551860        <item name="Swing Gate" icon="presets/barrier/swing_gate.svg" type="node" preset_name_label="true">
    … …  
    18631868            <reference ref="highway_access_vehicle" />
    18641869            <reference ref="check_access_nomotor" />
    18651870            <reference ref="check_access_motor" />
     1871            <check key="locked" text="Usually locked"/>
    18661872            <preset_link preset_name="Access Restrictions" />
    18671873        </item> <!-- Swing Gate -->
    18681874        <item name="Hampshire Gate" type="node" preset_name_label="true">
    … …  
    18751881            <reference ref="highway_access_vehicle" />
    18761882            <reference ref="check_access_nomotor" />
    18771883            <reference ref="check_access_motor" />
     1884            <check key="locked" text="Usually locked"/>
    18781885            <preset_link preset_name="Access Restrictions" />
    18791886        </item> <!-- Hampshire Gate -->
    18801887        <item name="Bump Gate" type="node" preset_name_label="true">
    … …  
    18871894            <reference ref="highway_access_vehicle" />
    18881895            <reference ref="check_access_nomotor" />
    18891896            <reference ref="check_access_motor" />
     1897            <check key="locked" text="Usually locked"/>
    18901898            <preset_link preset_name="Access Restrictions" />
    18911899        </item> <!-- Bump Gate -->
    18921900        <item name="Kissing Gate" icon="presets/barrier/kissing_gate.svg" type="node" preset_name_label="true">
    … …  
    18991907            <space />
    19001908            <reference ref="highway_access_vehicle" />
    19011909            <reference ref="check_access_nomotor" />
     1910            <check key="locked" text="Usually locked"/>
    19021911            <preset_link preset_name="Access Restrictions" />
    19031912        </item> <!-- Kissing Gate -->
    19041913        <item name="Height Restrictor" icon="presets/barrier/height_restrictor.svg" type="node" preset_name_label="true">
    … …  
    19211930            <reference ref="highway_access_vehicle" />
    19221931            <reference ref="check_access_nomotor" />
    19231932            <reference ref="check_access_motor" />
     1933            <check key="locked" text="Usually locked"/>
    19241934            <preset_link preset_name="Access Restrictions" />
    19251935        </item> <!-- Chain -->
    19261936        <item name="Stile" icon="presets/barrier/stile.svg" type="node" preset_name_label="true">
    … …  
    39433953            <space />
    39443954            <key key="leisure" value="dog_park" />
    39453955            <reference ref="name_oh_wheelchair" />
    3946             <check key="lit" text="Lit" />
     3956            <reference ref="lit_common_no_times"/>
    39473957        </item> <!-- Dog Park -->
    39483958        <item name="Amusement/Theme Park" icon="presets/leisure/theme_park.svg" type="node,closedway,multipolygon" preset_name_label="true">
    39493959            <link wiki="Tag:tourism=theme_park" />
    … …  
    56655675        <item name="Building" icon="presets/landmark/building.svg" type="node,closedway,multipolygon" preset_name_label="true">
    56665676            <link wiki="Key:building" />
    56675677            <space />
    5668             <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,boathouse,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,digester,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,grandstand,greenhouse,hangar,hospital,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,parking,public,retail,roof,ruins,school,service,shed,silo,stable,storage_tank,sty,supermarket,synagogue,temple,tent,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
     5678            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,boathouse,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,digester,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,grandstand,greenhouse,hangar,hospital,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,pavilion,parking,public,retail,roof,ruins,school,service,shed,silo,stable,storage_tank,sty,supermarket,synagogue,temple,tent,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
    56695679            <optional>
    56705680                <reference ref="name_operator" />
    56715681                <combo key="building:levels" text="Levels above ground" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
    … …  
    57005710            <link wiki="Tag:building=construction" />
    57015711            <space />
    57025712            <key key="building" value="construction" />
    5703             <combo key="construction" text="Building type" values="allotment_house,apartments,bakehouse,barn,basilica,boathouse,bungalow,bunker,cabin,carport,cathedral,chapel,church,college,commercial,cowshed,detached,digester,dormitory,farm,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,ger,grandstand,greenhouse,hangar,hospital,hotel,house,hut,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,parking,public,residential,retail,roof,ruins,school,service,shed,silo,stable,stilt_house,storage_tank,sty,supermarket,synagogue,temple,tent,terrace,toilets,train_station,transformer_tower,transportation,university,warehouse,wayside_shrine" values_context="building" />
     5713            <combo key="construction" text="Building type" values="allotment_house,apartments,bakehouse,barn,basilica,boathouse,bungalow,bunker,cabin,carport,cathedral,chapel,church,college,commercial,cowshed,detached,digester,dormitory,farm,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,ger,grandstand,greenhouse,hangar,hospital,hotel,house,hut,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,parking,pavilion,public,residential,retail,roof,ruins,school,service,shed,silo,stable,stilt_house,storage_tank,sty,supermarket,synagogue,temple,tent,terrace,toilets,train_station,transformer_tower,transportation,university,warehouse,wayside_shrine" values_context="building" />
    57045714            <optional>
    57055715                <reference ref="name_operator" />
    57065716                <combo key="building:levels" text="Levels above ground" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
    … …  
    57165726                <list_entry value="yes" icon="presets/misc/entrance_yes.svg" />
    57175727                <list_entry value="main" icon="presets/misc/entrance_main.svg" />
    57185728                <list_entry value="service" icon="presets/misc/entrance_service.svg" />
     5729                <list_entry value="shop" icon="presets/misc/entrance_yes.svg" />
    57195730                <list_entry value="exit" icon="presets/misc/entrance_exit.svg" />
    57205731                <list_entry value="emergency" icon="presets/misc/entrance_emergency.svg" />
    57215732                <list_entry value="staircase" icon="presets/misc/entrance_yes.svg" />
    … …  
    57525763            <space />
    57535764            <key key="man_made" value="works" />
    57545765            <text key="name" text="Name" />
     5766            <optional>
     5767                <combo key="product" text="Product" values="bakery_products,beer,bricks,dairy,electronics,food,furniture,machinery,meat,oil,packaging,rice,steel,sugar"/>
     5768            </optional>
    57555769        </item> <!-- Works -->
    57565770        <item name="Chimney" icon="presets/landmark/chimney.svg" type="node,closedway" preset_name_label="true">
    57575771            <link wiki="Tag:man_made=chimney" />
    … …  
    79777991        <link wiki="Tag:amenity=vending_machine" />
    79787992        <space />
    79797993        <key key="amenity" value="vending_machine" />
    7980         <multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;coffee;condoms;drinks;elongated_coin;excrement_bags;food;milk;newspapers;parking_tickets;parcel_pickup;parcel_mail_in;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys;water" values_searchable="true" />
     7994        <multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;coffee;condoms;drinks;elongated_coin;excrement_bags;food;fuel;milk;newspapers;parking_tickets;parcel_pickup;parcel_mail_in;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys;water" values_searchable="true" />
    79817995        <text key="operator" text="Operator" />
    79827996        <text key="ref" text="Reference number" />
    79837997        <preset_link preset_name="Payment Methods" />