Ticket #6881: 6881.patch

File 6881.patch, 10.5 KB (added by simon04, 15 years ago)

patch as patch for easier reviewing

  • defaultpresets.xml

    old new  
    311311                <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
    312312                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    313313                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
     314                <combo key="smoothness" text="Smoothness" values="excellent,good,intermediate,bad,very_bad,horrible,very_horrible,impassable" default="" delete_if_empty="true" />
    314315                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    315316                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
    316317            </optional>
    … …  
    331332                <check key="lit" text="Lit" default="off" delete_if_empty="true" />
    332333                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    333334                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
     335                <combo key="smoothness" text="Smoothness" values="excellent,good,intermediate,bad,very_bad,horrible,very_horrible,impassable" default="" delete_if_empty="true" />
    334336                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    335337                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
    336338            </optional>
    … …  
    351353                <check key="lit" text="Lit" default="off" delete_if_empty="true" />
    352354                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    353355                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
     356                <combo key="smoothness" text="Smoothness" values="excellent,good,intermediate,bad,very_bad,horrible,very_horrible,impassable" default="" delete_if_empty="true" />
    354357                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    355358                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
    356359            </optional>
    … …  
    373376                <check key="passing_places" text="Passing Places" default="off" delete_if_empty="true" />
    374377                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    375378                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
     379                <combo key="smoothness" text="Smoothness" values="excellent,good,intermediate,bad,very_bad,horrible,very_horrible,impassable" default="" delete_if_empty="true" />
    376380                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    377381                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    378382                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
    … …  
    408412                <check key="lit" text="Lit" default="off" delete_if_empty="true" />
    409413                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    410414                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
     415                <combo key="smoothness" text="Smoothness" values="excellent,good,intermediate,bad,very_bad,horrible,very_horrible,impassable" default="" delete_if_empty="true" />
    411416                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    412417                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    413418                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
    … …  
    544549            <optional>
    545550                <text key="name" text="Name" default="" delete_if_empty="true" />
    546551                <combo key="tracktype" text="Tracktype" values="grade1,grade2,grade3,grade4,grade5" default="" delete_if_empty="true" />
    547                 <combo key="surface" text="Surface" values="paved,concrete,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
     552                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
     553                <combo key="smoothness" text="Smoothness" values="excellent,good,intermediate,bad,very_bad,horrible,very_horrible,impassable" default="" delete_if_empty="true" />
    548554                <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" default="" delete_if_empty="true" />
    549555                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
    550556                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
    … …  
    579585                </combo>
    580586                <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" default="" delete_if_empty="true" />
    581587                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
     588                <combo key="smoothness" text="Smoothness" values="excellent,good,intermediate,bad,very_bad,horrible,very_horrible,impassable" default="" delete_if_empty="true" />
    582589                <combo key="trail_visibility" text="Visibility" values="excellent,good,intermediate,bad,horrible,no" default="" delete_if_empty="true" />
    583590                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
    584591                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
    … …  
    608615            <optional>
    609616                <text key="name" text="Name" default="" delete_if_empty="true" />
    610617                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
     618                <combo key="smoothness" text="Smoothness" values="excellent,good,intermediate,bad,very_bad,horrible,very_horrible,impassable" default="" delete_if_empty="true" />
    611619                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
    612620                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
    613621                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
    … …  
    642650            <optional>
    643651                <text key="name" text="Name" default="" delete_if_empty="true" />
    644652                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
     653                <combo key="smoothness" text="Smoothness" values="excellent,good,intermediate,bad,very_bad,horrible,very_horrible,impassable" default="" delete_if_empty="true" />
    645654                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
    646655                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
    647656                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
    … …  
    667676            <optional>
    668677                <text key="name" text="Name" default="" delete_if_empty="true" />
    669678                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
     679                <combo key="smoothness" text="Smoothness" values="excellent,good,intermediate,bad,very_bad,horrible,very_horrible,impassable" default="" delete_if_empty="true" />
    670680                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
    671681                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
    672682                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
    … …  
    691701            <optional>
    692702                <text key="name" text="Name" default="" delete_if_empty="true" />
    693703                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
     704                <combo key="smoothness" text="Smoothness" values="excellent,good,intermediate,bad,very_bad,horrible,very_horrible,impassable" default="" delete_if_empty="true" />
    694705                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
    695706                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
    696707                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
    … …  
    712723            <optional>
    713724                <text key="name" text="Name" default="" delete_if_empty="true" />
    714725                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
     726                <combo key="smoothness" text="Smoothness" values="excellent,good,intermediate,bad,very_bad,horrible,very_horrible,impassable" default="" delete_if_empty="true" />
    715727                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
    716728                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
    717729                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />