Changeset 15648 in josm


Ignore:
Timestamp:
2020-01-06T22:13:13+01:00 (3 months ago)
Author:
Klumbumbus
Message:
Location:
trunk
Files:
5 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r15647 r15648  
    11151115                <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,unmarked,no" />
    11161116                <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
     1117                <combo key="kerb" text="Kerb" values="flush,lowered,no,raised,rolled,yes" values_context="kerb" />
    11171118                <check key="crossing:island" text="With island" />
    11181119                <check key="button_operated" text="Button operated" />
     
    11601161            </combo>
    11611162            <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" />
     1163            <combo key="kerb" text="Kerb" values="flush,lowered,no,raised,rolled,yes" values_context="kerb" />
    11621164            <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
    11631165            <combo key="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" />
     
    19931995        </item> <!-- Bus Guideway -->
    19941996        <separator/>
     1997        <item name="Railway construction" icon="presets/transport/railway/railway_construction.svg" type="way" preset_name_label="true">
     1998            <link wiki="Key:construction" />
     1999            <key key="railway" value="construction" />
     2000            <combo key="construction" text="Railway type" values="rail,narrow_gauge,monorail,preserved,light_rail,subway,tram,funicular" />
     2001            <optional>
     2002                <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
     2003                <reference ref="railway_service_gauge_electrified_yesno" />
     2004            </optional>
     2005        </item> <!-- Railway construction -->
    19952006        <item name="Disused Rail" icon="presets/transport/railway/disused_rail.svg" type="way" preset_name_label="true">
    19962007            <link wiki="Tag:railway=disused" />
     
    40734084            <key key="recycling_type" value="container" />
    40744085            <text key="operator" text="Operator" />
    4075             <reference ref="oh_wheelchair" />
     4086            <combo key="opening_hours" text="Throw in times" delimiter="|" values="24/7|Mo-Fr 06:30-12:30,15:30-20:00; Sa 08:00-12:00; PH off" values_no_i18n="true" />
     4087            <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
    40764088            <space />
    40774089            <checkgroup columns="4">
     
    47514763            <link wiki="Key:building" />
    47524764            <space />
    4753             <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,farm_auxiliary,garage,garages,gasometer,ger,greenhouse,hangar,hospital,industrial,kindergarten,manufacture,mosque,office,public,retail,roof,ruins,school,service,shed,silo,stable,storage_tank,supermarket,synagogue,temple,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
     4765            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,farm_auxiliary,garage,garages,gasometer,greenhouse,hangar,hospital,industrial,kindergarten,manufacture,mosque,office,public,retail,roof,ruins,school,service,shed,silo,stable,storage_tank,supermarket,synagogue,temple,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
    47544766            <optional>
    47554767                <text key="name" text="Name" />
     
    47624774            <link wiki="Key:building" />
    47634775            <space />
    4764             <combo key="building" text="Building" values="yes,residential,apartments,house,hotel,hut,bungalow,dormitory,terrace,detached,farm" default="residential" match="keyvalue!" values_context="building" values_searchable="true" />
     4776            <combo key="building" text="Building" values="yes,residential,apartments,ger,house,hotel,hut,bungalow,dormitory,terrace,detached,farm" default="residential" match="keyvalue!" values_context="building" values_searchable="true" />
    47654777            <optional>
    47664778                <text key="name" text="Name" />
     
    66776689    </item> <!-- Caterer -->
    66786690    <separator/> <!-- food group -->
    6679     <item name="Upholsterer" type="node,closedway,multipolygon" preset_name_label="true">
     6691    <item name="Upholsterer" icon="presets/craft/upholsterer.svg" type="node,closedway,multipolygon" preset_name_label="true">
    66806692        <link wiki="Tag:craft=upholsterer" />
    66816693        <space />
     
    67766788        <reference ref="link_contact_address" />
    67776789    </item> <!-- Pottery -->
    6778     <item name="Gardener" type="node,closedway,multipolygon" preset_name_label="true">
     6790    <item name="Gardener" icon="presets/craft/gardener.svg" type="node,closedway,multipolygon" preset_name_label="true">
    67796791        <link wiki="Tag:craft=gardener" />
    67806792        <space />
     
    67836795        <reference ref="link_contact_address" />
    67846796    </item> <!-- Gardener -->
    6785     <item name="Shoemaker" type="node,closedway,multipolygon" preset_name_label="true">
     6797    <item name="Shoemaker" icon="presets/craft/shoemaker.svg" type="node,closedway,multipolygon" preset_name_label="true">
    67866798        <link wiki="Tag:craft=shoemaker" />
    67876799        <space />
  • trunk/data/validator/combinations.mapcss

    r15635 r15648  
    270270}
    271271
    272 /* {0.tag} together with {1.tag}, see #17950, #17330, #17623, #17592, #17594, #17542, #16861, #16147, #10186 */
     272/* {0.tag} together with {1.tag}, see #18411, #17950, #17330, #17623, #17592, #17594, #17542, #16861, #16147, #10186 */
     273*[barrier=kerb][kerb=no],
     274way[highway=construction][construction=yes],
     275way[railway=construction][construction=yes],
    273276*[man_made=bridge][bridge=yes],
    274277*[man_made=tunnel][tunnel=yes],
     
    649652  group: tr("suspicious tag combination");
    650653}
     654
     655/* #18374 */
     656*[amenity=recycling][collection_times="24/7"][!opening_hours],
     657*[amenity=recycling][collection_times       ][!opening_hours][collection_times=~/[a-z]-[A-Z].*[0-9]-[0-9]/] {
     658  throwWarning: tr("{0} together with {1}. Probably {2} is meant.", "{1.key}", "{0.tag}", "{2.key}");
     659  group: tr("suspicious tag combination");
     660  fixChangeKey: "collection_times => opening_hours";
     661  /* spaces in asserts are not yet supported
     662  assertMatch: "node amenity=recycling collection_times=Mo-Fr 06:00-20:00";
     663  assertNoMatch: "node amenity=recycling collection_times=Mo-Fr 15:00";
     664  assertNoMatch: "node amenity=recycling collection_times=Mo 08:00-11:00";
     665  assertNoMatch: "node amenity=recycling collection_times=Sa[2,4] 8:00-11:00";
     666  */
     667}
     668*[amenity=recycling][collection_times="24/7"][opening_hours],
     669*[amenity=recycling][collection_times       ][opening_hours][collection_times=~/[a-z]-[A-Z].*[0-9]-[0-9]/] {
     670  throwWarning: tr("{0} together with {1}. Probably {2} is meant.", "{1.key}", "{0.tag}", "{2.key}");
     671  group: tr("suspicious tag combination");
     672}
  • trunk/data/validator/deprecated.mapcss

    r15636 r15648  
    543543
    544544/* see #11070 */
     545*[kerb=unknown],
    545546*[lock=unknown],
    546547*[hide=unknown],
     
    10691070}
    10701071
     1072/* #18517 */
    10711073*[office=administrative] {
    10721074  throwWarning: tr("{0} is deprecated", "{0.tag}");
    1073   group: tr("deprecated tagging");
    10741075  suggestAlternative: "office=government";
     1076  group: tr("deprecated tagging");
     1077  fixAdd: "office=government";
    10751078}
    10761079
     
    18541857  group: tr("deprecated tagging");
    18551858}
     1859
     1860*[sloped_curb=yes][!kerb],
     1861*[sloped_curb=both][!kerb] {
     1862  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1863  suggestAlternative: "kerb=lowered";
     1864  group: tr("deprecated tagging");
     1865  fixRemove: "sloped_curb";
     1866  fixAdd: "kerb=lowered";
     1867}
     1868*[sloped_curb=no][!kerb] {
     1869  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1870  suggestAlternative: "kerb=yes";
     1871  group: tr("deprecated tagging");
     1872  fixRemove: "sloped_curb";
     1873  fixAdd: "kerb=yes";
     1874}
     1875*[sloped_curb][sloped_curb !~ /^(yes|both|no)$/][!kerb],
     1876*[sloped_curb][kerb] {
     1877  throwWarning: tr("{0} is deprecated", "{0.key}");
     1878  suggestAlternative: "kerb=*";
     1879  group: tr("deprecated tagging");
     1880}
  • trunk/data/validator/highway.mapcss

    r15314 r15648  
    158158  fixAdd: "railway=level_crossing";
    159159}
     160
     161node[highway=crossing][barrier=kerb].is_in_major_road {
     162  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
     163  suggestAlternative: "kerb=*";
     164  group: tr("suspicious tag combination");
     165}
  • trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java

    r15618 r15648  
    881881        "lexus", // lexus TOYOTA MOTOR CORPORATION
    882882        "lgbt", // lgbt Afilias Limited
    883         "liaison", // liaison Liaison Technologies, Incorporated
    884883        "lidl", // lidl Schwarz Domains und Services GmbH &amp; Co. KG
    885884        "life", // life Trixy Oaks, LLC
  • trunk/styles/standard/elemstyles.mapcss

    r15637 r15648  
    31493149    set icon_z17;
    31503150}
    3151 node[craft=shoemaker][!is_prop_set(icon-image)] {
    3152     icon-image: "presets/misc/no_icon.svg";
     3151node[craft=shoemaker] {
     3152    icon-image: "presets/craft/shoemaker.svg";
    31533153    set icon_z17;
    31543154}
     
    31763176    set icon_z17;
    31773177}
    3178 node[craft=gardener][!is_prop_set(icon-image)] {
    3179     icon-image: "presets/misc/no_icon.svg";
     3178node[craft=gardener] {
     3179    icon-image: "presets/craft/gardener.svg";
    31803180    set icon_z17;
    31813181}
     
    32323232    set icon_z17;
    32333233}
    3234 node[craft=upholsterer][!is_prop_set(icon-image)] {
    3235     icon-image: "presets/misc/no_icon.svg";
     3234node[craft=upholsterer] {
     3235    icon-image: "presets/craft/upholsterer.svg";
    32363236    set icon_z17;
    32373237}
Note: See TracChangeset for help on using the changeset viewer.