- Timestamp:
- 2016-10-17T19:09:26+02:00 (8 years ago)
- Location:
- trunk/data/validator
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/data/validator/deprecated.mapcss
r11133 r11138 1 1 *[barrier=wire_fence] { 2 2 throwWarning: tr("{0} is deprecated", "{0.tag}"); 3 group: tr("deprecated tagging"); 3 4 suggestAlternative: "barrier=fence + fence_type=chain_link"; 4 5 fixAdd: "barrier=fence"; … … 11 12 throwWarning: tr("{0} is deprecated", "{0.tag}"); 12 13 suggestAlternative: "barrier=fence + fence_type=wood"; 14 group: tr("deprecated tagging"); 13 15 fixAdd: "barrier=fence"; 14 16 fixAdd: "fence_type=wood"; … … 18 20 throwWarning: tr("{0} is deprecated", "{0.tag}"); 19 21 suggestAlternative: "ford=yes"; 22 group: tr("deprecated tagging"); 20 23 fixRemove: "highway"; 21 24 fixAdd: "ford=yes"; … … 24 27 throwWarning: tr("{0} is deprecated", "{0.tag}"); 25 28 suggestAlternative: "highway=* + ford=yes"; 29 group: tr("deprecated tagging"); 26 30 } 27 31 … … 30 34 throwWarning: tr("{0} is deprecated", "{0.key}"); 31 35 suggestAlternative: "highway"; 36 group: tr("deprecated tagging"); 32 37 } 33 38 … … 36 41 throwWarning: tr("{0} is deprecated", "{0.tag}"); 37 42 suggestAlternative: "barrier=stile"; 43 group: tr("deprecated tagging"); 38 44 fixRemove: "highway"; 39 45 fixAdd: "barrier=stile"; … … 44 50 throwWarning: tr("{0} is deprecated", "{0.tag}"); 45 51 suggestAlternative: "incline"; 52 group: tr("deprecated tagging"); 46 53 } 47 54 … … 50 57 throwWarning: tr("{0} is deprecated", "{0.tag}"); 51 58 suggestAlternative: "incline"; 59 group: tr("deprecated tagging"); 52 60 } 53 61 … … 56 64 throwWarning: tr("{0} is deprecated", "{0.tag}"); 57 65 suggestAlternative: "highway=* + surface=unpaved"; 66 group: tr("deprecated tagging"); 58 67 fixAdd: "highway=road"; 59 68 fixAdd: "surface=unpaved"; … … 65 74 suggestAlternative: "landuse=forest"; 66 75 suggestAlternative: "natural=wood"; 76 group: tr("deprecated tagging"); 67 77 } 68 78 … … 71 81 throwWarning: tr("{0} is deprecated", "{0.tag}"); 72 82 suggestAlternative: "natural=wetland + wetland=marsh"; 83 group: tr("deprecated tagging"); 73 84 fixAdd: "natural=wetland"; 74 85 fixAdd: "wetland=marsh"; … … 78 89 /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */ 79 90 throwWarning: tr("{0} is deprecated", "{0.tag}"); 91 group: tr("deprecated tagging"); 80 92 } 81 93 … … 84 96 throwWarning: tr("{0} is deprecated", "{0.key}"); 85 97 suggestAlternative: "generator:source"; 98 group: tr("deprecated tagging"); 86 99 } 87 100 … … 90 103 throwWarning: tr("{0} is deprecated", "{0.key}"); 91 104 suggestAlternative: "generator:output"; 105 group: tr("deprecated tagging"); 92 106 } 93 107 … … 95 109 throwWarning: tr("{0} is deprecated", "{0.tag}"); 96 110 suggestAlternative: "shop=antiques"; 111 group: tr("deprecated tagging"); 97 112 fixAdd: "shop=antiques"; 98 113 } … … 101 116 throwWarning: tr("{0} is deprecated", "{0.tag}"); 102 117 suggestAlternative: "shop=bag"; 118 group: tr("deprecated tagging"); 103 119 fixAdd: "shop=bag"; 104 120 } … … 109 125 suggestAlternative: "shop=* + organic=yes"; 110 126 suggestAlternative: "shop=* + organic=only"; 127 group: tr("deprecated tagging"); 111 128 } 112 129 … … 114 131 throwWarning: tr("{0} is deprecated", "{0.tag}"); 115 132 suggestAlternative: "shop=pet"; 133 group: tr("deprecated tagging"); 116 134 fixAdd: "shop=pet"; 117 135 } … … 120 138 throwWarning: tr("{0} is deprecated", "{0.tag}"); 121 139 suggestAlternative: "amenity=pharmacy"; 140 group: tr("deprecated tagging"); 122 141 fixChangeKey: "shop => amenity"; 123 142 } … … 127 146 throwWarning: tr("{0} is deprecated", "{0.tag}"); 128 147 suggestAlternative: "bicycle_parking=stands"; 148 group: tr("deprecated tagging"); 129 149 fixAdd: "bicycle_parking=stands"; 130 150 } … … 134 154 throwWarning: tr("{0} is deprecated", "{0.tag}"); 135 155 suggestAlternative: "emergency=phone"; 156 group: tr("deprecated tagging"); 136 157 fixRemove: "amenity"; 137 158 fixAdd: "emergency=phone"; … … 142 163 throwWarning: tr("{0} is deprecated", "{0.tag}"); 143 164 suggestAlternative: "sport=gaelic_games"; 165 group: tr("deprecated tagging"); 144 166 fixAdd: "sport=gaelic_games"; 145 167 } … … 150 172 suggestAlternative: "power=plant"; 151 173 suggestAlternative: "power=substation"; 174 group: tr("deprecated tagging"); 152 175 } 153 176 … … 155 178 throwWarning: tr("{0} is deprecated", "{0.tag}"); 156 179 suggestAlternative: "power=substation"; 180 group: tr("deprecated tagging"); 157 181 fixAdd: "power=substation"; 158 182 } … … 161 185 throwWarning: tr("{0} is deprecated", "{0.tag}"); 162 186 suggestAlternative: "generator:method=water-storage"; 187 group: tr("deprecated tagging"); 163 188 fixAdd: "generator:method=water-storage"; 164 189 } … … 167 192 throwWarning: tr("{0} is deprecated", "{0.tag}"); 168 193 suggestAlternative: "generator:method=water-pumped-storage"; 194 group: tr("deprecated tagging"); 169 195 fixAdd: "generator:method=water-pumped-storage"; 170 196 } … … 173 199 throwWarning: tr("{0} is deprecated", "{0.tag}"); 174 200 suggestAlternative: "generator:method=water-pumped-storage"; 201 group: tr("deprecated tagging"); 175 202 fixAdd: "generator:method=water-pumped-storage"; 176 203 } … … 181 208 suggestAlternative: "barrier=chain"; 182 209 suggestAlternative: "barrier=fence + fence_type=chain_link"; 210 group: tr("deprecated tagging"); 183 211 } 184 212 … … 187 215 throwWarning: tr("{0} is deprecated", "{0.tag}"); 188 216 suggestAlternative: "entrance"; 217 group: tr("deprecated tagging"); 189 218 } 190 219 … … 192 221 /* see #9213 - Useless tag proposed in internal preset for years */ 193 222 throwWarning: tr("{0} is deprecated", "{0.tag}"); 223 group: tr("deprecated tagging"); 194 224 fixRemove: "board_type"; 195 225 } … … 199 229 throwWarning: tr("{0} is deprecated", "{0.tag}"); 200 230 suggestAlternative: "man_made=monitoring_station"; 231 group: tr("deprecated tagging"); 201 232 fixAdd: "man_made=monitoring_station"; 202 233 } … … 205 236 throwWarning: tr("{0} is deprecated", "{0.tag}"); 206 237 suggestAlternative: "monitoring:water_level=yes"; 238 group: tr("deprecated tagging"); 207 239 fixRemove: "measurement"; 208 240 fixAdd: "monitoring:water_level=yes"; … … 212 244 throwWarning: tr("{0} is deprecated", "{0.tag}"); 213 245 suggestAlternative: "monitoring:weather=yes"; 246 group: tr("deprecated tagging"); 214 247 fixRemove: "measurement"; 215 248 fixAdd: "monitoring:weather=yes"; … … 219 252 throwWarning: tr("{0} is deprecated", "{0.tag}"); 220 253 suggestAlternative: "monitoring:seismic_activity=yes"; 254 group: tr("deprecated tagging"); 221 255 fixRemove: "measurement"; 222 256 fixAdd: "monitoring:seismic_activity=yes"; … … 226 260 throwWarning: tr("{0} is deprecated", "{0.key}"); 227 261 suggestAlternative: "monitoring:water_level"; 262 group: tr("deprecated tagging"); 228 263 fixChangeKey: "monitoring:river_level => monitoring:water_level"; 229 264 } … … 232 267 throwWarning: tr("{0} is deprecated", "{0.key}"); 233 268 suggestAlternative: "maxstay"; 269 group: tr("deprecated tagging"); 234 270 fixChangeKey: "stay => maxstay"; 235 271 } … … 239 275 throwWarning: tr("{0} is deprecated", "{0.tag}"); 240 276 suggestAlternative: "emergency=defibrillator"; 277 group: tr("deprecated tagging"); 241 278 fixAdd: "emergency=defibrillator"; 242 279 } … … 251 288 throwWarning: tr("{0} is deprecated", "{0.key}"); 252 289 suggestAlternative: "*:conditional"; 290 group: tr("deprecated tagging"); 253 291 assertMatch: "node day_on=0-12"; 254 292 } … … 288 326 throwWarning: tr("{0} is deprecated", "{0.tag}"); 289 327 suggestAlternative: "leaf_type=broadleaved"; 328 group: tr("deprecated tagging"); 290 329 fixRemove: "{0.key}"; 291 330 fixAdd: "leaf_type=broadleaved"; … … 297 336 throwWarning: tr("{0} is deprecated", "{0.tag}"); 298 337 suggestAlternative: "leaf_type=needleleaved"; 338 group: tr("deprecated tagging"); 299 339 fixRemove: "{0.key}"; 300 340 fixAdd: "leaf_type=needleleaved"; … … 304 344 throwWarning: tr("{0} is deprecated", "{0.tag}"); 305 345 suggestAlternative: "leaf_type=mixed"; 346 group: tr("deprecated tagging"); 306 347 fixRemove: "wood"; 307 348 fixAdd: "leaf_type=mixed"; … … 312 353 throwWarning: tr("{0} is deprecated", "{0.tag}"); 313 354 suggestAlternative: "leaf_cycle=evergreen"; 355 group: tr("deprecated tagging"); 314 356 fixRemove: "{0.key}"; 315 357 fixAdd: "leaf_cycle=evergreen"; … … 320 362 throwWarning: tr("{0} is deprecated", "{0.tag}"); 321 363 suggestAlternative: "leaf_cycle=deciduous"; 364 group: tr("deprecated tagging"); 322 365 fixRemove: "type"; 323 366 fixAdd: "leaf_cycle=deciduous"; … … 327 370 throwWarning: tr("{0} is deprecated", "{0.tag}"); 328 371 suggestAlternative: "leaf_type + leaf_cycle"; 372 group: tr("deprecated tagging"); 329 373 } 330 374 … … 335 379 suggestAlternative: "trees"; 336 380 suggestAlternative: "species"; 381 group: tr("deprecated tagging"); 337 382 } 338 383 339 384 *[natural=land] { 340 385 throwWarning: tr("{0} is deprecated. Please use instead a multipolygon.", "{0.tag}"); 386 group: tr("deprecated tagging"); 341 387 assertMatch: "way natural=land"; 342 388 } … … 348 394 suggestAlternative: "bridge=low_water_crossing"; 349 395 suggestAlternative: "embankment=yes"; 396 group: tr("deprecated tagging"); 350 397 } 351 398 … … 354 401 suggestAlternative: "bridge:movable=swing"; 355 402 suggestAlternative: "bridge:structure=simple-suspension"; 403 group: tr("deprecated tagging"); 356 404 } 357 405 … … 359 407 throwWarning: tr("{0} is deprecated", "{0.tag}"); 360 408 suggestAlternative: "bridge=yes + bridge:structure=suspension"; 409 group: tr("deprecated tagging"); 361 410 fixAdd: "bridge=yes"; 362 411 fixAdd: "bridge:structure=suspension"; … … 368 417 *[supervised=interval] { 369 418 throwWarning: tr("{0} is deprecated. Please specify interval by using opening_hours syntax", "{0.tag}"); 419 group: tr("deprecated tagging"); 370 420 } 371 421 … … 373 423 *[/josm\/ignore/] { 374 424 throwError: tr("{0} is deprecated. Please delete this object and use a private layer instead", "{0.key}"); 425 group: tr("deprecated tagging"); 375 426 fixDeleteObject: this; 376 427 } … … 381 432 suggestAlternative: "sport=scuba_diving"; 382 433 suggestAlternative: "sport=cliff_diving"; 434 group: tr("deprecated tagging"); 383 435 } 384 436 … … 387 439 throwWarning: tr("{0} is deprecated", "{0.tag}"); 388 440 suggestAlternative: "amenity=parking + park_ride=yes"; 441 group: tr("deprecated tagging"); 389 442 fixRemove: "parking"; 390 443 fixAdd: "amenity=parking"; … … 423 476 throwWarning: tr("{0} is deprecated", "{0.tag}"); 424 477 suggestAlternative: "amenity=water_point"; 478 group: tr("deprecated tagging"); 425 479 fixChangeKey: "waterway => amenity"; 426 480 } … … 428 482 throwWarning: tr("{0} is deprecated", "{0.tag}"); 429 483 suggestAlternative: "amenity=waste_disposal"; 484 group: tr("deprecated tagging"); 430 485 fixChangeKey: "waterway => amenity"; 431 486 } … … 433 488 throwWarning: tr("{0} is deprecated", "{0.tag}"); 434 489 suggestAlternative: "mooring=yes"; 490 group: tr("deprecated tagging"); 435 491 fixRemove: "waterway"; 436 492 fixAdd: "mooring=yes"; … … 442 498 throwWarning: tr("{0} is deprecated", "{1.key}"); 443 499 suggestAlternative: "building:levels"; 500 group: tr("deprecated tagging"); 444 501 fixChangeKey: "levels => building:levels"; 445 502 } … … 449 506 throwWarning: tr("{0} is deprecated", "{0.key}"); 450 507 suggestAlternative: "protect_class"; 508 group: tr("deprecated tagging"); 451 509 fixChangeKey: "protected_class => protect_class"; 452 510 } … … 476 534 suggestAlternative: "{0.key}=* + intermittent=yes"; 477 535 suggestAlternative: "natural=valley"; 536 group: tr("deprecated tagging"); 478 537 } 479 538 … … 482 541 throwWarning: tr("{0} is deprecated", "{0.tag}"); 483 542 suggestAlternative: "oneway=yes"; 543 group: tr("deprecated tagging"); 484 544 fixAdd: "oneway=yes"; 485 545 } … … 493 553 throwWarning: tr("{0} is deprecated", "{0.key}"); 494 554 suggestAlternative: "drinking_water"; 555 group: tr("deprecated tagging"); 495 556 } 496 557 … … 499 560 throwWarning: tr("{0} is deprecated", "{0.key}"); 500 561 suggestAlternative: "colour"; 562 group: tr("deprecated tagging"); 501 563 fixChangeKey: "color => colour"; 502 564 } 503 565 *[color][colour][tag(color)=tag(colour)] { 504 566 throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}"); 567 group: tr("deprecated tagging"); 505 568 set samecolor; 506 569 fixRemove: "color"; … … 510 573 *[color][colour]!.samecolor { 511 574 throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}"); 575 group: tr("deprecated tagging"); 512 576 assertNoMatch: "way color=red colour=red"; 513 577 assertMatch: "way color=red colour=green"; … … 516 580 throwWarning: tr("{0} is deprecated", "{0.key}"); 517 581 suggestAlternative: ":colour"; 582 group: tr("deprecated tagging"); 518 583 assertNoMatch: "way color=red"; 519 584 assertMatch: "way roof:color=grey"; … … 522 587 throwWarning: tr("{0} is deprecated", "{0.key}"); 523 588 suggestAlternative: "colour:"; 589 group: tr("deprecated tagging"); 524 590 } 525 591 … … 547 613 throwWarning: tr("{0} is deprecated", "{0.tag}"); 548 614 suggestAlternative: "tower=transition"; 615 group: tr("deprecated tagging"); 549 616 fixAdd: "tower=transition"; 550 617 } … … 552 619 throwWarning: tr("{0} is deprecated", "{0.tag}"); 553 620 suggestAlternative: "pole=transition"; 621 group: tr("deprecated tagging"); 554 622 fixAdd: "pole=transition"; 555 623 } … … 557 625 /* see #11439 */ 558 626 *[sport=hockey] { 559 throwWarning: tr("{0} is inaccurate", "{0.tag}");627 throwWarning: tr("{0} is deprecated", "{0.tag}"); 560 628 suggestAlternative: "sport=field_hockey"; 561 629 suggestAlternative: "sport=ice_hockey"; 630 group: tr("deprecated tagging"); 562 631 } 563 632 … … 568 637 throwWarning: tr("{0} is deprecated", "{0.tag}"); 569 638 suggestAlternative: "sport=billiards"; 639 group: tr("deprecated tagging"); 570 640 fixAdd: "sport=billiards"; 571 641 } … … 603 673 throwWarning: tr("{0} is deprecated", "{0.key}"); 604 674 suggestAlternative: "distance"; 675 group: tr("deprecated tagging"); 605 676 fixChangeKey: "kp => distance"; 606 677 } … … 610 681 throwWarning: tr("{0} is deprecated", "{0.key}"); 611 682 suggestAlternative: "distance"; 683 group: tr("deprecated tagging"); 612 684 fixChangeKey: "pk => distance"; 613 685 } … … 616 688 throwWarning: tr("{0} is deprecated", "{0.key}"); 617 689 suggestAlternative: "addr:postcode"; 690 group: tr("deprecated tagging"); 618 691 suggestAlternative: "postal_code"; 619 692 } … … 622 695 throwWarning: tr("{0} is deprecated", "{0.tag}"); 623 696 suggestAlternative: "intermittent=yes"; 697 group: tr("deprecated tagging"); 624 698 fixRemove: "water"; 625 699 fixAdd: "intermittent=yes"; … … 630 704 throwWarning: tr("{0} is deprecated", "{0.key}"); 631 705 suggestAlternative: "substance"; 706 group: tr("deprecated tagging"); 632 707 fixChangeKey: "type => substance"; 633 708 } … … 637 712 suggestAlternative: "landuse=farmland"; 638 713 suggestAlternative: "landuse=farmyard"; 714 group: tr("deprecated tagging"); 639 715 } 640 716 … … 643 719 throwWarning: tr("{0} is deprecated", "{0.tag}"); 644 720 suggestAlternative: "{1.tag}"; 721 group: tr("deprecated tagging"); 645 722 fixRemove: "seamark"; 646 723 } … … 648 725 throwWarning: tr("{0} is deprecated", "{0.tag}"); 649 726 suggestAlternative: "{1.tag}"; 727 group: tr("deprecated tagging"); 650 728 } 651 729 /* #12135 - Tag removed rom rendering https://github.com/gravitystorm/openstreetmap-carto/pull/1830 */ … … 653 731 throwWarning: tr("{0} is deprecated", "{0.tag}"); 654 732 suggestAlternative: "boundary=protected_area"; 733 group: tr("deprecated tagging"); 655 734 fixAdd: "boundary=protected_area"; 656 735 fixRemove: "landuse"; … … 661 740 throwWarning: tr("{0} is deprecated", "{0.tag}"); 662 741 suggestAlternative: "shop=kiosk"; 742 group: tr("deprecated tagging"); 663 743 fixChangeKey: "amenity => shop"; 664 744 } … … 666 746 throwWarning: tr("{0} is deprecated", "{0.tag}"); 667 747 suggestAlternative: "shop=*"; 748 group: tr("deprecated tagging"); 668 749 } 669 750 *[shop=fishmonger] { 670 751 throwWarning: tr("{0} is deprecated", "{0.tag}"); 671 752 suggestAlternative: "shop=seafood"; 753 group: tr("deprecated tagging"); 672 754 fixAdd: "shop=seafood"; 673 755 } … … 677 759 suggestAlternative: "shop=pet"; 678 760 suggestAlternative: "shop=fishing"; 761 group: tr("deprecated tagging"); 679 762 } 680 763 *[shop=betting] { … … 686 769 suggestAlternative: "leisure=adult_gaming_centre"; 687 770 suggestAlternative: "amenity=gambling"; 771 group: tr("deprecated tagging"); 688 772 } 689 773 *[shop=perfume] { 690 774 throwWarning: tr("{0} is deprecated", "{0.tag}"); 691 775 suggestAlternative: "shop=perfumery"; 776 group: tr("deprecated tagging"); 692 777 fixAdd: "shop=perfumery"; 693 778 } … … 695 780 throwWarning: tr("{0} is deprecated", "{0.tag}"); 696 781 suggestAlternative: "leisure=fitness_station"; 782 group: tr("deprecated tagging"); 697 783 fixAdd: "leisure=fitness_station"; 698 784 fixRemove: "amenity"; … … 701 787 throwWarning: tr("{0} is deprecated", "{0.tag}"); 702 788 suggestAlternative: "shop=car_parts"; 789 group: tr("deprecated tagging"); 703 790 fixAdd: "shop=car_parts"; 704 791 } … … 706 793 throwWarning: tr("{0} is deprecated", "{0.tag}"); 707 794 suggestAlternative: "shop=car_repair"; 795 group: tr("deprecated tagging"); 708 796 fixChangeKey: "amenity => shop"; 709 797 } … … 716 804 throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}"); 717 805 suggestAlternative: "studio"; 806 group: tr("deprecated tagging"); 718 807 fixChangeKey: "type => studio"; 719 808 } … … 723 812 throwWarning: tr("{0} is deprecated", "{0.tag}"); 724 813 suggestAlternative: "man_made=street_cabinet + street_cabinet=power"; 814 group: tr("deprecated tagging"); 725 815 fixAdd: "man_made=street_cabinet"; 726 816 fixAdd: "street_cabinet=power"; … … 733 823 suggestAlternative: "man_made=water_well"; 734 824 suggestAlternative: "man_made=petroleum_well"; 825 group: tr("deprecated tagging"); 735 826 } 736 827 *[amenity=dog_bin], … … 738 829 throwWarning: tr("{0} is deprecated", "{0.tag}"); 739 830 suggestAlternative: "amenity=waste_basket + waste=dog_excrement + vending=excrement_bags"; 831 group: tr("deprecated tagging"); 740 832 fixAdd: "amenity=waste_basket"; 741 833 fixAdd: "waste=dog_excrement"; … … 745 837 throwWarning: tr("{0} is deprecated", "{0.tag}"); 746 838 suggestAlternative: "tourism=artwork"; 839 group: tr("deprecated tagging"); 747 840 fixAdd: "tourism=artwork"; 748 841 fixRemove: "amenity"; … … 751 844 throwWarning: tr("{0} is deprecated", "{0.tag}"); 752 845 suggestAlternative: "amenity=community_centre"; 846 group: tr("deprecated tagging"); 753 847 fixAdd: "amenity=community_centre"; 754 848 } … … 756 850 throwWarning: tr("{0} is deprecated", "{0.tag}"); 757 851 suggestAlternative: "man_made=cutline"; 852 group: tr("deprecated tagging"); 758 853 fixAdd: "man_made=cutline"; 759 854 } … … 761 856 throwWarning: tr("{0} is deprecated", "{0.tag}"); 762 857 suggestAlternative: "leisure=park"; 858 group: tr("deprecated tagging"); 763 859 fixAdd: "leisure=park"; 764 860 fixRemove: "amenity"; … … 767 863 throwWarning: tr("{0} is deprecated", "{0.tag}"); 768 864 suggestAlternative: "tourism=hotel"; 865 group: tr("deprecated tagging"); 769 866 fixAdd: "tourism=hotel"; 770 867 fixRemove: "amenity"; … … 774 871 throwWarning: tr("{0} is deprecated", "{0.tag}"); 775 872 suggestAlternative: "craft=window_construction"; 873 group: tr("deprecated tagging"); 776 874 fixAdd: "craft=window_construction"; 777 875 fixRemove: "shop"; … … 782 880 suggestAlternative: "amenity=school"; 783 881 suggestAlternative: "amenity=university"; 882 group: tr("deprecated tagging"); 784 883 } 785 884 *[shop=gallery] { 786 885 throwWarning: tr("{0} is deprecated", "{0.tag}"); 787 886 suggestAlternative: "shop=art"; 887 group: tr("deprecated tagging"); 788 888 fixAdd: "shop=art"; 789 889 } … … 796 896 suggestAlternative: "leisure=amusement_arcade"; 797 897 suggestAlternative: "amenity=gambling"; 898 group: tr("deprecated tagging"); 798 899 } 799 900 *[office=real_estate_agent] { 800 901 throwWarning: tr("{0} is deprecated", "{0.tag}"); 801 902 suggestAlternative: "office=estate_agent "; 903 group: tr("deprecated tagging"); 802 904 fixAdd: "office=estate_agent "; 803 905 } … … 806 908 suggestAlternative: "shop=glaziery"; 807 909 suggestAlternative: "craft=glaziery"; 910 group: tr("deprecated tagging"); 808 911 } 809 912 *[amenity=proposed], … … 813 916 *[historic=abandoned] { 814 917 throwWarning: tr("{0} is deprecated. Use the {1}: key prefix instead.", "{0.tag}", "{0.value}"); 918 group: tr("deprecated tagging"); 815 919 } 816 920 … … 819 923 throwWarning: tr("{0} is deprecated", "{0.tag}"); 820 924 suggestAlternative: "leisure=swimming_pool"; 925 group: tr("deprecated tagging"); 821 926 fixChangeKey: "amenity => leisure"; 822 927 } … … 825 930 *[/^[^t][^i][^g].+_[0-9]$/][!/^note_[0-9]$/][!/^description_[0-9]$/] { 826 931 throwOther: tr("questionable key (ending with a number): {0}", "{0.key}"); 827 } /*should not warn for key tiger:name_base_1 */ 932 assertMatch: "way name_1=foo"; 933 assertNoMatch: "way note_2=foo"; 934 assertNoMatch: "way description_3=foo"; 935 assertNoMatch: "way tiger:name_base_1=bar"; /*should not warn for key tiger:name_base_1 */ 936 } 828 937 829 938 /* #12500 */ … … 832 941 suggestAlternative: "sport=ice_skating"; 833 942 suggestAlternative: "sport=roller_skating"; 943 group: tr("deprecated tagging"); 834 944 } 835 945 … … 838 948 throwWarning: tr("{0} is deprecated", "{1.tag}"); 839 949 suggestAlternative: "wall=noise_barrier"; 950 group: tr("deprecated tagging"); 840 951 fixChangeKey: "type => wall"; 841 952 } … … 843 954 throwWarning: tr("{0} is deprecated", "{1.tag}"); 844 955 suggestAlternative: "wall=noise_barrier"; 956 group: tr("deprecated tagging"); 845 957 } 846 958 … … 856 968 suggestAlternative: "building=public"; 857 969 suggestAlternative: "..."; 970 group: tr("deprecated tagging"); 858 971 } 859 972 … … 862 975 throwWarning: tr("{0} is deprecated", "{0.tag}"); 863 976 suggestAlternative: "vending=newspapers"; 977 group: tr("deprecated tagging"); 864 978 fixAdd: "vending=newspapers"; 865 979 } … … 869 983 throwWarning: tr("{0} is deprecated", "{0.tag}"); 870 984 suggestAlternative: "service=drive-through"; 985 group: tr("deprecated tagging"); 871 986 fixAdd: "service=drive-through"; 872 987 } … … 883 998 throwWarning: tr("{0} is deprecated", "{0.key}"); 884 999 suggestAlternative: "species"; 1000 group: tr("deprecated tagging"); 885 1001 } 886 1002 … … 889 1005 throwWarning: tr("{0} is deprecated", "{0.tag}"); 890 1006 suggestAlternative: "location:transition=yes"; 1007 group: tr("deprecated tagging"); 891 1008 fixAdd: "location:transition=yes"; 892 1009 fixRemove: "pole"; … … 895 1012 throwWarning: tr("{0} is deprecated", "{0.tag}"); 896 1013 suggestAlternative: "location:transition=yes"; 1014 group: tr("deprecated tagging"); 897 1015 fixAdd: "location:transition=yes"; 898 1016 fixRemove: "tower"; … … 903 1021 throwWarning: tr("{0} is deprecated", "{0.tag}"); 904 1022 suggestAlternative: "natural=water + water=pond"; 1023 group: tr("deprecated tagging"); 905 1024 fixAdd: "natural=water"; 906 1025 fixAdd: "water=pond"; … … 913 1032 throwWarning: tr("{0} is deprecated", "{0.tag}"); 914 1033 suggestAlternative: "shop=gift"; 1034 group: tr("deprecated tagging"); 915 1035 fixAdd: "shop=gift"; 916 1036 } … … 919 1039 throwWarning: tr("{0} is deprecated", "{0.tag}"); 920 1040 suggestAlternative: "vending=animal_feed"; 1041 group: tr("deprecated tagging"); 921 1042 fixAdd: "vending=animal_feed"; 922 1043 } … … 927 1048 throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}"); 928 1049 suggestAlternative: "emergency_telephone_code"; 1050 group: tr("deprecated tagging"); 929 1051 fixChangeKey: "phone => emergency_telephone_code"; 930 1052 assertMatch: "node highway=emergency_access_point phone=123"; … … 937 1059 throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}"); 938 1060 suggestAlternative: "emergency_telephone_code"; 1061 group: tr("deprecated tagging"); 939 1062 fixRemove: "phone"; 940 1063 assertNoMatch: "node highway=emergency_access_point phone=123"; … … 946 1069 throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}"); 947 1070 suggestAlternative: "emergency_telephone_code"; 1071 group: tr("deprecated tagging"); 948 1072 assertNoMatch: "node highway=emergency_access_point phone=123"; 949 1073 assertNoMatch: "node highway=emergency_access_point emergency_telephone_code=123"; -
trunk/data/validator/geometry.mapcss
r11133 r11138 219 219 node:unconnected:in-downloaded-area[barrier=height_restrictor], 220 220 node:unconnected:in-downloaded-area[barrier=debris] { 221 throwWarning: tr("{0} must be connected to a way", "{2.tag}"); 221 throwWarning: tr("{0}", "{2.tag}"); 222 group: tr("isolated node which must be connected to a way"); 222 223 } 223 224
Note:
See TracChangeset
for help on using the changeset viewer.