From a6f7b1300ae3b9d0c82753ad11eed4a015a62214 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 20 Jun 2023 01:52:15 +0200 Subject: [PATCH] Refactoring: move 'snapToLayer' from 'preciseInput' into the preset, remove 'preferredBackground'. The addNewPointFlow _always_ shows the precise input flow with the basic map; so the preferredBackground became irrelevant --- .../Conversion/LegacyJsonConvert.ts | 19 +++++++++ Models/ThemeConfig/Json/LayerConfigJson.ts | 38 +++++------------- Models/ThemeConfig/LayerConfig.ts | 38 +++++++----------- assets/layers/advertising/advertising.json | 40 ++++++------------- .../ambulancestation/ambulancestation.json | 2 +- assets/layers/artwork/artwork.json | 4 +- assets/layers/bank/bank.json | 2 +- assets/layers/barrier/barrier.json | 20 +++------- .../bicycle_library/bicycle_library.json | 2 +- .../bicycle_tube_vending_machine.json | 2 +- assets/layers/bike_cafe/bike_cafe.json | 2 +- .../layers/bike_cleaning/bike_cleaning.json | 2 +- assets/layers/bike_parking/bike_parking.json | 2 +- .../bike_repair_station.json | 2 +- assets/layers/bike_shop/bike_shop.json | 2 +- .../bike_themed_object.json | 2 +- assets/layers/binocular/binocular.json | 5 +-- assets/layers/birdhide/birdhide.json | 2 +- assets/layers/cafe_pub/cafe_pub.json | 14 +------ assets/layers/car_rental/car_rental.json | 2 +- .../charging_station/charging_station.json | 8 +--- assets/layers/climbing/climbing.json | 2 +- .../layers/climbing_club/climbing_club.json | 2 +- assets/layers/climbing_gym/climbing_gym.json | 2 +- .../climbing_opportunity.json | 2 +- .../layers/climbing_route/climbing_route.json | 2 +- assets/layers/clock/clock.json | 16 +------- assets/layers/conflation/conflation.json | 2 +- assets/layers/crab_address/crab_address.json | 2 +- assets/layers/crossings/crossings.json | 20 +++------- .../cycleways_and_roads.json | 2 +- .../layers/defibrillator/defibrillator.json | 9 ++--- assets/layers/dentist/dentist.json | 2 +- assets/layers/direction/direction.json | 2 +- assets/layers/doctors/doctors.json | 2 +- assets/layers/dogpark/dogpark.json | 2 +- assets/layers/elevator/elevator.json | 2 +- assets/layers/entrance/entrance.json | 22 ++++------ assets/layers/etymology/etymology.json | 2 +- assets/layers/extinguisher/extinguisher.json | 2 +- assets/layers/filters/filters.json | 2 +- assets/layers/fire_station/fire_station.json | 2 +- .../layers/fitness_centre/fitness_centre.json | 2 +- .../fitness_station/fitness_station.json | 2 +- assets/layers/fixme/fixme.json | 2 +- assets/layers/food/food.json | 11 +---- assets/layers/ghost_bike/ghost_bike.json | 2 +- assets/layers/governments/governments.json | 2 +- .../gps_location_history.json | 2 +- assets/layers/gps_track/gps_track.json | 2 +- assets/layers/hackerspace/hackerspace.json | 2 +- .../layers/home_location/home_location.json | 2 +- assets/layers/hospital/hospital.json | 2 +- assets/layers/hotel/hotel.json | 2 +- assets/layers/hydrant/hydrant.json | 2 +- assets/layers/id_presets/id_presets.json | 2 +- .../import_candidate/import_candidate.json | 2 +- assets/layers/indoors/indoors.json | 2 +- .../information_board/information_board.json | 2 +- assets/layers/kerbs/kerbs.json | 15 +++---- .../kindergarten_childcare.json | 2 +- assets/layers/map/map.json | 2 +- assets/layers/matchpoint/matchpoint.json | 2 +- assets/layers/maxspeed/maxspeed.json | 2 +- .../layers/named_streets/named_streets.json | 2 +- .../layers/nature_reserve/nature_reserve.json | 2 +- .../observation_tower/observation_tower.json | 2 +- .../osm_community_index.json | 2 +- .../layers/parcel_lockers/parcel_lockers.json | 5 +-- assets/layers/parking/parking.json | 2 +- .../layers/parking_spaces/parking_spaces.json | 2 +- .../parking_ticket_machine.json | 2 +- .../pedestrian_path/pedestrian_path.json | 2 +- assets/layers/pharmacy/pharmacy.json | 2 +- .../physiotherapist/physiotherapist.json | 2 +- assets/layers/picnic_table/picnic_table.json | 2 +- assets/layers/play_forest/play_forest.json | 2 +- assets/layers/playground/playground.json | 2 +- assets/layers/postboxes/postboxes.json | 2 +- assets/layers/postoffices/postoffices.json | 2 +- .../public_bookcase/public_bookcase.json | 7 +--- .../railway_platforms/railway_platforms.json | 2 +- .../rainbow_crossings/rainbow_crossings.json | 9 +---- assets/layers/range/range.json | 2 +- .../layers/reception_desk/reception_desk.json | 2 +- assets/layers/school/school.json | 2 +- .../selected_element/selected_element.json | 2 +- assets/layers/shelter/shelter.json | 2 +- assets/layers/slow_roads/slow_roads.json | 2 +- assets/layers/speed_camera/speed_camera.json | 13 +++--- .../layers/speed_display/speed_display.json | 7 +--- assets/layers/split_point/split_point.json | 2 +- assets/layers/split_road/split_road.json | 2 +- assets/layers/sport_pitch/sport_pitch.json | 2 +- .../layers/sports_centre/sports_centre.json | 2 +- assets/layers/stairs/stairs.json | 2 +- assets/layers/street_lamps/street_lamps.json | 5 +-- .../surveillance_camera.json | 9 +---- .../tertiary_education.json | 2 +- .../layers/ticket_machine/ticket_machine.json | 2 +- .../ticket_validator/ticket_validator.json | 2 +- assets/layers/toilet/toilet.json | 2 +- .../toilet_at_amenity/toilet_at_amenity.json | 2 +- assets/layers/trail/trail.json | 2 +- .../layers/transit_routes/transit_routes.json | 2 +- .../layers/transit_stops/transit_stops.json | 2 +- assets/layers/tree_node/tree_node.json | 11 +---- assets/layers/veterinary/veterinary.json | 2 +- assets/layers/viewpoint/viewpoint.json | 2 +- .../layers/village_green/village_green.json | 2 +- .../visitor_information_centre.json | 2 +- assets/layers/waste_basket/waste_basket.json | 2 +- .../layers/waste_disposal/waste_disposal.json | 2 +- assets/layers/windturbine/windturbine.json | 2 +- assets/themes/advertising/advertising.json | 1 - assets/themes/atm/atm.json | 2 +- assets/themes/bag/bag.json | 2 +- assets/themes/buurtnatuur/buurtnatuur.json | 2 +- assets/themes/climbing/climbing.json | 2 +- assets/themes/grb/grb.json | 2 +- assets/themes/onwheels/onwheels.json | 2 +- assets/themes/postal_codes/postal_codes.json | 2 +- assets/themes/speelplekken/speelplekken.json | 2 +- .../street_lighting_assen.json | 2 +- assets/themes/uk_addresses/uk_addresses.json | 2 +- assets/themes/waste_assen/waste_assen.json | 2 +- scripts/lint.ts | 4 +- 127 files changed, 209 insertions(+), 345 deletions(-) diff --git a/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts b/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts index f0f9b805ce..0ad777fe75 100644 --- a/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts +++ b/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts @@ -34,6 +34,25 @@ export class UpdateLegacyLayer extends DesugaringStep< delete config["overpassTags"] } + for (const preset of config.presets ?? []) { + const preciseInput = preset["preciseInput"] + if (typeof preciseInput === "boolean") { + delete preset["preciseInput"] + } else if (preciseInput !== undefined) { + delete preciseInput["preferredBackground"] + console.log("Precise input:", preciseInput) + preset.snapToLayer = preciseInput.snapToLayer + delete preciseInput.snapToLayer + if (preciseInput.maxSnapDistance) { + preset.maxSnapDistance = preciseInput.maxSnapDistance + delete preciseInput.maxSnapDistance + } + if (Object.keys(preciseInput).length == 0) { + delete preset["preciseInput"] + } + } + } + if (config.tagRenderings !== undefined) { let i = 0 for (const tagRendering of config.tagRenderings) { diff --git a/Models/ThemeConfig/Json/LayerConfigJson.ts b/Models/ThemeConfig/Json/LayerConfigJson.ts index 2bbee874f4..8e93636b05 100644 --- a/Models/ThemeConfig/Json/LayerConfigJson.ts +++ b/Models/ThemeConfig/Json/LayerConfigJson.ts @@ -233,36 +233,16 @@ export interface LayerConfigJson { exampleImages?: string[] /** - * If set, the user will prompted to confirm the location before actually adding the data. - * This will be with a 'drag crosshair'-method. - * - * If 'preferredBackgroundCategory' is set, the element will attempt to pick a background layer of that category. + * If specified, these layers will be shown to and the new point will be snapped towards it */ - preciseInput?: - | true - | { - /** - * The type of background picture - */ - preferredBackground?: - | "osmbasedmap" - | "photo" - | "historicphoto" - | "map" - | string - | string[] - /** - * If specified, these layers will be shown to and the new point will be snapped towards it - */ - snapToLayer?: string | string[] - /** - * If specified, a new point will only be snapped if it is within this range. - * Distance in meter - * - * Default: 10 - */ - maxSnapDistance?: number - } + snapToLayer?: string | string[] + /** + * If specified, a new point will only be snapped if it is within this range. + * Distance in meter + * + * Default: 10 + */ + maxSnapDistance?: number }[] /** diff --git a/Models/ThemeConfig/LayerConfig.ts b/Models/ThemeConfig/LayerConfig.ts index 763793784b..67d6214194 100644 --- a/Models/ThemeConfig/LayerConfig.ts +++ b/Models/ThemeConfig/LayerConfig.ts @@ -234,37 +234,27 @@ export default class LayerConfig extends WithContextLoader { snapToLayers: undefined, maxSnapDistance: undefined, } - if (pr.preciseInput !== undefined) { - if (pr.preciseInput === true) { - pr.preciseInput = { - preferredBackground: undefined, - } - } - + if (pr["preciseInput"] !== undefined) { + throw "Layer " + this.id + " still uses the old 'preciseInput'-field" + } + if (pr.snapToLayer !== undefined) { let snapToLayers: string[] - if (typeof pr.preciseInput.snapToLayer === "string") { - snapToLayers = [pr.preciseInput.snapToLayer] + if (typeof pr.snapToLayer === "string") { + snapToLayers = [pr.snapToLayer] } else { - snapToLayers = pr.preciseInput.snapToLayer + snapToLayers = pr.snapToLayer } - let preferredBackground: ( - | "map" - | "photo" - | "osmbasedmap" - | "historicphoto" - | string - )[] - if (typeof pr.preciseInput.preferredBackground === "string") { - preferredBackground = [pr.preciseInput.preferredBackground] - } else { - preferredBackground = pr.preciseInput.preferredBackground - } preciseInput = { - preferredBackground, snapToLayers, - maxSnapDistance: pr.preciseInput.maxSnapDistance ?? 10, + maxSnapDistance: pr.maxSnapDistance ?? 10, } + } else if (pr.maxSnapDistance !== undefined) { + throw ( + "Layer " + + this.id + + " defines a maxSnapDistance, but does not include a `snapToLayer`" + ) } const config: PresetConfig = { diff --git a/assets/layers/advertising/advertising.json b/assets/layers/advertising/advertising.json index 74b088a587..ec87665ce2 100644 --- a/assets/layers/advertising/advertising.json +++ b/assets/layers/advertising/advertising.json @@ -1059,9 +1059,7 @@ "cs": "plakátovací skříň připevněná na stěnu", "pt": "uma caixa de pôster montada em uma parede" }, - "preciseInput": { - "snapToLayer": "walls_and_buildings" - } + "snapToLayer": "walls_and_buildings" }, { "tags": [ @@ -1175,16 +1173,13 @@ "fr": "un écran fixé au mur", "pt": "uma tela montada em uma parede" }, - "preciseInput": { - "preferredBackground": "map", - "snapToLayer": "walls_and_buildings", - "maxSnapDistance": 5 - }, "exampleImages": [ "./assets/themes/advertising/Subway_screen.jpg", "./assets/themes/advertising/TV_media.jpg", "./assets/themes/advertising/Times square.jpg" - ] + ], + "snapToLayer": "walls_and_buildings", + "maxSnapDistance": 5 }, { "tags": [ @@ -1209,15 +1204,12 @@ "nl": "Een stuk groot, weerbestendig textiel met opgedrukte reclameboodschap die permanent aan de muur hangt", "pt": "Uma peça de tecido impermeável com uma mensagem impressa, permanentemente ancorada na parede" }, - "preciseInput": { - "preferredBackground": "map", - "snapToLayer": "walls_and_buildings", - "maxSnapDistance": 5 - }, "exampleImages": [ "./assets/themes/advertising/tarp_feder.jpg", "./assets/themes/advertising/tarp_madrid.jpg" - ] + ], + "snapToLayer": "walls_and_buildings", + "maxSnapDistance": 5 }, { "tags": [ @@ -1252,11 +1244,6 @@ "pt": "um sinal", "pt_BR": "uma placa" }, - "preciseInput": { - "preferredBackground": "map", - "snapToLayer": "walls_and_buildings", - "maxSnapDistance": 5 - }, "description": { "en": "Used for advertising signs, neon signs, logos & institutional entrance signs", "es": "Se utiliza para carteles publicitarios, letreros de neón, logotipos y carteles en entradas institucionales", @@ -1270,7 +1257,9 @@ "./assets/themes/advertising/Waitrose_sign.jpg", "./assets/themes/advertising/sign_EOI.jpg", "./assets/themes/advertising/farma_sign.jpg" - ] + ], + "snapToLayer": "walls_and_buildings", + "maxSnapDistance": 5 }, { "tags": [ @@ -1304,15 +1293,12 @@ "fr": "une peinture murale", "pt": "uma pintura de parede" }, - "preciseInput": { - "preferredBackground": "map", - "snapToLayer": "walls_and_buildings", - "maxSnapDistance": 5 - }, "exampleImages": [ "./assets/themes/advertising/Capitol_wall.jpg", "./assets/themes/advertising/clarke_wall.jpg" - ] + ], + "snapToLayer": "walls_and_buildings", + "maxSnapDistance": 5 } ] } diff --git a/assets/layers/ambulancestation/ambulancestation.json b/assets/layers/ambulancestation/ambulancestation.json index 84494d3294..bbf4e1bcc1 100644 --- a/assets/layers/ambulancestation/ambulancestation.json +++ b/assets/layers/ambulancestation/ambulancestation.json @@ -381,4 +381,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json index 3fd70adbd4..3f831aea62 100644 --- a/assets/layers/artwork/artwork.json +++ b/assets/layers/artwork/artwork.json @@ -139,9 +139,7 @@ "cs": "umělecké dílo na zdi", "es": "Una obra de arte en la pared" }, - "preciseInput": { - "snapToLayer": "walls_and_buildings" - } + "snapToLayer": "walls_and_buildings" } ], "calculatedTags": [ diff --git a/assets/layers/bank/bank.json b/assets/layers/bank/bank.json index 64bd96d632..0039f09ceb 100644 --- a/assets/layers/bank/bank.json +++ b/assets/layers/bank/bank.json @@ -102,4 +102,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json index 190cb4ab56..321da57332 100644 --- a/assets/layers/barrier/barrier.json +++ b/assets/layers/barrier/barrier.json @@ -108,13 +108,8 @@ "nb_NO": "En pullert i veien", "ca": "Un bol·lard a la carretera" }, - "preciseInput": { - "preferredBackground": [ - "photo" - ], - "snapToLayer": "cycleways_and_roads", - "maxSnapDistance": 25 - } + "snapToLayer": "cycleways_and_roads", + "maxSnapDistance": 25 }, { "title": { @@ -144,13 +139,8 @@ "nb_NO": "Sykkelbarrièrer, for å dempe farten", "ca": "Una barrera ciclista que relanteix als ciclistes" }, - "preciseInput": { - "preferredBackground": [ - "photo" - ], - "snapToLayer": "cycleways_and_roads", - "maxSnapDistance": 25 - } + "snapToLayer": "cycleways_and_roads", + "maxSnapDistance": 25 } ], "tagRenderings": [ @@ -613,4 +603,4 @@ ] } } -} \ No newline at end of file +} diff --git a/assets/layers/bicycle_library/bicycle_library.json b/assets/layers/bicycle_library/bicycle_library.json index 672361ded0..c48104f473 100644 --- a/assets/layers/bicycle_library/bicycle_library.json +++ b/assets/layers/bicycle_library/bicycle_library.json @@ -358,4 +358,4 @@ } ], "deletion": true -} \ No newline at end of file +} diff --git a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json index ab0f1b7fdc..f0ca93ea9c 100644 --- a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json +++ b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json @@ -323,4 +323,4 @@ "cs": "Vrstva zobrazující automaty na cyklistické duše (buď speciální automaty na cyklistické duše, nebo klasické automaty s cyklistickými dušemi a případně dalšími předměty souvisejícími s jízdními koly, jako jsou světla, rukavice, zámky, ...)", "ca": "Una capa que mostra màquines expenedores per a tubs de bicicleta (ja siguin màquines expenedores de tubs de bicicleta o màquines expenedores clàssiques amb tubs de bicicleta i opcionalment objectes addicionals relacionats amb la bicicleta com ara llums, guants, panys, ...)" } -} \ No newline at end of file +} diff --git a/assets/layers/bike_cafe/bike_cafe.json b/assets/layers/bike_cafe/bike_cafe.json index 0f914b683d..0a784823fd 100644 --- a/assets/layers/bike_cafe/bike_cafe.json +++ b/assets/layers/bike_cafe/bike_cafe.json @@ -369,4 +369,4 @@ "cs": "Cyklokavárna je kavárna zaměřená na cyklisty, například se službami, jako je pumpa, se spoustou výzdoby související s jízdními koly, …", "ca": "Un cafè ciclista és un cafè enfocat a ciclistes, per exemple, amb serveis com una manxa, amb molta decoració relacionada amb el ciclisme, …" } -} \ No newline at end of file +} diff --git a/assets/layers/bike_cleaning/bike_cleaning.json b/assets/layers/bike_cleaning/bike_cleaning.json index d148a35776..6ac80bd673 100644 --- a/assets/layers/bike_cleaning/bike_cleaning.json +++ b/assets/layers/bike_cleaning/bike_cleaning.json @@ -274,4 +274,4 @@ "cs": "Vrstva zobrazující zařízení, kde si můžete umýt kolo", "ca": "Una capa que mostra les instal·lacions on pots netejar la teva bicicleta" } -} \ No newline at end of file +} diff --git a/assets/layers/bike_parking/bike_parking.json b/assets/layers/bike_parking/bike_parking.json index ab155e42e5..b3b20d15d5 100644 --- a/assets/layers/bike_parking/bike_parking.json +++ b/assets/layers/bike_parking/bike_parking.json @@ -720,4 +720,4 @@ "cs": "Vrstva ukazující, kde můžete zaparkovat kolo", "ca": "Una capa que mostra on pots aparcar la teva bicicleta" } -} \ No newline at end of file +} diff --git a/assets/layers/bike_repair_station/bike_repair_station.json b/assets/layers/bike_repair_station/bike_repair_station.json index ea67a2ddc0..1c166a113f 100644 --- a/assets/layers/bike_repair_station/bike_repair_station.json +++ b/assets/layers/bike_repair_station/bike_repair_station.json @@ -1059,4 +1059,4 @@ "cs": "Vrstva zobrazující vzduchové kompresory na jízdní kola a stojany na nářadí pro opravu jízdních kol", "ca": "Una capa que mostra bombes de bicicletes i suports d'eines de reparació de bicicletes" } -} \ No newline at end of file +} diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json index 06f014ec96..dfb834b890 100644 --- a/assets/layers/bike_shop/bike_shop.json +++ b/assets/layers/bike_shop/bike_shop.json @@ -898,4 +898,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/bike_themed_object/bike_themed_object.json b/assets/layers/bike_themed_object/bike_themed_object.json index 87acd3c360..0c47cb3897 100644 --- a/assets/layers/bike_themed_object/bike_themed_object.json +++ b/assets/layers/bike_themed_object/bike_themed_object.json @@ -98,4 +98,4 @@ "da": "Et lag med objekter med cykeltema, men som ikke matcher noget andet lag", "ca": "Una capa amb els objectes relacionats amb bicis però que no coinxideixen amb cap altra capa" } -} \ No newline at end of file +} diff --git a/assets/layers/binocular/binocular.json b/assets/layers/binocular/binocular.json index 41f0c37420..35eae1d830 100644 --- a/assets/layers/binocular/binocular.json +++ b/assets/layers/binocular/binocular.json @@ -133,9 +133,6 @@ "da": "Et teleskop eller en kikkert monteret på en stang, som offentligheden kan se sig omkring med. ", "es": "Un telescopio o unos prismáticos montados en un poste, disponible para que el público mire alrededor. ", "ca": "Un telescopi o un parell de prismàtics muntats en un pal, a disposició del públic per mirar al seu voltant. " - }, - "preciseInput": { - "preferredBackground": "photo" } } ], @@ -180,4 +177,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/birdhide/birdhide.json b/assets/layers/birdhide/birdhide.json index c7d2249254..f7ba4276c3 100644 --- a/assets/layers/birdhide/birdhide.json +++ b/assets/layers/birdhide/birdhide.json @@ -412,4 +412,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/cafe_pub/cafe_pub.json b/assets/layers/cafe_pub/cafe_pub.json index ed6f4af781..0e8eaf9307 100644 --- a/assets/layers/cafe_pub/cafe_pub.json +++ b/assets/layers/cafe_pub/cafe_pub.json @@ -46,9 +46,6 @@ "da": "En pub, mest et sted at drikke øl i et varme, afslappede omgivelser", "fr": "Un pub, principalement pour boire un verre dans une atmosphère chaleureuse et décontractée", "ca": "Un bar, principalment per a beure cerveses en un interior càlid i relaxat" - }, - "preciseInput": { - "preferredBackground": "map" } }, { @@ -74,9 +71,6 @@ "es": "Un bar de copas más moderno y comercial, posiblemente con una instalación de música y luz", "fr": "Un bar plus moderne et commercial, avec éventuellement musique et jeux de lumière", "ca": "Un bar de copes més modern i comercial, possiblement amb equipació de música i llums" - }, - "preciseInput": { - "preferredBackground": "map" } }, { @@ -102,9 +96,6 @@ "es": "Una cafetería para beber té, café o una bebida alcohólica en un ambiente tranquilo", "fr": "Un café pour prendre un thé, un café ou une boisson alcoolisée dans un environnement calme", "ca": "Una cafeteria per a a beure té, café o una beguda alcohólica en un ambient tranquil" - }, - "preciseInput": { - "preferredBackground": "map" } }, { @@ -128,9 +119,6 @@ "fr": "Une boîte de nuit ou discothèque pour danser sur de la musique de DJ accompagnée de jeux de lumière et un bar pour prendre une boisson (alcoolisée)", "da": "En natklub eller diskotek med fokus på dans, musik af en DJ med tilhørende lysshow og en bar for at få (alkoholiske) drinks", "ca": "Un club nocturn o discoteca centrat en ballar, música d'un DJ acompanyat d'un espectacle de llums i una barra on obtindre begudes (alcohòliques)" - }, - "preciseInput": { - "preferredBackground": "map" } } ], @@ -369,4 +357,4 @@ "fr": "Une couche montrants les cafés et pubs où l’on peut prendre un verre. Cette couche pose des questions y afférentes.", "ca": "Una capa que mostra cafeteries i bars on un es pot reunir amb una beguda. La capa demana algunes preguntes rellevants" } -} \ No newline at end of file +} diff --git a/assets/layers/car_rental/car_rental.json b/assets/layers/car_rental/car_rental.json index 084e446b50..724a7f38d2 100644 --- a/assets/layers/car_rental/car_rental.json +++ b/assets/layers/car_rental/car_rental.json @@ -121,4 +121,4 @@ "filter": [ "open_now" ] -} \ No newline at end of file +} diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 7722b44973..2eaafe2012 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -4705,9 +4705,6 @@ "da": "en ladestation til elektriske cykler med et normalt europæisk vægstik (beregnet til opladning af elektriske cykler)", "de": "eine Ladestation für Elektrofahrräder mit einer normalen europäischen Steckdose (zum Laden von Elektrofahrrädern)", "es": "una estación de carga para bicicletas eléctricas con un enchufe de pared europeo normal (pensado para cargar bicicletas eléctricas)" - }, - "preciseInput": { - "preferredBackground": "map" } }, { @@ -4723,9 +4720,6 @@ "da": "en ladestation til biler", "de": "Eine Ladestation für Elektrofahrzeuge", "es": "una estación de carga para coches" - }, - "preciseInput": { - "preferredBackground": "map" } } ], @@ -5218,4 +5212,4 @@ }, "neededChangesets": 10 } -} \ No newline at end of file +} diff --git a/assets/layers/climbing/climbing.json b/assets/layers/climbing/climbing.json index 31e083a22e..ff4b724d56 100644 --- a/assets/layers/climbing/climbing.json +++ b/assets/layers/climbing/climbing.json @@ -416,4 +416,4 @@ } ], "mapRendering": null -} \ No newline at end of file +} diff --git a/assets/layers/climbing_club/climbing_club.json b/assets/layers/climbing_club/climbing_club.json index 652571a251..6abab043a6 100644 --- a/assets/layers/climbing_club/climbing_club.json +++ b/assets/layers/climbing_club/climbing_club.json @@ -187,4 +187,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/climbing_gym/climbing_gym.json b/assets/layers/climbing_gym/climbing_gym.json index 654ce5d029..7d57b03495 100644 --- a/assets/layers/climbing_gym/climbing_gym.json +++ b/assets/layers/climbing_gym/climbing_gym.json @@ -275,4 +275,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/climbing_opportunity/climbing_opportunity.json b/assets/layers/climbing_opportunity/climbing_opportunity.json index 5f775f1926..cdebcc27c2 100644 --- a/assets/layers/climbing_opportunity/climbing_opportunity.json +++ b/assets/layers/climbing_opportunity/climbing_opportunity.json @@ -136,4 +136,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/climbing_route/climbing_route.json b/assets/layers/climbing_route/climbing_route.json index de43f272d2..bc76290857 100644 --- a/assets/layers/climbing_route/climbing_route.json +++ b/assets/layers/climbing_route/climbing_route.json @@ -255,4 +255,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/clock/clock.json b/assets/layers/clock/clock.json index f4b672364a..cec32bffad 100644 --- a/assets/layers/clock/clock.json +++ b/assets/layers/clock/clock.json @@ -409,12 +409,6 @@ "nl": "Een publiekelijk zichtbare klok", "de": "Eine öffentlich sichtbare Uhr", "ca": "Un rellotge visible públicament" - }, - "preciseInput": { - "preferredBackground": [ - "photo", - "map" - ] } }, { @@ -435,13 +429,7 @@ "ca": "Un rellotge visible públicament muntat en una paret", "fr": "Une horloge publique fixée sur un mur" }, - "preciseInput": { - "preferredBackground": [ - "photo", - "map" - ], - "snapToLayer": "walls_and_buildings" - } + "snapToLayer": "walls_and_buildings" } ], "allowMove": true, @@ -472,4 +460,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/conflation/conflation.json b/assets/layers/conflation/conflation.json index 49aa6c9710..5cc23d0546 100644 --- a/assets/layers/conflation/conflation.json +++ b/assets/layers/conflation/conflation.json @@ -79,4 +79,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/crab_address/crab_address.json b/assets/layers/crab_address/crab_address.json index a86147ba4d..97728eb0ca 100644 --- a/assets/layers/crab_address/crab_address.json +++ b/assets/layers/crab_address/crab_address.json @@ -33,4 +33,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json index a499b051eb..b8ca7b79a5 100644 --- a/assets/layers/crossings/crossings.json +++ b/assets/layers/crossings/crossings.json @@ -84,13 +84,8 @@ "da": "Overgang for fodgængere og/eller cyklister", "es": "Cruce para peatones y/o ciclistas" }, - "preciseInput": { - "preferredBackground": [ - "photo" - ], - "snapToLayer": "cycleways_and_roads", - "maxSnapDistance": 25 - } + "snapToLayer": "cycleways_and_roads", + "maxSnapDistance": 25 }, { "title": { @@ -113,13 +108,8 @@ "da": "Trafiksignal på en vej", "es": "Señal de tráfico en una carretera" }, - "preciseInput": { - "preferredBackground": [ - "photo" - ], - "snapToLayer": "cycleways_and_roads", - "maxSnapDistance": 25 - } + "snapToLayer": "cycleways_and_roads", + "maxSnapDistance": 25 } ], "tagRenderings": [ @@ -616,4 +606,4 @@ "filter": [ "tactile_paving_advanced" ] -} \ No newline at end of file +} diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json index e5865f4b0b..a428c9897f 100644 --- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json +++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json @@ -1702,4 +1702,4 @@ "fr": "Toutes les infrastructures sur lesquelles quelqu'un peut rouler, accompagnées de questions sur cette infrastructure", "ca": "Totes les infraestructures per les quals algú pot ciclar, acompanyades de preguntes sobre aquesta infraestructura" } -} \ No newline at end of file +} diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json index 3dba2f5033..b7fdd11f97 100644 --- a/assets/layers/defibrillator/defibrillator.json +++ b/assets/layers/defibrillator/defibrillator.json @@ -72,11 +72,8 @@ "tags": [ "emergency=defibrillator" ], - "preciseInput": { - "preferredBackground": "map", - "snapToLayer": "walls_and_buildings", - "maxSnapDistance": 5 - } + "snapToLayer": "walls_and_buildings", + "maxSnapDistance": 5 } ], "tagRenderings": [ @@ -674,4 +671,4 @@ "has_image", "open_now" ] -} \ No newline at end of file +} diff --git a/assets/layers/dentist/dentist.json b/assets/layers/dentist/dentist.json index 0ee28b471d..a737b3a6f8 100644 --- a/assets/layers/dentist/dentist.json +++ b/assets/layers/dentist/dentist.json @@ -79,4 +79,4 @@ ], "deletion": true, "allowMove": true -} \ No newline at end of file +} diff --git a/assets/layers/direction/direction.json b/assets/layers/direction/direction.json index bd98af2f72..b290a82b89 100644 --- a/assets/layers/direction/direction.json +++ b/assets/layers/direction/direction.json @@ -48,4 +48,4 @@ "color": "--catch-detail-color" } ] -} \ No newline at end of file +} diff --git a/assets/layers/doctors/doctors.json b/assets/layers/doctors/doctors.json index c092d81dfb..c6c4874818 100644 --- a/assets/layers/doctors/doctors.json +++ b/assets/layers/doctors/doctors.json @@ -138,4 +138,4 @@ ], "deletion": true, "allowMove": true -} \ No newline at end of file +} diff --git a/assets/layers/dogpark/dogpark.json b/assets/layers/dogpark/dogpark.json index 8f0caa7f61..66d7210d37 100644 --- a/assets/layers/dogpark/dogpark.json +++ b/assets/layers/dogpark/dogpark.json @@ -185,4 +185,4 @@ "reviews", "images" ] -} \ No newline at end of file +} diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index c524e3025a..dbe8f50d64 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -266,4 +266,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json index f64d639cf9..9d84b69f80 100644 --- a/assets/layers/entrance/entrance.json +++ b/assets/layers/entrance/entrance.json @@ -453,15 +453,12 @@ "de": "einen Eingang", "nl": "een toegang" }, - "preciseInput": { - "preferredBackground": "photo", - "snapToLayer": [ - "walls_and_buildings", - "pedestrian_path" - ] - }, "tags": [ "entrance=yes" + ], + "snapToLayer": [ + "walls_and_buildings", + "pedestrian_path" ] }, { @@ -470,14 +467,11 @@ "de": "eine Innentür", "nl": "een binnendeur" }, - "preciseInput": { - "preferredBackground": "map", - "snapToLayer": [ - "indoors" - ] - }, "tags": [ "indoor=door" + ], + "snapToLayer": [ + "indoors" ] } ], @@ -520,4 +514,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/etymology/etymology.json b/assets/layers/etymology/etymology.json index 4032baa649..e8daacd486 100644 --- a/assets/layers/etymology/etymology.json +++ b/assets/layers/etymology/etymology.json @@ -307,4 +307,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/extinguisher/extinguisher.json b/assets/layers/extinguisher/extinguisher.json index e7d1526c86..b86e1e543f 100644 --- a/assets/layers/extinguisher/extinguisher.json +++ b/assets/layers/extinguisher/extinguisher.json @@ -167,4 +167,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/filters/filters.json b/assets/layers/filters/filters.json index c4ad463932..db570487e9 100644 --- a/assets/layers/filters/filters.json +++ b/assets/layers/filters/filters.json @@ -175,4 +175,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/fire_station/fire_station.json b/assets/layers/fire_station/fire_station.json index 9194345bb4..71b44c4f01 100644 --- a/assets/layers/fire_station/fire_station.json +++ b/assets/layers/fire_station/fire_station.json @@ -317,4 +317,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/fitness_centre/fitness_centre.json b/assets/layers/fitness_centre/fitness_centre.json index efc46d9748..6cf7ebb476 100644 --- a/assets/layers/fitness_centre/fitness_centre.json +++ b/assets/layers/fitness_centre/fitness_centre.json @@ -105,4 +105,4 @@ "filter": [ "open_now" ] -} \ No newline at end of file +} diff --git a/assets/layers/fitness_station/fitness_station.json b/assets/layers/fitness_station/fitness_station.json index 4bc191d233..ebef266570 100644 --- a/assets/layers/fitness_station/fitness_station.json +++ b/assets/layers/fitness_station/fitness_station.json @@ -414,4 +414,4 @@ "enableRelocation": false, "enableImproveAccuracy": true } -} \ No newline at end of file +} diff --git a/assets/layers/fixme/fixme.json b/assets/layers/fixme/fixme.json index 1cc5cc64a6..09b27d2aec 100644 --- a/assets/layers/fixme/fixme.json +++ b/assets/layers/fixme/fixme.json @@ -57,4 +57,4 @@ "width": 2 } ] -} \ No newline at end of file +} diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index a3540e3c38..84df6f9086 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -38,9 +38,6 @@ "de": "Ein klassisches Speiselokal mit Sitzgelegenheiten, in dem vollständige Mahlzeiten von Kellnern serviert werden", "es": "Un lugar de comidas formal, con mesas y sillas y que vende comidas completas servidas por camareros", "fr": "Un lieu de restauration formel avec des installations pour s'asseoir vendant des repas complets servis par des serveurs" - }, - "preciseInput": { - "preferredBackground": "map" } }, { @@ -61,9 +58,6 @@ "de": "Ein Lebensmittelunternehmen, das sich auf schnellen Thekendienst und Essen zum Mitnehmen konzentriert", "es": "Un negocio de comida centrado en servicio rápido solo en mostrador y comida para llevar", "fr": "Une entreprise alimentaire se concentrant sur le service rapide au comptoir et les plats à emporter" - }, - "preciseInput": { - "preferredBackground": "map" } }, { @@ -84,9 +78,6 @@ "de": "Eine Pommesbude", "fr": "Une restauration rapide centré sur la vente de frites", "ca": "Un local de menjar ràpid centrat en les patates fregides" - }, - "preciseInput": { - "preferredBackground": "map" } } ], @@ -1149,4 +1140,4 @@ "ca": "Una capa que mostra restaurants i locals de menjar ràpid (amb un renderitzat especial per a fregiduries)", "cs": "Vrstva zobrazující restaurace a zařízení rychlého občerstvení (se speciálním vykreslením pro fritézy)" } -} \ No newline at end of file +} diff --git a/assets/layers/ghost_bike/ghost_bike.json b/assets/layers/ghost_bike/ghost_bike.json index 250d4df137..b46383ecb4 100644 --- a/assets/layers/ghost_bike/ghost_bike.json +++ b/assets/layers/ghost_bike/ghost_bike.json @@ -244,4 +244,4 @@ "nl": "Een laag die herdenkingsplaatsen voor verongelukte fietsers toont", "de": "Eine Ebene mit Gedenkstätten für Radfahrer, die bei Verkehrsunfällen ums Leben gekommen sind" } -} \ No newline at end of file +} diff --git a/assets/layers/governments/governments.json b/assets/layers/governments/governments.json index 797a0a993a..dcf20cd508 100644 --- a/assets/layers/governments/governments.json +++ b/assets/layers/governments/governments.json @@ -74,4 +74,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/gps_location_history/gps_location_history.json b/assets/layers/gps_location_history/gps_location_history.json index 9385408d3e..34167beb5f 100644 --- a/assets/layers/gps_location_history/gps_location_history.json +++ b/assets/layers/gps_location_history/gps_location_history.json @@ -15,4 +15,4 @@ "iconSize": "5,5,center" } ] -} \ No newline at end of file +} diff --git a/assets/layers/gps_track/gps_track.json b/assets/layers/gps_track/gps_track.json index 9bbff8523a..f1af42e71a 100644 --- a/assets/layers/gps_track/gps_track.json +++ b/assets/layers/gps_track/gps_track.json @@ -45,4 +45,4 @@ } ], "syncSelection": "global" -} \ No newline at end of file +} diff --git a/assets/layers/hackerspace/hackerspace.json b/assets/layers/hackerspace/hackerspace.json index a1432320a9..75db7a4473 100644 --- a/assets/layers/hackerspace/hackerspace.json +++ b/assets/layers/hackerspace/hackerspace.json @@ -353,4 +353,4 @@ ], "allowMove": true, "deletion": true -} \ No newline at end of file +} diff --git a/assets/layers/home_location/home_location.json b/assets/layers/home_location/home_location.json index 34d7acc619..75a7e704c6 100644 --- a/assets/layers/home_location/home_location.json +++ b/assets/layers/home_location/home_location.json @@ -17,4 +17,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/hospital/hospital.json b/assets/layers/hospital/hospital.json index 479a15b9ce..9ecfbbded3 100644 --- a/assets/layers/hospital/hospital.json +++ b/assets/layers/hospital/hospital.json @@ -126,4 +126,4 @@ "width": 1 } ] -} \ No newline at end of file +} diff --git a/assets/layers/hotel/hotel.json b/assets/layers/hotel/hotel.json index 54f5563a8f..6e3a213527 100644 --- a/assets/layers/hotel/hotel.json +++ b/assets/layers/hotel/hotel.json @@ -97,4 +97,4 @@ "enableImproveAccuracy": true, "enableRelocation": true } -} \ No newline at end of file +} diff --git a/assets/layers/hydrant/hydrant.json b/assets/layers/hydrant/hydrant.json index 1fd4f6767c..184a45f137 100644 --- a/assets/layers/hydrant/hydrant.json +++ b/assets/layers/hydrant/hydrant.json @@ -545,4 +545,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/id_presets/id_presets.json b/assets/layers/id_presets/id_presets.json index b3716d3d1d..152dbc7be6 100644 --- a/assets/layers/id_presets/id_presets.json +++ b/assets/layers/id_presets/id_presets.json @@ -20215,4 +20215,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/import_candidate/import_candidate.json b/assets/layers/import_candidate/import_candidate.json index 41aa24298d..0e1a7653e8 100644 --- a/assets/layers/import_candidate/import_candidate.json +++ b/assets/layers/import_candidate/import_candidate.json @@ -19,4 +19,4 @@ "render": "{all_tags()}" } ] -} \ No newline at end of file +} diff --git a/assets/layers/indoors/indoors.json b/assets/layers/indoors/indoors.json index be6e909f7b..d7777601f8 100644 --- a/assets/layers/indoors/indoors.json +++ b/assets/layers/indoors/indoors.json @@ -248,4 +248,4 @@ "iconSize": "15,15, bottom" } ] -} \ No newline at end of file +} diff --git a/assets/layers/information_board/information_board.json b/assets/layers/information_board/information_board.json index f5da54062d..66e0fab161 100644 --- a/assets/layers/information_board/information_board.json +++ b/assets/layers/information_board/information_board.json @@ -91,4 +91,4 @@ "es": "Una capa que muestra paneles informativos turísticos (ej. informan sobre el paisaje, una construcción, una característica, un mapa, ...)", "ca": "Una capa que mostra panells informatius turístics (p.e. informen sobre el paissatge, una construcció, una característica, un mapa, …)" } -} \ No newline at end of file +} diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json index cab518d7e7..d25aa791e7 100644 --- a/assets/layers/kerbs/kerbs.json +++ b/assets/layers/kerbs/kerbs.json @@ -254,14 +254,11 @@ "de": "Bordstein in einem Fußweg", "fr": "Bordure dans un trottoir" }, - "preciseInput": { - "maxSnapDistance": 10, - "preferredBackground": "photo", - "snapToLayer": [ - "cycleways_and_roads", - "kerbs" - ] - } + "snapToLayer": [ + "cycleways_and_roads", + "kerbs" + ], + "maxSnapDistance": 10 } ], "filter": [ @@ -388,4 +385,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/kindergarten_childcare/kindergarten_childcare.json b/assets/layers/kindergarten_childcare/kindergarten_childcare.json index 2462551cb6..3c6203cc70 100644 --- a/assets/layers/kindergarten_childcare/kindergarten_childcare.json +++ b/assets/layers/kindergarten_childcare/kindergarten_childcare.json @@ -191,4 +191,4 @@ "enableImproveAccuracy": true }, "deletion": true -} \ No newline at end of file +} diff --git a/assets/layers/map/map.json b/assets/layers/map/map.json index 331b92d3bb..ec0006bc2b 100644 --- a/assets/layers/map/map.json +++ b/assets/layers/map/map.json @@ -281,4 +281,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/matchpoint/matchpoint.json b/assets/layers/matchpoint/matchpoint.json index b62d9a7af6..16375a75a2 100644 --- a/assets/layers/matchpoint/matchpoint.json +++ b/assets/layers/matchpoint/matchpoint.json @@ -11,4 +11,4 @@ "icon": "./assets/svg/crosshair-empty.svg" } ] -} \ No newline at end of file +} diff --git a/assets/layers/maxspeed/maxspeed.json b/assets/layers/maxspeed/maxspeed.json index 49c2bf8281..2861e50bf4 100644 --- a/assets/layers/maxspeed/maxspeed.json +++ b/assets/layers/maxspeed/maxspeed.json @@ -216,4 +216,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/named_streets/named_streets.json b/assets/layers/named_streets/named_streets.json index 03bab2dc89..b745d4f29c 100644 --- a/assets/layers/named_streets/named_streets.json +++ b/assets/layers/named_streets/named_streets.json @@ -21,4 +21,4 @@ } ], "shownByDefault": false -} \ No newline at end of file +} diff --git a/assets/layers/nature_reserve/nature_reserve.json b/assets/layers/nature_reserve/nature_reserve.json index 0d766743f9..c3710d9aaf 100644 --- a/assets/layers/nature_reserve/nature_reserve.json +++ b/assets/layers/nature_reserve/nature_reserve.json @@ -547,4 +547,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/observation_tower/observation_tower.json b/assets/layers/observation_tower/observation_tower.json index ec6ec31050..6b92fd1244 100644 --- a/assets/layers/observation_tower/observation_tower.json +++ b/assets/layers/observation_tower/observation_tower.json @@ -328,4 +328,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/osm_community_index/osm_community_index.json b/assets/layers/osm_community_index/osm_community_index.json index fa11337dcf..e2c1210b94 100644 --- a/assets/layers/osm_community_index/osm_community_index.json +++ b/assets/layers/osm_community_index/osm_community_index.json @@ -153,4 +153,4 @@ "de": "Eine Ebene aller OpenStreetMap-Communities", "ca": "Una capa que mostra les comunitats d'OpenStreetMap" } -} \ No newline at end of file +} diff --git a/assets/layers/parcel_lockers/parcel_lockers.json b/assets/layers/parcel_lockers/parcel_lockers.json index f8931211ad..faf9bbab31 100644 --- a/assets/layers/parcel_lockers/parcel_lockers.json +++ b/assets/layers/parcel_lockers/parcel_lockers.json @@ -34,9 +34,6 @@ "de": "ein Paketschließfach", "ca": "una bústia intel·ligent" }, - "preciseInput": { - "preferredBackground": "photo" - }, "tags": [ "amenity=parcel_locker" ] @@ -280,4 +277,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/parking/parking.json b/assets/layers/parking/parking.json index 2e3e2b76f0..4313006c5b 100644 --- a/assets/layers/parking/parking.json +++ b/assets/layers/parking/parking.json @@ -284,4 +284,4 @@ "color": "#ddcc00" } ] -} \ No newline at end of file +} diff --git a/assets/layers/parking_spaces/parking_spaces.json b/assets/layers/parking_spaces/parking_spaces.json index e79dbb6cab..fa6049a954 100644 --- a/assets/layers/parking_spaces/parking_spaces.json +++ b/assets/layers/parking_spaces/parking_spaces.json @@ -206,4 +206,4 @@ "width": "1" } ] -} \ No newline at end of file +} diff --git a/assets/layers/parking_ticket_machine/parking_ticket_machine.json b/assets/layers/parking_ticket_machine/parking_ticket_machine.json index 5b3b749d39..f132535472 100644 --- a/assets/layers/parking_ticket_machine/parking_ticket_machine.json +++ b/assets/layers/parking_ticket_machine/parking_ticket_machine.json @@ -91,4 +91,4 @@ "iconSize": "20,20,center" } ] -} \ No newline at end of file +} diff --git a/assets/layers/pedestrian_path/pedestrian_path.json b/assets/layers/pedestrian_path/pedestrian_path.json index 65df5a82e4..0d238b7c1f 100644 --- a/assets/layers/pedestrian_path/pedestrian_path.json +++ b/assets/layers/pedestrian_path/pedestrian_path.json @@ -37,4 +37,4 @@ "dashArray": "12 6" } ] -} \ No newline at end of file +} diff --git a/assets/layers/pharmacy/pharmacy.json b/assets/layers/pharmacy/pharmacy.json index a257d5ec9d..941fe08652 100644 --- a/assets/layers/pharmacy/pharmacy.json +++ b/assets/layers/pharmacy/pharmacy.json @@ -180,4 +180,4 @@ ], "deletion": true, "allowMove": true -} \ No newline at end of file +} diff --git a/assets/layers/physiotherapist/physiotherapist.json b/assets/layers/physiotherapist/physiotherapist.json index 215d6f6cfb..7412943099 100644 --- a/assets/layers/physiotherapist/physiotherapist.json +++ b/assets/layers/physiotherapist/physiotherapist.json @@ -74,4 +74,4 @@ ], "deletion": true, "allowMove": true -} \ No newline at end of file +} diff --git a/assets/layers/picnic_table/picnic_table.json b/assets/layers/picnic_table/picnic_table.json index 620f145762..37fdad5277 100644 --- a/assets/layers/picnic_table/picnic_table.json +++ b/assets/layers/picnic_table/picnic_table.json @@ -143,4 +143,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/play_forest/play_forest.json b/assets/layers/play_forest/play_forest.json index eb5014b600..dffb7d3748 100644 --- a/assets/layers/play_forest/play_forest.json +++ b/assets/layers/play_forest/play_forest.json @@ -122,4 +122,4 @@ "width": "2" } ] -} \ No newline at end of file +} diff --git a/assets/layers/playground/playground.json b/assets/layers/playground/playground.json index 87de491bb4..90c84a4849 100644 --- a/assets/layers/playground/playground.json +++ b/assets/layers/playground/playground.json @@ -645,4 +645,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/postboxes/postboxes.json b/assets/layers/postboxes/postboxes.json index 82283d687c..3f54d68caf 100644 --- a/assets/layers/postboxes/postboxes.json +++ b/assets/layers/postboxes/postboxes.json @@ -99,4 +99,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/postoffices/postoffices.json b/assets/layers/postoffices/postoffices.json index 8880729759..91de19877a 100644 --- a/assets/layers/postoffices/postoffices.json +++ b/assets/layers/postoffices/postoffices.json @@ -457,4 +457,4 @@ "width": "1" } ] -} \ No newline at end of file +} diff --git a/assets/layers/public_bookcase/public_bookcase.json b/assets/layers/public_bookcase/public_bookcase.json index 8d738b83ce..3c1c70921d 100644 --- a/assets/layers/public_bookcase/public_bookcase.json +++ b/assets/layers/public_bookcase/public_bookcase.json @@ -65,10 +65,7 @@ }, "tags": [ "amenity=public_bookcase" - ], - "preciseInput": { - "preferredBackground": "photo" - } + ] } ], "tagRenderings": [ @@ -550,4 +547,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/railway_platforms/railway_platforms.json b/assets/layers/railway_platforms/railway_platforms.json index 58a15c072d..142097ebd1 100644 --- a/assets/layers/railway_platforms/railway_platforms.json +++ b/assets/layers/railway_platforms/railway_platforms.json @@ -94,4 +94,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/rainbow_crossings/rainbow_crossings.json b/assets/layers/rainbow_crossings/rainbow_crossings.json index a1ed6a3892..4b59c54e8f 100644 --- a/assets/layers/rainbow_crossings/rainbow_crossings.json +++ b/assets/layers/rainbow_crossings/rainbow_crossings.json @@ -55,13 +55,8 @@ "fr": "Passage piéton", "ca": "Pas de vianants" }, - "preciseInput": { - "preferredBackground": [ - "photo" - ], - "snapToLayer": "cycleways_and_roads", - "maxSnapDistance": 25 - } + "snapToLayer": "cycleways_and_roads", + "maxSnapDistance": 25 } ], "tagRenderings": [ diff --git a/assets/layers/range/range.json b/assets/layers/range/range.json index 4268dc2d05..a68b56ba05 100644 --- a/assets/layers/range/range.json +++ b/assets/layers/range/range.json @@ -11,4 +11,4 @@ "color": "#cc00cc" } ] -} \ No newline at end of file +} diff --git a/assets/layers/reception_desk/reception_desk.json b/assets/layers/reception_desk/reception_desk.json index 1ac43a0a17..72333e67a3 100644 --- a/assets/layers/reception_desk/reception_desk.json +++ b/assets/layers/reception_desk/reception_desk.json @@ -114,4 +114,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/school/school.json b/assets/layers/school/school.json index a623c5d715..05f958831d 100644 --- a/assets/layers/school/school.json +++ b/assets/layers/school/school.json @@ -401,4 +401,4 @@ "width": 1 } ] -} \ No newline at end of file +} diff --git a/assets/layers/selected_element/selected_element.json b/assets/layers/selected_element/selected_element.json index fa829cbb89..1d23909393 100644 --- a/assets/layers/selected_element/selected_element.json +++ b/assets/layers/selected_element/selected_element.json @@ -20,4 +20,4 @@ "cssClasses": "block relative rounded-full" } ] -} \ No newline at end of file +} diff --git a/assets/layers/shelter/shelter.json b/assets/layers/shelter/shelter.json index 6a54adf262..130b390e3d 100644 --- a/assets/layers/shelter/shelter.json +++ b/assets/layers/shelter/shelter.json @@ -102,4 +102,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/slow_roads/slow_roads.json b/assets/layers/slow_roads/slow_roads.json index 9b521e8857..7d29d79953 100644 --- a/assets/layers/slow_roads/slow_roads.json +++ b/assets/layers/slow_roads/slow_roads.json @@ -292,4 +292,4 @@ "nl": "Alle verkeersvrije wegen", "de": "Alle autofreien Straßen" } -} \ No newline at end of file +} diff --git a/assets/layers/speed_camera/speed_camera.json b/assets/layers/speed_camera/speed_camera.json index 0dbe0657c4..97fc628ed6 100644 --- a/assets/layers/speed_camera/speed_camera.json +++ b/assets/layers/speed_camera/speed_camera.json @@ -72,13 +72,10 @@ "nl": "een flitspaal", "es": "una cámara de velocidad" }, - "preciseInput": { - "preferredBackground": "photo", - "maxSnapDistance": 10, - "snapToLayer": [ - "maxspeed" - ] - } + "snapToLayer": [ + "maxspeed" + ], + "maxSnapDistance": 10 } ], "mapRendering": [ @@ -148,4 +145,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/speed_display/speed_display.json b/assets/layers/speed_display/speed_display.json index f80a099ab0..853414687a 100644 --- a/assets/layers/speed_display/speed_display.json +++ b/assets/layers/speed_display/speed_display.json @@ -78,10 +78,7 @@ }, "tags": [ "highway=speed_display" - ], - "preciseInput": { - "preferredBackground": "photo" - } + ] } ], "mapRendering": [ @@ -151,4 +148,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/split_point/split_point.json b/assets/layers/split_point/split_point.json index 3efc3e55dd..9202df71ca 100644 --- a/assets/layers/split_point/split_point.json +++ b/assets/layers/split_point/split_point.json @@ -15,4 +15,4 @@ "iconSize": "30,30,center" } ] -} \ No newline at end of file +} diff --git a/assets/layers/split_road/split_road.json b/assets/layers/split_road/split_road.json index 94ed73899f..2b15e115fe 100644 --- a/assets/layers/split_road/split_road.json +++ b/assets/layers/split_road/split_road.json @@ -18,4 +18,4 @@ "color": "black" } ] -} \ No newline at end of file +} diff --git a/assets/layers/sport_pitch/sport_pitch.json b/assets/layers/sport_pitch/sport_pitch.json index 05d71c0d46..e7733347f5 100644 --- a/assets/layers/sport_pitch/sport_pitch.json +++ b/assets/layers/sport_pitch/sport_pitch.json @@ -684,4 +684,4 @@ }, "open_now" ] -} \ No newline at end of file +} diff --git a/assets/layers/sports_centre/sports_centre.json b/assets/layers/sports_centre/sports_centre.json index f75278d411..3e34be973f 100644 --- a/assets/layers/sports_centre/sports_centre.json +++ b/assets/layers/sports_centre/sports_centre.json @@ -68,4 +68,4 @@ "filter": [ "open_now" ] -} \ No newline at end of file +} diff --git a/assets/layers/stairs/stairs.json b/assets/layers/stairs/stairs.json index 285dfa57f0..2f14f7dabe 100644 --- a/assets/layers/stairs/stairs.json +++ b/assets/layers/stairs/stairs.json @@ -229,4 +229,4 @@ "dashArray": "6 12" } ] -} \ No newline at end of file +} diff --git a/assets/layers/street_lamps/street_lamps.json b/assets/layers/street_lamps/street_lamps.json index 35938898ae..b26054c7f3 100644 --- a/assets/layers/street_lamps/street_lamps.json +++ b/assets/layers/street_lamps/street_lamps.json @@ -57,8 +57,7 @@ }, "tags": [ "highway=street_lamp" - ], - "preciseInput": {} + ] } ], "tagRenderings": [ @@ -500,4 +499,4 @@ "de": "Eine Ebene mit Straßenbeleuchtung", "es": "Una capa que muestra luces callejeras" } -} \ No newline at end of file +} diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json index d4243c4fa9..94822e3c7c 100644 --- a/assets/layers/surveillance_camera/surveillance_camera.json +++ b/assets/layers/surveillance_camera/surveillance_camera.json @@ -592,14 +592,7 @@ "de": "eine an einer Wand montierte Überwachungskamera", "es": "una cámara de vigilancia montada en una pared" }, - "preciseInput": { - "snapToLayer": "walls_and_buildings", - "preferredBackground": [ - "photo", - "osmbasedmap", - "map" - ] - } + "snapToLayer": "walls_and_buildings" } ], "mapRendering": [ diff --git a/assets/layers/tertiary_education/tertiary_education.json b/assets/layers/tertiary_education/tertiary_education.json index 729eb3a44b..819515d875 100644 --- a/assets/layers/tertiary_education/tertiary_education.json +++ b/assets/layers/tertiary_education/tertiary_education.json @@ -208,4 +208,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/ticket_machine/ticket_machine.json b/assets/layers/ticket_machine/ticket_machine.json index bf19f4a622..0e61495340 100644 --- a/assets/layers/ticket_machine/ticket_machine.json +++ b/assets/layers/ticket_machine/ticket_machine.json @@ -95,4 +95,4 @@ ], "allowMove": true, "deletion": true -} \ No newline at end of file +} diff --git a/assets/layers/ticket_validator/ticket_validator.json b/assets/layers/ticket_validator/ticket_validator.json index ce648d4580..1529ff1ca4 100644 --- a/assets/layers/ticket_validator/ticket_validator.json +++ b/assets/layers/ticket_validator/ticket_validator.json @@ -123,4 +123,4 @@ ], "allowMove": true, "deletion": true -} \ No newline at end of file +} diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json index 0b7846dbb7..02ae4005c4 100644 --- a/assets/layers/toilet/toilet.json +++ b/assets/layers/toilet/toilet.json @@ -761,4 +761,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/toilet_at_amenity/toilet_at_amenity.json b/assets/layers/toilet_at_amenity/toilet_at_amenity.json index 41fd31237f..f9964e3069 100644 --- a/assets/layers/toilet_at_amenity/toilet_at_amenity.json +++ b/assets/layers/toilet_at_amenity/toilet_at_amenity.json @@ -463,4 +463,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/trail/trail.json b/assets/layers/trail/trail.json index e204135c1b..d09c238874 100644 --- a/assets/layers/trail/trail.json +++ b/assets/layers/trail/trail.json @@ -247,4 +247,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/transit_routes/transit_routes.json b/assets/layers/transit_routes/transit_routes.json index 9dc2e15af6..358d50a156 100644 --- a/assets/layers/transit_routes/transit_routes.json +++ b/assets/layers/transit_routes/transit_routes.json @@ -203,4 +203,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/transit_stops/transit_stops.json b/assets/layers/transit_stops/transit_stops.json index a78d749867..0a0a53bc0d 100644 --- a/assets/layers/transit_stops/transit_stops.json +++ b/assets/layers/transit_stops/transit_stops.json @@ -435,4 +435,4 @@ "tactile_paving" ], "allowMove": false -} \ No newline at end of file +} diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json index 9511439214..c0cf7a730c 100644 --- a/assets/layers/tree_node/tree_node.json +++ b/assets/layers/tree_node/tree_node.json @@ -757,9 +757,6 @@ "de": "Ein Baum mit Blättern, z. B. Eiche oder Buche.", "es": "Un árbol de hojas como el Roble o el Álamo.", "pt": "Uma árvore de uma espécie com folhas, como carvalho ou populus." - }, - "preciseInput": { - "preferredBackground": "photo" } }, { @@ -787,9 +784,6 @@ "de": "Ein Baum mit Nadeln, z. B. Kiefer oder Fichte.", "es": "Un árbol de hojas agujas, como el Pino o el Abeto.", "da": "Et træ af en art med nåle, såsom fyr eller gran." - }, - "preciseInput": { - "preferredBackground": "photo" } }, { @@ -819,9 +813,6 @@ "de": "Wenn Sie nicht sicher sind, ob es sich um einen Laubbaum oder einen Nadelbaum handelt.", "es": "Si no estás seguro de si es un árbol de hoja ancha o de hoja de aguja.", "da": "Hvis du ikke er sikker på, om det er et løv- eller nåletræ." - }, - "preciseInput": { - "preferredBackground": "photo" } } ], @@ -872,4 +863,4 @@ "fr": "Une couche montrant les arbres", "da": "Et lag, der viser træer" } -} \ No newline at end of file +} diff --git a/assets/layers/veterinary/veterinary.json b/assets/layers/veterinary/veterinary.json index 2fa9d984bc..cadeaf334b 100644 --- a/assets/layers/veterinary/veterinary.json +++ b/assets/layers/veterinary/veterinary.json @@ -116,4 +116,4 @@ "id": "vetName" } ] -} \ No newline at end of file +} diff --git a/assets/layers/viewpoint/viewpoint.json b/assets/layers/viewpoint/viewpoint.json index 504e7c1d30..c635d37bd4 100644 --- a/assets/layers/viewpoint/viewpoint.json +++ b/assets/layers/viewpoint/viewpoint.json @@ -91,4 +91,4 @@ "width": "5" } ] -} \ No newline at end of file +} diff --git a/assets/layers/village_green/village_green.json b/assets/layers/village_green/village_green.json index 3e58ac279d..0fd86ad1ae 100644 --- a/assets/layers/village_green/village_green.json +++ b/assets/layers/village_green/village_green.json @@ -51,4 +51,4 @@ "de": "Eine Ebene mit Dorfangern (kommunale Grünflächen, aber nicht wirklich Parks)", "ca": "Una capa que mostra “village-green” (que són zones verdes comunals, però no parcs del tot)" } -} \ No newline at end of file +} diff --git a/assets/layers/visitor_information_centre/visitor_information_centre.json b/assets/layers/visitor_information_centre/visitor_information_centre.json index b340369f55..dcc1da4480 100644 --- a/assets/layers/visitor_information_centre/visitor_information_centre.json +++ b/assets/layers/visitor_information_centre/visitor_information_centre.json @@ -88,4 +88,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/waste_basket/waste_basket.json b/assets/layers/waste_basket/waste_basket.json index 771c2a068f..ea7d4b2145 100644 --- a/assets/layers/waste_basket/waste_basket.json +++ b/assets/layers/waste_basket/waste_basket.json @@ -416,4 +416,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/layers/waste_disposal/waste_disposal.json b/assets/layers/waste_disposal/waste_disposal.json index 13b795ff1a..cdd0a0a069 100644 --- a/assets/layers/waste_disposal/waste_disposal.json +++ b/assets/layers/waste_disposal/waste_disposal.json @@ -238,4 +238,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/windturbine/windturbine.json b/assets/layers/windturbine/windturbine.json index 59fedda094..1c8b08b74f 100644 --- a/assets/layers/windturbine/windturbine.json +++ b/assets/layers/windturbine/windturbine.json @@ -381,4 +381,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/themes/advertising/advertising.json b/assets/themes/advertising/advertising.json index 30989fdf84..037b29b22d 100644 --- a/assets/themes/advertising/advertising.json +++ b/assets/themes/advertising/advertising.json @@ -31,7 +31,6 @@ }, "maintainer": "Offsel", "icon": "./assets/themes/advertising/icon.svg", - "version": "2023_01_29", "startLat": 0, "startLon": 0, "startZoom": 1, diff --git a/assets/themes/atm/atm.json b/assets/themes/atm/atm.json index f056ba0b85..a19bb96920 100644 --- a/assets/themes/atm/atm.json +++ b/assets/themes/atm/atm.json @@ -119,4 +119,4 @@ } } ] -} +} \ No newline at end of file diff --git a/assets/themes/bag/bag.json b/assets/themes/bag/bag.json index 556ab6b53d..7d12053226 100644 --- a/assets/themes/bag/bag.json +++ b/assets/themes/bag/bag.json @@ -420,4 +420,4 @@ } ], "hideFromOverview": true -} +} \ No newline at end of file diff --git a/assets/themes/buurtnatuur/buurtnatuur.json b/assets/themes/buurtnatuur/buurtnatuur.json index d961ae6b0f..c069e98055 100644 --- a/assets/themes/buurtnatuur/buurtnatuur.json +++ b/assets/themes/buurtnatuur/buurtnatuur.json @@ -613,4 +613,4 @@ ] }, "credits": "Pieter Vander Vennet" -} +} \ No newline at end of file diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json index 9f6962c7bb..66c2897375 100644 --- a/assets/themes/climbing/climbing.json +++ b/assets/themes/climbing/climbing.json @@ -338,4 +338,4 @@ } ], "credits": "Christian Neumann " -} +} \ No newline at end of file diff --git a/assets/themes/grb/grb.json b/assets/themes/grb/grb.json index 73cd2d72c2..77c3fb331d 100644 --- a/assets/themes/grb/grb.json +++ b/assets/themes/grb/grb.json @@ -776,4 +776,4 @@ "overpassMaxZoom": 15, "osmApiTileSize": 17, "credits": "Pieter Vander Vennet" -} +} \ No newline at end of file diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json index 16318636c7..908de015f8 100644 --- a/assets/themes/onwheels/onwheels.json +++ b/assets/themes/onwheels/onwheels.json @@ -503,4 +503,4 @@ ] }, "enableDownload": true -} +} \ No newline at end of file diff --git a/assets/themes/postal_codes/postal_codes.json b/assets/themes/postal_codes/postal_codes.json index 60ef79d149..440bb78c6e 100644 --- a/assets/themes/postal_codes/postal_codes.json +++ b/assets/themes/postal_codes/postal_codes.json @@ -216,4 +216,4 @@ "isShown": "_country=be" } ] -} +} \ No newline at end of file diff --git a/assets/themes/speelplekken/speelplekken.json b/assets/themes/speelplekken/speelplekken.json index b8fb53bc59..d4925477a5 100644 --- a/assets/themes/speelplekken/speelplekken.json +++ b/assets/themes/speelplekken/speelplekken.json @@ -267,4 +267,4 @@ ], "isShown": "_is_shadowed!=yes" } -} +} \ No newline at end of file diff --git a/assets/themes/street_lighting_assen/street_lighting_assen.json b/assets/themes/street_lighting_assen/street_lighting_assen.json index 86aec47de8..16877b6fb4 100644 --- a/assets/themes/street_lighting_assen/street_lighting_assen.json +++ b/assets/themes/street_lighting_assen/street_lighting_assen.json @@ -69,4 +69,4 @@ ], "hideFromOverview": true, "credits": "Robin van der Linde" -} +} \ No newline at end of file diff --git a/assets/themes/uk_addresses/uk_addresses.json b/assets/themes/uk_addresses/uk_addresses.json index 0d3a0051fd..1592ebefb9 100644 --- a/assets/themes/uk_addresses/uk_addresses.json +++ b/assets/themes/uk_addresses/uk_addresses.json @@ -694,4 +694,4 @@ "enableShareScreen": false, "enableMoreQuests": false, "credits": "Pieter Vander Vennet, Rob Nickerson, Russ Garrett" -} +} \ No newline at end of file diff --git a/assets/themes/waste_assen/waste_assen.json b/assets/themes/waste_assen/waste_assen.json index f437c419f1..e70b765acd 100644 --- a/assets/themes/waste_assen/waste_assen.json +++ b/assets/themes/waste_assen/waste_assen.json @@ -103,4 +103,4 @@ ], "hideFromOverview": true, "credits": "Robin van der Linde" -} +} \ No newline at end of file diff --git a/scripts/lint.ts b/scripts/lint.ts index ac10c45f1f..d3c8d0042d 100644 --- a/scripts/lint.ts +++ b/scripts/lint.ts @@ -33,7 +33,7 @@ const articles = { function addArticleToPresets(layerConfig: { presets?: { title: any }[] }) { /* if(layerConfig.presets === undefined){ - return + return } for (const preset of layerConfig.presets) { preset.title = new Translation(preset.title, "autofix") @@ -72,7 +72,7 @@ for (const layerFile of layerFiles) { ) ) addArticleToPresets(fixed) - writeFileSync(layerFile.path, JSON.stringify(fixed, null, " ")) + writeFileSync(layerFile.path, JSON.stringify(fixed, null, " ") + "\n") } catch (e) { console.error("COULD NOT LINT LAYER" + layerFile.path + ":\n\t" + e) }