Changeset 15262 in josm


Ignore:
Timestamp:
2019-07-23T21:47:40+02:00 (5 weeks ago)
Author:
Klumbumbus
Message:

fix #17370

  • deprecate amenity=garages, amenity=garage, office=real_estate, amenity=winery, shop=winery, amenity=youth_centre, bridge=pontoon, building:type, escalator, fenced, highway=abandoned, historic_name, landuse=field, leisure=beach, leisure=club, leisure=video_arcade, man_made=jetty, man_made=village_pump, man_made=water_tank, natural=moor, noexit=no, shop=dive, shop=furnace, sport=paragliding, tourism=bed_and_breakfast
  • add guest_house=*, community_centre=*, community_centre:for=*
Location:
trunk/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r15260 r15262  
    853853                <check key="oneway" text="Oneway" />
    854854                <check key="toll" text="Toll" />
    855                 <check key="noexit" text="No exit (cul-de-sac)" />
     855                <check key="noexit" text="No exit (cul-de-sac)" disable_off="true" />
    856856            </checkgroup>
    857857            <space />
     
    27462746            <text key="rooms" text="Rooms" />
    27472747            <text key="beds" text="Beds" />
     2748            <combo key="guest_house" text="Type" values="agritourism,bed_and_breakfast" />
    27482749            <reference ref="wheelchair" />
    27492750            <space />
     
    34923493            <key key="amenity" value="community_centre" />
    34933494            <reference ref="name_operator_oh_wheelchair" />
     3495            <combo key="community_centre" text="Type" values="club_home,community_hall,cultural_centre,environment_centre,events_venue,family_centre,language_centre,meeting_room,parish_hall,village_hall,youth_centre" />
     3496            <multiselect key="community_centre:for" text="For" values="child;juvenile;student;girl;boy;man;woman;senior;family;homosexual;multigeneration;disabled;athlete;immigrant;lgbtq" />
    34943497            <reference ref="link_contact_address" />
    34953498            <preset_link preset_name="Building" />
  • trunk/data/validator/deprecated.mapcss

    r15200 r15262  
    404404  group: tr("deprecated tagging");
    405405}
    406 
    407406*[bridge=swing] {
    408407  throwWarning: tr("{0} is deprecated", "{0.tag}");
     
    411410  group: tr("deprecated tagging");
    412411}
    413 
    414412*[bridge=suspension] {
    415413  throwWarning: tr("{0} is deprecated", "{0.tag}");
     
    418416  fixAdd: "bridge=yes";
    419417  fixAdd: "bridge:structure=suspension";
     418}
     419*[bridge=pontoon] {
     420  throwWarning: tr("{0} is deprecated", "{0.tag}");
     421  suggestAlternative: "bridge=yes + bridge:structure=floating";
     422  group: tr("deprecated tagging");
     423  fixAdd: "bridge=yes";
     424  fixAdd: "bridge:structure=floating";
    420425}
    421426
     
    961966  group: tr("deprecated tagging");
    962967}
     968*[office=real_estate],
    963969*[office=real_estate_agent] {
    964970  throwWarning: tr("{0} is deprecated", "{0.tag}");
    965   suggestAlternative: "office=estate_agent ";
    966   group: tr("deprecated tagging");
    967   fixAdd: "office=estate_agent ";
     971  suggestAlternative: "office=estate_agent";
     972  group: tr("deprecated tagging");
     973  fixAdd: "office=estate_agent";
    968974}
    969975*[shop=glass] {
     
    977983*[amenity=disused],
    978984*[shop=disused],
     985*[highway=abandoned],
    979986*[historic=abandoned] {
    980987  throwWarning: tr("{0} is deprecated. Use the {1}: key prefix instead.", "{0.tag}", "{0.value}");
     
    14741481  group: tr("deprecated tagging");
    14751482}
     1483
     1484/* #17370  */
     1485*[amenity=garages],
     1486*[amenity=garage] {
     1487  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1488  suggestAlternative: concat("building=", "{0.value}");
     1489  suggestAlternative: "landuse=garages";
     1490  suggestAlternative: "amenity=parking + parking=garage_boxes";
     1491  group: tr("deprecated tagging");
     1492}
     1493*[shop=winery],
     1494*[amenity=winery] {
     1495  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1496  suggestAlternative: "craft=winery";
     1497  suggestAlternative: "shop=wine";
     1498  group: tr("deprecated tagging");
     1499}
     1500*[amenity=youth_centre] {
     1501  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1502  suggestAlternative: "amenity=community_centre + community_centre=youth_centre";
     1503  fixAdd: "amenity=community_centre";
     1504  fixAdd: "community_centre=youth_centre";
     1505  group: tr("deprecated tagging");
     1506}
     1507*[building:type][building=yes],
     1508*[building:type][!building] {
     1509  throwWarning: tr("{0} is deprecated", "{0.key}");
     1510  suggestAlternative: "building";
     1511  group: tr("deprecated tagging");
     1512  fixChangeKey: "building:type => building";
     1513  assertMatch: "way building:type=church";
     1514  assertMatch: "way building:type=church building=yes";
     1515  assertNoMatch: "way building:type=church building=supermarket";
     1516}
     1517*[building:type][building][building!=yes] {
     1518  throwWarning: tr("{0} is deprecated", "{0.key}");
     1519  suggestAlternative: "building";
     1520  group: tr("deprecated tagging");
     1521  assertNoMatch: "way building:type=church";
     1522  assertNoMatch: "way building:type=church building=yes";
     1523  assertMatch: "way building:type=church building=supermarket";
     1524}
     1525*[escalator] {
     1526  throwWarning: tr("{0} is deprecated", "{0.key}");
     1527  suggestAlternative: "highway=steps + conveying=*";
     1528  group: tr("deprecated tagging");
     1529}
     1530*[fenced] {
     1531  throwWarning: tr("{0} is deprecated", "{0.key}");
     1532  suggestAlternative: "barrier=fence";
     1533  group: tr("deprecated tagging");
     1534}
     1535*[historic_name][!old_name] {
     1536  throwWarning: tr("{0} is deprecated", "{0.key}");
     1537  suggestAlternative: "old_name";
     1538  group: tr("deprecated tagging");
     1539  fixChangeKey: "historic_name => old_name";
     1540}
     1541*[historic_name][old_name] {
     1542  throwWarning: tr("{0} is deprecated", "{0.key}");
     1543  suggestAlternative: "old_name";
     1544  group: tr("deprecated tagging");
     1545}
     1546*[landuse=field] {
     1547  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1548  suggestAlternative: "landuse=farmland";
     1549  group: tr("deprecated tagging");
     1550  fixAdd: "landuse=farmland";
     1551}
     1552*[leisure=beach] {
     1553  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1554  suggestAlternative: "natural=beach";
     1555  suggestAlternative: "leisure=beach_resort";
     1556  group: tr("deprecated tagging");
     1557}
     1558*[leisure=club] {
     1559  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1560  suggestAlternative: "club=*";
     1561  group: tr("deprecated tagging");
     1562}
     1563*[leisure=video_arcade] {
     1564  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1565  suggestAlternative: "leisure=amusement_arcade";
     1566  suggestAlternative: "leisure=adult_gaming_centre";
     1567  group: tr("deprecated tagging");
     1568}
     1569*[man_made=jetty] {
     1570  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1571  suggestAlternative: "man_made=pier";
     1572  group: tr("deprecated tagging");
     1573  fixAdd: "man_made=pier";
     1574}
     1575*[man_made=village_pump] {
     1576  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1577  suggestAlternative: "man_made=water_well";
     1578  group: tr("deprecated tagging");
     1579  fixAdd: "man_made=water_well";
     1580}
     1581*[man_made=water_tank] {
     1582  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1583  suggestAlternative: "man_made=storage_tank + content=water";
     1584  group: tr("deprecated tagging");
     1585  fixAdd: "man_made=storage_tank";
     1586  fixAdd: "content=water";
     1587}
     1588*[natural=moor] {
     1589  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1590  suggestAlternative: "natural=heath";
     1591  suggestAlternative: "natural=scrub";
     1592  suggestAlternative: "natural=grassland";
     1593  suggestAlternative: "natural=wetland";
     1594  suggestAlternative: "natural=fell";
     1595  suggestAlternative: "natural=tundra";
     1596  suggestAlternative: "landuse=meadow + meadow=agricultural";
     1597  group: tr("deprecated tagging");
     1598}
     1599*[noexit=no][!fixme] {
     1600  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1601  suggestAlternative: "fixme=continue";
     1602  group: tr("deprecated tagging");
     1603  fixAdd: "fixme=continue";
     1604  fixRemove: "noexit";
     1605}
     1606*[noexit=no][fixme] {
     1607  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1608  suggestAlternative: "fixme=continue";
     1609  group: tr("deprecated tagging");
     1610}
     1611*[shop=dive] {
     1612  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1613  suggestAlternative: "shop=scuba_diving";
     1614  group: tr("deprecated tagging");
     1615  fixAdd: "shop=scuba_diving";
     1616}
     1617*[shop=furnace] {
     1618  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1619  suggestAlternative: "shop=fireplace";
     1620  suggestAlternative: "craft=plumber";
     1621  group: tr("deprecated tagging");
     1622}
     1623*[sport=paragliding] {
     1624  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1625  suggestAlternative: "sport=free_flying";
     1626  group: tr("deprecated tagging");
     1627  fixAdd: "sport=free_flying";
     1628}
     1629*[tourism=bed_and_breakfast] {
     1630  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1631  suggestAlternative: "tourism=guest_house + guest_house=bed_and_breakfast";
     1632  group: tr("deprecated tagging");
     1633  fixAdd: "tourism=guest_house";
     1634  fixAdd: "guest_house=bed_and_breakfast";
     1635}
Note: See TracChangeset for help on using the changeset viewer.