Changeset 6618 in josm for trunk/data


Ignore:
Timestamp:
2014-01-04T00:19:28+01:00 (6 years ago)
Author:
Don-vip
Message:

fix #7797 - add contact link to shops, health, etc.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r6576 r6618  
    158158Note that for a match, at least one positive and no negative is required.
    159159-->
     160    <!-- Item chunks -->
    160161    <chunk id="surface">
    161162        <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     
    286287        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
    287288    </chunk>
     289  <!-- Link chunks -->
     290  <chunk id="link_contact">
     291    <preset_link preset_name="Contact (common schema)" />
     292  </chunk>
     293  <!--  Groups -->
    288294  <group name="Highways" icon="presets/way_secondary.png">
    289295    <group name="Streets" icon="presets/way_secondary.png">
     
    23842390            <key key="shop" value="car" />
    23852391            <reference ref="name_brand_operator_oh" />
     2392            <reference ref="link_contact" />
    23862393        </item>
    23872394        <item name="Repair" icon="presets/car_repair.png" type="node,closedway">
     
    23902397            <key key="shop" value="car_repair" />
    23912398            <reference ref="name_brand_operator_oh" />
     2399            <reference ref="link_contact" />
    23922400        </item>
    23932401        <item name="Parts" icon="presets/car_repair.png" type="node,closedway">
     
    23982406            <key key="shop" value="car_parts" />
    23992407            <reference ref="name_brand_operator_oh" />
     2408            <reference ref="link_contact" />
    24002409        </item>
    24012410        <item name="Tyres" icon="presets/tyres.png" type="node,closedway">
     
    24042413            <key key="shop" value="tyres" />
    24052414            <reference ref="name_brand_operator_oh" />
    2406             <label text="Contact:" />
    2407                 <text key="phone" text="Phone Number" />
    2408                 <text key="fax" text="Fax Number" />
    2409                 <text key="website" text="Website" />
    2410                 <text key="email" text="Email Address" />
     2415            <reference ref="link_contact" />
    24112416        </item>
    24122417        <separator/>
     
    24222427            <reference ref="name_brand_operator_oh" />
    24232428            <combo key="second_hand" text="Second hand" values="only,yes,no" />
     2429            <reference ref="link_contact" />
    24242430        </item>
    24252431        <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway">
     
    24722478                <text key="services" text="Other" />
    24732479            </optional>
    2474             <optional text="Contact:">
    2475                 <text key="phone" text="Phone Number" />
    2476                 <text key="fax" text="Fax Number" />
    2477                 <text key="website" text="Website" />
    2478                 <text key="email" text="Email Address" />
    2479             </optional>
     2480            <reference ref="link_contact" />
    24802481        </item>
    24812482    </group> <!-- Motorcycle -->
     
    25212522            <check key="service:bicycle:diy" text="Tools for do-it-yourself repair (may be a bike co-operative)" />
    25222523            <check key="service:bicycle:cleaning" text="Bicycles are washed (for a fee)" />
     2524            <reference ref="link_contact" />
    25232525        </item>
    25242526        <item name="Rental" icon="presets/bicycle_rental.png" type="node,closedway">
     
    25382540            <key key="amenity" value="bicycle_rental" />
    25392541            <text key="name" text="Name" />
     2542            <reference ref="link_contact" />
    25402543        </item>
    25412544    </group> <!-- Bicycle -->
     
    29012904            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    29022905            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     2906            <reference ref="link_contact" />
    29032907        </item>
    29042908        <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node">
     
    32533257            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    32543258            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     3259            <reference ref="link_contact" />
    32553260        </item>
    32563261        <item name="Map" icon="presets/map.png" type="node">
     
    33623367            <key key="amenity" value="cinema" />
    33633368            <reference ref="name_operator_oh" />
     3369            <reference ref="link_contact" />
    33643370        </item>
    33653371        <item name="Zoo" icon="presets/zoo.png" type="node,closedway">
     
    35283534            <reference ref="name_operator_oh" />
    35293535            <text key="wikipedia" text="Wikipedia" />
     3536            <reference ref="link_contact" />
    35303537        </item>
    35313538        <item name="Theatre" icon="presets/theater.png" type="node,closedway,relation">
     
    35393546            <key key="amenity" value="theatre" />
    35403547            <reference ref="name_operator" />
     3548            <reference ref="link_contact" />
    35413549        </item>
    35423550        <item name="Library" icon="styles/standard/shop/rental/library.png" type="node,closedway,relation">
     
    35533561            <key key="amenity" value="library" />
    35543562            <reference ref="name_operator_oh" />
     3563            <reference ref="link_contact" />
    35553564        </item>
    35563565        <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation">
     
    35643573            <key key="amenity" value="arts_centre" />
    35653574            <text key="name" text="Name" />
     3575            <reference ref="link_contact" />
    35663576        </item>
    35673577        <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway">
     
    35883598            <reference ref="name_operator" />
    35893599            <combo key="type" text="Type" values="audio,video" />
    3590             <text key="phone" text="Phone Number" />
    3591             <text key="website" text="Website" />
     3600            <reference ref="link_contact" />
    35923601        </item>
    35933602    </group> <!-- Culture -->
     
    37793788            <key key="amenity" value="townhall" />
    37803789            <text key="name" text="Name" />
     3790            <reference ref="link_contact" />
    37813791        </item>
    37823792        <item name="Community Centre" icon="presets/community_centre.png" type="node,closedway">
     
    38033813            <key key="amenity" value="embassy" />
    38043814            <text key="name" text="Name" />
     3815            <reference ref="link_contact" />
    38053816        </item>
    38063817        <item name="Courthouse" icon="presets/JusticeScales.png" type="node,closedway,relation">
     
    38143825            <key key="amenity" value="courthouse" />
    38153826            <text key="name" text="Name" />
     3827            <reference ref="link_contact" />
    38163828        </item>
    38173829        <item name="Prison" icon="presets/prison.png" type="node,closedway,relation">
     
    38253837            <key key="amenity" value="prison" />
    38263838            <text key="name" text="Name" />
     3839            <reference ref="link_contact" />
    38273840        </item>
    38283841        <item name="Police" icon="styles/standard/service/police.png" type="node,closedway,relation">
     
    38393852            <key key="amenity" value="police" />
    38403853            <text key="name" text="Name" />
     3854            <reference ref="link_contact" />
    38413855        </item>
    38423856        <item name="Fire Station" icon="presets/firebrigade.png" type="node,closedway,relation">
     
    38763890            <key key="amenity" value="kindergarten" />
    38773891            <text key="name" text="Name" />
    3878             <preset_link preset_name="Contact (common schema)" />
     3892            <reference ref="link_contact" />
    38793893        </item>
    38803894        <item name="School" icon="presets/school.png" type="node,closedway,relation">
     
    38933907            <key key="amenity" value="school" />
    38943908            <text key="name" text="Name" />
    3895             <preset_link preset_name="Contact (common schema)" />
     3909            <reference ref="link_contact" />
    38963910        </item>
    38973911        <item name="University" icon="styles/standard/education/university.png" type="node,closedway,relation">
     
    39093923            <key key="amenity" value="university" />
    39103924            <text key="name" text="Name" />
    3911             <preset_link preset_name="Contact (common schema)" />
     3925            <reference ref="link_contact" />
    39123926        </item>
    39133927        <item name="College" icon="styles/standard/education/college.png" type="node,closedway,relation">
     
    39223936            <key key="amenity" value="college" />
    39233937            <text key="name" text="Name" />
    3924             <preset_link preset_name="Contact (common schema)" />
     3938            <reference ref="link_contact" />
    39253939        </item>
    39263940         <item name="Driving School" icon="styles/standard/education/driving_school.png" type="node,closedway">
     
    39313945            <reference ref="name_operator" />
    39323946            <combo key="license_classes" text="License Classes" values="A;A1;B;BE;C,A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E" />
    3933              <preset_link preset_name="Contact (common schema)" />
     3947            <reference ref="link_contact" />
    39343948        </item>
    39353949    </group> <!-- Education -->
     
    39483962            <key key="amenity" value="hospital" />
    39493963            <reference ref="name_operator" />
     3964            <reference ref="link_contact" />
    39503965        </item>
    39513966        <item name="Clinic" icon="styles/standard/health/hospital.png" type="node,closedway">
     
    39563971            <key key="amenity" value="clinic" />
    39573972            <text key="name" text="Name" />
     3973            <reference ref="link_contact" />
    39583974        </item>
    39593975        <item name="Doctors" icon="styles/standard/health/doctor.png" type="node,closedway">
     
    39663982            <key key="amenity" value="doctors" />
    39673983            <reference ref="name_oh" />
     3984            <reference ref="link_contact" />
    39683985        </item>
    39693986        <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway">
     
    39723989            <key key="amenity" value="dentist" />
    39733990            <reference ref="name_oh" />
     3991            <reference ref="link_contact" />
    39743992        </item>
    39753993        <item name="Nursing Home" type="node,closedway">
     
    39783996            <key key="amenity" value="nursing_home" />
    39793997            <reference ref="name_operator" />
     3998            <reference ref="link_contact" />
    39803999        </item>
    39814000        <item name="Retirement Home" type="node,closedway">
     
    39924011            <reference ref="name_operator" />
    39934012            <text key="capacity" text="Capacity" />
     4013            <reference ref="link_contact" />
    39944014        </item>
    39954015        <separator/>
     
    40094029            <combo key="dispensing" text="Dispensing" values="yes,no" default="no" />
    40104030            <reference ref="oh" />
     4031            <reference ref="link_contact" />
    40114032        </item>
    40124033        <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway">
     
    40184039            <key key="shop" value="hearing_aids" />
    40194040            <reference ref="name_operator_oh" />
     4041            <reference ref="link_contact" />
    40204042        </item>
    40214043        <separator/>
     
    40694091            <key key="amenity" value="veterinary" />
    40704092            <reference ref="name_oh" />
     4093            <reference ref="link_contact" />
    40714094        </item>
    40724095    </group> <!-- Health -->
     
    53475370            <key key="shop" value="supermarket" />
    53485371            <reference ref="name_oh" />
     5372            <reference ref="link_contact" />
    53495373        </item>
    53505374        <item name="Convenience Store" icon="presets/convenience.png" type="node,closedway">
     
    53585382            <key key="shop" value="convenience" />
    53595383            <reference ref="name_oh" />
     5384            <reference ref="link_contact" />
    53605385        </item>
    53615386        <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway">
     
    53705395            <key key="shop" value="kiosk" />
    53715396            <reference ref="name_oh" />
     5397            <reference ref="link_contact" />
    53725398        </item>
    53735399        <separator/>
     
    53865412            <key key="shop" value="bakery" />
    53875413            <reference ref="name_oh" />
     5414            <reference ref="link_contact" />
    53885415        </item>
    53895416        <item name="Butcher" icon="presets/cow.png" type="node,closedway">
     
    53995426            <key key="shop" value="butcher" />
    54005427            <reference ref="name_oh" />
     5428            <reference ref="link_contact" />
    54015429        </item>
    54025430        <item name="Seafood" icon="presets/seafood.png" type="node,closedway">
     
    54095437            <key key="shop" value="seafood" />
    54105438            <reference ref="name_operator_oh" />
     5439            <reference ref="link_contact" />
    54115440        </item>
    54125441        <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway">
     
    54215450            <key key="shop" value="deli" />
    54225451            <reference ref="name_operator_oh" />
     5452            <reference ref="link_contact" />
    54235453        </item>
    54245454        <item name="Confectionery" icon="presets/confectionery.png" type="node,closedway">
     
    54345464            <key key="shop" value="confectionery" />
    54355465            <reference ref="name_oh" />
     5466            <reference ref="link_contact" />
    54365467        </item>
    54375468        <separator/>
     
    54625493            <key key="shop" value="greengrocer" />
    54635494            <reference ref="name_oh" />
    5464             <text key="website" text="Website" />
    54655495            <combo key="organic" text="Organic" values="only,yes,no" />
     5496            <reference ref="link_contact" />
    54665497        </item>
    54675498        <item name="Farm Stand" icon="presets/apple.png" type="node,closedway">
     
    54755506            <reference ref="name_oh" />
    54765507            <text key="description" text="Description" />
    5477             <text key="phone" text="Phone Number" match="key" />
    5478             <text key="website" text="Website" />
    54795508            <combo key="organic" text="Organic" values="only,yes,no" />
     5509            <reference ref="link_contact" />
    54805510        </item>
    54815511        <separator/>
     
    55055535            <key key="shop" value="alcohol" />
    55065536            <reference ref="name_oh" />
     5537            <reference ref="link_contact" />
    55075538        </item>
    55085539        <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway">
     
    55155546            <key key="shop" value="beverages" />
    55165547            <reference ref="name_oh" />
     5548            <reference ref="link_contact" />
    55175549        </item>
    55185550    </group> <!-- Food -->
     
    55315563            <combo key="second_hand" text="Second hand" values="only,yes,no" />
    55325564            <combo key="organic" text="Organic" values="only,yes,no" />
     5565            <reference ref="link_contact" />
    55335566        </item>
    55345567        <item name="Boutique" icon="presets/boutique.png" type="node,closedway">
     
    55425575            <key key="shop" value="boutique" />
    55435576            <reference ref="name_operator_oh" />
     5577            <reference ref="link_contact" />
    55445578        </item>
    55455579        <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway">
     
    55545588            <combo key="second_hand" text="Second hand" values="only,yes,no" />
    55555589            <combo key="organic" text="Organic" values="only,yes,no" />
     5590            <reference ref="link_contact" />
    55565591        </item>
    55575592        <item name="Outdoor" icon="presets/tent.png" type="node,closedway">
     
    55645599            <key key="shop" value="outdoor" />
    55655600            <reference ref="name_oh" />
     5601            <reference ref="link_contact" />
    55665602        </item>
    55675603        <item name="Sports" icon="presets/rowing.png" type="node,closedway">
     
    55735609            <key key="shop" value="sports" />
    55745610            <reference ref="name_oh" />
     5611            <reference ref="link_contact" />
    55755612        </item>
    55765613        <separator/>
     
    55855622            <key key="shop" value="dry_cleaning" />
    55865623            <reference ref="name_oh" />
     5624            <reference ref="link_contact" />
    55875625        </item>
    55885626        <item name="Laundry" icon="presets/laundry.png" type="node,closedway">
     
    55955633            <key key="shop" value="laundry" />
    55965634            <reference ref="name_oh" />
     5635            <reference ref="link_contact" />
    55975636        </item>
    55985637        <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway">
     
    56015640            <key key="shop" value="tailor" />
    56025641            <reference ref="name_oh" />
     5642            <reference ref="link_contact" />
    56035643        </item>
    56045644        <item name="Fabric" icon="presets/fabric.png" type="node,closedway">
     
    56105650            <key key="shop" value="fabric" />
    56115651            <reference ref="name_operator_oh" />
     5652            <reference ref="link_contact" />
    56125653        </item>
    56135654    </group> <!-- Clothes -->
     
    56225663            <key key="shop" value="computer" />
    56235664            <reference ref="name_oh" />
     5665            <reference ref="link_contact" />
    56245666        </item>
    56255667        <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway">
     
    56325674            <key key="shop" value="electronics" />
    56335675            <reference ref="name_oh" />
     5676            <reference ref="link_contact" />
    56345677        </item>
    56355678        <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway">
     
    56415684            <key key="shop" value="mobile_phone" />
    56425685            <reference ref="name_operator_oh" />
     5686            <reference ref="link_contact" />
    56435687        </item>
    56445688        <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway">
     
    56505694            <key key="shop" value="vacuum_cleaner" />
    56515695            <reference ref="name_operator_oh" />
     5696            <reference ref="link_contact" />
    56525697        </item>
    56535698        <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway">
     
    56605705            <key key="shop" value="hifi" />
    56615706            <reference ref="name_oh" />
     5707            <reference ref="link_contact" />
    56625708        </item>
    56635709        <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway">
     
    56705716            <key key="shop" value="video" />
    56715717            <reference ref="name_oh" />
     5718            <reference ref="link_contact" />
    56725719        </item>
    56735720    </group> <!-- Electronic -->
     
    56895736            <reference ref="name_brand_operator_oh" />
    56905737            <check key="atm" text="Automated Teller Machine" default="on" />
     5738            <reference ref="link_contact" />
    56915739        </item>
    56925740        <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway">
     
    57015749            <key key="amenity" value="bureau_de_change" />
    57025750            <reference ref="name_oh" />
     5751            <reference ref="link_contact" />
    57035752        </item>
    57045753        <item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node">
     
    57295778            <key key="shop" value="pawnbroker" />
    57305779            <reference ref="name_oh" />
     5780            <reference ref="link_contact" />
    57315781        </item>
    57325782    </group> <!-- Cash -->
     
    57425792            <key key="shop" value="department_store" />
    57435793            <reference ref="name_operator_oh" />
     5794            <reference ref="link_contact" />
    57445795        </item>
    57455796        <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway">
     
    57525803            <key key="shop" value="mall" />
    57535804            <reference ref="name_operator_oh" />
     5805            <reference ref="link_contact" />
    57545806        </item>
    57555807        <separator/>
     
    57645816            <key key="shop" value="chemist" />
    57655817            <reference ref="name_oh" />
     5818            <reference ref="link_contact" />
    57665819        </item>
    57675820        <item name="Hairdresser" icon="styles/standard/shop/hairdresser.png" type="node,closedway">
     
    57765829            <key key="shop" value="hairdresser" />
    57775830            <reference ref="name_oh" />
     5831            <reference ref="link_contact" />
    57785832        </item>
    57795833        <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway">
     
    57855839            <key key="shop" value="optician" />
    57865840            <reference ref="name_oh" />
     5841            <reference ref="link_contact" />
    57875842        </item>
    57885843        <item name="Jewelry" icon="styles/standard/shop/jewelry.png" type="node,closedway">
     
    57945849            <key key="shop" value="jewelry" />
    57955850            <reference ref="name_operator_oh" />
     5851            <reference ref="link_contact" />
    57965852        </item>
    57975853        <item name="Gift" icon="http://openclipart.org/people/secretlondon/secretlondon_chocolate_present.svg" type="node,closedway">
     
    58105866                <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
    58115867            </optional>
     5868            <reference ref="link_contact" />
    58125869        </item>
    58135870        <item name="Erotic" icon="presets/erotic.png" type="node,closedway">
     
    58195876            <key key="shop" value="erotic" />
    58205877            <reference ref="name_operator_oh" />
     5878            <reference ref="link_contact" />
    58215879        </item>
    58225880        <separator/>
     
    58325890            <key key="shop" value="florist" />
    58335891            <reference ref="name_oh" />
     5892            <reference ref="link_contact" />
    58345893        </item>
    58355894        <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway">
     
    58455904            <key key="shop" value="garden_centre" />
    58465905            <reference ref="name_brand_oh" />
     5906            <reference ref="link_contact" />
    58475907        </item>
    58485908        <separator/>
     
    58585918            <key key="shop" value="doityourself" />
    58595919            <reference ref="name_brand_oh" />
     5920            <reference ref="link_contact" />
    58605921        </item>
    58615922        <item name="Hardware" icon="presets/hardware.png" type="node,closedway">
     
    58685929            <key key="shop" value="hardware" />
    58695930            <reference ref="name_oh" />
     5931            <reference ref="link_contact" />
    58705932        </item>
    58715933        <item name="Paint" icon="presets/paint.png" type="node,closedway">
     
    58785940            <key key="shop" value="paint" />
    58795941            <reference ref="name_operator_oh" />
     5942            <reference ref="link_contact" />
    58805943        </item>
    58815944        <separator/>
     
    58855948            <key key="shop" value="furniture" />
    58865949            <reference ref="name_brand_operator_oh" />
     5950            <reference ref="link_contact" />
    58875951        </item>
    58885952        <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway">
     
    58965960            <key key="shop" value="kitchen" />
    58975961            <reference ref="name_brand_operator_oh" />
     5962            <reference ref="link_contact" />
    58985963        </item>
    58995964        <item name="Curtain" icon="presets/curtain.png" type="node,closedway">
     
    59055970            <key key="shop" value="curtain" />
    59065971            <reference ref="name_operator_oh" />
     5972            <reference ref="link_contact" />
    59075973        </item>
    59085974        <item name="Frame" icon="presets/frame.png" type="node,closedway">
     
    59155981            <key key="shop" value="frame" />
    59165982            <reference ref="name_operator_oh" />
     5983            <reference ref="link_contact" />
    59175984        </item>
    59185985        <separator/>
Note: See TracChangeset for help on using the changeset viewer.