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

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) {

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.
+         * If specified, these layers will be shown to and the new point will be snapped towards it
-         * This will be with a 'drag crosshair'-method.
-         *
-         * If 'preferredBackgroundCategory' is set, the element will attempt to pick a background layer of that category.
          */
-        preciseInput?:
+        snapToLayer?: string | string[]
-            | true
+        /**
-            | {
+         * If specified, a new point will only be snapped if it is within this range.
-                  /**
+         * Distance in meter
-                   * The type of background picture
+         *
-                   */
+         * Default: 10
-                  preferredBackground?:
+         */
-                      | "osmbasedmap"
+        maxSnapDistance?: number
-                      | "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
-              }
     }[]
 
     /**

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"] !== undefined) {
-                if (pr.preciseInput === true) {
+                throw "Layer " + this.id + " still uses the old 'preciseInput'-field"
-                    pr.preciseInput = {
+            }
-                        preferredBackground: undefined,
+            if (pr.snapToLayer !== undefined) {
-                    }
-                }
-
                 let snapToLayers: string[]
-                if (typeof pr.preciseInput.snapToLayer === "string") {
+                if (typeof pr.snapToLayer === "string") {
-                    snapToLayers = [pr.preciseInput.snapToLayer]
+                    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 = {

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
     }
   ]
 }

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": [

assets/layers/barrier/barrier.json

@@ -108,13 +108,8 @@
         "nb_NO": "En pullert i veien",
         "ca": "Un bol·lard a la carretera"
       },
-      "preciseInput": {
+      "snapToLayer": "cycleways_and_roads",
-        "preferredBackground": [
+      "maxSnapDistance": 25
-          "photo"
-        ],
-        "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": {
+      "snapToLayer": "cycleways_and_roads",
-        "preferredBackground": [
+      "maxSnapDistance": 25
-          "photo"
-        ],
-        "snapToLayer": "cycleways_and_roads",
-        "maxSnapDistance": 25
-      }
     }
   ],
   "tagRenderings": [

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. <img src='./assets/layers/binocular/binoculars_example.jpg' style='height: 300px; width: auto; display: block;' />",
         "es": "Un telescopio o unos prismáticos montados en un poste, disponible para que el público mire alrededor. <img src='./assets/layers/binocular/binoculars_example.jpg' style='height: 300px; width: auto; display: block;' />",
         "ca": "Un telescopi o un parell de prismàtics muntats en un pal, a disposició del públic per mirar al seu voltant. <img src='./assets/layers/binocular/binoculars_example.jpg' style='height: 300px; width: auto; display: block;' />"
-      },
-      "preciseInput": {
-        "preferredBackground": "photo"
       }
     }
   ],

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 <b>bar de copas</b> más moderno y comercial, posiblemente con una instalación de música y luz",
         "fr": "Un <b>bar</b> plus moderne et commercial, avec éventuellement musique et jeux de lumière",
         "ca": "Un <b>bar de copes</b> més modern i comercial, possiblement amb equipació de música i llums"
-      },
-      "preciseInput": {
-        "preferredBackground": "map"
       }
     },
     {
@@ -102,9 +96,6 @@
         "es": "Una <b>cafetería</b> para beber té, café o una bebida alcohólica en un ambiente tranquilo",
         "fr": "Un <b>café</b> pour prendre un thé, un café ou une boisson alcoolisée dans un environnement calme",
         "ca": "Una <b>cafeteria</b> per a a beure té, café o una beguda alcohólica en un ambient tranquil"
-      },
-      "preciseInput": {
-        "preferredBackground": "map"
       }
     },
     {
@@ -128,9 +119,6 @@
         "fr": "Une <b>boîte de nuit</b> 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 <b>natklub</b> eller diskotek med fokus på dans, musik af en DJ med tilhørende lysshow og en bar for at få (alkoholiske) drinks",
         "ca": "Un <b>club nocturn</b> 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"
       }
     }
   ],

assets/layers/charging_station/charging_station.json

@@ -4705,9 +4705,6 @@
         "da": "en ladestation til elektriske cykler med et normalt europæisk vægstik <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (beregnet til opladning af elektriske cykler)",
         "de": "eine Ladestation für Elektrofahrräder mit einer normalen europäischen Steckdose <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (zum Laden von Elektrofahrrädern)",
         "es": "una estación de carga para bicicletas eléctricas con un enchufe de pared europeo normal <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (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"
       }
     }
   ],

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": {
+      "snapToLayer": "walls_and_buildings"
-        "preferredBackground": [
-          "photo",
-          "map"
-        ],
-        "snapToLayer": "walls_and_buildings"
-      }
     }
   ],
   "allowMove": true,

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": {
+      "snapToLayer": "cycleways_and_roads",
-        "preferredBackground": [
+      "maxSnapDistance": 25
-          "photo"
-        ],
-        "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": {
+      "snapToLayer": "cycleways_and_roads",
-        "preferredBackground": [
+      "maxSnapDistance": 25
-          "photo"
-        ],
-        "snapToLayer": "cycleways_and_roads",
-        "maxSnapDistance": 25
-      }
     }
   ],
   "tagRenderings": [

assets/layers/defibrillator/defibrillator.json

@@ -72,11 +72,8 @@
       "tags": [
         "emergency=defibrillator"
       ],
-      "preciseInput": {
+      "snapToLayer": "walls_and_buildings",
-        "preferredBackground": "map",
+      "maxSnapDistance": 5
-        "snapToLayer": "walls_and_buildings",
-        "maxSnapDistance": 5
-      }
     }
   ],
   "tagRenderings": [

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"
       ]
     }
   ],

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"
       }
     }
   ],

assets/layers/kerbs/kerbs.json

@@ -254,14 +254,11 @@
         "de": "Bordstein in einem Fußweg",
         "fr": "Bordure dans un trottoir"
       },
-      "preciseInput": {
+      "snapToLayer": [
-        "maxSnapDistance": 10,
+        "cycleways_and_roads",
-        "preferredBackground": "photo",
+        "kerbs"
-        "snapToLayer": [
+      ],
-          "cycleways_and_roads",
+      "maxSnapDistance": 10
-          "kerbs"
-        ]
-      }
     }
   ],
   "filter": [

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"
       ]

assets/layers/public_bookcase/public_bookcase.json

@@ -65,10 +65,7 @@
       },
       "tags": [
         "amenity=public_bookcase"
-      ],
+      ]
-      "preciseInput": {
-        "preferredBackground": "photo"
-      }
     }
   ],
   "tagRenderings": [

assets/layers/rainbow_crossings/rainbow_crossings.json

@@ -55,13 +55,8 @@
         "fr": "Passage piéton",
         "ca": "Pas de vianants"
       },
-      "preciseInput": {
+      "snapToLayer": "cycleways_and_roads",
-        "preferredBackground": [
+      "maxSnapDistance": 25
-          "photo"
-        ],
-        "snapToLayer": "cycleways_and_roads",
-        "maxSnapDistance": 25
-      }
     }
   ],
   "tagRenderings": [

assets/layers/speed_camera/speed_camera.json

@@ -72,13 +72,10 @@
         "nl": "een flitspaal",
         "es": "una cámara de velocidad"
       },
-      "preciseInput": {
+      "snapToLayer": [
-        "preferredBackground": "photo",
+        "maxspeed"
-        "maxSnapDistance": 10,
+      ],
-        "snapToLayer": [
+      "maxSnapDistance": 10
-          "maxspeed"
-        ]
-      }
     }
   ],
   "mapRendering": [

assets/layers/speed_display/speed_display.json

@@ -78,10 +78,7 @@
       },
       "tags": [
         "highway=speed_display"
-      ],
+      ]
-      "preciseInput": {
-        "preferredBackground": "photo"
-      }
     }
   ],
   "mapRendering": [

assets/layers/street_lamps/street_lamps.json

@@ -57,8 +57,7 @@
       },
       "tags": [
         "highway=street_lamp"
-      ],
+      ]
-      "preciseInput": {}
     }
   ],
   "tagRenderings": [

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"
-        "snapToLayer": "walls_and_buildings",
-        "preferredBackground": [
-          "photo",
-          "osmbasedmap",
-          "map"
-        ]
-      }
     }
   ],
   "mapRendering": [

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"
       }
     }
   ],

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,

scripts/lint.ts

@@ -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)
     }