Ticket #16325: 0001-use-multiselects-for-access-restrictions.patch

File 0001-use-multiselects-for-access-restrictions.patch, 6.0 KB (added by Dakon, 7 years ago)

updated patch (removes a duplicate values_searchable=true)

  • data/defaultpresets.xml 

    From de830a54ac3ea351c682f8e1fa3da754160987aa Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eike@sf-mail.de>
Date: Sun, 27 May 2018 09:05:02 +0200
Subject: [PATCH] use multiselects for access restrictions

It's not uncommon that 2 classes are permitted at the same time.
---
 data/defaultpresets.xml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index f5c5cba6c..d2ee8665b 100644
    a b  
    990990            <check key="noexit" text="No exit (cul-de-sac)" />
    991991            <label text="Transport mode restrictions" />
    992992            <space />
    993             <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" match="key" values_searchable="true" />
    994             <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
    995             <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
     993            <multiselect key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" match="key" values_searchable="true" />
     994            <multiselect key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" values_searchable="true" />
     995            <multiselect key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" values_searchable="true" />
    996996            <label text="Vehicles per type" />
    997997            <space />
    998             <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    999             <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" match="key" />
    1000             <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    1001             <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    1002             <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    1003             <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    1004             <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
     998            <multiselect key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" values_searchable="true" />
     999            <multiselect key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" match="key" values_searchable="true" />
     1000            <multiselect key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" values_searchable="true" />
     1001            <multiselect key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" values_searchable="true" />
     1002            <multiselect key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" values_searchable="true" />
     1003            <multiselect key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" values_searchable="true" />
     1004            <multiselect key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" values_searchable="true" />
    10051005            <label text="Vehicles per use" />
    10061006            <space />
    10071007            <combo key="agricultural" text="Agricultural" values="yes,official,designated,destination,permissive,private,no" match="key" />
    … …  
    10881088                <reference ref="highway_yesno_incline_oneway_lit_width" />
    10891089                <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
    10901090                <reference ref="general_access" />
    1091                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
    1092                 <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
    1093                 <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
    1094                 <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" />
     1091                <multiselect key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_searchable="true" />
     1092                <multiselect key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_searchable="true" />
     1093                <multiselect key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_searchable="true" />
     1094                <multiselect key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_searchable="true" />
    10951095            </optional>
    10961096            <preset_link preset_name="Road Restrictions" />
    10971097        </item> <!-- Track -->