From 6e7e7be97709424f4d86284af43ac4d9bf7311e0 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Tue, 14 Oct 2025 19:23:46 +0200 Subject: [PATCH] sort all `terms` alphbetically (#1758) by UTF-16 code units order (which can easily be checked programmatically) --- data/presets/aeroway/jet_bridge.json | 4 +-- data/presets/aeroway/terminal.json | 4 +-- data/presets/amenity/animal_shelter.json | 4 +-- data/presets/amenity/atm.json | 4 +-- data/presets/amenity/baking_oven.json | 4 +-- data/presets/amenity/bar.json | 4 +-- data/presets/amenity/bar/lgbtq.json | 4 +-- data/presets/amenity/bench.json | 4 +-- .../amenity/bicycle_parking/building.json | 6 ++-- .../amenity/bicycle_parking/lockers.json | 4 +-- .../presets/amenity/bicycle_parking/shed.json | 4 +-- data/presets/amenity/bicycle_rental.json | 6 ++-- .../amenity/bicycle_repair_station.json | 4 +-- data/presets/amenity/bicycle_wash.json | 8 ++--- data/presets/amenity/binoculars.json | 2 +- data/presets/amenity/cafe/bubble_tea.json | 6 ++-- data/presets/amenity/cafe/coffee_shop.json | 2 +- data/presets/amenity/cafe/teahouse.json | 18 +++++------ data/presets/amenity/casino.json | 6 ++-- data/presets/amenity/cinema.json | 4 +-- data/presets/amenity/clinic/dialysis.json | 4 +-- data/presets/amenity/clinic/fertility.json | 4 +-- .../amenity/community_centre/lgbtq.json | 8 ++--- data/presets/amenity/dentist.json | 4 +-- data/presets/amenity/doctors/cardiology.json | 2 +- .../amenity/doctors/gastroenterology.json | 4 +-- data/presets/amenity/doctors/general.json | 4 +-- data/presets/amenity/doctors/gynaecology.json | 2 +- data/presets/amenity/doctors/nephrology.json | 2 +- data/presets/amenity/doctors/pathology.json | 4 +-- .../amenity/doctors/plastic_surgery.json | 4 +-- data/presets/amenity/doctors/pulmonology.json | 6 ++-- data/presets/amenity/doctors/radiology.json | 4 +-- data/presets/amenity/doctors/urology.json | 6 ++-- data/presets/amenity/dog_toilet.json | 6 ++-- data/presets/amenity/dojo.json | 4 +-- data/presets/amenity/drinking_water.json | 4 +-- data/presets/amenity/driver_training.json | 2 +- data/presets/amenity/events_venue.json | 4 +-- data/presets/amenity/exhibition_centre.json | 4 +-- data/presets/amenity/fast_food/donut.json | 2 +- .../amenity/fast_food/fish_and_chips.json | 4 +-- data/presets/amenity/fast_food/hot_dog.json | 2 +- data/presets/amenity/fast_food/juice.json | 2 +- data/presets/amenity/fast_food/kebab.json | 2 +- data/presets/amenity/fast_food/mexican.json | 14 ++++----- data/presets/amenity/fast_food/pizza.json | 6 ++-- data/presets/amenity/food_court.json | 4 +-- data/presets/amenity/fuel.json | 10 +++---- data/presets/amenity/hookah_lounge.json | 4 +-- data/presets/amenity/ice_cream.json | 6 ++-- .../amenity/ice_cream/frozen_yogurt.json | 4 +-- data/presets/amenity/internet_cafe.json | 10 +++---- data/presets/amenity/karaoke_box.json | 2 +- data/presets/amenity/letter_box.json | 2 +- data/presets/amenity/library_dropoff.json | 2 +- data/presets/amenity/lounger.json | 4 +-- data/presets/amenity/monastery.json | 2 +- data/presets/amenity/money_transfer.json | 14 ++++----- data/presets/amenity/motorcycle_rental.json | 2 +- data/presets/amenity/nightclub/lgbtq.json | 4 +-- data/presets/amenity/parking/park_ride.json | 4 +-- data/presets/amenity/parking/street-side.json | 6 ++-- data/presets/amenity/payment_centre.json | 8 ++--- data/presets/amenity/payment_terminal.json | 12 ++++---- data/presets/amenity/photo_booth.json | 6 ++-- data/presets/amenity/place_of_worship.json | 2 +- .../amenity/place_of_worship/buddhist.json | 10 +++---- .../amenity/place_of_worship/christian.json | 10 +++---- .../christian/jehovahs_witness.json | 2 +- .../christian/la_luz_del_mundo.json | 2 +- .../place_of_worship/christian/quaker.json | 2 +- .../amenity/place_of_worship/hindu.json | 8 ++--- data/presets/amenity/planetarium.json | 2 +- data/presets/amenity/police.json | 2 +- data/presets/amenity/prison.json | 4 +-- data/presets/amenity/pub.json | 6 ++-- data/presets/amenity/pub/irish.json | 4 +-- data/presets/amenity/pub/lgbtq.json | 4 +-- data/presets/amenity/pub/microbrewery.json | 4 +-- data/presets/amenity/public_bath.json | 4 +-- data/presets/amenity/public_bookcase.json | 2 +- data/presets/amenity/ranger_station.json | 10 +++---- .../recycling/container/green_waste.json | 4 +-- data/presets/amenity/recycling_centre.json | 2 +- data/presets/amenity/recycling_container.json | 4 +-- data/presets/amenity/research_institute.json | 2 +- data/presets/amenity/restaurant/greek.json | 6 ++-- data/presets/amenity/restaurant/indian.json | 4 +-- data/presets/amenity/restaurant/italian.json | 4 +-- data/presets/amenity/restaurant/mexican.json | 14 ++++----- data/presets/amenity/restaurant/noodle.json | 8 ++--- data/presets/amenity/restaurant/pizza.json | 6 ++-- data/presets/amenity/restaurant/seafood.json | 20 ++++++------- .../amenity/restaurant/steakhouse.json | 6 ++-- .../amenity/sanitary_dump_station.json | 16 +++++----- data/presets/amenity/shelter.json | 2 +- .../social_facility/homeless_shelter.json | 4 +-- .../amenity/social_facility/nursing_home.json | 4 +-- data/presets/amenity/stripclub.json | 4 +-- data/presets/amenity/studio.json | 2 +- data/presets/amenity/taxi/cycle_rickshaw.json | 2 +- data/presets/amenity/telephone.json | 4 +-- data/presets/amenity/theatre.json | 4 +-- data/presets/amenity/theatre/type/amphi.json | 6 ++-- data/presets/amenity/ticket_validator.json | 4 +-- data/presets/amenity/toilets.json | 10 +++---- .../amenity/toilets/disposal/flush.json | 4 +-- data/presets/amenity/toilets/portable.json | 6 ++-- data/presets/amenity/townhall.json | 6 ++-- .../amenity/vending_machine/bicycle_tube.json | 4 +-- .../amenity/vending_machine/drinks.json | 6 ++-- .../vending_machine/excrement_bags.json | 10 +++---- .../vending_machine/feminine_hygiene.json | 10 +++---- .../amenity/vending_machine/food/snacks.json | 6 ++-- .../presets/amenity/vending_machine/fuel.json | 10 +++---- .../amenity/vending_machine/ice_cream.json | 2 +- data/presets/amenity/veterinary.json | 6 ++-- data/presets/amenity/veterinary_pharmacy.json | 4 +-- data/presets/amenity/waste/dog_excrement.json | 6 ++-- data/presets/amenity/waste_basket.json | 2 +- data/presets/amenity/waste_disposal.json | 2 +- data/presets/amenity/water_point.json | 4 +-- data/presets/area/footway.json | 4 +-- data/presets/attraction/amusement_ride.json | 4 +-- data/presets/attraction/big_wheel.json | 4 +-- data/presets/attraction/bumper_car.json | 4 +-- data/presets/attraction/bungee_jumping.json | 4 +-- data/presets/attraction/carousel.json | 10 +++---- data/presets/attraction/dark_ride.json | 4 +-- data/presets/attraction/drop_tower.json | 6 ++-- data/presets/attraction/log_flume.json | 4 +-- data/presets/attraction/maze.json | 4 +-- data/presets/attraction/pirate_ship.json | 4 +-- data/presets/attraction/river_rafting.json | 6 ++-- data/presets/attraction/roller_coaster.json | 4 +-- data/presets/attraction/swing_carousel.json | 6 ++-- data/presets/attraction/train.json | 8 ++--- data/presets/attraction/water_slide.json | 6 ++-- data/presets/barrier/cattle_grid.json | 2 +- data/presets/barrier/cycle_barrier.json | 6 ++-- data/presets/barrier/fence/railing.json | 4 +-- data/presets/barrier/guard_rail.json | 6 ++-- data/presets/barrier/height_restrictor.json | 2 +- data/presets/barrier/jersey_barrier.json | 2 +- data/presets/barrier/kerb/lowered.json | 2 +- data/presets/barrier/sally_port.json | 4 +-- data/presets/building/bungalow.json | 4 +-- data/presets/building/carport.json | 2 +- data/presets/building/detached.json | 6 ++-- data/presets/building/farm_auxiliary.json | 2 +- data/presets/building/grandstand.json | 4 +-- data/presets/building/house.json | 6 ++-- data/presets/building/houseboat.json | 6 ++-- data/presets/building/kindergarten.json | 2 +- data/presets/building/riding_hall.json | 2 +- data/presets/building/school.json | 4 +-- data/presets/building/semidetached_house.json | 6 ++-- data/presets/building_part.json | 2 +- data/presets/climbing/route_bottom.json | 12 ++++---- data/presets/craft/confectionery.json | 4 +-- data/presets/craft/distillery.json | 2 +- data/presets/craft/gardener.json | 4 +-- data/presets/education/college.json | 4 +-- data/presets/education/kindergarten.json | 2 +- data/presets/education/prep_school.json | 4 +-- data/presets/education/school.json | 4 +-- data/presets/education/university.json | 4 +-- data/presets/emergency/ambulance_station.json | 4 +-- data/presets/emergency/assembly_point.json | 4 +-- data/presets/emergency/defibrillator.json | 2 +- data/presets/emergency/disaster_response.json | 2 +- data/presets/emergency/life_ring.json | 6 ++-- data/presets/emergency/lifeboat_station.json | 6 ++-- data/presets/emergency/lifeguard.json | 2 +- data/presets/emergency/mountain_rescue.json | 4 +-- data/presets/emergency/phone.json | 4 +-- data/presets/emergency/water_reservoir.json | 4 +-- .../emergency/water_reservoir_covered.json | 4 +-- data/presets/emergency/water_tank.json | 4 +-- data/presets/entrance.json | 4 +-- data/presets/entrance/emergency.json | 4 +-- data/presets/golf/green.json | 2 +- data/presets/healthcare.json | 2 +- .../traditional_chinese_medicine.json | 6 ++-- data/presets/healthcare/birthing_center.json | 2 +- data/presets/healthcare/blood_donation.json | 2 +- data/presets/healthcare/hospice.json | 4 +-- data/presets/healthcare/laboratory.json | 4 +-- data/presets/healthcare/midwife.json | 2 +- data/presets/healthcare/podiatrist.json | 2 +- data/presets/highway/bus_guideway.json | 4 +-- .../highway/crossing/uncontrolled.json | 6 ++-- .../highway/cycleway/bicycle_foot.json | 4 +-- .../cycleway/crossing/uncontrolled.json | 6 ++-- .../highway/cycleway/crossing/unmarked.json | 2 +- .../highway/emergency_access_point.json | 4 +-- data/presets/highway/emergency_bay.json | 2 +- data/presets/highway/escape.json | 2 +- data/presets/highway/footway/conveying.json | 6 ++-- .../footway/crossing/traffic_signals.json | 4 +-- .../footway/crossing/uncontrolled.json | 6 ++-- data/presets/highway/give_way.json | 4 +-- data/presets/highway/motorway_link.json | 6 ++-- data/presets/highway/primary_link.json | 2 +- data/presets/highway/raceway/motocross.json | 6 ++-- data/presets/highway/secondary_link.json | 2 +- data/presets/highway/steps.json | 2 +- data/presets/highway/stop.json | 4 +-- data/presets/highway/street_lamp.json | 6 ++-- data/presets/highway/tertiary_link.json | 2 +- data/presets/highway/toll_gantry.json | 2 +- data/presets/highway/track.json | 4 +-- data/presets/highway/trailhead.json | 2 +- data/presets/highway/trunk_link.json | 2 +- data/presets/historic/castle/palace.json | 6 ++-- data/presets/historic/castle/stately.json | 8 ++--- data/presets/historic/city_gate.json | 2 +- data/presets/historic/manor.json | 6 ++-- data/presets/historic/memorial.json | 4 +-- data/presets/historic/memorial/plaque.json | 4 +-- data/presets/historic/wreck.json | 6 ++-- data/presets/indoor/stairs.json | 2 +- data/presets/internet_access/wlan.json | 4 +-- data/presets/landuse/aquaculture.json | 12 ++++---- data/presets/landuse/education.json | 6 ++-- .../landuse/greenhouse_horticulture.json | 2 +- data/presets/landuse/industrial/depot.json | 6 ++-- data/presets/landuse/railway.json | 4 +-- data/presets/landuse/religious.json | 8 ++--- data/presets/landuse/salt_pond.json | 4 +-- data/presets/leisure/amusement_arcade.json | 6 ++-- data/presets/leisure/bathing_place.json | 4 +-- data/presets/leisure/bleachers.json | 8 ++--- data/presets/leisure/disc_golf_course.json | 2 +- data/presets/leisure/fitness_centre.json | 2 +- .../fitness_station/horizontal_bar.json | 4 +-- .../fitness_station/horizontal_ladder.json | 4 +-- .../leisure/fitness_station/push-up.json | 2 +- .../leisure/fitness_station/rings.json | 2 +- .../leisure/fitness_station/sit-up.json | 2 +- data/presets/leisure/garden/kitchen.json | 6 ++-- data/presets/leisure/hackerspace.json | 4 +-- data/presets/leisure/horse_riding.json | 2 +- data/presets/leisure/ice_rink.json | 4 +-- data/presets/leisure/outdoor_seating.json | 12 ++++---- data/presets/leisure/picnic_table/chess.json | 2 +- .../leisure/pitch/australian_football.json | 4 +-- data/presets/leisure/pitch/chess.json | 2 +- data/presets/leisure/pitch/equestrian.json | 12 ++++---- data/presets/leisure/pitch/futsal.json | 4 +-- data/presets/leisure/pitch/padel.json | 4 +-- data/presets/leisure/pitch/pickleball.json | 4 +-- data/presets/leisure/pitch/shooting.json | 2 +- data/presets/leisure/pitch/skateboard.json | 2 +- data/presets/leisure/pitch/table_tennis.json | 4 +-- data/presets/leisure/pitch/tetherball.json | 4 +-- data/presets/leisure/playground/indoor.json | 6 ++-- data/presets/leisure/slipway.json | 4 +-- data/presets/leisure/slipway_drivable.json | 4 +-- .../leisure/sports_centre/climbing.json | 2 +- .../leisure/sports_centre/horse_racing.json | 2 +- .../leisure/sports_centre/karting.json | 4 +-- .../leisure/sports_centre/shooting.json | 6 ++-- data/presets/leisure/swimming_area.json | 4 +-- data/presets/leisure/swimming_pool.json | 4 +-- data/presets/leisure/water_park.json | 4 +-- data/presets/man_made/antenna.json | 2 +- data/presets/man_made/bunker_silo.json | 4 +-- data/presets/man_made/cairn.json | 4 +-- data/presets/man_made/carpet_hanger.json | 2 +- .../man_made/ceremonial_gate/torii.json | 4 +-- data/presets/man_made/crane/gantry_crane.json | 4 +-- data/presets/man_made/dyke.json | 8 ++--- data/presets/man_made/flare.json | 6 ++-- .../footwear_decontamination-AU-NZ.json | 6 ++-- data/presets/man_made/fuel_pump.json | 10 +++---- data/presets/man_made/manhole.json | 2 +- data/presets/man_made/manhole/drain.json | 2 +- data/presets/man_made/manhole/power.json | 2 +- data/presets/man_made/manhole/sewer.json | 2 +- data/presets/man_made/manhole/telecom.json | 2 +- data/presets/man_made/mast/lighting.json | 4 +-- data/presets/man_made/monitoring_station.json | 12 ++++---- data/presets/man_made/petroleum_well.json | 2 +- data/presets/man_made/pipeline.json | 6 ++-- .../man_made/pipeline/underground.json | 6 ++-- data/presets/man_made/silo.json | 2 +- data/presets/man_made/ski_jump.json | 6 ++-- data/presets/man_made/storage_tank.json | 8 ++--- data/presets/man_made/surveillance.json | 2 +- .../presets/man_made/surveillance/camera.json | 2 +- data/presets/man_made/survey_point.json | 6 ++-- data/presets/man_made/telescope/optical.json | 4 +-- data/presets/man_made/telescope/radio.json | 4 +-- data/presets/man_made/tower/defensive.json | 4 +-- data/presets/man_made/tower/minaret.json | 6 ++-- data/presets/man_made/tower/observation.json | 4 +-- data/presets/man_made/tower/pagoda.json | 4 +-- data/presets/man_made/video_wall.json | 10 +++---- data/presets/man_made/water_well.json | 2 +- data/presets/man_made/watermill.json | 8 ++--- data/presets/man_made/windmill.json | 4 +-- data/presets/man_made/windpump.json | 4 +-- data/presets/man_made/works.json | 4 +-- data/presets/natural/cave_entrance.json | 6 ++-- data/presets/natural/rock.json | 4 +-- data/presets/natural/saddle.json | 6 ++-- data/presets/natural/stone.json | 4 +-- data/presets/natural/valley.json | 2 +- data/presets/natural/volcano.json | 4 +-- data/presets/natural/water/pond.json | 4 +-- data/presets/natural/water/wastewater.json | 8 ++--- data/presets/natural/wetland/reedbed.json | 4 +-- data/presets/office/financial_advisor.json | 2 +- .../office/government/register_office.json | 8 ++--- data/presets/office/graphic_design.json | 2 +- data/presets/office/moving_company.json | 4 +-- data/presets/office/ngo.json | 4 +-- data/presets/office/private_investigator.json | 6 ++-- data/presets/office/quango.json | 2 +- data/presets/office/research.json | 4 +-- data/presets/office/translator.json | 4 +-- data/presets/office/water_utility.json | 4 +-- data/presets/pipeline/valve.json | 6 ++-- data/presets/piste/_piste.json | 30 +++++++++---------- data/presets/piste/downhill/halfpipe.json | 10 +++---- data/presets/piste/skitour.json | 6 ++-- data/presets/piste/sleigh.json | 8 ++--- data/presets/piste/take_off.json | 8 ++--- data/presets/place/plot.json | 4 +-- data/presets/playground/roundabout.json | 4 +-- data/presets/playground/zipwire.json | 2 +- data/presets/power/catenary_mast.json | 2 +- .../power/generator/method/photovoltaic.json | 2 +- .../method/photovoltaic/building/roof.json | 4 +-- .../method/photovoltaic/location/roof.json | 4 +-- .../presets/power/generator/source/hydro.json | 2 +- data/presets/power/generator/source/wind.json | 4 +-- data/presets/power/line.json | 4 +-- data/presets/power/plant/source/coal.json | 2 +- data/presets/power/plant/source/gas.json | 4 +-- data/presets/power/plant/source/nuclear.json | 4 +-- data/presets/power/plant/source/waste.json | 12 ++++---- .../public_transport/platform/light_rail.json | 4 +-- .../public_transport/platform/tram.json | 4 +-- .../public_transport/platform/tram_point.json | 4 +-- .../public_transport/platform/trolleybus.json | 4 +-- .../platform/trolleybus_point.json | 4 +-- .../public_transport/station_light_rail.json | 4 +-- .../public_transport/station_tram.json | 4 +-- .../public_transport/station_trolleybus.json | 4 +-- .../stop_position_light_rail.json | 4 +-- .../public_transport/stop_position_tram.json | 4 +-- .../stop_position_trolleybus.json | 4 +-- data/presets/railway/buffer_stop.json | 4 +-- data/presets/railway/crossing.json | 8 ++--- data/presets/railway/funicular.json | 4 +-- data/presets/railway/level_crossing.json | 2 +- data/presets/railway/milestone.json | 4 +-- data/presets/railway/miniature.json | 4 +-- data/presets/railway/narrow_gauge.json | 4 +-- data/presets/railway/rail.json | 2 +- data/presets/railway/rail/highspeed.json | 2 +- data/presets/railway/signal.json | 4 +-- data/presets/railway/switch.json | 4 +-- data/presets/railway/train_wash.json | 4 +-- data/presets/roller_coaster/station.json | 4 +-- data/presets/roller_coaster/track.json | 4 +-- .../seamark/beacon_isolated_danger.json | 4 +-- data/presets/seamark/beacon_lateral.json | 2 +- data/presets/seamark/buoy_lateral.json | 2 +- data/presets/seamark/buoy_lateral/green.json | 2 +- data/presets/seamark/buoy_lateral/red.json | 2 +- data/presets/seamark/mooring.json | 4 +-- data/presets/shop/_hobby.json | 2 +- data/presets/shop/agrarian.json | 6 ++-- data/presets/shop/beauty.json | 2 +- data/presets/shop/butcher.json | 2 +- data/presets/shop/car_repair.json | 2 +- data/presets/shop/charity.json | 4 +-- data/presets/shop/clothes/underwear.json | 2 +- data/presets/shop/computer.json | 2 +- data/presets/shop/convenience.json | 4 +-- data/presets/shop/dairy.json | 4 +-- data/presets/shop/electrical.json | 2 +- data/presets/shop/erotic.json | 4 +-- data/presets/shop/erotic/lgbtq.json | 4 +-- data/presets/shop/fireplace.json | 4 +-- data/presets/shop/funeral_directors.json | 4 +-- data/presets/shop/hairdresser/barber.json | 10 +++---- data/presets/shop/hairdresser_supply.json | 4 +-- data/presets/shop/health_food.json | 2 +- data/presets/shop/household_linen.json | 2 +- data/presets/shop/jewelry.json | 2 +- data/presets/shop/lighting.json | 2 +- data/presets/shop/lottery.json | 2 +- data/presets/shop/military_surplus.json | 2 +- data/presets/shop/motorcycle_repair.json | 2 +- data/presets/shop/music.json | 12 ++++---- data/presets/shop/nuts.json | 2 +- data/presets/shop/outdoor.json | 4 +-- data/presets/shop/pastry.json | 4 +-- data/presets/shop/second_hand.json | 2 +- data/presets/shop/shoes.json | 6 ++-- data/presets/shop/supermarket.json | 6 ++-- data/presets/shop/video.json | 8 ++--- data/presets/shop/wholesale.json | 4 +-- data/presets/telecom/data_center.json | 4 +-- data/presets/tourism/artwork/graffiti.json | 8 ++--- data/presets/tourism/artwork/sculpture.json | 4 +-- data/presets/tourism/artwork/statue.json | 4 +-- data/presets/tourism/camp_pitch.json | 4 +-- data/presets/tourism/camp_site.json | 2 +- data/presets/tourism/caravan_site.json | 4 +-- data/presets/tourism/guest_house.json | 4 +-- data/presets/tourism/museum/history.json | 2 +- data/presets/tourism/wilderness_hut.json | 2 +- data/presets/tourism/zoo/petting.json | 8 ++--- data/presets/tourism/zoo/safari.json | 4 +-- data/presets/traffic_calming/bump.json | 4 +-- data/presets/traffic_calming/chicane.json | 4 +-- data/presets/traffic_calming/choker.json | 4 +-- data/presets/traffic_calming/cushion.json | 4 +-- data/presets/traffic_calming/dip.json | 4 +-- data/presets/traffic_calming/hump.json | 4 +-- data/presets/traffic_calming/mini_bumps.json | 2 +- .../presets/traffic_calming/rumble_strip.json | 4 +-- data/presets/traffic_calming/table.json | 4 +-- data/presets/traffic_sign.json | 4 +-- data/presets/traffic_sign/city_limit.json | 10 +++---- data/presets/traffic_sign/maxspeed.json | 4 +-- .../traffic_sign/variable_message.json | 4 +-- data/presets/type/route/climbing.json | 4 +-- data/presets/waterway/dock.json | 4 +-- data/presets/waterway/fuel.json | 6 ++-- data/presets/waterway/milestone.json | 4 +-- .../waterway/sanitary_dump_station.json | 20 ++++++------- data/presets/waterway/tidal_channel.json | 2 +- data/presets/waterway/water_point.json | 4 +-- 440 files changed, 997 insertions(+), 997 deletions(-) diff --git a/data/presets/aeroway/jet_bridge.json b/data/presets/aeroway/jet_bridge.json index fbf20d4d..5ec117d5 100644 --- a/data/presets/aeroway/jet_bridge.json +++ b/data/presets/aeroway/jet_bridge.json @@ -24,10 +24,10 @@ "finger", "gangway", "jet bridge", - "jetbridge", "jet way", + "jetbridge", "jetway", - "PBB", + "pbb", "portal", "terminal gate connector" ], diff --git a/data/presets/aeroway/terminal.json b/data/presets/aeroway/terminal.json index c39ffe05..fb4fc71a 100644 --- a/data/presets/aeroway/terminal.json +++ b/data/presets/aeroway/terminal.json @@ -19,8 +19,8 @@ "aeroway": "terminal" }, "terms": [ - "airport", - "aerodrome" + "aerodrome", + "airport" ], "name": "Airport Terminal" } diff --git a/data/presets/amenity/animal_shelter.json b/data/presets/amenity/animal_shelter.json index 8879df29..8584ff50 100644 --- a/data/presets/amenity/animal_shelter.json +++ b/data/presets/amenity/animal_shelter.json @@ -24,12 +24,12 @@ "kitten", "pet care", "pet rescue", + "pound", "puppy", "raptor", "reptile", "rescue", - "spca", - "pound" + "spca" ], "tags": { "amenity": "animal_shelter" diff --git a/data/presets/amenity/atm.json b/data/presets/amenity/atm.json index 38719c8d..304f99f7 100644 --- a/data/presets/amenity/atm.json +++ b/data/presets/amenity/atm.json @@ -25,9 +25,9 @@ "vertex" ], "terms": [ - "money", "cash", - "machine" + "machine", + "money" ], "tags": { "amenity": "atm" diff --git a/data/presets/amenity/baking_oven.json b/data/presets/amenity/baking_oven.json index 4677ddfb..afe10d46 100644 --- a/data/presets/amenity/baking_oven.json +++ b/data/presets/amenity/baking_oven.json @@ -21,8 +21,8 @@ "clay oven", "horno", "masonry oven", - "tabun oven", - "pizza oven" + "pizza oven", + "tabun oven" ], "name": "Baking Oven" } diff --git a/data/presets/amenity/bar.json b/data/presets/amenity/bar.json index d5ef84e2..bb31b03c 100644 --- a/data/presets/amenity/bar.json +++ b/data/presets/amenity/bar.json @@ -24,10 +24,10 @@ "area" ], "terms": [ - "dive", "beer", "bier", - "booze" + "booze", + "dive" ], "tags": { "amenity": "bar" diff --git a/data/presets/amenity/bar/lgbtq.json b/data/presets/amenity/bar/lgbtq.json index 2944b744..fe3d29da 100644 --- a/data/presets/amenity/bar/lgbtq.json +++ b/data/presets/amenity/bar/lgbtq.json @@ -7,9 +7,9 @@ "terms": [ "gay bar", "lesbian bar", - "lgbtq bar", + "lgb bar", "lgbt bar", - "lgb bar" + "lgbtq bar" ], "tags": { "amenity": "bar", diff --git a/data/presets/amenity/bench.json b/data/presets/amenity/bench.json index 81dcdbf1..1addc71f 100644 --- a/data/presets/amenity/bench.json +++ b/data/presets/amenity/bench.json @@ -23,8 +23,8 @@ "line" ], "terms": [ - "seat", - "chair" + "chair", + "seat" ], "tags": { "amenity": "bench" diff --git a/data/presets/amenity/bicycle_parking/building.json b/data/presets/amenity/bicycle_parking/building.json index 248a0b71..43030d94 100644 --- a/data/presets/amenity/bicycle_parking/building.json +++ b/data/presets/amenity/bicycle_parking/building.json @@ -21,11 +21,11 @@ "key": "bicycle_parking" }, "terms": [ - "Bike Parking Station", + "bike parking station", "cycle parking", "cycling", - "Multi-Storey Bicycle Park", - "Multi-Storey Bike Park" + "multi-storey bicycle park", + "multi-storey bike park" ], "name": "Bicycle Parking Garage" } diff --git a/data/presets/amenity/bicycle_parking/lockers.json b/data/presets/amenity/bicycle_parking/lockers.json index 92e9d547..0ac80b1e 100644 --- a/data/presets/amenity/bicycle_parking/lockers.json +++ b/data/presets/amenity/bicycle_parking/lockers.json @@ -13,9 +13,9 @@ "key": "bicycle_parking" }, "terms": [ + "bike lockers", "cycle locker", - "cycling", - "Bike Lockers" + "cycling" ], "name": "Bicycle Lockers" } diff --git a/data/presets/amenity/bicycle_parking/shed.json b/data/presets/amenity/bicycle_parking/shed.json index dfcf90ca..25767023 100644 --- a/data/presets/amenity/bicycle_parking/shed.json +++ b/data/presets/amenity/bicycle_parking/shed.json @@ -17,9 +17,9 @@ "key": "bicycle_parking" }, "terms": [ + "bike shed", "cycle shed", - "cycling", - "Bike Shed" + "cycling" ], "name": "Bicycle Shed" } diff --git a/data/presets/amenity/bicycle_rental.json b/data/presets/amenity/bicycle_rental.json index eda29e5b..146b6977 100644 --- a/data/presets/amenity/bicycle_rental.json +++ b/data/presets/amenity/bicycle_rental.json @@ -21,11 +21,11 @@ "area" ], "terms": [ - "bike", "bicycle", - "bikeshare", - "bike share", "bicycle share", + "bike", + "bike share", + "bikeshare", "cycle dock", "cycle hub", "cycleshare", diff --git a/data/presets/amenity/bicycle_repair_station.json b/data/presets/amenity/bicycle_repair_station.json index 0dd4f27c..7bdf1e5d 100644 --- a/data/presets/amenity/bicycle_repair_station.json +++ b/data/presets/amenity/bicycle_repair_station.json @@ -26,10 +26,10 @@ "bike multitool", "bike repair", "bike tools", + "compressed air", "cycle pump", "cycle repair", - "cycling", - "compressed air" + "cycling" ], "tags": { "amenity": "bicycle_repair_station" diff --git a/data/presets/amenity/bicycle_wash.json b/data/presets/amenity/bicycle_wash.json index 9cbb503a..91d45678 100644 --- a/data/presets/amenity/bicycle_wash.json +++ b/data/presets/amenity/bicycle_wash.json @@ -18,13 +18,13 @@ "area" ], "terms": [ - "bike", "bicycle", - "bike wash", - "bicycle wash", "bicycle cleaning", - "cycle wash", + "bicycle wash", + "bike", + "bike wash", "cycle rinse station", + "cycle wash", "cycling" ], "tags": { diff --git a/data/presets/amenity/binoculars.json b/data/presets/amenity/binoculars.json index 1d619e38..b357f74b 100644 --- a/data/presets/amenity/binoculars.json +++ b/data/presets/amenity/binoculars.json @@ -24,8 +24,8 @@ "terms": [ "observation viewer", "optical ranger", - "spotting scope", "sight", + "spotting scope", "spyglass", "telescope", "tower viewer", diff --git a/data/presets/amenity/cafe/bubble_tea.json b/data/presets/amenity/cafe/bubble_tea.json index 5b08d7bb..ae211b72 100644 --- a/data/presets/amenity/cafe/bubble_tea.json +++ b/data/presets/amenity/cafe/bubble_tea.json @@ -14,12 +14,12 @@ }, "terms": [ "boba", + "boba drink", "bubble milk tea", "pearl milk tea", - "taiwanese tea drink", - "tapioca", "pearl tea", - "boba drink" + "taiwanese tea drink", + "tapioca" ], "name": "Bubble Tea Cafe" } diff --git a/data/presets/amenity/cafe/coffee_shop.json b/data/presets/amenity/cafe/coffee_shop.json index 595bac10..05df1b0b 100644 --- a/data/presets/amenity/cafe/coffee_shop.json +++ b/data/presets/amenity/cafe/coffee_shop.json @@ -16,9 +16,9 @@ "americano", "brew", "cafe", - "café", "caffe", "caffè", + "café", "cappuccino", "cocoa", "coffee shop", diff --git a/data/presets/amenity/cafe/teahouse.json b/data/presets/amenity/cafe/teahouse.json index 5eec4c69..a2294602 100644 --- a/data/presets/amenity/cafe/teahouse.json +++ b/data/presets/amenity/cafe/teahouse.json @@ -13,18 +13,18 @@ "value": "cafe" }, "terms": [ - "teahouse", - "tea house", - "tearoom", - "tea room", - "tea", - "tea drink", "black tea", "green tea", - "yellow tea", - "white tea", + "hot drinks", "oolong tea", - "hot drinks" + "tea", + "tea drink", + "tea house", + "tea room", + "teahouse", + "tearoom", + "white tea", + "yellow tea" ], "name": "Teahouse" } diff --git a/data/presets/amenity/casino.json b/data/presets/amenity/casino.json index 72e6057d..62568fc2 100644 --- a/data/presets/amenity/casino.json +++ b/data/presets/amenity/casino.json @@ -21,11 +21,11 @@ "area" ], "terms": [ - "gambling", - "roulette", + "blackjack", "craps", + "gambling", "poker", - "blackjack" + "roulette" ], "tags": { "amenity": "casino" diff --git a/data/presets/amenity/cinema.json b/data/presets/amenity/cinema.json index 0149c75c..5cb106c2 100644 --- a/data/presets/amenity/cinema.json +++ b/data/presets/amenity/cinema.json @@ -25,10 +25,10 @@ "film", "flick", "movie", - "theater", "picture", + "screen", "show", - "screen" + "theater" ], "tags": { "amenity": "cinema" diff --git a/data/presets/amenity/clinic/dialysis.json b/data/presets/amenity/clinic/dialysis.json index edb4bab0..f920d7e5 100644 --- a/data/presets/amenity/clinic/dialysis.json +++ b/data/presets/amenity/clinic/dialysis.json @@ -17,8 +17,8 @@ "value": "dialysis" }, "terms": [ - "kidney dialysis", - "dialysis clinic" + "dialysis clinic", + "kidney dialysis" ], "name": "Dialysis Center" } diff --git a/data/presets/amenity/clinic/fertility.json b/data/presets/amenity/clinic/fertility.json index 2642deb6..2dde77ab 100644 --- a/data/presets/amenity/clinic/fertility.json +++ b/data/presets/amenity/clinic/fertility.json @@ -7,9 +7,9 @@ "terms": [ "egg", "fertility", + "ovulation", "reproductive", - "sperm", - "ovulation" + "sperm" ], "tags": { "amenity": "clinic", diff --git a/data/presets/amenity/community_centre/lgbtq.json b/data/presets/amenity/community_centre/lgbtq.json index 49e32bbd..843f7aa7 100644 --- a/data/presets/amenity/community_centre/lgbtq.json +++ b/data/presets/amenity/community_centre/lgbtq.json @@ -12,12 +12,12 @@ "area" ], "terms": [ - "lgbtq event", - "lgbtq hall", + "lgb event", + "lgb hall", "lgbt event", "lgbt hall", - "lgb event", - "lgb hall" + "lgbtq event", + "lgbtq hall" ], "tags": { "amenity": "community_centre", diff --git a/data/presets/amenity/dentist.json b/data/presets/amenity/dentist.json index 5261080b..1b011e87 100644 --- a/data/presets/amenity/dentist.json +++ b/data/presets/amenity/dentist.json @@ -16,8 +16,8 @@ "area" ], "terms": [ - "tooth", - "teeth" + "teeth", + "tooth" ], "tags": { "amenity": "dentist" diff --git a/data/presets/amenity/doctors/cardiology.json b/data/presets/amenity/doctors/cardiology.json index a644403a..d911eb18 100644 --- a/data/presets/amenity/doctors/cardiology.json +++ b/data/presets/amenity/doctors/cardiology.json @@ -6,7 +6,7 @@ ], "terms": [ "cardiac surgeon", - "Cardiology", + "cardiology", "cardiovascular system", "coronary artery", "heart" diff --git a/data/presets/amenity/doctors/gastroenterology.json b/data/presets/amenity/doctors/gastroenterology.json index b1dea481..7b507e17 100644 --- a/data/presets/amenity/doctors/gastroenterology.json +++ b/data/presets/amenity/doctors/gastroenterology.json @@ -6,13 +6,13 @@ ], "terms": [ "bowels", - "digestive system", "digestion", + "digestive system", "esophagus", "food pipe", "gallstone", - "gastrointestinal tract", "gastroenterology", + "gastrointestinal tract", "gullet", "intestines", "large intestine", diff --git a/data/presets/amenity/doctors/general.json b/data/presets/amenity/doctors/general.json index bbb68b39..71b4fe60 100644 --- a/data/presets/amenity/doctors/general.json +++ b/data/presets/amenity/doctors/general.json @@ -5,10 +5,10 @@ "area" ], "terms": [ - "gp", + "family doctor", "family physician", "family practitioner", - "family doctor" + "gp" ], "tags": { "amenity": "doctors", diff --git a/data/presets/amenity/doctors/gynaecology.json b/data/presets/amenity/doctors/gynaecology.json index b047c2b5..290b1e16 100644 --- a/data/presets/amenity/doctors/gynaecology.json +++ b/data/presets/amenity/doctors/gynaecology.json @@ -9,8 +9,8 @@ "gynaecologist", "gynaecology", "gynecology", - "OBGYN", "ob/gyn", + "obgyn", "obstetrics", "ovulation", "reproductive", diff --git a/data/presets/amenity/doctors/nephrology.json b/data/presets/amenity/doctors/nephrology.json index 07b4c274..7792ee8f 100644 --- a/data/presets/amenity/doctors/nephrology.json +++ b/data/presets/amenity/doctors/nephrology.json @@ -6,8 +6,8 @@ ], "terms": [ "kidney", - "kidneys", "kidney medicine", + "kidneys", "nephrology", "renal" ], diff --git a/data/presets/amenity/doctors/pathology.json b/data/presets/amenity/doctors/pathology.json index feab3476..2fffc041 100644 --- a/data/presets/amenity/doctors/pathology.json +++ b/data/presets/amenity/doctors/pathology.json @@ -5,9 +5,9 @@ "area" ], "terms": [ - "autopsy", - "anatomical pathology", "anatomic pathology", + "anatomical pathology", + "autopsy", "pathology" ], "tags": { diff --git a/data/presets/amenity/doctors/plastic_surgery.json b/data/presets/amenity/doctors/plastic_surgery.json index c561fc91..bdb3ab24 100644 --- a/data/presets/amenity/doctors/plastic_surgery.json +++ b/data/presets/amenity/doctors/plastic_surgery.json @@ -8,8 +8,8 @@ "aesthetic surgery", "cosmetic surgery", "craniofacial surgery", - "reconstructive surgery", - "plastic surgery" + "plastic surgery", + "reconstructive surgery" ], "tags": { "amenity": "doctors", diff --git a/data/presets/amenity/doctors/pulmonology.json b/data/presets/amenity/doctors/pulmonology.json index f9629114..74ffc1d5 100644 --- a/data/presets/amenity/doctors/pulmonology.json +++ b/data/presets/amenity/doctors/pulmonology.json @@ -11,13 +11,13 @@ "lungs", "pneumologist", "pneumology", + "pneumonia", "pneumonologist", "pneumonology", - "pneumonia", "pulmonology", + "respiratory medicine", "respiratory tract", - "respirology", - "respiratory medicine" + "respirology" ], "tags": { "amenity": "doctors", diff --git a/data/presets/amenity/doctors/radiology.json b/data/presets/amenity/doctors/radiology.json index efe88e15..d6af5689 100644 --- a/data/presets/amenity/doctors/radiology.json +++ b/data/presets/amenity/doctors/radiology.json @@ -5,13 +5,13 @@ "area" ], "terms": [ - "radiology", "computed tomography", "ct", "magnetic resonance imaging", - "medical ultrasound", "medical ultrasonography", + "medical ultrasound", "mri", + "radiology", "sonography", "ultrasonography" ], diff --git a/data/presets/amenity/doctors/urology.json b/data/presets/amenity/doctors/urology.json index 40380ad9..7a781c80 100644 --- a/data/presets/amenity/doctors/urology.json +++ b/data/presets/amenity/doctors/urology.json @@ -15,10 +15,10 @@ "scrotum", "testicles", "testis", - "urethra", "ureters", - "urology", - "urinary" + "urethra", + "urinary", + "urology" ], "tags": { "amenity": "doctors", diff --git a/data/presets/amenity/dog_toilet.json b/data/presets/amenity/dog_toilet.json index 12f22c44..b62a438b 100644 --- a/data/presets/amenity/dog_toilet.json +++ b/data/presets/amenity/dog_toilet.json @@ -22,12 +22,12 @@ "amenity": "dog_toilet" }, "terms": [ - "dog poo area", "dog excrement", "dog excrete", - "dog urine", + "dog poo area", + "dog relief area", "dog urinate", - "dog relief area" + "dog urine" ], "name": "Dog Toilet" } diff --git a/data/presets/amenity/dojo.json b/data/presets/amenity/dojo.json index e53df203..a683bb04 100644 --- a/data/presets/amenity/dojo.json +++ b/data/presets/amenity/dojo.json @@ -15,8 +15,8 @@ "area" ], "terms": [ - "martial arts", - "dojang" + "dojang", + "martial arts" ], "tags": { "amenity": "dojo" diff --git a/data/presets/amenity/drinking_water.json b/data/presets/amenity/drinking_water.json index d27407c3..8e9c44f4 100644 --- a/data/presets/amenity/drinking_water.json +++ b/data/presets/amenity/drinking_water.json @@ -24,10 +24,10 @@ "amenity": "drinking_water" }, "terms": [ + "bubbler", + "drinking fountain", "potable water source", "water fountain", - "drinking fountain", - "bubbler", "water tap" ], "name": "Drinking Water" diff --git a/data/presets/amenity/driver_training.json b/data/presets/amenity/driver_training.json index 80c4784a..eca53c52 100644 --- a/data/presets/amenity/driver_training.json +++ b/data/presets/amenity/driver_training.json @@ -23,6 +23,6 @@ "Driving Safety Center" ], "terms": [ - "Driving School" + "driving school" ] } diff --git a/data/presets/amenity/events_venue.json b/data/presets/amenity/events_venue.json index 646702e8..033e41a0 100644 --- a/data/presets/amenity/events_venue.json +++ b/data/presets/amenity/events_venue.json @@ -26,8 +26,8 @@ "terms": [ "banquet hall", "baptism", - "Bar Mitzvah", - "Bat Mitzvah", + "bar mitzvah", + "bat mitzvah", "birthdays", "celebrations", "conferences", diff --git a/data/presets/amenity/exhibition_centre.json b/data/presets/amenity/exhibition_centre.json index b19ad668..c99eff81 100644 --- a/data/presets/amenity/exhibition_centre.json +++ b/data/presets/amenity/exhibition_centre.json @@ -23,11 +23,11 @@ "amenity": "exhibition_centre" }, "terms": [ + "expo", "fair", + "trade exhibition", "trade fair", "trade show", - "trade exhibition", - "expo", "tradeshow" ], "name": "Exposition Center", diff --git a/data/presets/amenity/fast_food/donut.json b/data/presets/amenity/fast_food/donut.json index e10b92da..98cc2e72 100644 --- a/data/presets/amenity/fast_food/donut.json +++ b/data/presets/amenity/fast_food/donut.json @@ -12,9 +12,9 @@ "coffee", "dine", "diner", + "dining", "donut", "doughnut", - "dining", "eat", "lunch", "table" diff --git a/data/presets/amenity/fast_food/fish_and_chips.json b/data/presets/amenity/fast_food/fish_and_chips.json index 27a2cf41..1dcf1161 100644 --- a/data/presets/amenity/fast_food/fish_and_chips.json +++ b/data/presets/amenity/fast_food/fish_and_chips.json @@ -13,10 +13,10 @@ "dinner", "drive-in", "eat", + "french fries", "grill", "lunch", - "table", - "french fries" + "table" ], "tags": { "amenity": "fast_food", diff --git a/data/presets/amenity/fast_food/hot_dog.json b/data/presets/amenity/fast_food/hot_dog.json index 0a39973c..0463113a 100644 --- a/data/presets/amenity/fast_food/hot_dog.json +++ b/data/presets/amenity/fast_food/hot_dog.json @@ -6,8 +6,8 @@ ], "terms": [ "ballpark", - "frankfurter", "frank", + "frankfurter", "hotdog stand", "sandwich", "sausage", diff --git a/data/presets/amenity/fast_food/juice.json b/data/presets/amenity/fast_food/juice.json index 5239e22e..f5ad8d9f 100644 --- a/data/presets/amenity/fast_food/juice.json +++ b/data/presets/amenity/fast_food/juice.json @@ -5,9 +5,9 @@ "area" ], "terms": [ + "beverages", "cafe", "café", - "beverages", "fruit drinks", "juice bar", "shakes", diff --git a/data/presets/amenity/fast_food/kebab.json b/data/presets/amenity/fast_food/kebab.json index 5daee6d9..217c8100 100644 --- a/data/presets/amenity/fast_food/kebab.json +++ b/data/presets/amenity/fast_food/kebab.json @@ -14,8 +14,8 @@ "dining", "dinner", "doner kebab", - "döner kebab", "drive-in", + "döner kebab", "eat", "grill", "lunch", diff --git a/data/presets/amenity/fast_food/mexican.json b/data/presets/amenity/fast_food/mexican.json index 827815f7..16e21247 100644 --- a/data/presets/amenity/fast_food/mexican.json +++ b/data/presets/amenity/fast_food/mexican.json @@ -6,23 +6,23 @@ ], "terms": [ "breakfast", + "burritos", "dine", "dining", "dinner", "drive-in", "eat", - "grill", - "lunch", - "table", - "tacos", - "burritos", "enchiladas", "fajitas", + "grill", + "lunch", "nachos", - "tortillas", + "quesadillas", "salsa", + "table", + "tacos", "tamales", - "quesadillas" + "tortillas" ], "tags": { "amenity": "fast_food", diff --git a/data/presets/amenity/fast_food/pizza.json b/data/presets/amenity/fast_food/pizza.json index 35050aa3..ce06f271 100644 --- a/data/presets/amenity/fast_food/pizza.json +++ b/data/presets/amenity/fast_food/pizza.json @@ -5,16 +5,16 @@ "area" ], "terms": [ + "deep dish", "dine", "dining", "dinner", "drive-in", "eat", "lunch", + "slice", "table", - "deep dish", - "thin crust", - "slice" + "thin crust" ], "tags": { "amenity": "fast_food", diff --git a/data/presets/amenity/food_court.json b/data/presets/amenity/food_court.json index b67194e1..c86ecf07 100644 --- a/data/presets/amenity/food_court.json +++ b/data/presets/amenity/food_court.json @@ -23,8 +23,8 @@ ], "terms": [ "fast food", - "restaurant", - "food" + "food", + "restaurant" ], "tags": { "amenity": "food_court" diff --git a/data/presets/amenity/fuel.json b/data/presets/amenity/fuel.json index e81471b4..a7ccb990 100644 --- a/data/presets/amenity/fuel.json +++ b/data/presets/amenity/fuel.json @@ -20,14 +20,14 @@ "area" ], "terms": [ - "petrol", + "biodiesel", + "cng", + "diesel", "fuel", "gasoline", - "propane", - "diesel", "lng", - "cng", - "biodiesel" + "petrol", + "propane" ], "tags": { "amenity": "fuel" diff --git a/data/presets/amenity/hookah_lounge.json b/data/presets/amenity/hookah_lounge.json index db11a568..36356e24 100644 --- a/data/presets/amenity/hookah_lounge.json +++ b/data/presets/amenity/hookah_lounge.json @@ -20,10 +20,10 @@ "area" ], "terms": [ - "waterpipe", + "flavored tobacco", "nargile", "shisha", - "flavored tobacco" + "waterpipe" ], "tags": { "amenity": "hookah_lounge" diff --git a/data/presets/amenity/ice_cream.json b/data/presets/amenity/ice_cream.json index c2299e7c..6cd79a39 100644 --- a/data/presets/amenity/ice_cream.json +++ b/data/presets/amenity/ice_cream.json @@ -25,10 +25,10 @@ "area" ], "terms": [ - "gelato", - "sorbet", - "sherbet", "frozen", + "gelato", + "sherbet", + "sorbet", "yogurt" ], "tags": { diff --git a/data/presets/amenity/ice_cream/frozen_yogurt.json b/data/presets/amenity/ice_cream/frozen_yogurt.json index 52affc84..423b7158 100644 --- a/data/presets/amenity/ice_cream/frozen_yogurt.json +++ b/data/presets/amenity/ice_cream/frozen_yogurt.json @@ -9,8 +9,8 @@ "froyo", "frozen yoghurt", "ice cream", - "yogurt", - "yoghurt" + "yoghurt", + "yogurt" ], "tags": { "amenity": "ice_cream", diff --git a/data/presets/amenity/internet_cafe.json b/data/presets/amenity/internet_cafe.json index 96b76368..31f25312 100644 --- a/data/presets/amenity/internet_cafe.json +++ b/data/presets/amenity/internet_cafe.json @@ -23,13 +23,13 @@ "area" ], "terms": [ - "cybercafe", - "taxiphone", - "teleboutique", - "coffee", "cafe", + "coffee", + "cybercafe", + "lanhouse", "net", - "lanhouse" + "taxiphone", + "teleboutique" ], "tags": { "amenity": "internet_cafe" diff --git a/data/presets/amenity/karaoke_box.json b/data/presets/amenity/karaoke_box.json index 77b6ea9e..6e6f73a8 100644 --- a/data/presets/amenity/karaoke_box.json +++ b/data/presets/amenity/karaoke_box.json @@ -22,7 +22,7 @@ "karaoke club", "karaoke room", "karaoke television", - "KTV" + "ktv" ], "tags": { "amenity": "karaoke_box" diff --git a/data/presets/amenity/letter_box.json b/data/presets/amenity/letter_box.json index f98cc033..a91aef38 100644 --- a/data/presets/amenity/letter_box.json +++ b/data/presets/amenity/letter_box.json @@ -27,8 +27,8 @@ }, "terms": [ "curbside delivery box", - "home delivery box", "direct-to-door delivery box", + "home delivery box", "letter hole", "letter plate", "letter slot", diff --git a/data/presets/amenity/library_dropoff.json b/data/presets/amenity/library_dropoff.json index ec85fa71..da285d4e 100644 --- a/data/presets/amenity/library_dropoff.json +++ b/data/presets/amenity/library_dropoff.json @@ -20,8 +20,8 @@ "terms": [ "book drop-off", "book return", - "library drop-off", "library book return", + "library drop-off", "library return" ], "name": "Book Return Drop Box" diff --git a/data/presets/amenity/lounger.json b/data/presets/amenity/lounger.json index dc4fd62d..3de0328f 100644 --- a/data/presets/amenity/lounger.json +++ b/data/presets/amenity/lounger.json @@ -20,9 +20,9 @@ "amenity": "lounger" }, "terms": [ - "seat", + "bench", "chair", - "bench" + "seat" ], "name": "Lounger" } diff --git a/data/presets/amenity/monastery.json b/data/presets/amenity/monastery.json index 6dc5ffdb..497276af 100644 --- a/data/presets/amenity/monastery.json +++ b/data/presets/amenity/monastery.json @@ -25,7 +25,7 @@ "chapel", "church", "fold", - "house of God", + "house of god", "house of prayer", "house of worship", "minster", diff --git a/data/presets/amenity/money_transfer.json b/data/presets/amenity/money_transfer.json index 36b9ff4e..f2f63637 100644 --- a/data/presets/amenity/money_transfer.json +++ b/data/presets/amenity/money_transfer.json @@ -18,16 +18,16 @@ "area" ], "terms": [ - "money order", - "check", "bill", - "currency", - "finance", - "wire transfer", "cable", - "person to person", "cash to cash", - "exchange" + "check", + "currency", + "exchange", + "finance", + "money order", + "person to person", + "wire transfer" ], "tags": { "amenity": "money_transfer" diff --git a/data/presets/amenity/motorcycle_rental.json b/data/presets/amenity/motorcycle_rental.json index a938cf48..9eab473d 100644 --- a/data/presets/amenity/motorcycle_rental.json +++ b/data/presets/amenity/motorcycle_rental.json @@ -23,8 +23,8 @@ "hog", "minibike", "moped", - "motorbike", "motor scooter", + "motorbike", "sidecar", "sportbike" ], diff --git a/data/presets/amenity/nightclub/lgbtq.json b/data/presets/amenity/nightclub/lgbtq.json index ff459ae1..0d3b7523 100644 --- a/data/presets/amenity/nightclub/lgbtq.json +++ b/data/presets/amenity/nightclub/lgbtq.json @@ -11,9 +11,9 @@ "terms": [ "gay nightclub", "lesbian nightclub", - "lgbtq nightclub", + "lgb nightclub", "lgbt nightclub", - "lgb nightclub" + "lgbtq nightclub" ], "name": "LGBTQ+ Nightclub" } diff --git a/data/presets/amenity/parking/park_ride.json b/data/presets/amenity/parking/park_ride.json index 4d2cef9a..a99b8c59 100644 --- a/data/presets/amenity/parking/park_ride.json +++ b/data/presets/amenity/parking/park_ride.json @@ -21,11 +21,11 @@ "commuter parking lot", "incentive parking lot", "metro parking lot", + "p+r", "park and pool lot", "park and ride lot", - "P+R", - "public transport parking lot", "public transit parking lot", + "public transport parking lot", "train parking lot" ], "matchScore": 0.95, diff --git a/data/presets/amenity/parking/street-side.json b/data/presets/amenity/parking/street-side.json index 0ec0f4bc..277b7b22 100644 --- a/data/presets/amenity/parking/street-side.json +++ b/data/presets/amenity/parking/street-side.json @@ -24,12 +24,12 @@ "terms": [ "automobile parking", "car parking", - "vehicle parking", + "road-side parking", + "roadside parking", "street parking", "street-side parking", "streetside parking", - "road-side parking", - "roadside parking" + "vehicle parking" ], "name": "Street-side Parking" } diff --git a/data/presets/amenity/payment_centre.json b/data/presets/amenity/payment_centre.json index 0cbc75d9..4b3a129d 100644 --- a/data/presets/amenity/payment_centre.json +++ b/data/presets/amenity/payment_centre.json @@ -18,13 +18,13 @@ "area" ], "terms": [ - "check", - "tax pay", "bill pay", + "cash", + "check", "currency", "finance", - "cash", - "money" + "money", + "tax pay" ], "tags": { "amenity": "payment_centre" diff --git a/data/presets/amenity/payment_terminal.json b/data/presets/amenity/payment_terminal.json index 47c32742..611aa76e 100644 --- a/data/presets/amenity/payment_terminal.json +++ b/data/presets/amenity/payment_terminal.json @@ -20,16 +20,16 @@ "point" ], "terms": [ - "interactive kiosk", - "ekiosk", "atm", "bill pay", - "tax pay", - "phone pay", - "finance", + "card", "cash", + "ekiosk", + "finance", + "interactive kiosk", "money transfer", - "card" + "phone pay", + "tax pay" ], "tags": { "amenity": "payment_terminal" diff --git a/data/presets/amenity/photo_booth.json b/data/presets/amenity/photo_booth.json index 72cbb324..0cbda0e8 100644 --- a/data/presets/amenity/photo_booth.json +++ b/data/presets/amenity/photo_booth.json @@ -17,11 +17,11 @@ "area" ], "terms": [ - "photobooth", - "photo", "booth", + "camera", "kiosk", - "camera" + "photo", + "photobooth" ], "tags": { "amenity": "photo_booth" diff --git a/data/presets/amenity/place_of_worship.json b/data/presets/amenity/place_of_worship.json index 33a6e3d4..b0147097 100644 --- a/data/presets/amenity/place_of_worship.json +++ b/data/presets/amenity/place_of_worship.json @@ -34,7 +34,7 @@ "chapel", "church", "fold", - "house of God", + "house of god", "house of prayer", "house of worship", "minster", diff --git a/data/presets/amenity/place_of_worship/buddhist.json b/data/presets/amenity/place_of_worship/buddhist.json index 0f6e7874..4a792400 100644 --- a/data/presets/amenity/place_of_worship/buddhist.json +++ b/data/presets/amenity/place_of_worship/buddhist.json @@ -11,13 +11,13 @@ "area" ], "terms": [ - "stupa", - "vihara", + "dojo", "monastery", - "temple", "pagoda", - "zendo", - "dojo" + "stupa", + "temple", + "vihara", + "zendo" ], "tags": { "amenity": "place_of_worship", diff --git a/data/presets/amenity/place_of_worship/christian.json b/data/presets/amenity/place_of_worship/christian.json index 1ab858c9..5e3a147a 100644 --- a/data/presets/amenity/place_of_worship/christian.json +++ b/data/presets/amenity/place_of_worship/christian.json @@ -11,29 +11,29 @@ "area" ], "terms": [ - "christian", "abbey", + "anglican", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", + "christian", "fold", - "house of God", + "house of god", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", + "roman catholic", "sacellum", "sanctuary", "shrine", "tabernacle", - "temple", - "anglican", - "roman catholic" + "temple" ], "tags": { "amenity": "place_of_worship", diff --git a/data/presets/amenity/place_of_worship/christian/jehovahs_witness.json b/data/presets/amenity/place_of_worship/christian/jehovahs_witness.json index 2fa3aa32..c56dd303 100644 --- a/data/presets/amenity/place_of_worship/christian/jehovahs_witness.json +++ b/data/presets/amenity/place_of_worship/christian/jehovahs_witness.json @@ -7,7 +7,7 @@ "terms": [ "christian", "church", - "house of God", + "house of god", "house of prayer", "house of worship" ], diff --git a/data/presets/amenity/place_of_worship/christian/la_luz_del_mundo.json b/data/presets/amenity/place_of_worship/christian/la_luz_del_mundo.json index d683fdec..7b3e5100 100644 --- a/data/presets/amenity/place_of_worship/christian/la_luz_del_mundo.json +++ b/data/presets/amenity/place_of_worship/christian/la_luz_del_mundo.json @@ -7,7 +7,7 @@ "terms": [ "christian", "church", - "house of God", + "house of god", "house of prayer", "house of worship", "the light of the world church" diff --git a/data/presets/amenity/place_of_worship/christian/quaker.json b/data/presets/amenity/place_of_worship/christian/quaker.json index 5ff9fe7b..8b0cb1d7 100644 --- a/data/presets/amenity/place_of_worship/christian/quaker.json +++ b/data/presets/amenity/place_of_worship/christian/quaker.json @@ -7,7 +7,7 @@ "terms": [ "christian", "church", - "house of God", + "house of god", "house of prayer", "house of worship" ], diff --git a/data/presets/amenity/place_of_worship/hindu.json b/data/presets/amenity/place_of_worship/hindu.json index dc49d5c7..fd96fd64 100644 --- a/data/presets/amenity/place_of_worship/hindu.json +++ b/data/presets/amenity/place_of_worship/hindu.json @@ -11,11 +11,11 @@ "area" ], "terms": [ - "kovil", - "devasthana", - "mandir", - "kshetram", "alayam", + "devasthana", + "kovil", + "kshetram", + "mandir", "shrine", "temple" ], diff --git a/data/presets/amenity/planetarium.json b/data/presets/amenity/planetarium.json index 15cb4cfe..2b7cb50b 100644 --- a/data/presets/amenity/planetarium.json +++ b/data/presets/amenity/planetarium.json @@ -18,8 +18,8 @@ "area" ], "terms": [ - "museum", "astronomy", + "museum", "observatory" ], "tags": { diff --git a/data/presets/amenity/police.json b/data/presets/amenity/police.json index 7420ef47..663c8d02 100644 --- a/data/presets/amenity/police.json +++ b/data/presets/amenity/police.json @@ -24,9 +24,9 @@ "constabulary", "cop", "detective", + "enforcement", "fed", "law", - "enforcement", "officer", "patrol" ], diff --git a/data/presets/amenity/prison.json b/data/presets/amenity/prison.json index 8ac60e2e..e2a34c0e 100644 --- a/data/presets/amenity/prison.json +++ b/data/presets/amenity/prison.json @@ -17,8 +17,8 @@ ], "terms": [ "cell", - "jail", - "correction" + "correction", + "jail" ], "tags": { "amenity": "prison" diff --git a/data/presets/amenity/pub.json b/data/presets/amenity/pub.json index 17b6ba46..f2f071db 100644 --- a/data/presets/amenity/pub.json +++ b/data/presets/amenity/pub.json @@ -34,11 +34,11 @@ }, "terms": [ "alcohol", - "drink", - "dive", "beer", "bier", - "booze" + "booze", + "dive", + "drink" ], "name": "Pub" } diff --git a/data/presets/amenity/pub/irish.json b/data/presets/amenity/pub/irish.json index 932575f2..2cdf8f18 100644 --- a/data/presets/amenity/pub/irish.json +++ b/data/presets/amenity/pub/irish.json @@ -14,8 +14,8 @@ "value": "irish" }, "terms": [ - "irish pub", - "irish bar" + "irish bar", + "irish pub" ], "locationSet": { "exclude": [ diff --git a/data/presets/amenity/pub/lgbtq.json b/data/presets/amenity/pub/lgbtq.json index f8c3b9f8..8692850a 100644 --- a/data/presets/amenity/pub/lgbtq.json +++ b/data/presets/amenity/pub/lgbtq.json @@ -11,9 +11,9 @@ "terms": [ "gay pub", "lesbian pub", - "lgbtq pub", + "lgb pub", "lgbt pub", - "lgb pub" + "lgbtq pub" ], "name": "LGBTQ+ Pub" } diff --git a/data/presets/amenity/pub/microbrewery.json b/data/presets/amenity/pub/microbrewery.json index d02868d3..b73281eb 100644 --- a/data/presets/amenity/pub/microbrewery.json +++ b/data/presets/amenity/pub/microbrewery.json @@ -13,12 +13,12 @@ }, "terms": [ "alcohol", - "drink", - "dive", "beer", "bier", "booze", "craft brewery", + "dive", + "drink", "microbrewery", "small batch brewery" ], diff --git a/data/presets/amenity/public_bath.json b/data/presets/amenity/public_bath.json index b996f1ae..18d8814d 100644 --- a/data/presets/amenity/public_bath.json +++ b/data/presets/amenity/public_bath.json @@ -22,9 +22,9 @@ "amenity": "public_bath" }, "terms": [ - "onsen", "foot bath", - "hot springs" + "hot springs", + "onsen" ], "name": "Public Bath" } diff --git a/data/presets/amenity/public_bookcase.json b/data/presets/amenity/public_bookcase.json index 95c75756..ebac2e0c 100644 --- a/data/presets/amenity/public_bookcase.json +++ b/data/presets/amenity/public_bookcase.json @@ -32,10 +32,10 @@ "area" ], "terms": [ - "bookcrossing", "book exchange shelf", "book sharing", "book swap", + "bookcrossing", "library", "little free library", "share a book", diff --git a/data/presets/amenity/ranger_station.json b/data/presets/amenity/ranger_station.json index dce0a086..9d9545c3 100644 --- a/data/presets/amenity/ranger_station.json +++ b/data/presets/amenity/ranger_station.json @@ -18,13 +18,13 @@ "area" ], "terms": [ - "visitor center", - "visitor centre", + "backcountry office", "permit center", "permit centre", - "backcountry office", - "warden office", - "warden center" + "visitor center", + "visitor centre", + "warden center", + "warden office" ], "tags": { "amenity": "ranger_station" diff --git a/data/presets/amenity/recycling/container/green_waste.json b/data/presets/amenity/recycling/container/green_waste.json index 02f59166..f5f4d67f 100644 --- a/data/presets/amenity/recycling/container/green_waste.json +++ b/data/presets/amenity/recycling/container/green_waste.json @@ -15,11 +15,11 @@ "biological", "compost", "decomposable", + "food scrap", "garbage bin", "garden waste", "organic", - "rubbish", - "food scrap" + "rubbish" ], "tags": { "amenity": "recycling", diff --git a/data/presets/amenity/recycling_centre.json b/data/presets/amenity/recycling_centre.json index bc6bd046..d3a389ef 100644 --- a/data/presets/amenity/recycling_centre.json +++ b/data/presets/amenity/recycling_centre.json @@ -24,8 +24,8 @@ "bottle", "can", "dump", - "glass", "garbage", + "glass", "rubbish", "scrap", "trash" diff --git a/data/presets/amenity/recycling_container.json b/data/presets/amenity/recycling_container.json index ee32a5ca..770e9662 100644 --- a/data/presets/amenity/recycling_container.json +++ b/data/presets/amenity/recycling_container.json @@ -21,10 +21,10 @@ ], "terms": [ "bin", - "can", "bottle", - "glass", + "can", "garbage", + "glass", "rubbish", "scrap", "trash" diff --git a/data/presets/amenity/research_institute.json b/data/presets/amenity/research_institute.json index 3932fe0c..cecc64db 100644 --- a/data/presets/amenity/research_institute.json +++ b/data/presets/amenity/research_institute.json @@ -24,9 +24,9 @@ "terms": [ "applied research", "experimentation", - "r&d", "r & d", "r and d", + "r&d", "research and development", "research institution", "research laboratory", diff --git a/data/presets/amenity/restaurant/greek.json b/data/presets/amenity/restaurant/greek.json index b961bd44..5240f330 100644 --- a/data/presets/amenity/restaurant/greek.json +++ b/data/presets/amenity/restaurant/greek.json @@ -16,11 +16,11 @@ "drive-in", "eat", "grill", - "lunch", - "table", "gyros", + "lunch", + "olives", "pitas", - "olives" + "table" ], "tags": { "amenity": "restaurant", diff --git a/data/presets/amenity/restaurant/indian.json b/data/presets/amenity/restaurant/indian.json index 5dc8b4b8..936aa216 100644 --- a/data/presets/amenity/restaurant/indian.json +++ b/data/presets/amenity/restaurant/indian.json @@ -7,6 +7,7 @@ "terms": [ "bar", "breakfast", + "curry", "dine", "dining", "dinner", @@ -14,8 +15,7 @@ "eat", "grill", "lunch", - "table", - "curry" + "table" ], "tags": { "amenity": "restaurant", diff --git a/data/presets/amenity/restaurant/italian.json b/data/presets/amenity/restaurant/italian.json index 6cf56079..5a338da7 100644 --- a/data/presets/amenity/restaurant/italian.json +++ b/data/presets/amenity/restaurant/italian.json @@ -17,9 +17,9 @@ "eat", "grill", "lunch", - "table", "pasta", - "pizza" + "pizza", + "table" ], "tags": { "amenity": "restaurant", diff --git a/data/presets/amenity/restaurant/mexican.json b/data/presets/amenity/restaurant/mexican.json index aa8d3441..4622184d 100644 --- a/data/presets/amenity/restaurant/mexican.json +++ b/data/presets/amenity/restaurant/mexican.json @@ -7,23 +7,23 @@ "terms": [ "bar", "breakfast", + "burritos", "dine", "dining", "dinner", "drive-in", "eat", - "grill", - "lunch", - "table", - "tacos", - "burritos", "enchiladas", "fajitas", + "grill", + "lunch", "nachos", - "tortillas", + "quesadillas", "salsa", + "table", + "tacos", "tamales", - "quesadillas" + "tortillas" ], "tags": { "amenity": "restaurant", diff --git a/data/presets/amenity/restaurant/noodle.json b/data/presets/amenity/restaurant/noodle.json index 5bd5d288..673af1c6 100644 --- a/data/presets/amenity/restaurant/noodle.json +++ b/data/presets/amenity/restaurant/noodle.json @@ -10,6 +10,7 @@ "cafe", "café", "canteen", + "cellophane noodles", "dine", "dining", "dinner", @@ -17,11 +18,10 @@ "eat", "grill", "lunch", - "table", - "soup", + "rice noodles", "soba noodles", - "cellophane noodles", - "rice noodles" + "soup", + "table" ], "tags": { "amenity": "restaurant", diff --git a/data/presets/amenity/restaurant/pizza.json b/data/presets/amenity/restaurant/pizza.json index adb37207..7a10d83d 100644 --- a/data/presets/amenity/restaurant/pizza.json +++ b/data/presets/amenity/restaurant/pizza.json @@ -6,16 +6,16 @@ ], "terms": [ "bar", + "deep dish", "dine", "dining", "dinner", "drive-in", "eat", "lunch", + "slice", "table", - "deep dish", - "thin crust", - "slice" + "thin crust" ], "tags": { "amenity": "restaurant", diff --git a/data/presets/amenity/restaurant/seafood.json b/data/presets/amenity/restaurant/seafood.json index 2c84a23d..361db18e 100644 --- a/data/presets/amenity/restaurant/seafood.json +++ b/data/presets/amenity/restaurant/seafood.json @@ -9,25 +9,25 @@ "breakfast", "cafe", "café", + "clams", + "crab", + "crustaceans", "dine", "dining", "dinner", "drive-in", "eat", - "grill", - "lunch", - "table", "fish", - "shellfish", - "molluscs", - "crustaceans", - "clams", - "oysters", + "grill", "lobsters", - "crab", + "lunch", + "molluscs", + "octopus", + "oysters", + "shellfish", "shrimp", "squid", - "octopus" + "table" ], "tags": { "amenity": "restaurant", diff --git a/data/presets/amenity/restaurant/steakhouse.json b/data/presets/amenity/restaurant/steakhouse.json index 77d8ebe3..78d986e9 100644 --- a/data/presets/amenity/restaurant/steakhouse.json +++ b/data/presets/amenity/restaurant/steakhouse.json @@ -6,10 +6,12 @@ ], "terms": [ "bar", + "beef", "breakfast", "cafe", "café", "canteen", + "chop house", "dine", "dining", "dinner", @@ -17,10 +19,8 @@ "eat", "grill", "lunch", - "table", "steak house", - "chop house", - "beef" + "table" ], "tags": { "amenity": "restaurant", diff --git a/data/presets/amenity/sanitary_dump_station.json b/data/presets/amenity/sanitary_dump_station.json index ea101ea9..dd36c8c1 100644 --- a/data/presets/amenity/sanitary_dump_station.json +++ b/data/presets/amenity/sanitary_dump_station.json @@ -17,14 +17,14 @@ "area" ], "terms": [ - "Motor Home", - "Camper", - "Sanitary", - "Dump Station", - "Elsan", - "CDP", - "CTDP", - "Chemical Toilet" + "camper", + "cdp", + "chemical toilet", + "ctdp", + "dump station", + "elsan", + "motor home", + "sanitary" ], "tags": { "amenity": "sanitary_dump_station" diff --git a/data/presets/amenity/shelter.json b/data/presets/amenity/shelter.json index 05d8184f..40801491 100644 --- a/data/presets/amenity/shelter.json +++ b/data/presets/amenity/shelter.json @@ -20,8 +20,8 @@ "area" ], "terms": [ - "lean-to", "gazebo", + "lean-to", "picnic" ], "tags": { diff --git a/data/presets/amenity/social_facility/homeless_shelter.json b/data/presets/amenity/social_facility/homeless_shelter.json index 6640e61c..a98f058e 100644 --- a/data/presets/amenity/social_facility/homeless_shelter.json +++ b/data/presets/amenity/social_facility/homeless_shelter.json @@ -5,9 +5,9 @@ "area" ], "terms": [ + "displaced", "houseless", - "unhoused", - "displaced" + "unhoused" ], "tags": { "amenity": "social_facility", diff --git a/data/presets/amenity/social_facility/nursing_home.json b/data/presets/amenity/social_facility/nursing_home.json index f837796e..e767c7d2 100644 --- a/data/presets/amenity/social_facility/nursing_home.json +++ b/data/presets/amenity/social_facility/nursing_home.json @@ -9,12 +9,12 @@ "area" ], "terms": [ + "assisted living", "elderly", "living", "nursing", "old", - "senior", - "assisted living" + "senior" ], "tags": { "amenity": "social_facility", diff --git a/data/presets/amenity/stripclub.json b/data/presets/amenity/stripclub.json index fc0e7611..d8f003c1 100644 --- a/data/presets/amenity/stripclub.json +++ b/data/presets/amenity/stripclub.json @@ -22,10 +22,10 @@ "amenity": "stripclub" }, "terms": [ - "lap dance", "adult*", - "gentlemen*", "cabaret", + "gentlemen*", + "lap dance", "strip*" ], "name": "Strip club" diff --git a/data/presets/amenity/studio.json b/data/presets/amenity/studio.json index 5723d41d..b474faba 100644 --- a/data/presets/amenity/studio.json +++ b/data/presets/amenity/studio.json @@ -19,8 +19,8 @@ "area" ], "terms": [ - "recording", "radio", + "recording", "television" ], "tags": { diff --git a/data/presets/amenity/taxi/cycle_rickshaw.json b/data/presets/amenity/taxi/cycle_rickshaw.json index 3acc68b8..8483735c 100644 --- a/data/presets/amenity/taxi/cycle_rickshaw.json +++ b/data/presets/amenity/taxi/cycle_rickshaw.json @@ -22,8 +22,8 @@ "padyak", "pedicab", "sikad", - "trisikad", "trishaw", + "trisikad", "velotaxi" ], "tags": { diff --git a/data/presets/amenity/telephone.json b/data/presets/amenity/telephone.json index df2d420a..567d15b7 100644 --- a/data/presets/amenity/telephone.json +++ b/data/presets/amenity/telephone.json @@ -27,10 +27,10 @@ "amenity": "telephone" }, "terms": [ - "payphone", "pay phone", - "phone booth", + "payphone", "phone", + "phone booth", "public phone", "public telephone" ], diff --git a/data/presets/amenity/theatre.json b/data/presets/amenity/theatre.json index 5de1e407..847f1806 100644 --- a/data/presets/amenity/theatre.json +++ b/data/presets/amenity/theatre.json @@ -18,10 +18,10 @@ "area" ], "terms": [ - "theatre", + "musical", "performance", "play", - "musical" + "theatre" ], "tags": { "amenity": "theatre" diff --git a/data/presets/amenity/theatre/type/amphi.json b/data/presets/amenity/theatre/type/amphi.json index 42ffd55e..30ba74b0 100644 --- a/data/presets/amenity/theatre/type/amphi.json +++ b/data/presets/amenity/theatre/type/amphi.json @@ -11,10 +11,10 @@ "area" ], "terms": [ - "open air", - "outdoor", + "ampi", "greek", - "ampi" + "open air", + "outdoor" ], "tags": { "amenity": "theatre", diff --git a/data/presets/amenity/ticket_validator.json b/data/presets/amenity/ticket_validator.json index ad5e28d1..05d0064a 100644 --- a/data/presets/amenity/ticket_validator.json +++ b/data/presets/amenity/ticket_validator.json @@ -20,9 +20,9 @@ "amenity": "ticket_validator" }, "terms": [ + "puncher", "ticket", - "validator", - "puncher" + "validator" ], "aliases": [ "Ticket Puncher", diff --git a/data/presets/amenity/toilets.json b/data/presets/amenity/toilets.json index 2a2f1843..f286f66d 100644 --- a/data/presets/amenity/toilets.json +++ b/data/presets/amenity/toilets.json @@ -26,14 +26,14 @@ "area" ], "terms": [ - "outhouse", - "privy", "head", "latrine", - "public toilet", + "outhouse", + "privy", "public restroom", - "WC", - "W.C." + "public toilet", + "w.c.", + "wc" ], "tags": { "amenity": "toilets" diff --git a/data/presets/amenity/toilets/disposal/flush.json b/data/presets/amenity/toilets/disposal/flush.json index f681e9e9..b48d3989 100644 --- a/data/presets/amenity/toilets/disposal/flush.json +++ b/data/presets/amenity/toilets/disposal/flush.json @@ -18,9 +18,9 @@ "lavatory", "privy", "restroom", + "w.c.", "water closet", - "WC", - "W.C." + "wc" ], "tags": { "amenity": "toilets", diff --git a/data/presets/amenity/toilets/portable.json b/data/presets/amenity/toilets/portable.json index 2d892bd3..9da7f957 100644 --- a/data/presets/amenity/toilets/portable.json +++ b/data/presets/amenity/toilets/portable.json @@ -14,12 +14,12 @@ "vertex" ], "terms": [ - "restroom", - "privy", + "chemical toilet", "porta john", "porta potty", "portapot", - "chemical toilet" + "privy", + "restroom" ], "tags": { "amenity": "toilets", diff --git a/data/presets/amenity/townhall.json b/data/presets/amenity/townhall.json index 455f7e27..fac2de70 100644 --- a/data/presets/amenity/townhall.json +++ b/data/presets/amenity/townhall.json @@ -20,11 +20,11 @@ "area" ], "terms": [ - "village", "city", - "government", "courthouse", - "municipal" + "government", + "municipal", + "village" ], "tags": { "amenity": "townhall" diff --git a/data/presets/amenity/vending_machine/bicycle_tube.json b/data/presets/amenity/vending_machine/bicycle_tube.json index 4e591447..d982f448 100644 --- a/data/presets/amenity/vending_machine/bicycle_tube.json +++ b/data/presets/amenity/vending_machine/bicycle_tube.json @@ -5,9 +5,9 @@ "vertex" ], "terms": [ - "inner tube", "bicycle tubes", - "bike tube" + "bike tube", + "inner tube" ], "tags": { "amenity": "vending_machine", diff --git a/data/presets/amenity/vending_machine/drinks.json b/data/presets/amenity/vending_machine/drinks.json index 1eee9a84..40603929 100644 --- a/data/presets/amenity/vending_machine/drinks.json +++ b/data/presets/amenity/vending_machine/drinks.json @@ -10,11 +10,11 @@ "vertex" ], "terms": [ - "drink", - "soda", "beverage", + "drink", "juice", - "pop" + "pop", + "soda" ], "tags": { "amenity": "vending_machine", diff --git a/data/presets/amenity/vending_machine/excrement_bags.json b/data/presets/amenity/vending_machine/excrement_bags.json index ec86a275..ff3511fd 100644 --- a/data/presets/amenity/vending_machine/excrement_bags.json +++ b/data/presets/amenity/vending_machine/excrement_bags.json @@ -22,12 +22,12 @@ "vertex" ], "terms": [ - "excrement bags", - "poop", - "waste", - "dog", "animal", - "pet" + "dog", + "excrement bags", + "pet", + "poop", + "waste" ], "tags": { "amenity": "vending_machine", diff --git a/data/presets/amenity/vending_machine/feminine_hygiene.json b/data/presets/amenity/vending_machine/feminine_hygiene.json index a8652dd8..41fcba85 100644 --- a/data/presets/amenity/vending_machine/feminine_hygiene.json +++ b/data/presets/amenity/vending_machine/feminine_hygiene.json @@ -6,12 +6,12 @@ ], "terms": [ "condom", - "tampon", - "pad", - "woman", - "women", "menstrual hygiene products", - "personal care" + "pad", + "personal care", + "tampon", + "woman", + "women" ], "tags": { "amenity": "vending_machine", diff --git a/data/presets/amenity/vending_machine/food/snacks.json b/data/presets/amenity/vending_machine/food/snacks.json index 1b8fdfe2..01419fc3 100644 --- a/data/presets/amenity/vending_machine/food/snacks.json +++ b/data/presets/amenity/vending_machine/food/snacks.json @@ -6,11 +6,11 @@ ], "terms": [ "candy", - "gum", "chip", - "pretzel", "cookie", - "cracker" + "cracker", + "gum", + "pretzel" ], "tags": { "amenity": "vending_machine", diff --git a/data/presets/amenity/vending_machine/fuel.json b/data/presets/amenity/vending_machine/fuel.json index 87f8b9fc..79bf32b2 100644 --- a/data/presets/amenity/vending_machine/fuel.json +++ b/data/presets/amenity/vending_machine/fuel.json @@ -11,14 +11,14 @@ "operator" ], "terms": [ - "petrol", + "biodiesel", + "cng", + "diesel", "fuel", "gasoline", - "propane", - "diesel", "lng", - "cng", - "biodiesel" + "petrol", + "propane" ], "tags": { "amenity": "vending_machine", diff --git a/data/presets/amenity/vending_machine/ice_cream.json b/data/presets/amenity/vending_machine/ice_cream.json index 89453106..5efca62c 100644 --- a/data/presets/amenity/vending_machine/ice_cream.json +++ b/data/presets/amenity/vending_machine/ice_cream.json @@ -6,8 +6,8 @@ ], "terms": [ "chocolate", - "ice cream", "frozen", + "ice cream", "popsicle", "vanilla" ], diff --git a/data/presets/amenity/veterinary.json b/data/presets/amenity/veterinary.json index b0a4de81..5a830761 100644 --- a/data/presets/amenity/veterinary.json +++ b/data/presets/amenity/veterinary.json @@ -17,10 +17,10 @@ "area" ], "terms": [ - "pet clinic", - "veterinarian", "animal hospital", - "pet doctor" + "pet clinic", + "pet doctor", + "veterinarian" ], "tags": { "amenity": "veterinary" diff --git a/data/presets/amenity/veterinary_pharmacy.json b/data/presets/amenity/veterinary_pharmacy.json index 4d9449a3..f96de322 100644 --- a/data/presets/amenity/veterinary_pharmacy.json +++ b/data/presets/amenity/veterinary_pharmacy.json @@ -18,11 +18,11 @@ "pet meds", "pet pharmacy", "pet prescriptions", + "vet pharmacy", "veterinarian", "veterinary compounding", "veterinary pharmacy", - "veterinary supplies", - "vet pharmacy" + "veterinary supplies" ], "aliases": [ "Animal Pharmacy" diff --git a/data/presets/amenity/waste/dog_excrement.json b/data/presets/amenity/waste/dog_excrement.json index c42d0a35..eca3f063 100644 --- a/data/presets/amenity/waste/dog_excrement.json +++ b/data/presets/amenity/waste/dog_excrement.json @@ -18,12 +18,12 @@ }, "terms": [ "bin", + "dog", "garbage", - "rubbish", "litter", - "trash", "poo", - "dog" + "rubbish", + "trash" ], "name": "Dog Excrement Bin" } diff --git a/data/presets/amenity/waste_basket.json b/data/presets/amenity/waste_basket.json index ec76b181..ae673d91 100644 --- a/data/presets/amenity/waste_basket.json +++ b/data/presets/amenity/waste_basket.json @@ -22,8 +22,8 @@ "terms": [ "bin", "garbage", - "rubbish", "litter", + "rubbish", "trash" ], "aliases": [ diff --git a/data/presets/amenity/waste_disposal.json b/data/presets/amenity/waste_disposal.json index ee642ff9..45abd712 100644 --- a/data/presets/amenity/waste_disposal.json +++ b/data/presets/amenity/waste_disposal.json @@ -24,8 +24,8 @@ }, "terms": [ "garbage", - "rubbish", "litter", + "rubbish", "trash", "waste disposal" ], diff --git a/data/presets/amenity/water_point.json b/data/presets/amenity/water_point.json index 72b1c84c..21ec200a 100644 --- a/data/presets/amenity/water_point.json +++ b/data/presets/amenity/water_point.json @@ -25,9 +25,9 @@ "terms": [ "water faucet", "water point", - "water tap", "water source", - "water spigot" + "water spigot", + "water tap" ], "name": "RV Drinking Water" } diff --git a/data/presets/area/footway.json b/data/presets/area/footway.json index f82f0b7d..5ffb4cf5 100644 --- a/data/presets/area/footway.json +++ b/data/presets/area/footway.json @@ -11,8 +11,8 @@ "footway area", "footway shape", "pavement", - "sidewalk shape", - "sidewalk area" + "sidewalk area", + "sidewalk shape" ], "tags": { "area:highway": "footway" diff --git a/data/presets/attraction/amusement_ride.json b/data/presets/attraction/amusement_ride.json index 8a7acbe7..424091e0 100644 --- a/data/presets/attraction/amusement_ride.json +++ b/data/presets/attraction/amusement_ride.json @@ -10,8 +10,8 @@ "area" ], "terms": [ - "theme park", - "carnival ride" + "carnival ride", + "theme park" ], "tags": { "attraction": "amusement_ride" diff --git a/data/presets/attraction/big_wheel.json b/data/presets/attraction/big_wheel.json index 8d536822..ad41cbc4 100644 --- a/data/presets/attraction/big_wheel.json +++ b/data/presets/attraction/big_wheel.json @@ -14,9 +14,9 @@ "area" ], "terms": [ + "amusement ride", "ferris wheel", - "theme park", - "amusement ride" + "theme park" ], "tags": { "attraction": "big_wheel" diff --git a/data/presets/attraction/bumper_car.json b/data/presets/attraction/bumper_car.json index 6b2d057e..631f9d3c 100644 --- a/data/presets/attraction/bumper_car.json +++ b/data/presets/attraction/bumper_car.json @@ -10,9 +10,9 @@ "area" ], "terms": [ - "theme park", + "autoscooter", "dodgem cars", - "autoscooter" + "theme park" ], "tags": { "attraction": "bumper_car" diff --git a/data/presets/attraction/bungee_jumping.json b/data/presets/attraction/bungee_jumping.json index 64032ea6..8eb487a6 100644 --- a/data/presets/attraction/bungee_jumping.json +++ b/data/presets/attraction/bungee_jumping.json @@ -14,9 +14,9 @@ "area" ], "terms": [ - "theme park", "bungy jumping", - "jumping platform" + "jumping platform", + "theme park" ], "tags": { "attraction": "bungee_jumping" diff --git a/data/presets/attraction/carousel.json b/data/presets/attraction/carousel.json index 23dfefd1..474d505d 100644 --- a/data/presets/attraction/carousel.json +++ b/data/presets/attraction/carousel.json @@ -14,13 +14,13 @@ "area" ], "terms": [ - "theme park", - "roundabout", - "merry-go-round", + "flying horses", "galloper", - "jumper", "horseabout", - "flying horses" + "jumper", + "merry-go-round", + "roundabout", + "theme park" ], "tags": { "attraction": "carousel" diff --git a/data/presets/attraction/dark_ride.json b/data/presets/attraction/dark_ride.json index 5bfd9db4..fa131c51 100644 --- a/data/presets/attraction/dark_ride.json +++ b/data/presets/attraction/dark_ride.json @@ -15,8 +15,8 @@ "area" ], "terms": [ - "theme park", - "ghost train" + "ghost train", + "theme park" ], "tags": { "attraction": "dark_ride" diff --git a/data/presets/attraction/drop_tower.json b/data/presets/attraction/drop_tower.json index 180da561..6e42c672 100644 --- a/data/presets/attraction/drop_tower.json +++ b/data/presets/attraction/drop_tower.json @@ -14,11 +14,11 @@ "area" ], "terms": [ - "theme park", "amusement ride", + "big drop", "gondola", - "tower", - "big drop" + "theme park", + "tower" ], "tags": { "attraction": "drop_tower" diff --git a/data/presets/attraction/log_flume.json b/data/presets/attraction/log_flume.json index 874f3e92..26fdd811 100644 --- a/data/presets/attraction/log_flume.json +++ b/data/presets/attraction/log_flume.json @@ -15,9 +15,9 @@ "area" ], "terms": [ - "theme park", "amusement ride", - "flume" + "flume", + "theme park" ], "tags": { "attraction": "log_flume" diff --git a/data/presets/attraction/maze.json b/data/presets/attraction/maze.json index 9835c940..0f71639f 100644 --- a/data/presets/attraction/maze.json +++ b/data/presets/attraction/maze.json @@ -10,9 +10,9 @@ "area" ], "terms": [ - "theme park", "amusement ride", - "labyrinth" + "labyrinth", + "theme park" ], "tags": { "attraction": "maze" diff --git a/data/presets/attraction/pirate_ship.json b/data/presets/attraction/pirate_ship.json index 916ced4d..776f73ae 100644 --- a/data/presets/attraction/pirate_ship.json +++ b/data/presets/attraction/pirate_ship.json @@ -9,9 +9,9 @@ "point" ], "terms": [ - "theme park", + "amusement ride", "carnival ride", - "amusement ride" + "theme park" ], "tags": { "attraction": "pirate_ship" diff --git a/data/presets/attraction/river_rafting.json b/data/presets/attraction/river_rafting.json index ba9c4b82..dcd4f9d8 100644 --- a/data/presets/attraction/river_rafting.json +++ b/data/presets/attraction/river_rafting.json @@ -10,12 +10,12 @@ "line" ], "terms": [ - "theme park", "aquatic park", - "water park", "rafting simulator", "river rafting ride", - "river rapids ride" + "river rapids ride", + "theme park", + "water park" ], "tags": { "attraction": "river_rafting" diff --git a/data/presets/attraction/roller_coaster.json b/data/presets/attraction/roller_coaster.json index 5da6f1c8..3c75a458 100644 --- a/data/presets/attraction/roller_coaster.json +++ b/data/presets/attraction/roller_coaster.json @@ -10,8 +10,8 @@ "area" ], "terms": [ - "theme park", - "amusement ride" + "amusement ride", + "theme park" ], "tags": { "attraction": "roller_coaster" diff --git a/data/presets/attraction/swing_carousel.json b/data/presets/attraction/swing_carousel.json index ac725365..c7c61e95 100644 --- a/data/presets/attraction/swing_carousel.json +++ b/data/presets/attraction/swing_carousel.json @@ -14,11 +14,11 @@ "area" ], "terms": [ - "theme park", "amusement ride", "carousel", - "tower", - "carousel tower" + "carousel tower", + "theme park", + "tower" ], "tags": { "attraction": "swing_carousel" diff --git a/data/presets/attraction/train.json b/data/presets/attraction/train.json index bfd8d55e..6d73dea5 100644 --- a/data/presets/attraction/train.json +++ b/data/presets/attraction/train.json @@ -10,12 +10,12 @@ "line" ], "terms": [ - "theme park", + "dotto train", + "park train", "rackless train", "road train", - "Tschu-Tschu train", - "dotto train", - "park train" + "theme park", + "tschu-tschu train" ], "tags": { "attraction": "train" diff --git a/data/presets/attraction/water_slide.json b/data/presets/attraction/water_slide.json index 6dd868b4..5d14b4fc 100644 --- a/data/presets/attraction/water_slide.json +++ b/data/presets/attraction/water_slide.json @@ -15,12 +15,12 @@ "line" ], "terms": [ - "theme park", "aquatic park", - "water park", "flumes", + "hydroslides", + "theme park", "water chutes", - "hydroslides" + "water park" ], "tags": { "attraction": "water_slide" diff --git a/data/presets/barrier/cattle_grid.json b/data/presets/barrier/cattle_grid.json index f2646308..646b8bcc 100644 --- a/data/presets/barrier/cattle_grid.json +++ b/data/presets/barrier/cattle_grid.json @@ -13,7 +13,7 @@ "stock gate", "stock grid", "stock stop", - "Texas gate", + "texas gate", "vehicle pass" ], "name": "Cattle Grid" diff --git a/data/presets/barrier/cycle_barrier.json b/data/presets/barrier/cycle_barrier.json index cbfb6231..99cdb8cc 100644 --- a/data/presets/barrier/cycle_barrier.json +++ b/data/presets/barrier/cycle_barrier.json @@ -20,12 +20,12 @@ "barrier": "cycle_barrier" }, "terms": [ - "chicane", - "bike chicane", - "bike barrier", "bicycle barrier", "bicycling barrier", + "bike barrier", + "bike chicane", "bike gates", + "chicane", "cycling barrier" ], "name": "Cycle Barrier" diff --git a/data/presets/barrier/fence/railing.json b/data/presets/barrier/fence/railing.json index 4b9e410d..5ea493d1 100644 --- a/data/presets/barrier/fence/railing.json +++ b/data/presets/barrier/fence/railing.json @@ -8,9 +8,9 @@ "fence_type": "railing" }, "terms": [ - "railing", + "guard rail", "handrail", - "guard rail" + "railing" ], "name": "Railing", "matchScore": 0.5 diff --git a/data/presets/barrier/guard_rail.json b/data/presets/barrier/guard_rail.json index 1e384ddb..55d1aa3a 100644 --- a/data/presets/barrier/guard_rail.json +++ b/data/presets/barrier/guard_rail.json @@ -15,12 +15,12 @@ }, "name": "Guard Rail", "terms": [ - "guardrail", - "traffic barrier", + "armco barrier", "crash barrier", + "guardrail", "median barrier", "roadside barrier", - "Armco barrier" + "traffic barrier" ], "matchScore": 0.75 } diff --git a/data/presets/barrier/height_restrictor.json b/data/presets/barrier/height_restrictor.json index c539e825..e2e8b4d2 100644 --- a/data/presets/barrier/height_restrictor.json +++ b/data/presets/barrier/height_restrictor.json @@ -15,8 +15,8 @@ "terms": [ "height barrier", "height restriction barrier", - "maxheight", "max height", + "maxheight", "maximum height measurer" ], "name": "Height Restrictor" diff --git a/data/presets/barrier/jersey_barrier.json b/data/presets/barrier/jersey_barrier.json index 179ae8d6..058a2dd4 100644 --- a/data/presets/barrier/jersey_barrier.json +++ b/data/presets/barrier/jersey_barrier.json @@ -15,8 +15,8 @@ "barrier": "jersey_barrier" }, "terms": [ - "concrete median", "concrete barrier", + "concrete median", "constant-slope barrier", "f-shape barrier", "k-rail", diff --git a/data/presets/barrier/kerb/lowered.json b/data/presets/barrier/kerb/lowered.json index d54803e1..4e4d9eb0 100644 --- a/data/presets/barrier/kerb/lowered.json +++ b/data/presets/barrier/kerb/lowered.json @@ -19,8 +19,8 @@ "terms": [ "curb cut", "curb ramp", - "kerb ramp", "dropped kerb", + "kerb ramp", "pram ramp" ], "matchScore": 0.55, diff --git a/data/presets/barrier/sally_port.json b/data/presets/barrier/sally_port.json index 67b24afa..1115c701 100644 --- a/data/presets/barrier/sally_port.json +++ b/data/presets/barrier/sally_port.json @@ -7,8 +7,8 @@ "barrier": "sally_port" }, "terms": [ - "Postern", - "castle side gate" + "castle side gate", + "postern" ], "name": "Sally Port" } diff --git a/data/presets/building/bungalow.json b/data/presets/building/bungalow.json index 1cce91d9..7d2e3474 100644 --- a/data/presets/building/bungalow.json +++ b/data/presets/building/bungalow.json @@ -7,8 +7,8 @@ "building": "bungalow" }, "terms": [ - "home", - "detached" + "detached", + "home" ], "matchScore": 0.5, "name": "Bungalow" diff --git a/data/presets/building/carport.json b/data/presets/building/carport.json index 136f2451..1c15541c 100644 --- a/data/presets/building/carport.json +++ b/data/presets/building/carport.json @@ -12,9 +12,9 @@ }, "matchScore": 0.5, "terms": [ + "car", "covered parking space", "garage", - "car", "porch" ], "name": "Carport" diff --git a/data/presets/building/detached.json b/data/presets/building/detached.json index 43400e01..7bc8468b 100644 --- a/data/presets/building/detached.json +++ b/data/presets/building/detached.json @@ -7,11 +7,11 @@ "building": "detached" }, "terms": [ - "home", - "single", + "dwelling", "family", + "home", "residence", - "dwelling" + "single" ], "matchScore": 0.5, "name": "Detached House" diff --git a/data/presets/building/farm_auxiliary.json b/data/presets/building/farm_auxiliary.json index 9290a995..64f2281d 100644 --- a/data/presets/building/farm_auxiliary.json +++ b/data/presets/building/farm_auxiliary.json @@ -8,8 +8,8 @@ }, "terms": [ "agriculture", - "auxiliary", "auxilary", + "auxiliary", "chicken coop", "farm auxiliary", "pigsty", diff --git a/data/presets/building/grandstand.json b/data/presets/building/grandstand.json index e27f052a..4e145ad7 100644 --- a/data/presets/building/grandstand.json +++ b/data/presets/building/grandstand.json @@ -7,10 +7,10 @@ "building": "grandstand" }, "terms": [ - "tribune", + "bleachers", "stand", "stands", - "bleachers" + "tribune" ], "matchScore": 0.5, "name": "Grandstand" diff --git a/data/presets/building/house.json b/data/presets/building/house.json index d2a05461..53b59c72 100644 --- a/data/presets/building/house.json +++ b/data/presets/building/house.json @@ -11,10 +11,10 @@ "building": "house" }, "terms": [ - "home", + "dwelling", "family", - "residence", - "dwelling" + "home", + "residence" ], "matchScore": 0.5, "name": "House" diff --git a/data/presets/building/houseboat.json b/data/presets/building/houseboat.json index 9549140d..43efce54 100644 --- a/data/presets/building/houseboat.json +++ b/data/presets/building/houseboat.json @@ -7,10 +7,10 @@ "building": "houseboat" }, "terms": [ - "home", + "dwelling", "family", - "residence", - "dwelling" + "home", + "residence" ], "matchScore": 0.5, "name": "Houseboat" diff --git a/data/presets/building/kindergarten.json b/data/presets/building/kindergarten.json index dfe6d3b5..a697b0ce 100644 --- a/data/presets/building/kindergarten.json +++ b/data/presets/building/kindergarten.json @@ -4,8 +4,8 @@ "area" ], "terms": [ - "kindergarten", "kindergarden", + "kindergarten", "pre-school" ], "tags": { diff --git a/data/presets/building/riding_hall.json b/data/presets/building/riding_hall.json index 5910926e..566cf49d 100644 --- a/data/presets/building/riding_hall.json +++ b/data/presets/building/riding_hall.json @@ -12,8 +12,8 @@ "equestrian indoor arena", "horse riding", "indoor arena", - "indoor ring", "indoor riding", + "indoor ring", "longeing hall" ], "name": "Indoor Horseback Riding Arena", diff --git a/data/presets/building/school.json b/data/presets/building/school.json index daff0625..63f22cc8 100644 --- a/data/presets/building/school.json +++ b/data/presets/building/school.json @@ -10,8 +10,8 @@ "terms": [ "academy", "elementary school", - "middle school", - "high school" + "high school", + "middle school" ], "tags": { "building": "school" diff --git a/data/presets/building/semidetached_house.json b/data/presets/building/semidetached_house.json index 2cf3ef06..86e63966 100644 --- a/data/presets/building/semidetached_house.json +++ b/data/presets/building/semidetached_house.json @@ -7,13 +7,13 @@ "building": "semidetached_house" }, "terms": [ - "home", "double", "duplex", - "twin", + "dwelling", "family", + "home", "residence", - "dwelling" + "twin" ], "matchScore": 0.5, "name": "Semi-Detached House" diff --git a/data/presets/building_part.json b/data/presets/building_part.json index b734d16f..b456855a 100644 --- a/data/presets/building_part.json +++ b/data/presets/building_part.json @@ -22,7 +22,7 @@ "matchScore": 0.5, "terms": [ "roof", - "simple 3D buildings" + "simple 3d buildings" ], "name": "Building Part" } diff --git a/data/presets/climbing/route_bottom.json b/data/presets/climbing/route_bottom.json index 3f2e27f9..203cd8e3 100644 --- a/data/presets/climbing/route_bottom.json +++ b/data/presets/climbing/route_bottom.json @@ -20,13 +20,13 @@ "description" ], "terms": [ - "rock climbing route", - "sport climbing", - "route bottom", - "climbing point", - "route start", "climbing area", - "climbing crag" + "climbing crag", + "climbing point", + "rock climbing route", + "route bottom", + "route start", + "sport climbing" ], "tags": { "climbing": "route_bottom" diff --git a/data/presets/craft/confectionery.json b/data/presets/craft/confectionery.json index 3a2767f4..071aba4e 100644 --- a/data/presets/craft/confectionery.json +++ b/data/presets/craft/confectionery.json @@ -5,8 +5,8 @@ "area" ], "terms": [ - "sweet", - "candy" + "candy", + "sweet" ], "moreFields": [ "fhrs/id-GB" diff --git a/data/presets/craft/distillery.json b/data/presets/craft/distillery.json index 73d87339..cd9b6cbc 100644 --- a/data/presets/craft/distillery.json +++ b/data/presets/craft/distillery.json @@ -16,8 +16,8 @@ "terms": [ "alcohol", "beverage", - "bourbon", "booze", + "bourbon", "brandy", "gin", "hooch", diff --git a/data/presets/craft/gardener.json b/data/presets/craft/gardener.json index c2470b0e..830adc22 100644 --- a/data/presets/craft/gardener.json +++ b/data/presets/craft/gardener.json @@ -5,8 +5,8 @@ "area" ], "terms": [ - "landscaper", - "grounds keeper" + "grounds keeper", + "landscaper" ], "tags": { "craft": "gardener" diff --git a/data/presets/education/college.json b/data/presets/education/college.json index 836083c9..0662799c 100644 --- a/data/presets/education/college.json +++ b/data/presets/education/college.json @@ -20,8 +20,8 @@ "point" ], "terms": [ - "university", - "undergraduate school" + "undergraduate school", + "university" ], "tags": { "amenity": "college" diff --git a/data/presets/education/kindergarten.json b/data/presets/education/kindergarten.json index 8b0b2deb..c22ea4a3 100644 --- a/data/presets/education/kindergarten.json +++ b/data/presets/education/kindergarten.json @@ -29,8 +29,8 @@ "point" ], "terms": [ - "kindergarten", "kindergarden", + "kindergarten", "pre-school" ], "tags": { diff --git a/data/presets/education/prep_school.json b/data/presets/education/prep_school.json index 5dc65478..0b0325e8 100644 --- a/data/presets/education/prep_school.json +++ b/data/presets/education/prep_school.json @@ -16,11 +16,11 @@ ], "terms": [ "academic", - "ACT", - "SAT", + "act", "homework", "math", "reading", + "sat", "test prep", "tutoring", "writing" diff --git a/data/presets/education/school.json b/data/presets/education/school.json index c70816da..4cc20ac1 100644 --- a/data/presets/education/school.json +++ b/data/presets/education/school.json @@ -33,8 +33,8 @@ "terms": [ "academy", "elementary school", - "middle school", - "high school" + "high school", + "middle school" ], "tags": { "amenity": "school" diff --git a/data/presets/education/university.json b/data/presets/education/university.json index 3014f407..325e6aa3 100644 --- a/data/presets/education/university.json +++ b/data/presets/education/university.json @@ -13,8 +13,8 @@ "terms": [ "college", "graduate school", - "PhD program", - "master's degree program" + "master's degree program", + "phd program" ], "tags": { "amenity": "university" diff --git a/data/presets/emergency/ambulance_station.json b/data/presets/emergency/ambulance_station.json index 2a48857f..6a8482f5 100644 --- a/data/presets/emergency/ambulance_station.json +++ b/data/presets/emergency/ambulance_station.json @@ -16,8 +16,8 @@ "area" ], "terms": [ - "EMS", - "EMT", + "ems", + "emt", "rescue" ], "tags": { diff --git a/data/presets/emergency/assembly_point.json b/data/presets/emergency/assembly_point.json index 228b4bd2..98ec6e36 100644 --- a/data/presets/emergency/assembly_point.json +++ b/data/presets/emergency/assembly_point.json @@ -14,9 +14,9 @@ "emergency": "assembly_point" }, "terms": [ - "EAP", - "muster point", + "eap", "meeting point", + "muster point", "staging area" ], "name": "Emergency Assembly Point" diff --git a/data/presets/emergency/defibrillator.json b/data/presets/emergency/defibrillator.json index 56cc589a..0fb932bd 100644 --- a/data/presets/emergency/defibrillator.json +++ b/data/presets/emergency/defibrillator.json @@ -16,7 +16,7 @@ "vertex" ], "terms": [ - "AED" + "aed" ], "tags": { "emergency": "defibrillator" diff --git a/data/presets/emergency/disaster_response.json b/data/presets/emergency/disaster_response.json index fef2483a..247ec750 100644 --- a/data/presets/emergency/disaster_response.json +++ b/data/presets/emergency/disaster_response.json @@ -19,7 +19,7 @@ "civil protection", "disaster management", "emergency management", - "SES" + "ses" ], "tags": { "emergency": "disaster_response" diff --git a/data/presets/emergency/life_ring.json b/data/presets/emergency/life_ring.json index 21119ad7..92e18439 100644 --- a/data/presets/emergency/life_ring.json +++ b/data/presets/emergency/life_ring.json @@ -9,10 +9,10 @@ "vertex" ], "terms": [ - "lifering", - "life buoy", - "kisby ring", "kisbie ring", + "kisby ring", + "life buoy", + "lifering", "perry buoy" ], "tags": { diff --git a/data/presets/emergency/lifeboat_station.json b/data/presets/emergency/lifeboat_station.json index f3873c3d..025777d7 100644 --- a/data/presets/emergency/lifeboat_station.json +++ b/data/presets/emergency/lifeboat_station.json @@ -19,11 +19,11 @@ "area" ], "terms": [ + "boat rescue", + "life saving", "lifeboat", "rescue", - "search and rescue", - "life saving", - "boat rescue" + "search and rescue" ], "tags": { "emergency": "water_rescue" diff --git a/data/presets/emergency/lifeguard.json b/data/presets/emergency/lifeguard.json index b0cf3d04..c8faa4d2 100644 --- a/data/presets/emergency/lifeguard.json +++ b/data/presets/emergency/lifeguard.json @@ -13,7 +13,7 @@ "area" ], "terms": [ - "CPR", + "cpr", "rescue" ], "tags": { diff --git a/data/presets/emergency/mountain_rescue.json b/data/presets/emergency/mountain_rescue.json index 447d47c1..5650e5d2 100644 --- a/data/presets/emergency/mountain_rescue.json +++ b/data/presets/emergency/mountain_rescue.json @@ -18,8 +18,8 @@ "area" ], "terms": [ - "EMS", - "EMT", + "ems", + "emt", "rescue" ], "tags": { diff --git a/data/presets/emergency/phone.json b/data/presets/emergency/phone.json index c951b3fa..fca81f24 100644 --- a/data/presets/emergency/phone.json +++ b/data/presets/emergency/phone.json @@ -18,9 +18,9 @@ "emergency": "phone" }, "terms": [ - "sos", + "call point", "help", - "call point" + "sos" ], "name": "Emergency Phone" } diff --git a/data/presets/emergency/water_reservoir.json b/data/presets/emergency/water_reservoir.json index 3cc0c4a7..fec4e640 100644 --- a/data/presets/emergency/water_reservoir.json +++ b/data/presets/emergency/water_reservoir.json @@ -16,9 +16,9 @@ ], "terms": [ "basin", - "reservoir", "extinguishing", - "firefighting" + "firefighting", + "reservoir" ], "tags": { "emergency": "water_tank", diff --git a/data/presets/emergency/water_reservoir_covered.json b/data/presets/emergency/water_reservoir_covered.json index 55ba8ea9..c30c2214 100644 --- a/data/presets/emergency/water_reservoir_covered.json +++ b/data/presets/emergency/water_reservoir_covered.json @@ -17,9 +17,9 @@ ], "terms": [ "cistern", - "reservoir", "extinguishing", - "firefighting" + "firefighting", + "reservoir" ], "tags": { "emergency": "water_tank", diff --git a/data/presets/emergency/water_tank.json b/data/presets/emergency/water_tank.json index 7544b3a1..2f9ca46f 100644 --- a/data/presets/emergency/water_tank.json +++ b/data/presets/emergency/water_tank.json @@ -19,10 +19,10 @@ "area" ], "terms": [ - "water tank", "cistern", "extinguishing", - "firefighting" + "firefighting", + "water tank" ], "tags": { "emergency": "water_tank", diff --git a/data/presets/entrance.json b/data/presets/entrance.json index 69420970..736ec0f1 100644 --- a/data/presets/entrance.json +++ b/data/presets/entrance.json @@ -16,9 +16,9 @@ "entrance": "*" }, "terms": [ + "door", "entrance", - "exit", - "door" + "exit" ], "name": "Entrance / Exit" } diff --git a/data/presets/entrance/emergency.json b/data/presets/entrance/emergency.json index 1012f5b2..e85f4c19 100644 --- a/data/presets/entrance/emergency.json +++ b/data/presets/entrance/emergency.json @@ -14,8 +14,8 @@ "entrance": "emergency" }, "terms": [ - "fire exit", - "door" + "door", + "fire exit" ], "matchScore": 0.8, "name": "Emergency Exit" diff --git a/data/presets/golf/green.json b/data/presets/golf/green.json index 053c05e9..957fb8a8 100644 --- a/data/presets/golf/green.json +++ b/data/presets/golf/green.json @@ -10,7 +10,7 @@ "golf": "green" }, "terms": [ - "Green" + "green" ], "name": "Putting Green" } diff --git a/data/presets/healthcare.json b/data/presets/healthcare.json index e9fe524d..3d1b157b 100644 --- a/data/presets/healthcare.json +++ b/data/presets/healthcare.json @@ -31,8 +31,8 @@ }, "terms": [ "clinic", - "doctor", "disease", + "doctor", "health", "institution", "sick", diff --git a/data/presets/healthcare/alternative/traditional_chinese_medicine.json b/data/presets/healthcare/alternative/traditional_chinese_medicine.json index 5ca6b901..aa54a9a4 100644 --- a/data/presets/healthcare/alternative/traditional_chinese_medicine.json +++ b/data/presets/healthcare/alternative/traditional_chinese_medicine.json @@ -8,9 +8,9 @@ "die da", "dit da", "reiki", - "TCM", - "tui na", - "shiatsu" + "shiatsu", + "tcm", + "tui na" ], "tags": { "healthcare": "alternative", diff --git a/data/presets/healthcare/birthing_center.json b/data/presets/healthcare/birthing_center.json index be818298..165e13bd 100644 --- a/data/presets/healthcare/birthing_center.json +++ b/data/presets/healthcare/birthing_center.json @@ -8,8 +8,8 @@ "baby", "childbirth", "delivery", - "labour", "labor", + "labour", "midwive", "pregnancy", "pregnant" diff --git a/data/presets/healthcare/blood_donation.json b/data/presets/healthcare/blood_donation.json index b7bbe2f7..516a1a54 100644 --- a/data/presets/healthcare/blood_donation.json +++ b/data/presets/healthcare/blood_donation.json @@ -9,10 +9,10 @@ "area" ], "terms": [ + "apheresis", "blood bank", "blood donation", "blood transfusion", - "apheresis", "plasmapheresis", "plateletpheresis", "stem cell donation" diff --git a/data/presets/healthcare/hospice.json b/data/presets/healthcare/hospice.json index c55a6ab4..7eb1bfc6 100644 --- a/data/presets/healthcare/hospice.json +++ b/data/presets/healthcare/hospice.json @@ -5,8 +5,8 @@ "area" ], "terms": [ - "terminal", - "illness" + "illness", + "terminal" ], "tags": { "healthcare": "hospice" diff --git a/data/presets/healthcare/laboratory.json b/data/presets/healthcare/laboratory.json index 092391c1..0eb98e2e 100644 --- a/data/presets/healthcare/laboratory.json +++ b/data/presets/healthcare/laboratory.json @@ -18,9 +18,9 @@ "area" ], "terms": [ - "medical_laboratory", + "blood_check", "medical_lab", - "blood_check" + "medical_laboratory" ], "tags": { "healthcare": "laboratory" diff --git a/data/presets/healthcare/midwife.json b/data/presets/healthcare/midwife.json index f9074c15..da1a1c9a 100644 --- a/data/presets/healthcare/midwife.json +++ b/data/presets/healthcare/midwife.json @@ -8,8 +8,8 @@ "baby", "childbirth", "delivery", - "labour", "labor", + "labour", "pregnancy" ], "tags": { diff --git a/data/presets/healthcare/podiatrist.json b/data/presets/healthcare/podiatrist.json index ebd282fc..cb6ab60d 100644 --- a/data/presets/healthcare/podiatrist.json +++ b/data/presets/healthcare/podiatrist.json @@ -5,8 +5,8 @@ "area" ], "terms": [ - "foot", "feet", + "foot", "nails" ], "tags": { diff --git a/data/presets/highway/bus_guideway.json b/data/presets/highway/bus_guideway.json index ca070ff4..4f3f2a32 100644 --- a/data/presets/highway/bus_guideway.json +++ b/data/presets/highway/bus_guideway.json @@ -24,8 +24,8 @@ "bus": "designated" }, "terms": [ - "busway", - "bus track" + "bus track", + "busway" ], "name": "Bus Guideway" } diff --git a/data/presets/highway/crossing/uncontrolled.json b/data/presets/highway/crossing/uncontrolled.json index 370987fe..0dc337ae 100644 --- a/data/presets/highway/crossing/uncontrolled.json +++ b/data/presets/highway/crossing/uncontrolled.json @@ -22,11 +22,11 @@ "value": "uncontrolled" }, "terms": [ - "marked foot path crossing", + "crosswalk", "marked crosswalk", + "marked foot path crossing", "marked pedestrian crosswalk", - "zebra crossing", - "crosswalk" + "zebra crossing" ], "name": "Marked Crossing" } diff --git a/data/presets/highway/cycleway/bicycle_foot.json b/data/presets/highway/cycleway/bicycle_foot.json index 236a9693..3608ca79 100644 --- a/data/presets/highway/cycleway/bicycle_foot.json +++ b/data/presets/highway/cycleway/bicycle_foot.json @@ -46,10 +46,10 @@ "greenway", "mixed-use trail", "multi-use trail", + "rail trail", "segregated trail", "shared path", - "shared use path", - "rail trail" + "shared use path" ], "matchScore": 0.9, "name": "Cycle & Foot Path" diff --git a/data/presets/highway/cycleway/crossing/uncontrolled.json b/data/presets/highway/cycleway/crossing/uncontrolled.json index 5a8c7006..2477ba7b 100644 --- a/data/presets/highway/cycleway/crossing/uncontrolled.json +++ b/data/presets/highway/cycleway/crossing/uncontrolled.json @@ -23,11 +23,11 @@ "value": "uncontrolled" }, "terms": [ + "bicycle crossing", + "bike crossing", "cycle crosswalk", "cycle path crossing", - "cycleway crossing", - "bicycle crossing", - "bike crossing" + "cycleway crossing" ], "matchScore": 0.95, "name": "Marked Cycle Crossing" diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json index 3d93b802..a5151247 100644 --- a/data/presets/highway/cycleway/crossing/unmarked.json +++ b/data/presets/highway/cycleway/crossing/unmarked.json @@ -28,8 +28,8 @@ "value": "unmarked" }, "terms": [ - "bike crossing", "bicycle crossing", + "bike crossing", "cycle path crossing", "cycleway crossing" ], diff --git a/data/presets/highway/emergency_access_point.json b/data/presets/highway/emergency_access_point.json index e1c4028a..3a4e8e5f 100644 --- a/data/presets/highway/emergency_access_point.json +++ b/data/presets/highway/emergency_access_point.json @@ -11,10 +11,10 @@ "highway": "emergency_access_point" }, "terms": [ - "rescue", + "elm", "emergency", "emergency marker", - "elm" + "rescue" ], "name": "Emergency Access Point", "aliases": [ diff --git a/data/presets/highway/emergency_bay.json b/data/presets/highway/emergency_bay.json index fd2a1f86..44c9534e 100644 --- a/data/presets/highway/emergency_bay.json +++ b/data/presets/highway/emergency_bay.json @@ -11,7 +11,7 @@ "direction_vertex_dual" ], "terms": [ - "Highway Emergency Bay" + "highway emergency bay" ], "name": "Emergency Stopping Place" } diff --git a/data/presets/highway/escape.json b/data/presets/highway/escape.json index 1a1d7208..105666b1 100644 --- a/data/presets/highway/escape.json +++ b/data/presets/highway/escape.json @@ -7,8 +7,8 @@ "line" ], "terms": [ - "escape lane", "emergency escape ramp", + "escape lane", "runaway truck lane", "truck arrester bed" ], diff --git a/data/presets/highway/footway/conveying.json b/data/presets/highway/footway/conveying.json index 26acd914..8136613d 100644 --- a/data/presets/highway/footway/conveying.json +++ b/data/presets/highway/footway/conveying.json @@ -12,13 +12,13 @@ "line" ], "terms": [ - "moving sidewalk", "autwalk", + "conveyor", + "moving sidewalk", "skywalk", - "travolator", "travelator", "travellator", - "conveyor" + "travolator" ], "tags": { "highway": "footway", diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json index 28807d16..987c60ba 100644 --- a/data/presets/highway/footway/crossing/traffic_signals.json +++ b/data/presets/highway/footway/crossing/traffic_signals.json @@ -27,8 +27,8 @@ "name": "Crossing With Pedestrian Signals", "terms": [ "crosswalk (lights)", + "pedestrian crossing (lights)", "pedestrian traffic lights", - "pedestrian traffic signals", - "pedestrian crossing (lights)" + "pedestrian traffic signals" ] } diff --git a/data/presets/highway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/crossing/uncontrolled.json index 828bb345..af0a1ac3 100644 --- a/data/presets/highway/footway/crossing/uncontrolled.json +++ b/data/presets/highway/footway/crossing/uncontrolled.json @@ -23,11 +23,11 @@ "value": "uncontrolled" }, "terms": [ - "marked foot path crossing", + "crosswalk", "marked crosswalk", + "marked foot path crossing", "marked pedestrian crosswalk", - "zebra crossing", - "crosswalk" + "zebra crossing" ], "name": "Marked Crossing" } diff --git a/data/presets/highway/give_way.json b/data/presets/highway/give_way.json index e6001a40..452ec1d0 100644 --- a/data/presets/highway/give_way.json +++ b/data/presets/highway/give_way.json @@ -11,8 +11,8 @@ }, "terms": [ "give way", - "yield", - "sign" + "sign", + "yield" ], "name": "Yield Sign" } diff --git a/data/presets/highway/motorway_link.json b/data/presets/highway/motorway_link.json index bf454b0d..b947e0cf 100644 --- a/data/presets/highway/motorway_link.json +++ b/data/presets/highway/motorway_link.json @@ -39,11 +39,11 @@ }, "terms": [ "exit", + "off ramp", + "on ramp", "ramp", "road", - "street", - "on ramp", - "off ramp" + "street" ], "locationSet": { "exclude": [ diff --git a/data/presets/highway/primary_link.json b/data/presets/highway/primary_link.json index 82fbb450..4d86be8f 100644 --- a/data/presets/highway/primary_link.json +++ b/data/presets/highway/primary_link.json @@ -44,8 +44,8 @@ "highway": "primary_link" }, "terms": [ - "on ramp", "off ramp", + "on ramp", "ramp", "road", "street" diff --git a/data/presets/highway/raceway/motocross.json b/data/presets/highway/raceway/motocross.json index fce52163..71c676c0 100644 --- a/data/presets/highway/raceway/motocross.json +++ b/data/presets/highway/raceway/motocross.json @@ -13,11 +13,11 @@ "value": "motocross" }, "terms": [ - "off-road racing", - "offroad moto racing", "motocross circuit", "motorcycle track", - "motorsports" + "motorsports", + "off-road racing", + "offroad moto racing" ], "name": "Motocross Racetrack" } diff --git a/data/presets/highway/secondary_link.json b/data/presets/highway/secondary_link.json index c59def4c..ab92f2e1 100644 --- a/data/presets/highway/secondary_link.json +++ b/data/presets/highway/secondary_link.json @@ -14,8 +14,8 @@ "highway": "secondary_link" }, "terms": [ - "on ramp", "off ramp", + "on ramp", "ramp", "road", "street" diff --git a/data/presets/highway/steps.json b/data/presets/highway/steps.json index cda872fa..323f8a45 100644 --- a/data/presets/highway/steps.json +++ b/data/presets/highway/steps.json @@ -30,8 +30,8 @@ "highway": "steps" }, "terms": [ - "stairs", "staircase", + "stairs", "stairway" ], "name": "Steps" diff --git a/data/presets/highway/stop.json b/data/presets/highway/stop.json index c8eaa619..926ba781 100644 --- a/data/presets/highway/stop.json +++ b/data/presets/highway/stop.json @@ -11,9 +11,9 @@ "highway": "stop" }, "terms": [ - "stop", "halt", - "sign" + "sign", + "stop" ], "name": "Stop Sign" } diff --git a/data/presets/highway/street_lamp.json b/data/presets/highway/street_lamp.json index 0e31afad..80ffd45e 100644 --- a/data/presets/highway/street_lamp.json +++ b/data/presets/highway/street_lamp.json @@ -17,11 +17,11 @@ "ref" ], "terms": [ - "streetlight", - "street light", + "gaslight", "lamp", "light", - "gaslight" + "street light", + "streetlight" ], "name": "Street Lamp" } diff --git a/data/presets/highway/tertiary_link.json b/data/presets/highway/tertiary_link.json index 2763ae1d..f5027298 100644 --- a/data/presets/highway/tertiary_link.json +++ b/data/presets/highway/tertiary_link.json @@ -14,8 +14,8 @@ "highway": "tertiary_link" }, "terms": [ - "on ramp", "off ramp", + "on ramp", "ramp", "road", "street" diff --git a/data/presets/highway/toll_gantry.json b/data/presets/highway/toll_gantry.json index 2fa13af9..627a5a58 100644 --- a/data/presets/highway/toll_gantry.json +++ b/data/presets/highway/toll_gantry.json @@ -21,10 +21,10 @@ "highway": "toll_gantry" }, "terms": [ - "license plate camera toll", "cashless toll", "electronic toll", "free-flow toll", + "license plate camera toll", "toll gantry", "transponder toll" ], diff --git a/data/presets/highway/track.json b/data/presets/highway/track.json index 97daf67d..2e200782 100644 --- a/data/presets/highway/track.json +++ b/data/presets/highway/track.json @@ -48,15 +48,15 @@ "jeep", "logging road", "mining road", - "offroad", "off-road", + "offroad", "overgrown", "primitive", "quad", "ranch road", "rut", - "two-track", "two track", + "two-track", "unmaintained", "vehicular trail", "woods road" diff --git a/data/presets/highway/trailhead.json b/data/presets/highway/trailhead.json index ae7a1a29..867d5b9f 100644 --- a/data/presets/highway/trailhead.json +++ b/data/presets/highway/trailhead.json @@ -25,9 +25,9 @@ "mile zero", "mountain biking", "mountaineering", + "staging area", "trail endpoint", "trail start", - "staging area", "trekking" ], "name": "Trailhead" diff --git a/data/presets/highway/trunk_link.json b/data/presets/highway/trunk_link.json index df6ab918..45f826ba 100644 --- a/data/presets/highway/trunk_link.json +++ b/data/presets/highway/trunk_link.json @@ -14,8 +14,8 @@ "highway": "trunk_link" }, "terms": [ - "on ramp", "off ramp", + "on ramp", "ramp", "road", "street" diff --git a/data/presets/historic/castle/palace.json b/data/presets/historic/castle/palace.json index cee13f98..0a510cbb 100644 --- a/data/presets/historic/castle/palace.json +++ b/data/presets/historic/castle/palace.json @@ -19,10 +19,10 @@ "castle_type": "palace" }, "terms": [ - "Royal Residence", - "royal", "king", - "queen" + "queen", + "royal", + "royal residence" ], "name": "Palace" } diff --git a/data/presets/historic/castle/stately.json b/data/presets/historic/castle/stately.json index e39c0839..9167403e 100644 --- a/data/presets/historic/castle/stately.json +++ b/data/presets/historic/castle/stately.json @@ -19,11 +19,11 @@ "castle_type": "stately" }, "terms": [ - "Historic Country House", - "Stately Home", - "nobility", "gentry", - "representative" + "historic country house", + "nobility", + "representative", + "stately home" ], "name": "Château" } diff --git a/data/presets/historic/city_gate.json b/data/presets/historic/city_gate.json index 8e9bca91..7dc9e459 100644 --- a/data/presets/historic/city_gate.json +++ b/data/presets/historic/city_gate.json @@ -14,7 +14,7 @@ "historic": "city_gate" }, "terms": [ - "Town Gate" + "town gate" ], "name": "City Gate" } diff --git a/data/presets/historic/manor.json b/data/presets/historic/manor.json index e06fe5ec..3e8aa4b5 100644 --- a/data/presets/historic/manor.json +++ b/data/presets/historic/manor.json @@ -14,10 +14,10 @@ "historic": "manor" }, "terms": [ - "Mansion", + "estate", "gentry", - "nobility", - "estate" + "mansion", + "nobility" ], "name": "Manor House" } diff --git a/data/presets/historic/memorial.json b/data/presets/historic/memorial.json index e213d5f8..69bda609 100644 --- a/data/presets/historic/memorial.json +++ b/data/presets/historic/memorial.json @@ -18,10 +18,10 @@ "terms": [ "dedicatory", "epitaph", - "remember", - "remembrance", "memory", "monument", + "remember", + "remembrance", "stolperstein" ], "tags": { diff --git a/data/presets/historic/memorial/plaque.json b/data/presets/historic/memorial/plaque.json index f04f956a..dcf43a79 100644 --- a/data/presets/historic/memorial/plaque.json +++ b/data/presets/historic/memorial/plaque.json @@ -12,9 +12,9 @@ "dedicatory", "epitaph", "historical marker", + "memory", "remember", - "remembrance", - "memory" + "remembrance" ], "tags": { "historic": "memorial", diff --git a/data/presets/historic/wreck.json b/data/presets/historic/wreck.json index 0650a602..e6d20adb 100644 --- a/data/presets/historic/wreck.json +++ b/data/presets/historic/wreck.json @@ -24,12 +24,12 @@ "seamark:type": "wreck" }, "terms": [ + "boat", "hull", - "mast", "maritime", + "mast", "remains", - "ship", - "boat" + "ship" ], "name": "Shipwreck" } diff --git a/data/presets/indoor/stairs.json b/data/presets/indoor/stairs.json index c3e21055..dc46ee7c 100644 --- a/data/presets/indoor/stairs.json +++ b/data/presets/indoor/stairs.json @@ -14,8 +14,8 @@ }, "terms": [ "stair", - "stairs", "staircase", + "stairs", "stairway", "stairwell", "steps" diff --git a/data/presets/internet_access/wlan.json b/data/presets/internet_access/wlan.json index 966329b3..fca74e71 100644 --- a/data/presets/internet_access/wlan.json +++ b/data/presets/internet_access/wlan.json @@ -12,9 +12,9 @@ "level" ], "terms": [ + "hotspot", "wi-fi", - "wifi", - "hotspot" + "wifi" ], "tags": { "internet_access": "wlan" diff --git a/data/presets/landuse/aquaculture.json b/data/presets/landuse/aquaculture.json index 48f66ee5..be1663c2 100644 --- a/data/presets/landuse/aquaculture.json +++ b/data/presets/landuse/aquaculture.json @@ -17,15 +17,15 @@ "landuse": "aquaculture" }, "terms": [ - "marine farm", - "crustacean", + "algaculture", "algae", "aquafarming", - "shrimp farm", - "oyster farm", - "mussel farm", + "crustacean", "mariculture", - "algaculture" + "marine farm", + "mussel farm", + "oyster farm", + "shrimp farm" ], "name": "Aquaculture" } diff --git a/data/presets/landuse/education.json b/data/presets/landuse/education.json index eb19ccdc..0de11516 100644 --- a/data/presets/landuse/education.json +++ b/data/presets/landuse/education.json @@ -9,10 +9,10 @@ "area" ], "terms": [ - "educational facilities", "campus", - "school grounds", - "school center" + "educational facilities", + "school center", + "school grounds" ], "tags": { "landuse": "education" diff --git a/data/presets/landuse/greenhouse_horticulture.json b/data/presets/landuse/greenhouse_horticulture.json index 8bf96cfe..4d64f525 100644 --- a/data/presets/landuse/greenhouse_horticulture.json +++ b/data/presets/landuse/greenhouse_horticulture.json @@ -14,8 +14,8 @@ "terms": [ "flower", "greenhouse", - "horticulture", "grow", + "horticulture", "vivero" ], "tags": { diff --git a/data/presets/landuse/industrial/depot.json b/data/presets/landuse/industrial/depot.json index 8ff33762..1457f8b9 100644 --- a/data/presets/landuse/industrial/depot.json +++ b/data/presets/landuse/industrial/depot.json @@ -26,11 +26,11 @@ "terms": [ "bus", "depot", + "parking", + "storage", "truck", "vehicle", - "yard", - "storage", - "parking" + "yard" ], "name": "Depot" } diff --git a/data/presets/landuse/railway.json b/data/presets/landuse/railway.json index 198a7a62..9edfebad 100644 --- a/data/presets/landuse/railway.json +++ b/data/presets/landuse/railway.json @@ -13,9 +13,9 @@ "depot", "rail", "railway", + "track", "train", - "train depot", - "track" + "train depot" ], "name": "Railway Corridor" } diff --git a/data/presets/landuse/religious.json b/data/presets/landuse/religious.json index 105c36ba..2e0588f2 100644 --- a/data/presets/landuse/religious.json +++ b/data/presets/landuse/religious.json @@ -24,11 +24,11 @@ "muslim", "place of worship", "shinto", - "sikh", - "taoist", - "temple", "shrine", - "synagogue" + "sikh", + "synagogue", + "taoist", + "temple" ], "name": "Religious Area" } diff --git a/data/presets/landuse/salt_pond.json b/data/presets/landuse/salt_pond.json index 8b8bf0fe..107586c0 100644 --- a/data/presets/landuse/salt_pond.json +++ b/data/presets/landuse/salt_pond.json @@ -14,8 +14,8 @@ "evapoation", "saline", "salt", - "salt works", - "salt pan" + "salt pan", + "salt works" ], "aliases": [ "Salt Pond", diff --git a/data/presets/leisure/amusement_arcade.json b/data/presets/leisure/amusement_arcade.json index 2593a894..ef991867 100644 --- a/data/presets/leisure/amusement_arcade.json +++ b/data/presets/leisure/amusement_arcade.json @@ -19,10 +19,10 @@ "area" ], "terms": [ - "pay-to-play games", - "video games", "driving simulators", - "pinball machines" + "pay-to-play games", + "pinball machines", + "video games" ], "tags": { "leisure": "amusement_arcade" diff --git a/data/presets/leisure/bathing_place.json b/data/presets/leisure/bathing_place.json index ab0bf4ab..34b83abd 100644 --- a/data/presets/leisure/bathing_place.json +++ b/data/presets/leisure/bathing_place.json @@ -24,10 +24,10 @@ "terms": [ "bathing", "dipping", - "swimming", - "swimming hole", "ladder", "pier", + "swimming", + "swimming hole", "water" ], "tags": { diff --git a/data/presets/leisure/bleachers.json b/data/presets/leisure/bleachers.json index d52b8d3b..d0b86973 100644 --- a/data/presets/leisure/bleachers.json +++ b/data/presets/leisure/bleachers.json @@ -7,13 +7,13 @@ "leisure": "bleachers" }, "terms": [ - "crowd", "bench", + "crowd", + "seat", + "seating", "sports", "stand", - "stands", - "seat", - "seating" + "stands" ], "name": "Bleachers" } diff --git a/data/presets/leisure/disc_golf_course.json b/data/presets/leisure/disc_golf_course.json index ea28eb56..3845cdf9 100644 --- a/data/presets/leisure/disc_golf_course.json +++ b/data/presets/leisure/disc_golf_course.json @@ -26,8 +26,8 @@ }, "terms": [ "disk golf", - "frisbee golf", "flying disc golf", + "frisbee golf", "frolf", "ultimate" ], diff --git a/data/presets/leisure/fitness_centre.json b/data/presets/leisure/fitness_centre.json index 8a760fe6..d4b85e2b 100644 --- a/data/presets/leisure/fitness_centre.json +++ b/data/presets/leisure/fitness_centre.json @@ -25,8 +25,8 @@ "leisure": "fitness_centre" }, "terms": [ - "health", "gym", + "health", "leisure", "pilates", "studio" diff --git a/data/presets/leisure/fitness_station/horizontal_bar.json b/data/presets/leisure/fitness_station/horizontal_bar.json index 74feeee5..d0ac7fdd 100644 --- a/data/presets/leisure/fitness_station/horizontal_bar.json +++ b/data/presets/leisure/fitness_station/horizontal_bar.json @@ -19,13 +19,13 @@ }, "terms": [ "bar", - "chinup", "chin up", + "chinup", "exercise", "fitness", "gym", - "pullup", "pull up", + "pullup", "trim trail" ], "name": "Exercise Horizontal Bar" diff --git a/data/presets/leisure/fitness_station/horizontal_ladder.json b/data/presets/leisure/fitness_station/horizontal_ladder.json index c4842213..539ccf4b 100644 --- a/data/presets/leisure/fitness_station/horizontal_ladder.json +++ b/data/presets/leisure/fitness_station/horizontal_ladder.json @@ -19,15 +19,15 @@ }, "terms": [ "bar", - "chinup", "chin up", + "chinup", "exercise", "fitness", "gym", "ladder", "monkey bars", - "pullup", "pull up", + "pullup", "trim trail" ], "name": "Exercise Monkey Bars" diff --git a/data/presets/leisure/fitness_station/push-up.json b/data/presets/leisure/fitness_station/push-up.json index 66d7fb6b..8d8c8a91 100644 --- a/data/presets/leisure/fitness_station/push-up.json +++ b/data/presets/leisure/fitness_station/push-up.json @@ -22,8 +22,8 @@ "exercise", "fitness", "gym", - "pushup", "push up", + "pushup", "trim trail" ], "name": "Push-Up Station" diff --git a/data/presets/leisure/fitness_station/rings.json b/data/presets/leisure/fitness_station/rings.json index 8428731c..bc79c93b 100644 --- a/data/presets/leisure/fitness_station/rings.json +++ b/data/presets/leisure/fitness_station/rings.json @@ -22,8 +22,8 @@ "fitness", "gym", "muscle up", - "pullup", "pull up", + "pullup", "trim trail" ], "name": "Exercise Rings" diff --git a/data/presets/leisure/fitness_station/sit-up.json b/data/presets/leisure/fitness_station/sit-up.json index c50d0220..05a7e96c 100644 --- a/data/presets/leisure/fitness_station/sit-up.json +++ b/data/presets/leisure/fitness_station/sit-up.json @@ -22,8 +22,8 @@ "exercise", "fitness", "gym", - "situp", "sit up", + "situp", "trim trail" ], "name": "Sit-Up Station" diff --git a/data/presets/leisure/garden/kitchen.json b/data/presets/leisure/garden/kitchen.json index fa564d5d..71cca3ce 100644 --- a/data/presets/leisure/garden/kitchen.json +++ b/data/presets/leisure/garden/kitchen.json @@ -25,11 +25,11 @@ "key": "garden:style" }, "terms": [ - "vegetable garden", - "potager garden", + "cook's garden", "culinary garden", "edible garden", - "cook's garden" + "potager garden", + "vegetable garden" ], "name": "Kitchen Garden" } diff --git a/data/presets/leisure/hackerspace.json b/data/presets/leisure/hackerspace.json index 4c03e87e..cdcd44e6 100644 --- a/data/presets/leisure/hackerspace.json +++ b/data/presets/leisure/hackerspace.json @@ -22,9 +22,9 @@ "area" ], "terms": [ - "makerspace", + "hacklab", "hackspace", - "hacklab" + "makerspace" ], "tags": { "leisure": "hackerspace" diff --git a/data/presets/leisure/horse_riding.json b/data/presets/leisure/horse_riding.json index f8e988d1..add87c50 100644 --- a/data/presets/leisure/horse_riding.json +++ b/data/presets/leisure/horse_riding.json @@ -23,9 +23,9 @@ "horse farm", "horse park", "horse ranch", + "horse riding", "horse riding center", "horse riding facility", - "horse riding", "riding facility", "riding stables", "stables" diff --git a/data/presets/leisure/ice_rink.json b/data/presets/leisure/ice_rink.json index 024b56e2..37a0f033 100644 --- a/data/presets/leisure/ice_rink.json +++ b/data/presets/leisure/ice_rink.json @@ -21,9 +21,9 @@ "point" ], "terms": [ + "curling", "hockey", - "skating", - "curling" + "skating" ], "tags": { "leisure": "ice_rink" diff --git a/data/presets/leisure/outdoor_seating.json b/data/presets/leisure/outdoor_seating.json index 5332f0c3..1587b9fb 100644 --- a/data/presets/leisure/outdoor_seating.json +++ b/data/presets/leisure/outdoor_seating.json @@ -18,13 +18,13 @@ ], "terms": [ "al fresco", - "beer garden", - "dining", - "cafe", - "restaurant", - "pub", "bar", - "patio" + "beer garden", + "cafe", + "dining", + "patio", + "pub", + "restaurant" ], "tags": { "leisure": "outdoor_seating" diff --git a/data/presets/leisure/picnic_table/chess.json b/data/presets/leisure/picnic_table/chess.json index d2c48022..7ab7f3f2 100644 --- a/data/presets/leisure/picnic_table/chess.json +++ b/data/presets/leisure/picnic_table/chess.json @@ -13,10 +13,10 @@ }, "terms": [ "bench", - "chess board", "checkerboard", "checkers", "chequerboard", + "chess board", "game table" ], "name": "Chess Table" diff --git a/data/presets/leisure/pitch/australian_football.json b/data/presets/leisure/pitch/australian_football.json index da6b4207..1d6f9210 100644 --- a/data/presets/leisure/pitch/australian_football.json +++ b/data/presets/leisure/pitch/australian_football.json @@ -13,8 +13,8 @@ "value": "australian_football" }, "terms": [ - "Aussie", - "AFL", + "afl", + "aussie", "football" ], "name": "Australian Football Field" diff --git a/data/presets/leisure/pitch/chess.json b/data/presets/leisure/pitch/chess.json index b8456b73..e3eb5d05 100644 --- a/data/presets/leisure/pitch/chess.json +++ b/data/presets/leisure/pitch/chess.json @@ -13,10 +13,10 @@ "value": "chess" }, "terms": [ - "chessboard", "checkerboard", "checkers", "chequerboard", + "chessboard", "garden chess", "large chess", "oversize chess" diff --git a/data/presets/leisure/pitch/equestrian.json b/data/presets/leisure/pitch/equestrian.json index f597f328..5f983ac6 100644 --- a/data/presets/leisure/pitch/equestrian.json +++ b/data/presets/leisure/pitch/equestrian.json @@ -17,23 +17,23 @@ }, "terms": [ "arena", + "dressage", "dressage arena", "dressage ring", - "dressage", "equestrian arena", - "horse riding ring", - "horse riding", "horse", - "horseback riding arena", - "horseback riding", + "horse riding", + "horse riding ring", "horseback", + "horseback riding", + "horseback riding arena", "jumping arena", "jumping ring", "longeing", "pen", "polo", - "riding ring", "riding", + "riding ring", "ring", "rodeo", "round pen" diff --git a/data/presets/leisure/pitch/futsal.json b/data/presets/leisure/pitch/futsal.json index 87f34c6d..c8a82608 100644 --- a/data/presets/leisure/pitch/futsal.json +++ b/data/presets/leisure/pitch/futsal.json @@ -13,8 +13,8 @@ "value": "futsal" }, "terms": [ - "minifootball", - "five-a-side soccer" + "five-a-side soccer", + "minifootball" ], "name": "Futsal Court" } diff --git a/data/presets/leisure/pitch/padel.json b/data/presets/leisure/pitch/padel.json index ab60a044..fcf8ef06 100644 --- a/data/presets/leisure/pitch/padel.json +++ b/data/presets/leisure/pitch/padel.json @@ -13,8 +13,8 @@ "value": "padel" }, "terms": [ - "tennis", - "paddle" + "paddle", + "tennis" ], "name": "Padel Court" } diff --git a/data/presets/leisure/pitch/pickleball.json b/data/presets/leisure/pitch/pickleball.json index 51274b95..0eefb412 100644 --- a/data/presets/leisure/pitch/pickleball.json +++ b/data/presets/leisure/pitch/pickleball.json @@ -13,8 +13,8 @@ "value": "pickleball" }, "terms": [ - "tennis", - "paddleball" + "paddleball", + "tennis" ], "name": "Pickleball Court" } diff --git a/data/presets/leisure/pitch/shooting.json b/data/presets/leisure/pitch/shooting.json index 50a4a5a8..9c4a22fe 100644 --- a/data/presets/leisure/pitch/shooting.json +++ b/data/presets/leisure/pitch/shooting.json @@ -14,9 +14,9 @@ }, "terms": [ "firing range", + "gun practice", "gun range", "shooting gallery", - "gun practice", "shooting practice", "target practice" ], diff --git a/data/presets/leisure/pitch/skateboard.json b/data/presets/leisure/pitch/skateboard.json index 34feb5ff..2f5c183b 100644 --- a/data/presets/leisure/pitch/skateboard.json +++ b/data/presets/leisure/pitch/skateboard.json @@ -13,7 +13,7 @@ "value": "skateboard" }, "terms": [ - "BMX", + "bmx", "scooter", "skateboarding", "skatepark", diff --git a/data/presets/leisure/pitch/table_tennis.json b/data/presets/leisure/pitch/table_tennis.json index 992336b1..83984e8c 100644 --- a/data/presets/leisure/pitch/table_tennis.json +++ b/data/presets/leisure/pitch/table_tennis.json @@ -18,8 +18,8 @@ "value": "table_tennis" }, "terms": [ - "table tennis", - "ping pong" + "ping pong", + "table tennis" ], "name": "Ping Pong Table" } diff --git a/data/presets/leisure/pitch/tetherball.json b/data/presets/leisure/pitch/tetherball.json index 135f54aa..0bdfc62c 100644 --- a/data/presets/leisure/pitch/tetherball.json +++ b/data/presets/leisure/pitch/tetherball.json @@ -13,8 +13,8 @@ "value": "tetherball" }, "terms": [ - "tether tennis", - "swingball" + "swingball", + "tether tennis" ], "name": "Tetherball Court" } diff --git a/data/presets/leisure/playground/indoor.json b/data/presets/leisure/playground/indoor.json index ce0864ce..4448dc7d 100644 --- a/data/presets/leisure/playground/indoor.json +++ b/data/presets/leisure/playground/indoor.json @@ -6,10 +6,10 @@ ], "terms": [ "ball pit", - "play pen", - "play pit", "indoor play area", - "inside playground" + "inside playground", + "play pen", + "play pit" ], "tags": { "leisure": "playground", diff --git a/data/presets/leisure/slipway.json b/data/presets/leisure/slipway.json index 78918490..9655f7fd 100644 --- a/data/presets/leisure/slipway.json +++ b/data/presets/leisure/slipway.json @@ -20,9 +20,9 @@ "line" ], "terms": [ + "boat landing", "boat launch", - "boat ramp", - "boat landing" + "boat ramp" ], "tags": { "leisure": "slipway" diff --git a/data/presets/leisure/slipway_drivable.json b/data/presets/leisure/slipway_drivable.json index d0b27cbd..f6f0ff2c 100644 --- a/data/presets/leisure/slipway_drivable.json +++ b/data/presets/leisure/slipway_drivable.json @@ -11,9 +11,9 @@ "line" ], "terms": [ + "boat landing", "boat launch", - "boat ramp", - "boat landing" + "boat ramp" ], "tags": { "leisure": "slipway", diff --git a/data/presets/leisure/sports_centre/climbing.json b/data/presets/leisure/sports_centre/climbing.json index 43985853..4e5f0760 100644 --- a/data/presets/leisure/sports_centre/climbing.json +++ b/data/presets/leisure/sports_centre/climbing.json @@ -13,9 +13,9 @@ "artificial climbing wall", "belaying", "bouldering", - "rock climbing facility", "indoor rock wall", "rappeling", + "rock climbing facility", "rock gym", "ropes" ], diff --git a/data/presets/leisure/sports_centre/horse_racing.json b/data/presets/leisure/sports_centre/horse_racing.json index 2a10345d..cb16eca1 100644 --- a/data/presets/leisure/sports_centre/horse_racing.json +++ b/data/presets/leisure/sports_centre/horse_racing.json @@ -19,8 +19,8 @@ "terms": [ "equestrian race course", "gallop", - "horse race betting", "horse race", + "horse race betting", "horse racing", "horseracing", "race course", diff --git a/data/presets/leisure/sports_centre/karting.json b/data/presets/leisure/sports_centre/karting.json index bb061a7f..1590123f 100644 --- a/data/presets/leisure/sports_centre/karting.json +++ b/data/presets/leisure/sports_centre/karting.json @@ -6,8 +6,8 @@ ], "terms": [ "go cart", - "karting", - "kart racing" + "kart racing", + "karting" ], "tags": { "leisure": "sports_centre", diff --git a/data/presets/leisure/sports_centre/shooting.json b/data/presets/leisure/sports_centre/shooting.json index 2997e920..38b7ab0e 100644 --- a/data/presets/leisure/sports_centre/shooting.json +++ b/data/presets/leisure/sports_centre/shooting.json @@ -13,11 +13,11 @@ "value": "shooting" }, "terms": [ - "shooting club", "firing range", - "gun range", - "shooting gallery", "gun practice", + "gun range", + "shooting club", + "shooting gallery", "shooting practice", "target practice" ], diff --git a/data/presets/leisure/swimming_area.json b/data/presets/leisure/swimming_area.json index 1d8e988a..a2ba1740 100644 --- a/data/presets/leisure/swimming_area.json +++ b/data/presets/leisure/swimming_area.json @@ -17,9 +17,9 @@ "area" ], "terms": [ + "aquatics", "dive", - "water", - "aquatics" + "water" ], "tags": { "leisure": "swimming_area" diff --git a/data/presets/leisure/swimming_pool.json b/data/presets/leisure/swimming_pool.json index 50f492c0..bcd5bfd6 100644 --- a/data/presets/leisure/swimming_pool.json +++ b/data/presets/leisure/swimming_pool.json @@ -20,9 +20,9 @@ "point" ], "terms": [ + "aquatics", "dive", - "water", - "aquatics" + "water" ], "tags": { "leisure": "swimming_pool" diff --git a/data/presets/leisure/water_park.json b/data/presets/leisure/water_park.json index 8d3a879a..9f657237 100644 --- a/data/presets/leisure/water_park.json +++ b/data/presets/leisure/water_park.json @@ -12,9 +12,9 @@ "point" ], "terms": [ - "swim", + "dive", "pool", - "dive" + "swim" ], "tags": { "leisure": "water_park" diff --git a/data/presets/man_made/antenna.json b/data/presets/man_made/antenna.json index 1e507df9..11e15cd4 100644 --- a/data/presets/man_made/antenna.json +++ b/data/presets/man_made/antenna.json @@ -11,8 +11,8 @@ ], "terms": [ "broadcast", - "cell phone", "cell", + "cell phone", "communication", "mobile phone", "radio", diff --git a/data/presets/man_made/bunker_silo.json b/data/presets/man_made/bunker_silo.json index 48b99112..84cba56e 100644 --- a/data/presets/man_made/bunker_silo.json +++ b/data/presets/man_made/bunker_silo.json @@ -11,8 +11,8 @@ "area" ], "terms": [ - "Silage", - "Storage" + "silage", + "storage" ], "tags": { "man_made": "bunker_silo" diff --git a/data/presets/man_made/cairn.json b/data/presets/man_made/cairn.json index 4b1e5d67..94402b0a 100644 --- a/data/presets/man_made/cairn.json +++ b/data/presets/man_made/cairn.json @@ -17,10 +17,10 @@ "area" ], "terms": [ + "càrn", "rock pile", - "stone stack", "stone pile", - "càrn" + "stone stack" ], "tags": { "man_made": "cairn" diff --git a/data/presets/man_made/carpet_hanger.json b/data/presets/man_made/carpet_hanger.json index b9e10ef4..557591dc 100644 --- a/data/presets/man_made/carpet_hanger.json +++ b/data/presets/man_made/carpet_hanger.json @@ -10,8 +10,8 @@ "line" ], "terms": [ - "rack", "beater", + "rack", "stand" ], "tags": { diff --git a/data/presets/man_made/ceremonial_gate/torii.json b/data/presets/man_made/ceremonial_gate/torii.json index 95cbfb2a..23284a77 100644 --- a/data/presets/man_made/ceremonial_gate/torii.json +++ b/data/presets/man_made/ceremonial_gate/torii.json @@ -13,8 +13,8 @@ "line" ], "terms": [ - "Japanese gate", - "Shinto shrine" + "japanese gate", + "shinto shrine" ], "tags": { "ceremonial_gate": "torii" diff --git a/data/presets/man_made/crane/gantry_crane.json b/data/presets/man_made/crane/gantry_crane.json index 7023958a..e7f659b2 100644 --- a/data/presets/man_made/crane/gantry_crane.json +++ b/data/presets/man_made/crane/gantry_crane.json @@ -14,8 +14,8 @@ "value": "gantry_crane" }, "terms": [ - "overhead crane", - "bridge crane" + "bridge crane", + "overhead crane" ], "name": "Gantry Crane" } diff --git a/data/presets/man_made/dyke.json b/data/presets/man_made/dyke.json index dedbc399..1df973b5 100644 --- a/data/presets/man_made/dyke.json +++ b/data/presets/man_made/dyke.json @@ -6,10 +6,10 @@ "man_made": "dyke" }, "terms": [ - "Dike", - "Dyke", - "Floodbank", - "Stopbank" + "dike", + "dyke", + "floodbank", + "stopbank" ], "name": "Levee" } diff --git a/data/presets/man_made/flare.json b/data/presets/man_made/flare.json index 3c488011..ebff7776 100644 --- a/data/presets/man_made/flare.json +++ b/data/presets/man_made/flare.json @@ -12,11 +12,11 @@ "vertex" ], "terms": [ + "burn", + "fire", "flare stack", "gas", - "oil", - "fire", - "burn" + "oil" ], "tags": { "man_made": "flare" diff --git a/data/presets/man_made/footwear_decontamination-AU-NZ.json b/data/presets/man_made/footwear_decontamination-AU-NZ.json index c97e6c95..f242c988 100644 --- a/data/presets/man_made/footwear_decontamination-AU-NZ.json +++ b/data/presets/man_made/footwear_decontamination-AU-NZ.json @@ -14,11 +14,11 @@ "area" ], "terms": [ - "footwear cleaning", - "shoe cleaning", "boot cleaning", "contamination station", - "decontamination station" + "decontamination station", + "footwear cleaning", + "shoe cleaning" ], "tags": { "man_made": "footwear_decontamination" diff --git a/data/presets/man_made/fuel_pump.json b/data/presets/man_made/fuel_pump.json index 092efef5..11070081 100644 --- a/data/presets/man_made/fuel_pump.json +++ b/data/presets/man_made/fuel_pump.json @@ -12,14 +12,14 @@ "vertex" ], "terms": [ - "petrol", + "biodiesel", + "cng", + "diesel", "fuel", "gasoline", - "propane", - "diesel", "lng", - "cng", - "biodiesel" + "petrol", + "propane" ], "tags": { "man_made": "fuel_pump" diff --git a/data/presets/man_made/manhole.json b/data/presets/man_made/manhole.json index 8db14daf..5003c586 100644 --- a/data/presets/man_made/manhole.json +++ b/data/presets/man_made/manhole.json @@ -16,8 +16,8 @@ "terms": [ "cover", "hole", - "sewer", "sewage", + "sewer", "telecom" ], "name": "Manhole" diff --git a/data/presets/man_made/manhole/drain.json b/data/presets/man_made/manhole/drain.json index 55dcdb18..4e2129ca 100644 --- a/data/presets/man_made/manhole/drain.json +++ b/data/presets/man_made/manhole/drain.json @@ -20,8 +20,8 @@ "drain", "hole", "rain", - "sewer", "sewage", + "sewer", "storm" ], "name": "Storm Drain" diff --git a/data/presets/man_made/manhole/power.json b/data/presets/man_made/manhole/power.json index 610b30a5..656fcd27 100644 --- a/data/presets/man_made/manhole/power.json +++ b/data/presets/man_made/manhole/power.json @@ -17,9 +17,9 @@ }, "terms": [ "cover", - "hole", "electric", "hole", + "hole", "power", "utility" ], diff --git a/data/presets/man_made/manhole/sewer.json b/data/presets/man_made/manhole/sewer.json index 3a1058f5..4f26aec8 100644 --- a/data/presets/man_made/manhole/sewer.json +++ b/data/presets/man_made/manhole/sewer.json @@ -19,8 +19,8 @@ "cover", "drain", "hole", - "sewer", "sewage", + "sewer", "utility" ], "name": "Sewer Utility Manhole" diff --git a/data/presets/man_made/manhole/telecom.json b/data/presets/man_made/manhole/telecom.json index e6f59b62..4da370ce 100644 --- a/data/presets/man_made/manhole/telecom.json +++ b/data/presets/man_made/manhole/telecom.json @@ -19,8 +19,8 @@ "bt", "cable", "cover", - "phone", "hole", + "phone", "telecom", "telephone", "utility" diff --git a/data/presets/man_made/mast/lighting.json b/data/presets/man_made/mast/lighting.json index 64e58f75..8a9815e2 100644 --- a/data/presets/man_made/mast/lighting.json +++ b/data/presets/man_made/mast/lighting.json @@ -12,10 +12,10 @@ ], "terms": [ "flood light", + "headlight", "lighting", - "stadium lights", "stadium lighting", - "headlight" + "stadium lights" ], "tags": { "man_made": "mast", diff --git a/data/presets/man_made/monitoring_station.json b/data/presets/man_made/monitoring_station.json index c7b22197..9dbf58c3 100644 --- a/data/presets/man_made/monitoring_station.json +++ b/data/presets/man_made/monitoring_station.json @@ -14,16 +14,16 @@ "ref" ], "terms": [ - "weather", - "earthquake", - "seismology", "air", - "gps", - "traffic counter", "bicycle counter", "bike counter", + "earthquake", + "gps", + "measurement station", + "seismology", + "traffic counter", "water level", - "measurement station" + "weather" ], "tags": { "man_made": "monitoring_station" diff --git a/data/presets/man_made/petroleum_well.json b/data/presets/man_made/petroleum_well.json index dbc2d816..edf684b2 100644 --- a/data/presets/man_made/petroleum_well.json +++ b/data/presets/man_made/petroleum_well.json @@ -18,8 +18,8 @@ "oil derrick", "oil drill", "oil horse", - "oil rig", "oil pump", + "oil rig", "petroleum well", "pumpjack" ], diff --git a/data/presets/man_made/pipeline.json b/data/presets/man_made/pipeline.json index 153a57b2..ba5e71f5 100644 --- a/data/presets/man_made/pipeline.json +++ b/data/presets/man_made/pipeline.json @@ -11,11 +11,11 @@ "line" ], "terms": [ - "oil", "natural gas", - "water", + "oil", + "sewage", "sewer", - "sewage" + "water" ], "tags": { "man_made": "pipeline" diff --git a/data/presets/man_made/pipeline/underground.json b/data/presets/man_made/pipeline/underground.json index 8b60c68b..a98c7b78 100644 --- a/data/presets/man_made/pipeline/underground.json +++ b/data/presets/man_made/pipeline/underground.json @@ -4,11 +4,11 @@ "line" ], "terms": [ - "oil", "natural gas", - "water", + "oil", + "sewage", "sewer", - "sewage" + "water" ], "tags": { "man_made": "pipeline", diff --git a/data/presets/man_made/silo.json b/data/presets/man_made/silo.json index 2392beda..7e6724d9 100644 --- a/data/presets/man_made/silo.json +++ b/data/presets/man_made/silo.json @@ -12,8 +12,8 @@ "area" ], "terms": [ - "grain", "corn", + "grain", "wheat" ], "tags": { diff --git a/data/presets/man_made/ski_jump.json b/data/presets/man_made/ski_jump.json index 2c5b8b7c..004b2f31 100644 --- a/data/presets/man_made/ski_jump.json +++ b/data/presets/man_made/ski_jump.json @@ -12,12 +12,12 @@ "area" ], "terms": [ - "jump", - "ski jump", "in-run", "inrun", - "ski jump structure", + "jump", + "ski jump", "ski jump in-run tower", + "ski jump structure", "ski jumping hill tower" ], "tags": { diff --git a/data/presets/man_made/storage_tank.json b/data/presets/man_made/storage_tank.json index f7679806..1720eae8 100644 --- a/data/presets/man_made/storage_tank.json +++ b/data/presets/man_made/storage_tank.json @@ -18,11 +18,11 @@ "point" ], "terms": [ - "water", - "oil", - "gas", "fuel", - "petrol" + "gas", + "oil", + "petrol", + "water" ], "tags": { "man_made": "storage_tank" diff --git a/data/presets/man_made/surveillance.json b/data/presets/man_made/surveillance.json index 832a6101..fec4cd93 100644 --- a/data/presets/man_made/surveillance.json +++ b/data/presets/man_made/surveillance.json @@ -11,8 +11,8 @@ "direction" ], "terms": [ - "anpr", "alpr", + "anpr", "camera", "car plate recognition", "cctv", diff --git a/data/presets/man_made/surveillance/camera.json b/data/presets/man_made/surveillance/camera.json index 46991414..ce4e3568 100644 --- a/data/presets/man_made/surveillance/camera.json +++ b/data/presets/man_made/surveillance/camera.json @@ -17,8 +17,8 @@ "manufacturer" ], "terms": [ - "anpr", "alpr", + "anpr", "camera", "car plate recognition", "cctv", diff --git a/data/presets/man_made/survey_point.json b/data/presets/man_made/survey_point.json index 20d30ef5..934c8784 100644 --- a/data/presets/man_made/survey_point.json +++ b/data/presets/man_made/survey_point.json @@ -16,12 +16,12 @@ "vertex" ], "terms": [ - "trig point", - "trig station", - "survey marker", "geodetic mark", "geodetic point", + "survey marker", "triangulation pillar", + "trig point", + "trig station", "trigonometrical station" ], "tags": { diff --git a/data/presets/man_made/telescope/optical.json b/data/presets/man_made/telescope/optical.json index b44d1a65..33966c5d 100644 --- a/data/presets/man_made/telescope/optical.json +++ b/data/presets/man_made/telescope/optical.json @@ -16,8 +16,8 @@ "key": "man_made" }, "terms": [ - "refracting telescope", - "reflecting telescope" + "reflecting telescope", + "refracting telescope" ], "name": "Optical Telescope" } diff --git a/data/presets/man_made/telescope/radio.json b/data/presets/man_made/telescope/radio.json index 05cfc17b..ca3cf5eb 100644 --- a/data/presets/man_made/telescope/radio.json +++ b/data/presets/man_made/telescope/radio.json @@ -13,8 +13,8 @@ }, "terms": [ "ground station", - "radio dish", - "radio antenna" + "radio antenna", + "radio dish" ], "name": "Radio Telescope" } diff --git a/data/presets/man_made/tower/defensive.json b/data/presets/man_made/tower/defensive.json index 9b3ffbaa..98b7b667 100644 --- a/data/presets/man_made/tower/defensive.json +++ b/data/presets/man_made/tower/defensive.json @@ -13,8 +13,8 @@ "value": "defensive" }, "terms": [ - "Defensive Tower", - "Castle Tower" + "castle tower", + "defensive tower" ], "name": "Fortified Tower" } diff --git a/data/presets/man_made/tower/minaret.json b/data/presets/man_made/tower/minaret.json index addff51f..17de8629 100644 --- a/data/presets/man_made/tower/minaret.json +++ b/data/presets/man_made/tower/minaret.json @@ -5,10 +5,10 @@ "area" ], "terms": [ - "Islam", + "islam", "mosque", - "Muezzin", - "Muslim" + "muezzin", + "muslim" ], "tags": { "man_made": "tower", diff --git a/data/presets/man_made/tower/observation.json b/data/presets/man_made/tower/observation.json index 78ef4a28..79639c82 100644 --- a/data/presets/man_made/tower/observation.json +++ b/data/presets/man_made/tower/observation.json @@ -10,8 +10,8 @@ "area" ], "terms": [ - "lookout tower", - "fire tower" + "fire tower", + "lookout tower" ], "tags": { "man_made": "tower", diff --git a/data/presets/man_made/tower/pagoda.json b/data/presets/man_made/tower/pagoda.json index 8c1a5f89..c39abefd 100644 --- a/data/presets/man_made/tower/pagoda.json +++ b/data/presets/man_made/tower/pagoda.json @@ -10,8 +10,8 @@ ], "terms": [ "buddhist tower", - "tiered tower", - "chinese pagodas" + "chinese pagodas", + "tiered tower" ], "tags": { "man_made": "tower", diff --git a/data/presets/man_made/video_wall.json b/data/presets/man_made/video_wall.json index bfe74a4c..4c16d772 100644 --- a/data/presets/man_made/video_wall.json +++ b/data/presets/man_made/video_wall.json @@ -16,12 +16,12 @@ "line" ], "terms": [ - "screen", - "tv", - "television", "display", - "video wall", - "led wall" + "led wall", + "screen", + "television", + "tv", + "video wall" ], "tags": { "man_made": "video_wall" diff --git a/data/presets/man_made/water_well.json b/data/presets/man_made/water_well.json index 97484e5a..aace1a9c 100644 --- a/data/presets/man_made/water_well.json +++ b/data/presets/man_made/water_well.json @@ -20,8 +20,8 @@ "terms": [ "aquifer", "drinking water", - "water pump", "water point", + "water pump", "water source" ], "name": "Water Well" diff --git a/data/presets/man_made/watermill.json b/data/presets/man_made/watermill.json index f0d14c94..6e912b30 100644 --- a/data/presets/man_made/watermill.json +++ b/data/presets/man_made/watermill.json @@ -15,11 +15,11 @@ "area" ], "terms": [ - "waterwheel", - "water wheel", + "mill", "water", - "wheel", - "mill" + "water wheel", + "waterwheel", + "wheel" ], "tags": { "man_made": "watermill" diff --git a/data/presets/man_made/windmill.json b/data/presets/man_made/windmill.json index de17680c..2e9886df 100644 --- a/data/presets/man_made/windmill.json +++ b/data/presets/man_made/windmill.json @@ -14,9 +14,9 @@ "area" ], "terms": [ - "wind", + "mill", "wheel", - "mill" + "wind" ], "tags": { "man_made": "windmill" diff --git a/data/presets/man_made/windpump.json b/data/presets/man_made/windpump.json index dd32b4ac..d80094f1 100644 --- a/data/presets/man_made/windpump.json +++ b/data/presets/man_made/windpump.json @@ -14,8 +14,8 @@ "terms": [ "aerorotor", "water pump", - "windmill", - "wind pump" + "wind pump", + "windmill" ], "tags": { "man_made": "windpump" diff --git a/data/presets/man_made/works.json b/data/presets/man_made/works.json index ccca14d6..d801713a 100644 --- a/data/presets/man_made/works.json +++ b/data/presets/man_made/works.json @@ -17,13 +17,13 @@ ], "terms": [ "assembly", - "build", "brewery", + "build", "car", + "manufacture", "plant", "plastic", "processing", - "manufacture", "refinery" ], "tags": { diff --git a/data/presets/natural/cave_entrance.json b/data/presets/natural/cave_entrance.json index 314cec90..82ad7f51 100644 --- a/data/presets/natural/cave_entrance.json +++ b/data/presets/natural/cave_entrance.json @@ -19,10 +19,10 @@ }, "terms": [ "cavern", - "hollow", + "cavity", "grotto", - "shelter", - "cavity" + "hollow", + "shelter" ], "name": "Cave Entrance" } diff --git a/data/presets/natural/rock.json b/data/presets/natural/rock.json index 38ea34d9..d91a7d8c 100644 --- a/data/presets/natural/rock.json +++ b/data/presets/natural/rock.json @@ -12,8 +12,8 @@ }, "terms": [ "boulder", - "stone", - "rock" + "rock", + "stone" ], "name": "Attached Rock / Boulder" } diff --git a/data/presets/natural/saddle.json b/data/presets/natural/saddle.json index ccecb1f9..de0f990b 100644 --- a/data/presets/natural/saddle.json +++ b/data/presets/natural/saddle.json @@ -12,11 +12,11 @@ "natural": "saddle" }, "terms": [ - "top", - "gap", "col", + "gap", "notch", - "pass" + "pass", + "top" ], "name": "Saddle", "aliases": [ diff --git a/data/presets/natural/stone.json b/data/presets/natural/stone.json index 423ab638..249f34b5 100644 --- a/data/presets/natural/stone.json +++ b/data/presets/natural/stone.json @@ -12,8 +12,8 @@ }, "terms": [ "boulder", - "stone", - "rock" + "rock", + "stone" ], "name": "Unattached Stone / Boulder" } diff --git a/data/presets/natural/valley.json b/data/presets/natural/valley.json index c5eedb2a..b672d871 100644 --- a/data/presets/natural/valley.json +++ b/data/presets/natural/valley.json @@ -20,8 +20,8 @@ "depression", "glen", "gorge", - "gully", "gulley", + "gully", "gultch", "hollow", "ravine", diff --git a/data/presets/natural/volcano.json b/data/presets/natural/volcano.json index ca8aa507..a602d069 100644 --- a/data/presets/natural/volcano.json +++ b/data/presets/natural/volcano.json @@ -14,8 +14,8 @@ "natural": "volcano" }, "terms": [ - "mountain", - "crater" + "crater", + "mountain" ], "name": "Volcano" } diff --git a/data/presets/natural/water/pond.json b/data/presets/natural/water/pond.json index 69f9dcbb..bcebb42a 100644 --- a/data/presets/natural/water/pond.json +++ b/data/presets/natural/water/pond.json @@ -17,10 +17,10 @@ }, "terms": [ "lakelet", + "mere", "millpond", - "tarn", "pool", - "mere" + "tarn" ], "name": "Pond" } diff --git a/data/presets/natural/water/wastewater.json b/data/presets/natural/water/wastewater.json index be3b647d..618c0b4e 100644 --- a/data/presets/natural/water/wastewater.json +++ b/data/presets/natural/water/wastewater.json @@ -12,12 +12,12 @@ "value": "wastewater" }, "terms": [ + "clarifier basin", "excrement", - "shit", + "settling basin", "sewage", - "wastewater", - "Settling Basin", - "Clarifier Basin" + "shit", + "wastewater" ], "name": "Wastewater Basin" } diff --git a/data/presets/natural/wetland/reedbed.json b/data/presets/natural/wetland/reedbed.json index 696c3ca9..2bdd9c79 100644 --- a/data/presets/natural/wetland/reedbed.json +++ b/data/presets/natural/wetland/reedbed.json @@ -13,9 +13,9 @@ "value": "reedbed" }, "terms": [ - "reeds", "bulrushes", - "cattail" + "cattail", + "reeds" ], "name": "Reed bed" } diff --git a/data/presets/office/financial_advisor.json b/data/presets/office/financial_advisor.json index 463c1196..9b9b12a8 100644 --- a/data/presets/office/financial_advisor.json +++ b/data/presets/office/financial_advisor.json @@ -10,9 +10,9 @@ "terms": [ "401k", "inheritance", + "retirement", "savings", "stocks", - "retirement", "wealth management" ], "name": "Financial Advisor" diff --git a/data/presets/office/government/register_office.json b/data/presets/office/government/register_office.json index 45d50421..3602558e 100644 --- a/data/presets/office/government/register_office.json +++ b/data/presets/office/government/register_office.json @@ -9,11 +9,11 @@ "area" ], "terms": [ - "clerk", - "marriage", - "death", "birth", - "certificate" + "certificate", + "clerk", + "death", + "marriage" ], "tags": { "office": "government", diff --git a/data/presets/office/graphic_design.json b/data/presets/office/graphic_design.json index 5f64a3ca..9cb0c48a 100644 --- a/data/presets/office/graphic_design.json +++ b/data/presets/office/graphic_design.json @@ -8,8 +8,8 @@ "office": "graphic_design" }, "terms": [ - "design", "art", + "design", "illustrate", "technology", "visual" diff --git a/data/presets/office/moving_company.json b/data/presets/office/moving_company.json index ffbf621b..eb29197a 100644 --- a/data/presets/office/moving_company.json +++ b/data/presets/office/moving_company.json @@ -8,8 +8,8 @@ "office": "moving_company" }, "terms": [ - "relocation", - "movers" + "movers", + "relocation" ], "name": "Moving Company Office" } diff --git a/data/presets/office/ngo.json b/data/presets/office/ngo.json index f5bab99b..d975dafe 100644 --- a/data/presets/office/ngo.json +++ b/data/presets/office/ngo.json @@ -11,8 +11,8 @@ "ngo", "non government", "non-government", - "organization", - "organisation" + "organisation", + "organization" ], "name": "NGO Office" } diff --git a/data/presets/office/private_investigator.json b/data/presets/office/private_investigator.json index f16b507b..b58ca272 100644 --- a/data/presets/office/private_investigator.json +++ b/data/presets/office/private_investigator.json @@ -8,9 +8,9 @@ "office": "private_investigator" }, "terms": [ - "PI", - "private eye", - "private detective" + "pi", + "private detective", + "private eye" ], "name": "Private Investigator Office" } diff --git a/data/presets/office/quango.json b/data/presets/office/quango.json index 6af3918e..f88f51ae 100644 --- a/data/presets/office/quango.json +++ b/data/presets/office/quango.json @@ -11,8 +11,8 @@ "ngo", "non government", "non-government", - "organization", "organisation", + "organization", "quasi autonomous", "quasi-autonomous" ], diff --git a/data/presets/office/research.json b/data/presets/office/research.json index 612a351a..2d977902 100644 --- a/data/presets/office/research.json +++ b/data/presets/office/research.json @@ -8,10 +8,10 @@ "office": "research" }, "terms": [ - "R and D", + "r and d", + "r&d", "research and development", "research lab", - "r&d", "rnd" ], "name": "Research Office" diff --git a/data/presets/office/translator.json b/data/presets/office/translator.json index 8f4e8f5c..7a6e79fa 100644 --- a/data/presets/office/translator.json +++ b/data/presets/office/translator.json @@ -8,10 +8,10 @@ "office": "translator" }, "terms": [ - "translator", "translation", + "translation agency", "translation office", - "translation agency" + "translator" ], "name": "Translation Office" } diff --git a/data/presets/office/water_utility.json b/data/presets/office/water_utility.json index 23e29ba0..6e800279 100644 --- a/data/presets/office/water_utility.json +++ b/data/presets/office/water_utility.json @@ -12,8 +12,8 @@ "office": "water_utility" }, "terms": [ - "water board", - "utility" + "utility", + "water board" ], "name": "Water Utility Office" } diff --git a/data/presets/pipeline/valve.json b/data/presets/pipeline/valve.json index 742dc052..c37e113b 100644 --- a/data/presets/pipeline/valve.json +++ b/data/presets/pipeline/valve.json @@ -16,11 +16,11 @@ "material" ], "terms": [ - "oil", "natural gas", - "water", + "oil", + "sewage", "sewer", - "sewage" + "water" ], "tags": { "pipeline": "valve" diff --git a/data/presets/piste/_piste.json b/data/presets/piste/_piste.json index 33b98ab9..07ffb8aa 100644 --- a/data/presets/piste/_piste.json +++ b/data/presets/piste/_piste.json @@ -16,26 +16,26 @@ "piste:type": "*" }, "terms": [ - "ski", - "nordic", + "alpine", "crosscountry", "downhill", - "alpine", - "snowboard", - "skitour", - "ski touring", - "sled", - "luge", - "sleigh", - "sledge", - "ski-joring", - "husky", "horse", - "winter hiking", + "husky", + "ice", + "luge", + "nordic", + "skating", + "ski", + "ski touring", + "ski-joring", + "skitour", + "sled", + "sledge", + "sleigh", + "snowboard", "snowshoe", "snowshoeing", - "ice", - "skating" + "winter hiking" ], "name": "Snowsports Trail / Piste (Unspecified Type)", "searchable": false diff --git a/data/presets/piste/downhill/halfpipe.json b/data/presets/piste/downhill/halfpipe.json index 04605cdd..3e370dfb 100644 --- a/data/presets/piste/downhill/halfpipe.json +++ b/data/presets/piste/downhill/halfpipe.json @@ -13,13 +13,13 @@ "value": "piste:halfpipe" }, "terms": [ - "ski", "alpine", - "halfpipe", - "half pipe", - "snowboard", "downhill", - "piste" + "half pipe", + "halfpipe", + "piste", + "ski", + "snowboard" ], "name": "Snowsports Half-Pipe" } diff --git a/data/presets/piste/skitour.json b/data/presets/piste/skitour.json index b8d5bb27..236f0863 100644 --- a/data/presets/piste/skitour.json +++ b/data/presets/piste/skitour.json @@ -16,11 +16,11 @@ "piste:type": "skitour" }, "terms": [ - "ski", - "skitour", "crosscountry", + "piste", + "ski", "ski touring", - "piste" + "skitour" ], "name": "Ski Touring Trail" } diff --git a/data/presets/piste/sleigh.json b/data/presets/piste/sleigh.json index 077b2295..d38f8b91 100644 --- a/data/presets/piste/sleigh.json +++ b/data/presets/piste/sleigh.json @@ -17,13 +17,13 @@ }, "terms": [ "dogsledding", - "husky", "horse", + "husky", "piste", - "sled", - "sledge", "ski-joring", - "skijoring" + "skijoring", + "sled", + "sledge" ], "name": "Sleigh Trail" } diff --git a/data/presets/piste/take_off.json b/data/presets/piste/take_off.json index 536fda7c..86104631 100644 --- a/data/presets/piste/take_off.json +++ b/data/presets/piste/take_off.json @@ -12,11 +12,11 @@ "terms": [ "jump", "ski jump", - "take-off", - "takeoff", - "ski jump take-off", "ski jump table", - "ski jumping hill in-run table" + "ski jump take-off", + "ski jumping hill in-run table", + "take-off", + "takeoff" ], "name": "Ski Jumping Take-Off", "aliases": [ diff --git a/data/presets/place/plot.json b/data/presets/place/plot.json index 32c4e271..439e51da 100644 --- a/data/presets/place/plot.json +++ b/data/presets/place/plot.json @@ -8,10 +8,10 @@ "place": "plot" }, "terms": [ - "tract", "land", "lot", - "parcel" + "parcel", + "tract" ], "name": "Plot" } diff --git a/data/presets/playground/roundabout.json b/data/presets/playground/roundabout.json index 3ec559cd..2bf262f6 100644 --- a/data/presets/playground/roundabout.json +++ b/data/presets/playground/roundabout.json @@ -12,8 +12,8 @@ "playground": "roundabout" }, "terms": [ - "merry-go-round", - "carousel" + "carousel", + "merry-go-round" ], "name": "Play Roundabout" } diff --git a/data/presets/playground/zipwire.json b/data/presets/playground/zipwire.json index 09f5273f..80bf8f2b 100644 --- a/data/presets/playground/zipwire.json +++ b/data/presets/playground/zipwire.json @@ -8,8 +8,8 @@ "playground": "zipwire" }, "terms": [ - "zipline", "zip wire", + "zipline", "zipwire" ], "name": "Play Zip Line" diff --git a/data/presets/power/catenary_mast.json b/data/presets/power/catenary_mast.json index f931150b..2e4fbcc6 100644 --- a/data/presets/power/catenary_mast.json +++ b/data/presets/power/catenary_mast.json @@ -19,8 +19,8 @@ "power": "catenary_mast" }, "terms": [ - "catenary pylon", "catenary mast", + "catenary pylon", "overhead line", "overhead wire" ], diff --git a/data/presets/power/generator/method/photovoltaic.json b/data/presets/power/generator/method/photovoltaic.json index 3130f552..d2c9e254 100644 --- a/data/presets/power/generator/method/photovoltaic.json +++ b/data/presets/power/generator/method/photovoltaic.json @@ -30,7 +30,7 @@ }, "terms": [ "photovoltaic module", - "PV module", + "pv module", "sunlight" ], "name": "Solar Panel" diff --git a/data/presets/power/generator/method/photovoltaic/building/roof.json b/data/presets/power/generator/method/photovoltaic/building/roof.json index 6634a774..7e350498 100644 --- a/data/presets/power/generator/method/photovoltaic/building/roof.json +++ b/data/presets/power/generator/method/photovoltaic/building/roof.json @@ -32,8 +32,8 @@ "terms": [ "photovoltaic canopy", "solar awning", - "solar carport", - "solar canopy" + "solar canopy", + "solar carport" ], "name": "Solar Panel Canopy" } diff --git a/data/presets/power/generator/method/photovoltaic/location/roof.json b/data/presets/power/generator/method/photovoltaic/location/roof.json index 470d23dc..a3d3adfe 100644 --- a/data/presets/power/generator/method/photovoltaic/location/roof.json +++ b/data/presets/power/generator/method/photovoltaic/location/roof.json @@ -30,8 +30,8 @@ }, "terms": [ "home solar", - "rooftop photovoltaic module", - "PV module" + "pv module", + "rooftop photovoltaic module" ], "name": "Rooftop Solar Panel" } diff --git a/data/presets/power/generator/source/hydro.json b/data/presets/power/generator/source/hydro.json index 1b289ad7..e8cac2a0 100644 --- a/data/presets/power/generator/source/hydro.json +++ b/data/presets/power/generator/source/hydro.json @@ -30,8 +30,8 @@ }, "terms": [ "dam", - "generator", "francis turbine", + "generator", "hydroelectricity", "kaplan turbine", "pelton turbine" diff --git a/data/presets/power/generator/source/wind.json b/data/presets/power/generator/source/wind.json index 8dc5411a..fca0f93d 100644 --- a/data/presets/power/generator/source/wind.json +++ b/data/presets/power/generator/source/wind.json @@ -32,8 +32,8 @@ "terms": [ "generator", "turbine", - "windmill", - "wind" + "wind", + "windmill" ], "name": "Wind Turbine" } diff --git a/data/presets/power/line.json b/data/presets/power/line.json index 54c0f7d6..f651357b 100644 --- a/data/presets/power/line.json +++ b/data/presets/power/line.json @@ -13,8 +13,8 @@ ], "terms": [ "electric power transmission line", - "high voltage line", - "high tension line" + "high tension line", + "high voltage line" ], "tags": { "power": "line" diff --git a/data/presets/power/plant/source/coal.json b/data/presets/power/plant/source/coal.json index c872b2d4..d30c37ab 100644 --- a/data/presets/power/plant/source/coal.json +++ b/data/presets/power/plant/source/coal.json @@ -31,9 +31,9 @@ }, "terms": [ "carbon", + "coalfired", "combustion", "fossil fuel", - "coalfired", "power station" ], "name": "Coal-Fired Power Plant" diff --git a/data/presets/power/plant/source/gas.json b/data/presets/power/plant/source/gas.json index e02d939c..02039aa4 100644 --- a/data/presets/power/plant/source/gas.json +++ b/data/presets/power/plant/source/gas.json @@ -34,8 +34,8 @@ "combustion", "fossil fuel", "gasfired", - "power station", - "natural gas" + "natural gas", + "power station" ], "name": "Gas-Fired Power Plant" } diff --git a/data/presets/power/plant/source/nuclear.json b/data/presets/power/plant/source/nuclear.json index 5d91e194..8933f887 100644 --- a/data/presets/power/plant/source/nuclear.json +++ b/data/presets/power/plant/source/nuclear.json @@ -27,8 +27,8 @@ "terms": [ "atomic", "fission", - "power station", - "nuclear reactor" + "nuclear reactor", + "power station" ], "name": "Nuclear Power Plant" } diff --git a/data/presets/power/plant/source/waste.json b/data/presets/power/plant/source/waste.json index adadc6f8..195d478f 100644 --- a/data/presets/power/plant/source/waste.json +++ b/data/presets/power/plant/source/waste.json @@ -31,13 +31,13 @@ "value": "waste" }, "terms": [ - "Refuse Incineration Plant", - "Incinerator", - "Garbage Incinerator", - "Garbage Incineration Plant", - "waste", "combustion", - "gasification" + "garbage incineration plant", + "garbage incinerator", + "gasification", + "incinerator", + "refuse incineration plant", + "waste" ], "name": "Waste Incineration Power Plant" } diff --git a/data/presets/public_transport/platform/light_rail.json b/data/presets/public_transport/platform/light_rail.json index fe501116..40869b0b 100644 --- a/data/presets/public_transport/platform/light_rail.json +++ b/data/presets/public_transport/platform/light_rail.json @@ -32,9 +32,9 @@ "rail", "track", "tram", - "trolley", "transit", - "transportation" + "transportation", + "trolley" ], "name": "Light Rail Platform" } diff --git a/data/presets/public_transport/platform/tram.json b/data/presets/public_transport/platform/tram.json index b057aea3..883c58b2 100644 --- a/data/presets/public_transport/platform/tram.json +++ b/data/presets/public_transport/platform/tram.json @@ -33,9 +33,9 @@ "streetcar", "track", "tram", - "trolley", "transit", - "transportation" + "transportation", + "trolley" ], "name": "Tram Platform" } diff --git a/data/presets/public_transport/platform/tram_point.json b/data/presets/public_transport/platform/tram_point.json index fe6a700a..fd34f6b8 100644 --- a/data/presets/public_transport/platform/tram_point.json +++ b/data/presets/public_transport/platform/tram_point.json @@ -27,9 +27,9 @@ "streetcar", "track", "tram", - "trolley", "transit", - "transportation" + "transportation", + "trolley" ], "name": "Tram Stop / Platform" } diff --git a/data/presets/public_transport/platform/trolleybus.json b/data/presets/public_transport/platform/trolleybus.json index 3c2ebdfc..ab6bd867 100644 --- a/data/presets/public_transport/platform/trolleybus.json +++ b/data/presets/public_transport/platform/trolleybus.json @@ -27,9 +27,9 @@ "streetcar", "trackless", "tram", - "trolley", "transit", - "transportation" + "transportation", + "trolley" ], "name": "Trolleybus Platform" } diff --git a/data/presets/public_transport/platform/trolleybus_point.json b/data/presets/public_transport/platform/trolleybus_point.json index 1ba26653..59217386 100644 --- a/data/presets/public_transport/platform/trolleybus_point.json +++ b/data/presets/public_transport/platform/trolleybus_point.json @@ -32,9 +32,9 @@ "streetcar", "trackless", "tram", - "trolley", "transit", - "transportation" + "transportation", + "trolley" ], "name": "Trolleybus Stop" } diff --git a/data/presets/public_transport/station_light_rail.json b/data/presets/public_transport/station_light_rail.json index bf66fdc7..58d4c62e 100644 --- a/data/presets/public_transport/station_light_rail.json +++ b/data/presets/public_transport/station_light_rail.json @@ -35,9 +35,9 @@ "terminal", "track", "tram", - "trolley", "transit", - "transportation" + "transportation", + "trolley" ], "name": "Light Rail Station" } diff --git a/data/presets/public_transport/station_tram.json b/data/presets/public_transport/station_tram.json index 8334906e..f40b7522 100644 --- a/data/presets/public_transport/station_tram.json +++ b/data/presets/public_transport/station_tram.json @@ -29,9 +29,9 @@ "terminal", "track", "tram", - "trolley", "transit", - "transportation" + "transportation", + "trolley" ], "name": "Tram Station" } diff --git a/data/presets/public_transport/station_trolleybus.json b/data/presets/public_transport/station_trolleybus.json index dcbdd4f8..cf105d66 100644 --- a/data/presets/public_transport/station_trolleybus.json +++ b/data/presets/public_transport/station_trolleybus.json @@ -33,9 +33,9 @@ "terminal", "trackless", "tram", - "trolley", "transit", - "transportation" + "transportation", + "trolley" ], "name": "Trolleybus Station / Terminal" } diff --git a/data/presets/public_transport/stop_position_light_rail.json b/data/presets/public_transport/stop_position_light_rail.json index 0c5b7ee3..fdf882ae 100644 --- a/data/presets/public_transport/stop_position_light_rail.json +++ b/data/presets/public_transport/stop_position_light_rail.json @@ -30,9 +30,9 @@ "rail", "track", "tram", - "trolley", "transit", - "transportation" + "transportation", + "trolley" ], "name": "Light Rail Stopping Location" } diff --git a/data/presets/public_transport/stop_position_tram.json b/data/presets/public_transport/stop_position_tram.json index 0902a7ea..5e1be671 100644 --- a/data/presets/public_transport/stop_position_tram.json +++ b/data/presets/public_transport/stop_position_tram.json @@ -31,9 +31,9 @@ "streetcar", "track", "tram", - "trolley", "transit", - "transportation" + "transportation", + "trolley" ], "name": "Tram Stopping Location" } diff --git a/data/presets/public_transport/stop_position_trolleybus.json b/data/presets/public_transport/stop_position_trolleybus.json index fc7b8a98..45f2f724 100644 --- a/data/presets/public_transport/stop_position_trolleybus.json +++ b/data/presets/public_transport/stop_position_trolleybus.json @@ -25,9 +25,9 @@ "streetcar", "trackless", "tram", - "trolley", "transit", - "transportation" + "transportation", + "trolley" ], "name": "Trolleybus Stopping Location" } diff --git a/data/presets/railway/buffer_stop.json b/data/presets/railway/buffer_stop.json index bfd73e6c..1c8ae102 100644 --- a/data/presets/railway/buffer_stop.json +++ b/data/presets/railway/buffer_stop.json @@ -7,9 +7,9 @@ "railway": "buffer_stop" }, "terms": [ - "stop", + "buffer", "halt", - "buffer" + "stop" ], "name": "Buffer Stop" } diff --git a/data/presets/railway/crossing.json b/data/presets/railway/crossing.json index a258dc61..895d2544 100644 --- a/data/presets/railway/crossing.json +++ b/data/presets/railway/crossing.json @@ -17,13 +17,13 @@ }, "terms": [ "crossing", - "path railway crossing", - "pedestrian crossing", - "level crossing", "grade crossing", + "level crossing", + "path railway crossing", + "path through railroad", + "pedestrian crossing", "railroad crossing", "railway path crossing", - "path through railroad", "train crossing" ], "name": "Railway-Path Crossing" diff --git a/data/presets/railway/funicular.json b/data/presets/railway/funicular.json index b1d41265..3f6cd1cd 100644 --- a/data/presets/railway/funicular.json +++ b/data/presets/railway/funicular.json @@ -20,10 +20,10 @@ "line" ], "terms": [ - "venicular", "cable car", "cable railway", - "funicular railway" + "funicular railway", + "venicular" ], "tags": { "railway": "funicular" diff --git a/data/presets/railway/level_crossing.json b/data/presets/railway/level_crossing.json index 1bfda0cd..7ed06182 100644 --- a/data/presets/railway/level_crossing.json +++ b/data/presets/railway/level_crossing.json @@ -13,8 +13,8 @@ }, "terms": [ "crossing", - "level crossing", "grade crossing", + "level crossing", "railroad crossing", "railway road crossing", "road railway crossing", diff --git a/data/presets/railway/milestone.json b/data/presets/railway/milestone.json index d878a84a..d3e554d4 100644 --- a/data/presets/railway/milestone.json +++ b/data/presets/railway/milestone.json @@ -15,8 +15,8 @@ "railway": "milestone" }, "terms": [ - "milestone", - "marker" + "marker", + "milestone" ], "name": "Railway Milestone" } diff --git a/data/presets/railway/miniature.json b/data/presets/railway/miniature.json index 58667c04..dd9e37c9 100644 --- a/data/presets/railway/miniature.json +++ b/data/presets/railway/miniature.json @@ -13,9 +13,9 @@ "railway": "miniature" }, "terms": [ - "rideable miniature railway", + "minimum gauge railway", "narrow gauge railway", - "minimum gauge railway" + "rideable miniature railway" ], "name": "Miniature Train Track" } diff --git a/data/presets/railway/narrow_gauge.json b/data/presets/railway/narrow_gauge.json index 75ccc950..7b532f57 100644 --- a/data/presets/railway/narrow_gauge.json +++ b/data/presets/railway/narrow_gauge.json @@ -13,8 +13,8 @@ "railway": "narrow_gauge" }, "terms": [ - "narrow gauge railway", - "narrow gauge railroad" + "narrow gauge railroad", + "narrow gauge railway" ], "name": "Narrow Gauge Track" } diff --git a/data/presets/railway/rail.json b/data/presets/railway/rail.json index cc32677f..f51a6c0e 100644 --- a/data/presets/railway/rail.json +++ b/data/presets/railway/rail.json @@ -16,8 +16,8 @@ "railway": "rail" }, "terms": [ - "rail", "permanent way", + "rail", "rail line", "track", "train track" diff --git a/data/presets/railway/rail/highspeed.json b/data/presets/railway/rail/highspeed.json index f42b5704..176b8bcf 100644 --- a/data/presets/railway/rail/highspeed.json +++ b/data/presets/railway/rail/highspeed.json @@ -15,7 +15,7 @@ "fast rail", "high speed rail", "highspeed rail", - "HSR" + "hsr" ], "name": "High-Speed Train Track" } diff --git a/data/presets/railway/signal.json b/data/presets/railway/signal.json index 83f56eea..9266cd51 100644 --- a/data/presets/railway/signal.json +++ b/data/presets/railway/signal.json @@ -13,8 +13,8 @@ "railway": "signal" }, "terms": [ - "signal", - "lights" + "lights", + "signal" ], "name": "Railway Signal" } diff --git a/data/presets/railway/switch.json b/data/presets/railway/switch.json index 9627e12a..411b0e0c 100644 --- a/data/presets/railway/switch.json +++ b/data/presets/railway/switch.json @@ -11,8 +11,8 @@ "railway": "switch" }, "terms": [ - "switch", - "points" + "points", + "switch" ], "name": "Railway Switch" } diff --git a/data/presets/railway/train_wash.json b/data/presets/railway/train_wash.json index 1b637eb7..3bbfa5c2 100644 --- a/data/presets/railway/train_wash.json +++ b/data/presets/railway/train_wash.json @@ -13,8 +13,8 @@ "railway": "wash" }, "terms": [ - "wash", - "clean" + "clean", + "wash" ], "name": "Train Wash" } diff --git a/data/presets/roller_coaster/station.json b/data/presets/roller_coaster/station.json index 640e62b7..b107f4b9 100644 --- a/data/presets/roller_coaster/station.json +++ b/data/presets/roller_coaster/station.json @@ -8,8 +8,8 @@ "area" ], "terms": [ - "theme park", - "amusement ride" + "amusement ride", + "theme park" ], "tags": { "roller_coaster": "station" diff --git a/data/presets/roller_coaster/track.json b/data/presets/roller_coaster/track.json index 30f772c2..b2ff5a30 100644 --- a/data/presets/roller_coaster/track.json +++ b/data/presets/roller_coaster/track.json @@ -9,8 +9,8 @@ "line" ], "terms": [ - "theme park", - "amusement ride" + "amusement ride", + "theme park" ], "tags": { "roller_coaster": "track" diff --git a/data/presets/seamark/beacon_isolated_danger.json b/data/presets/seamark/beacon_isolated_danger.json index 93449c79..2b555bd5 100644 --- a/data/presets/seamark/beacon_isolated_danger.json +++ b/data/presets/seamark/beacon_isolated_danger.json @@ -11,8 +11,8 @@ ], "terms": [ "beacon isolated danger", - "isolated danger beacon", - "iala" + "iala", + "isolated danger beacon" ], "tags": { "seamark:type": "beacon_isolated_danger" diff --git a/data/presets/seamark/beacon_lateral.json b/data/presets/seamark/beacon_lateral.json index 9b9aab95..9747ec9b 100644 --- a/data/presets/seamark/beacon_lateral.json +++ b/data/presets/seamark/beacon_lateral.json @@ -13,11 +13,11 @@ "vertex" ], "terms": [ - "lateral beacon", "beacon lateral", "cevni", "channel marker", "iala", + "lateral beacon", "lateral mark" ], "tags": { diff --git a/data/presets/seamark/buoy_lateral.json b/data/presets/seamark/buoy_lateral.json index cc9294e9..7bd44d8f 100644 --- a/data/presets/seamark/buoy_lateral.json +++ b/data/presets/seamark/buoy_lateral.json @@ -14,11 +14,11 @@ "vertex" ], "terms": [ - "lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", + "lateral buoy", "lateral mark" ], "tags": { diff --git a/data/presets/seamark/buoy_lateral/green.json b/data/presets/seamark/buoy_lateral/green.json index 0f0a43d6..33c76393 100644 --- a/data/presets/seamark/buoy_lateral/green.json +++ b/data/presets/seamark/buoy_lateral/green.json @@ -5,11 +5,11 @@ "vertex" ], "terms": [ - "lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", + "lateral buoy", "lateral mark" ], "tags": { diff --git a/data/presets/seamark/buoy_lateral/red.json b/data/presets/seamark/buoy_lateral/red.json index 7f7b9165..d9f4b099 100644 --- a/data/presets/seamark/buoy_lateral/red.json +++ b/data/presets/seamark/buoy_lateral/red.json @@ -5,11 +5,11 @@ "vertex" ], "terms": [ - "lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", + "lateral buoy", "lateral mark" ], "tags": { diff --git a/data/presets/seamark/mooring.json b/data/presets/seamark/mooring.json index e1f31c2b..9c4f94bc 100644 --- a/data/presets/seamark/mooring.json +++ b/data/presets/seamark/mooring.json @@ -10,10 +10,10 @@ "point" ], "terms": [ - "dolphin", - "pile", "bollard", "buoy", + "dolphin", + "pile", "post" ], "tags": { diff --git a/data/presets/shop/_hobby.json b/data/presets/shop/_hobby.json index d5e13620..e1c58c07 100644 --- a/data/presets/shop/_hobby.json +++ b/data/presets/shop/_hobby.json @@ -8,8 +8,8 @@ "shop": "hobby" }, "terms": [ - "manga", "figurine", + "manga", "model" ], "name": "Hobby Shop", diff --git a/data/presets/shop/agrarian.json b/data/presets/shop/agrarian.json index 75042578..17dead1f 100644 --- a/data/presets/shop/agrarian.json +++ b/data/presets/shop/agrarian.json @@ -11,10 +11,10 @@ "terms": [ "agricultural inputs", "agricultural machines", - "seeds", - "pesticides", + "agricultural tools", "fertilizer", - "agricultural tools" + "pesticides", + "seeds" ], "tags": { "shop": "agrarian" diff --git a/data/presets/shop/beauty.json b/data/presets/shop/beauty.json index d1686303..69537f27 100644 --- a/data/presets/shop/beauty.json +++ b/data/presets/shop/beauty.json @@ -9,8 +9,8 @@ "area" ], "terms": [ - "spa", "salon", + "spa", "tanning" ], "tags": { diff --git a/data/presets/shop/butcher.json b/data/presets/shop/butcher.json index 00c41f01..b6d5ad10 100644 --- a/data/presets/shop/butcher.json +++ b/data/presets/shop/butcher.json @@ -5,8 +5,8 @@ "area" ], "terms": [ - "chicken", "beef", + "chicken", "lamb", "meat", "pork" diff --git a/data/presets/shop/car_repair.json b/data/presets/shop/car_repair.json index 06744211..bad0ff5f 100644 --- a/data/presets/shop/car_repair.json +++ b/data/presets/shop/car_repair.json @@ -15,8 +15,8 @@ "inspection", "mechanic", "oil change", - "panelbeater", "panel beater", + "panelbeater", "service" ], "tags": { diff --git a/data/presets/shop/charity.json b/data/presets/shop/charity.json index 051577cc..6b516416 100644 --- a/data/presets/shop/charity.json +++ b/data/presets/shop/charity.json @@ -9,9 +9,9 @@ "area" ], "terms": [ - "thrift", + "nonprofit", "op shop", - "nonprofit" + "thrift" ], "tags": { "shop": "charity" diff --git a/data/presets/shop/clothes/underwear.json b/data/presets/shop/clothes/underwear.json index 57c70e96..c4b2cfc2 100644 --- a/data/presets/shop/clothes/underwear.json +++ b/data/presets/shop/clothes/underwear.json @@ -14,10 +14,10 @@ }, "terms": [ "boutique", + "boxers", "bras", "brassieres", "briefs", - "boxers", "dessous", "fashion", "lingerie", diff --git a/data/presets/shop/computer.json b/data/presets/shop/computer.json index ede82281..47efd971 100644 --- a/data/presets/shop/computer.json +++ b/data/presets/shop/computer.json @@ -9,8 +9,8 @@ }, "terms": [ "desktop", - "laptop", "hardware", + "laptop", "operating system", "software" ], diff --git a/data/presets/shop/convenience.json b/data/presets/shop/convenience.json index 9775dafd..e44782d6 100644 --- a/data/presets/shop/convenience.json +++ b/data/presets/shop/convenience.json @@ -13,8 +13,8 @@ "shop": "convenience" }, "terms": [ - "mini-mart", - "mini-market" + "mini-market", + "mini-mart" ], "name": "Convenience Store", "aliases": [ diff --git a/data/presets/shop/dairy.json b/data/presets/shop/dairy.json index b00b1727..75bce336 100644 --- a/data/presets/shop/dairy.json +++ b/data/presets/shop/dairy.json @@ -5,9 +5,9 @@ "area" ], "terms": [ - "milk", + "cheese", "egg", - "cheese" + "milk" ], "tags": { "shop": "dairy" diff --git a/data/presets/shop/electrical.json b/data/presets/shop/electrical.json index 55564646..abd7ad53 100644 --- a/data/presets/shop/electrical.json +++ b/data/presets/shop/electrical.json @@ -8,7 +8,7 @@ "cable", "electric", "fan", - "LED", + "led", "lighting", "power", "wire" diff --git a/data/presets/shop/erotic.json b/data/presets/shop/erotic.json index cfa6060d..1d14a421 100644 --- a/data/presets/shop/erotic.json +++ b/data/presets/shop/erotic.json @@ -9,8 +9,8 @@ "area" ], "terms": [ - "sex", - "porn" + "porn", + "sex" ], "tags": { "shop": "erotic" diff --git a/data/presets/shop/erotic/lgbtq.json b/data/presets/shop/erotic/lgbtq.json index 4cb57ca3..3c95f70a 100644 --- a/data/presets/shop/erotic/lgbtq.json +++ b/data/presets/shop/erotic/lgbtq.json @@ -5,8 +5,8 @@ "area" ], "terms": [ - "sex", - "porn" + "porn", + "sex" ], "tags": { "shop": "erotic", diff --git a/data/presets/shop/fireplace.json b/data/presets/shop/fireplace.json index 05bd77c2..ab8a9461 100644 --- a/data/presets/shop/fireplace.json +++ b/data/presets/shop/fireplace.json @@ -6,8 +6,8 @@ ], "terms": [ "fireplace", - "stove", - "masonry heater" + "masonry heater", + "stove" ], "tags": { "shop": "fireplace" diff --git a/data/presets/shop/funeral_directors.json b/data/presets/shop/funeral_directors.json index ae88ef13..89dcad03 100644 --- a/data/presets/shop/funeral_directors.json +++ b/data/presets/shop/funeral_directors.json @@ -10,9 +10,9 @@ "area" ], "terms": [ - "undertaker", "memorial home", - "mortuary" + "mortuary", + "undertaker" ], "tags": { "shop": "funeral_directors" diff --git a/data/presets/shop/hairdresser/barber.json b/data/presets/shop/hairdresser/barber.json index bdaf3484..dd2bed66 100644 --- a/data/presets/shop/hairdresser/barber.json +++ b/data/presets/shop/hairdresser/barber.json @@ -6,14 +6,14 @@ ], "terms": [ "beard", - "moustache", - "shave", - "shaving", "groom", "grooming", - "razor", + "hair cut", "hairdresser", - "hair cut" + "moustache", + "razor", + "shave", + "shaving" ], "fields": [ "name", diff --git a/data/presets/shop/hairdresser_supply.json b/data/presets/shop/hairdresser_supply.json index a2d8c1d3..ed89392f 100644 --- a/data/presets/shop/hairdresser_supply.json +++ b/data/presets/shop/hairdresser_supply.json @@ -6,10 +6,10 @@ ], "terms": [ "barber", + "conditioner", "razor", "shampoo", - "shaver", - "conditioner" + "shaver" ], "tags": { "shop": "hairdresser_supply" diff --git a/data/presets/shop/health_food.json b/data/presets/shop/health_food.json index 049f7235..4e237f87 100644 --- a/data/presets/shop/health_food.json +++ b/data/presets/shop/health_food.json @@ -10,8 +10,8 @@ "organic", "raw food", "unprocessed", - "vegetarian", "vegan", + "vegetarian", "vitamins", "wholefood" ], diff --git a/data/presets/shop/household_linen.json b/data/presets/shop/household_linen.json index 083454f1..35d46363 100644 --- a/data/presets/shop/household_linen.json +++ b/data/presets/shop/household_linen.json @@ -10,8 +10,8 @@ "terms": [ "bedspreads", "blankets", - "domestic cloths", "curtains", + "domestic cloths", "handkerchieves", "napkins", "pillow cases", diff --git a/data/presets/shop/jewelry.json b/data/presets/shop/jewelry.json index 8cfd6eb8..2e541f83 100644 --- a/data/presets/shop/jewelry.json +++ b/data/presets/shop/jewelry.json @@ -11,8 +11,8 @@ "gem", "gold", "jeweler", - "jewellery", "jeweller", + "jewellery", "necklace", "pins", "ring", diff --git a/data/presets/shop/lighting.json b/data/presets/shop/lighting.json index d2f9629c..c5fc253c 100644 --- a/data/presets/shop/lighting.json +++ b/data/presets/shop/lighting.json @@ -7,7 +7,7 @@ "terms": [ "fluorescent lighting", "lamps", - "LEDs", + "leds", "light fixtures", "lightbulbs" ], diff --git a/data/presets/shop/lottery.json b/data/presets/shop/lottery.json index 5adf1702..0c3f51cb 100644 --- a/data/presets/shop/lottery.json +++ b/data/presets/shop/lottery.json @@ -12,9 +12,9 @@ "shop": "lottery" }, "terms": [ - "lotto tickets", "gamble", "gambling", + "lotto tickets", "scratch-offs" ], "name": "Lottery Shop" diff --git a/data/presets/shop/military_surplus.json b/data/presets/shop/military_surplus.json index 6b180074..f7859315 100644 --- a/data/presets/shop/military_surplus.json +++ b/data/presets/shop/military_surplus.json @@ -6,8 +6,8 @@ ], "terms": [ "armor", - "army-navy store", "army surplus", + "army-navy store", "navy surplus", "tactical gear", "war surplus shop", diff --git a/data/presets/shop/motorcycle_repair.json b/data/presets/shop/motorcycle_repair.json index c60b348c..4ac33c99 100644 --- a/data/presets/shop/motorcycle_repair.json +++ b/data/presets/shop/motorcycle_repair.json @@ -12,8 +12,8 @@ "auto", "bike", "garage", - "motorcycle", "motorbike", + "motorcycle", "repair", "service" ], diff --git a/data/presets/shop/music.json b/data/presets/shop/music.json index 2bf03af0..dbb8173e 100644 --- a/data/presets/shop/music.json +++ b/data/presets/shop/music.json @@ -5,14 +5,14 @@ "area" ], "terms": [ - "tape cassettes", - "CDs", + "casette", + "casette store", + "cd store", + "cds", "compact discs", "hobby", - "vinyl records", - "CD store", - "casette", - "casette store" + "tape cassettes", + "vinyl records" ], "tags": { "shop": "music" diff --git a/data/presets/shop/nuts.json b/data/presets/shop/nuts.json index 6869974f..806dfaac 100644 --- a/data/presets/shop/nuts.json +++ b/data/presets/shop/nuts.json @@ -10,8 +10,8 @@ "name": "Nuts Shop", "terms": [ "almonds", - "cashews", "brazil nuts", + "cashews", "chestnuts", "coconuts", "dried fruits", diff --git a/data/presets/shop/outdoor.json b/data/presets/shop/outdoor.json index 5033e442..ae39b7bf 100644 --- a/data/presets/shop/outdoor.json +++ b/data/presets/shop/outdoor.json @@ -17,9 +17,9 @@ "climbing", "hiking", "hobby", - "outfitter", "outdoor equipment", - "outdoor supplies" + "outdoor supplies", + "outfitter" ], "tags": { "shop": "outdoor" diff --git a/data/presets/shop/pastry.json b/data/presets/shop/pastry.json index 9ff5aae7..7fb6134d 100644 --- a/data/presets/shop/pastry.json +++ b/data/presets/shop/pastry.json @@ -8,10 +8,10 @@ "shop": "pastry" }, "terms": [ - "patisserie", "cake shop", "cakery", - "cookies" + "cookies", + "patisserie" ], "moreFields": [ "fhrs/id-GB" diff --git a/data/presets/shop/second_hand.json b/data/presets/shop/second_hand.json index b251680a..67208548 100644 --- a/data/presets/shop/second_hand.json +++ b/data/presets/shop/second_hand.json @@ -9,8 +9,8 @@ "area" ], "terms": [ - "second-hand", "resale", + "second-hand", "used" ], "tags": { diff --git a/data/presets/shop/shoes.json b/data/presets/shop/shoes.json index 6f05961d..d060185a 100644 --- a/data/presets/shop/shoes.json +++ b/data/presets/shop/shoes.json @@ -16,13 +16,13 @@ "boots", "cleats", "clogs", + "footwear", "heels", "loafers", "oxfords", - "sneakers", - "footwear", "sandals", - "slippers" + "slippers", + "sneakers" ], "name": "Shoe Store" } diff --git a/data/presets/shop/supermarket.json b/data/presets/shop/supermarket.json index 2c06b1bc..015adbd0 100644 --- a/data/presets/shop/supermarket.json +++ b/data/presets/shop/supermarket.json @@ -12,12 +12,12 @@ "area" ], "terms": [ + "food market", "grocery", - "store", - "shop", "grocery store", "market", - "food market" + "shop", + "store" ], "tags": { "shop": "supermarket" diff --git a/data/presets/shop/video.json b/data/presets/shop/video.json index 44b024c7..4e2f3d41 100644 --- a/data/presets/shop/video.json +++ b/data/presets/shop/video.json @@ -9,11 +9,11 @@ "area" ], "terms": [ - "DVD", + "dvd", "hobby", - "VHS", - "video cassette", - "video casette" + "vhs", + "video casette", + "video cassette" ], "tags": { "shop": "video" diff --git a/data/presets/shop/wholesale.json b/data/presets/shop/wholesale.json index 922ea03d..7e495d1c 100644 --- a/data/presets/shop/wholesale.json +++ b/data/presets/shop/wholesale.json @@ -9,8 +9,8 @@ "area" ], "terms": [ - "warehouse club", - "cash and carry" + "cash and carry", + "warehouse club" ], "tags": { "shop": "wholesale" diff --git a/data/presets/telecom/data_center.json b/data/presets/telecom/data_center.json index c9bae424..a6faf11a 100644 --- a/data/presets/telecom/data_center.json +++ b/data/presets/telecom/data_center.json @@ -22,8 +22,8 @@ "computer systems storage", "information technology", "server farm", - "the cloud", - "telecommunications" + "telecommunications", + "the cloud" ], "name": "Data Center" } diff --git a/data/presets/tourism/artwork/graffiti.json b/data/presets/tourism/artwork/graffiti.json index 1cffe813..e93a2ac4 100644 --- a/data/presets/tourism/artwork/graffiti.json +++ b/data/presets/tourism/artwork/graffiti.json @@ -19,10 +19,10 @@ "value": "graffiti" }, "terms": [ - "Street Artwork", - "Guerrilla Artwork", - "Guerilla Artwork", - "Graffiti Artwork" + "graffiti artwork", + "guerilla artwork", + "guerrilla artwork", + "street artwork" ], "name": "Graffiti" } diff --git a/data/presets/tourism/artwork/sculpture.json b/data/presets/tourism/artwork/sculpture.json index 84e67993..d336b424 100644 --- a/data/presets/tourism/artwork/sculpture.json +++ b/data/presets/tourism/artwork/sculpture.json @@ -20,9 +20,9 @@ "value": "sculpture" }, "terms": [ - "statue", + "carving", "figure", - "carving" + "statue" ], "name": "Sculpture" } diff --git a/data/presets/tourism/artwork/statue.json b/data/presets/tourism/artwork/statue.json index 52fd7877..ba4ee42b 100644 --- a/data/presets/tourism/artwork/statue.json +++ b/data/presets/tourism/artwork/statue.json @@ -20,9 +20,9 @@ "value": "statue" }, "terms": [ - "sculpture", + "carving", "figure", - "carving" + "sculpture" ], "name": "Statue" } diff --git a/data/presets/tourism/camp_pitch.json b/data/presets/tourism/camp_pitch.json index c4ef9734..880d4e41 100644 --- a/data/presets/tourism/camp_pitch.json +++ b/data/presets/tourism/camp_pitch.json @@ -9,8 +9,8 @@ "area" ], "terms": [ - "tent", - "rv" + "rv", + "tent" ], "tags": { "tourism": "camp_pitch" diff --git a/data/presets/tourism/camp_site.json b/data/presets/tourism/camp_site.json index 272ab9ae..960495bd 100644 --- a/data/presets/tourism/camp_site.json +++ b/data/presets/tourism/camp_site.json @@ -47,13 +47,13 @@ "tourism": "camp_site" }, "terms": [ - "caravans", "camp ground", "camp pitch", "camp site", "campers", "campground", "campsite", + "caravans", "mobile homes", "recreational vehicles", "rv", diff --git a/data/presets/tourism/caravan_site.json b/data/presets/tourism/caravan_site.json index 74b275ee..5449e8b8 100644 --- a/data/presets/tourism/caravan_site.json +++ b/data/presets/tourism/caravan_site.json @@ -23,8 +23,8 @@ "area" ], "terms": [ - "Motor Home", - "Camper" + "camper", + "motor home" ], "tags": { "tourism": "caravan_site" diff --git a/data/presets/tourism/guest_house.json b/data/presets/tourism/guest_house.json index 62aa153b..639cfa8d 100644 --- a/data/presets/tourism/guest_house.json +++ b/data/presets/tourism/guest_house.json @@ -32,8 +32,8 @@ "terms": [ "b & b", "b and b", - "B&B", - "Bed and Breakfast", + "b&b", + "bed and breakfast", "bnb", "lodging", "overnight accommodations" diff --git a/data/presets/tourism/museum/history.json b/data/presets/tourism/museum/history.json index 81296329..99c286ce 100644 --- a/data/presets/tourism/museum/history.json +++ b/data/presets/tourism/museum/history.json @@ -7,8 +7,8 @@ "terms": [ "artifacts", "dioramas", - "exhibits", "exhibitions", + "exhibits", "foundation", "hall", "institution" diff --git a/data/presets/tourism/wilderness_hut.json b/data/presets/tourism/wilderness_hut.json index 714dfc0b..f2721468 100644 --- a/data/presets/tourism/wilderness_hut.json +++ b/data/presets/tourism/wilderness_hut.json @@ -30,9 +30,9 @@ "bivouac", "bivouac box", "biwakschachtel", - "cabin", "bothy", "cabin", + "cabin", "lodge", "lodging", "overnight accommodations", diff --git a/data/presets/tourism/zoo/petting.json b/data/presets/tourism/zoo/petting.json index f8606383..7c8d6492 100644 --- a/data/presets/tourism/zoo/petting.json +++ b/data/presets/tourism/zoo/petting.json @@ -13,10 +13,10 @@ "value": "petting_zoo" }, "terms": [ - "Children's Zoo", - "Children's Farm", - "Petting Farm", - "farm animals" + "children's farm", + "children's zoo", + "farm animals", + "petting farm" ], "name": "Petting Zoo" } diff --git a/data/presets/tourism/zoo/safari.json b/data/presets/tourism/zoo/safari.json index 47f5839c..31d40fe0 100644 --- a/data/presets/tourism/zoo/safari.json +++ b/data/presets/tourism/zoo/safari.json @@ -13,8 +13,8 @@ "value": "safari_park" }, "terms": [ - "Drive-Through Zoo", - "Drive-In Zoo" + "drive-in zoo", + "drive-through zoo" ], "name": "Safari Park" } diff --git a/data/presets/traffic_calming/bump.json b/data/presets/traffic_calming/bump.json index da54d588..d9ec3257 100644 --- a/data/presets/traffic_calming/bump.json +++ b/data/presets/traffic_calming/bump.json @@ -9,8 +9,8 @@ ], "terms": [ "hump", - "speed", - "slow" + "slow", + "speed" ], "tags": { "traffic_calming": "bump" diff --git a/data/presets/traffic_calming/chicane.json b/data/presets/traffic_calming/chicane.json index a3fcfdb4..49118efd 100644 --- a/data/presets/traffic_calming/chicane.json +++ b/data/presets/traffic_calming/chicane.json @@ -9,8 +9,8 @@ ], "terms": [ "driveway link", - "speed", - "slow" + "slow", + "speed" ], "tags": { "traffic_calming": "chicane" diff --git a/data/presets/traffic_calming/choker.json b/data/presets/traffic_calming/choker.json index 85bfe1ed..407b9d30 100644 --- a/data/presets/traffic_calming/choker.json +++ b/data/presets/traffic_calming/choker.json @@ -8,8 +8,8 @@ "vertex" ], "terms": [ - "speed", - "slow" + "slow", + "speed" ], "tags": { "traffic_calming": "choker" diff --git a/data/presets/traffic_calming/cushion.json b/data/presets/traffic_calming/cushion.json index 5fb2530d..92f3fe36 100644 --- a/data/presets/traffic_calming/cushion.json +++ b/data/presets/traffic_calming/cushion.json @@ -10,8 +10,8 @@ "terms": [ "bump", "hump", - "speed", - "slow" + "slow", + "speed" ], "tags": { "traffic_calming": "cushion" diff --git a/data/presets/traffic_calming/dip.json b/data/presets/traffic_calming/dip.json index 444a6a2e..4a107e43 100644 --- a/data/presets/traffic_calming/dip.json +++ b/data/presets/traffic_calming/dip.json @@ -8,8 +8,8 @@ "vertex" ], "terms": [ - "speed", - "slow" + "slow", + "speed" ], "tags": { "traffic_calming": "dip" diff --git a/data/presets/traffic_calming/hump.json b/data/presets/traffic_calming/hump.json index fb772299..519c0ca3 100644 --- a/data/presets/traffic_calming/hump.json +++ b/data/presets/traffic_calming/hump.json @@ -9,8 +9,8 @@ ], "terms": [ "bump", - "speed", - "slow" + "slow", + "speed" ], "tags": { "traffic_calming": "hump" diff --git a/data/presets/traffic_calming/mini_bumps.json b/data/presets/traffic_calming/mini_bumps.json index 77df8e78..f8ddbfef 100644 --- a/data/presets/traffic_calming/mini_bumps.json +++ b/data/presets/traffic_calming/mini_bumps.json @@ -14,9 +14,9 @@ "bumps", "circular bumps", "circular speed bumps", + "slow", "small bumps", "small speed bumps", - "slow", "speed" ], "name": "Mini Speed Bumps" diff --git a/data/presets/traffic_calming/rumble_strip.json b/data/presets/traffic_calming/rumble_strip.json index 0731411a..4de71010 100644 --- a/data/presets/traffic_calming/rumble_strip.json +++ b/data/presets/traffic_calming/rumble_strip.json @@ -8,8 +8,8 @@ ], "terms": [ "audible lines", - "sleeper lines", - "growlers" + "growlers", + "sleeper lines" ], "tags": { "traffic_calming": "rumble_strip" diff --git a/data/presets/traffic_calming/table.json b/data/presets/traffic_calming/table.json index 87e38ddc..b1fa1328 100644 --- a/data/presets/traffic_calming/table.json +++ b/data/presets/traffic_calming/table.json @@ -13,8 +13,8 @@ "terms": [ "flat top", "hump", - "speed", - "slow" + "slow", + "speed" ], "name": "Speed Table", "matchScore": 0.9 diff --git a/data/presets/traffic_sign.json b/data/presets/traffic_sign.json index 60d84885..69223f0b 100644 --- a/data/presets/traffic_sign.json +++ b/data/presets/traffic_sign.json @@ -13,8 +13,8 @@ "traffic_sign": "*" }, "terms": [ - "road", - "highway" + "highway", + "road" ], "name": "Traffic Sign" } diff --git a/data/presets/traffic_sign/city_limit.json b/data/presets/traffic_sign/city_limit.json index dd438a9d..8edb5045 100644 --- a/data/presets/traffic_sign/city_limit.json +++ b/data/presets/traffic_sign/city_limit.json @@ -12,14 +12,14 @@ "traffic_sign": "city_limit" }, "terms": [ - "town", - "village", - "hamlet", + "border", "boundary", "edge", - "border", + "hamlet", + "highway", "road", - "highway" + "town", + "village" ], "name": "City Limit Sign" } diff --git a/data/presets/traffic_sign/maxspeed.json b/data/presets/traffic_sign/maxspeed.json index 3a3db165..7893a27b 100644 --- a/data/presets/traffic_sign/maxspeed.json +++ b/data/presets/traffic_sign/maxspeed.json @@ -19,10 +19,10 @@ ] }, "terms": [ + "highway", "max speed", "maximum speed", - "road", - "highway" + "road" ], "name": "Speed Limit Sign" } diff --git a/data/presets/traffic_sign/variable_message.json b/data/presets/traffic_sign/variable_message.json index 606c6b82..63eca4fb 100644 --- a/data/presets/traffic_sign/variable_message.json +++ b/data/presets/traffic_sign/variable_message.json @@ -12,8 +12,8 @@ "traffic_sign": "variable_message" }, "terms": [ - "vms", - "dynamic message sign" + "dynamic message sign", + "vms" ], "name": "Variable Message Sign" } diff --git a/data/presets/type/route/climbing.json b/data/presets/type/route/climbing.json index 2f0f0d93..885ca155 100644 --- a/data/presets/type/route/climbing.json +++ b/data/presets/type/route/climbing.json @@ -12,9 +12,9 @@ "terms": [ "climb", "climbing", + "mountain climbing", "rock climbing", - "rock climbing route", - "mountain climbing" + "rock climbing route" ], "tags": { "type": "route", diff --git a/data/presets/waterway/dock.json b/data/presets/waterway/dock.json index 8caf3194..85c6500f 100644 --- a/data/presets/waterway/dock.json +++ b/data/presets/waterway/dock.json @@ -12,9 +12,9 @@ ], "terms": [ "boat", + "marine", "ship", - "vessel", - "marine" + "vessel" ], "tags": { "waterway": "dock" diff --git a/data/presets/waterway/fuel.json b/data/presets/waterway/fuel.json index ea5e15c3..c9b6643c 100644 --- a/data/presets/waterway/fuel.json +++ b/data/presets/waterway/fuel.json @@ -22,10 +22,10 @@ "area" ], "terms": [ - "petrol", - "gas", + "boat", "diesel", - "boat" + "gas", + "petrol" ], "tags": { "waterway": "fuel" diff --git a/data/presets/waterway/milestone.json b/data/presets/waterway/milestone.json index be1b30c4..03fe8f94 100644 --- a/data/presets/waterway/milestone.json +++ b/data/presets/waterway/milestone.json @@ -15,8 +15,8 @@ "waterway": "milestone" }, "terms": [ - "milestone", - "marker" + "marker", + "milestone" ], "name": "Waterway Milestone" } diff --git a/data/presets/waterway/sanitary_dump_station.json b/data/presets/waterway/sanitary_dump_station.json index 0ac0b8ab..95983ca1 100644 --- a/data/presets/waterway/sanitary_dump_station.json +++ b/data/presets/waterway/sanitary_dump_station.json @@ -19,16 +19,16 @@ "area" ], "terms": [ - "Boat", - "Watercraft", - "Sanitary", - "Dump Station", - "Pumpout", - "Pump out", - "Elsan", - "CDP", - "CTDP", - "Chemical Toilet" + "boat", + "cdp", + "chemical toilet", + "ctdp", + "dump station", + "elsan", + "pump out", + "pumpout", + "sanitary", + "watercraft" ], "tags": { "waterway": "sanitary_dump_station" diff --git a/data/presets/waterway/tidal_channel.json b/data/presets/waterway/tidal_channel.json index 8aea81b4..0df2eb9e 100644 --- a/data/presets/waterway/tidal_channel.json +++ b/data/presets/waterway/tidal_channel.json @@ -18,10 +18,10 @@ ], "terms": [ "coastal", - "pill", "intertidal", "mangroves", "marine", + "pill", "salt marsh", "tidal creek", "tidal flat", diff --git a/data/presets/waterway/water_point.json b/data/presets/waterway/water_point.json index f5b34459..c3b72a64 100644 --- a/data/presets/waterway/water_point.json +++ b/data/presets/waterway/water_point.json @@ -17,9 +17,9 @@ "terms": [ "water faucet", "water point", - "water tap", "water source", - "water spigot" + "water spigot", + "water tap" ], "name": "Marine Drinking Water" }