From 1f6afeea49948e93f711e0eed072be8d0938ae4f Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Fri, 4 Feb 2022 15:47:29 +0100 Subject: [PATCH] Regenerate schemas --- Docs/Schemas/LayerConfigJson.schema.json | 27 ++++++++++++---- Docs/Schemas/LayerConfigJsonJSC.ts | 27 ++++++++++++---- Docs/Schemas/LayoutConfigJson.schema.json | 32 +++++++++++++++---- Docs/Schemas/LayoutConfigJsonJSC.ts | 32 +++++++++++++++---- .../LineRenderingConfigJson.schema.json | 2 +- Docs/Schemas/LineRenderingConfigJsonJSC.ts | 2 +- .../PointRenderingConfigJson.schema.json | 4 +-- Docs/Schemas/PointRenderingConfigJsonJSC.ts | 4 +-- .../TagRenderingConfigJson.schema.json | 2 +- Docs/Schemas/TagRenderingConfigJsonJSC.ts | 2 +- Docs/Schemas/TilesourceConfigJson.schema.json | 4 +-- Docs/Schemas/TilesourceConfigJsonJSC.ts | 4 +-- 12 files changed, 104 insertions(+), 38 deletions(-) diff --git a/Docs/Schemas/LayerConfigJson.schema.json b/Docs/Schemas/LayerConfigJson.schema.json index d06a403e51..3cc9c553d3 100644 --- a/Docs/Schemas/LayerConfigJson.schema.json +++ b/Docs/Schemas/LayerConfigJson.schema.json @@ -351,10 +351,25 @@ }, "filter": { "description": "All the extra questions for filtering", - "type": "array", - "items": { - "$ref": "#/definitions/default" - } + "anyOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/default" + } + }, + { + "type": "object", + "properties": { + "sameAs": { + "type": "string" + } + }, + "required": [ + "sameAs" + ] + } + ] }, "deletion": { "description": "This block defines under what circumstances the delete dialog is shown for objects of this layer.\nIf set, a dialog is shown to the user to (soft) delete the point.\nThe dialog is built to be user friendly and to prevent mistakes.\nIf deletion is not possible, the dialog will hide itself and show the reason of non-deletability instead.\n\nTo configure, the following values are possible:\n\n- false: never ever show the delete button\n- true: show the default delete button\n- undefined: use the mapcomplete default to show deletion or not. Currently, this is the same as 'false' but this will change in the future\n- or: a hash with options (see below)\n\n The delete dialog\n =================\n\n\n\n#### Hard deletion if enough experience\n\nA feature can only be deleted from OpenStreetMap by mapcomplete if:\n\n- It is a node\n- No ways or relations use the node\n- The logged-in user has enough experience OR the user is the only one to have edited the point previously\n- The logged-in user has no unread messages (or has a ton of experience)\n- The user did not select one of the 'non-delete-options' (see below)\n\nIn all other cases, a 'soft deletion' is used.\n\n#### Soft deletion\n\nA 'soft deletion' is when the point isn't deleted from OSM but retagged so that it'll won't how up in the mapcomplete theme anymore.\nThis makes it look like it was deleted, without doing damage. A fixme will be added to the point.\n\nNote that a soft deletion is _only_ possible if these tags are provided by the theme creator, as they'll be different for every theme\n\n#### No-delete options\n\nIn some cases, the contributor might want to delete something for the wrong reason (e.g. someone who wants to have a path removed \"because the path is on their private property\").\nHowever, the path exists in reality and should thus be on OSM - otherwise the next contributor will pass by and notice \"hey, there is a path missing here! Let me redraw it in OSM!)\n\nThe correct approach is to retag the feature in such a way that it is semantically correct *and* that it doesn't show up on the theme anymore.\nA no-delete option is offered as 'reason to delete it', but secretly retags.", @@ -557,7 +572,7 @@ "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option" }, "icon": { - "description": "An icon supporting this mapping; typically shown pretty small", + "description": "An icon supporting this mapping; typically shown pretty small\nType: icon", "type": "string" }, "hideInAnswer": { @@ -641,7 +656,7 @@ ] }, "then": { - "description": "Badge to show\nType: icon[]", + "description": "Badge to show\nType: icon", "anyOf": [ { "$ref": "#/definitions/TagRenderingConfigJson" diff --git a/Docs/Schemas/LayerConfigJsonJSC.ts b/Docs/Schemas/LayerConfigJsonJSC.ts index b4013181a3..e40dfa16c3 100644 --- a/Docs/Schemas/LayerConfigJsonJSC.ts +++ b/Docs/Schemas/LayerConfigJsonJSC.ts @@ -351,10 +351,25 @@ export default { }, "filter": { "description": "All the extra questions for filtering", - "type": "array", - "items": { - "$ref": "#/definitions/default" - } + "anyOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/default" + } + }, + { + "type": "object", + "properties": { + "sameAs": { + "type": "string" + } + }, + "required": [ + "sameAs" + ] + } + ] }, "deletion": { "description": "This block defines under what circumstances the delete dialog is shown for objects of this layer.\nIf set, a dialog is shown to the user to (soft) delete the point.\nThe dialog is built to be user friendly and to prevent mistakes.\nIf deletion is not possible, the dialog will hide itself and show the reason of non-deletability instead.\n\nTo configure, the following values are possible:\n\n- false: never ever show the delete button\n- true: show the default delete button\n- undefined: use the mapcomplete default to show deletion or not. Currently, this is the same as 'false' but this will change in the future\n- or: a hash with options (see below)\n\n The delete dialog\n =================\n\n\n\n#### Hard deletion if enough experience\n\nA feature can only be deleted from OpenStreetMap by mapcomplete if:\n\n- It is a node\n- No ways or relations use the node\n- The logged-in user has enough experience OR the user is the only one to have edited the point previously\n- The logged-in user has no unread messages (or has a ton of experience)\n- The user did not select one of the 'non-delete-options' (see below)\n\nIn all other cases, a 'soft deletion' is used.\n\n#### Soft deletion\n\nA 'soft deletion' is when the point isn't deleted from OSM but retagged so that it'll won't how up in the mapcomplete theme anymore.\nThis makes it look like it was deleted, without doing damage. A fixme will be added to the point.\n\nNote that a soft deletion is _only_ possible if these tags are provided by the theme creator, as they'll be different for every theme\n\n#### No-delete options\n\nIn some cases, the contributor might want to delete something for the wrong reason (e.g. someone who wants to have a path removed \"because the path is on their private property\").\nHowever, the path exists in reality and should thus be on OSM - otherwise the next contributor will pass by and notice \"hey, there is a path missing here! Let me redraw it in OSM!)\n\nThe correct approach is to retag the feature in such a way that it is semantically correct *and* that it doesn't show up on the theme anymore.\nA no-delete option is offered as 'reason to delete it', but secretly retags.", @@ -555,7 +570,7 @@ export default { "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option" }, "icon": { - "description": "An icon supporting this mapping; typically shown pretty small", + "description": "An icon supporting this mapping; typically shown pretty small\nType: icon", "type": "string" }, "hideInAnswer": { @@ -638,7 +653,7 @@ export default { ] }, "then": { - "description": "Badge to show\nType: icon[]", + "description": "Badge to show\nType: icon", "anyOf": [ { "$ref": "#/definitions/TagRenderingConfigJson" diff --git a/Docs/Schemas/LayoutConfigJson.schema.json b/Docs/Schemas/LayoutConfigJson.schema.json index 9223c6aeb0..50eb063a57 100644 --- a/Docs/Schemas/LayoutConfigJson.schema.json +++ b/Docs/Schemas/LayoutConfigJson.schema.json @@ -151,7 +151,7 @@ "type": "boolean" }, "lockLocation": { - "description": "If set to true, the basemap will not scroll outside of the area visible on initial zoom.\nIf set to [[lat0, lon0], [lat1, lon1]], the map will not scroll outside of those bounds.\nOff by default, which will enable panning to the entire world", + "description": "If set to true, the basemap will not scroll outside of the area visible on initial zoom.\nIf set to [[lon, lat], [lon, lat]], the map will not scroll outside of those bounds.\nOff by default, which will enable panning to the entire world", "anyOf": [ { "type": "array", @@ -236,6 +236,9 @@ "enableIframePopout": { "type": "boolean" }, + "enableNoteImports": { + "type": "boolean" + }, "overpassUrl": { "description": "Set one or more overpass URLs to use for this theme..", "anyOf": [ @@ -429,7 +432,7 @@ "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option" }, "icon": { - "description": "An icon supporting this mapping; typically shown pretty small", + "description": "An icon supporting this mapping; typically shown pretty small\nType: icon", "type": "string" }, "hideInAnswer": { @@ -513,7 +516,7 @@ ] }, "then": { - "description": "Badge to show\nType: icon[]", + "description": "Badge to show\nType: icon", "anyOf": [ { "$ref": "#/definitions/TagRenderingConfigJson" @@ -1206,10 +1209,25 @@ }, "filter": { "description": "All the extra questions for filtering", - "type": "array", - "items": { - "$ref": "#/definitions/default" - } + "anyOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/default" + } + }, + { + "type": "object", + "properties": { + "sameAs": { + "type": "string" + } + }, + "required": [ + "sameAs" + ] + } + ] }, "deletion": { "description": "This block defines under what circumstances the delete dialog is shown for objects of this layer.\nIf set, a dialog is shown to the user to (soft) delete the point.\nThe dialog is built to be user friendly and to prevent mistakes.\nIf deletion is not possible, the dialog will hide itself and show the reason of non-deletability instead.\n\nTo configure, the following values are possible:\n\n- false: never ever show the delete button\n- true: show the default delete button\n- undefined: use the mapcomplete default to show deletion or not. Currently, this is the same as 'false' but this will change in the future\n- or: a hash with options (see below)\n\n The delete dialog\n =================\n\n\n\n#### Hard deletion if enough experience\n\nA feature can only be deleted from OpenStreetMap by mapcomplete if:\n\n- It is a node\n- No ways or relations use the node\n- The logged-in user has enough experience OR the user is the only one to have edited the point previously\n- The logged-in user has no unread messages (or has a ton of experience)\n- The user did not select one of the 'non-delete-options' (see below)\n\nIn all other cases, a 'soft deletion' is used.\n\n#### Soft deletion\n\nA 'soft deletion' is when the point isn't deleted from OSM but retagged so that it'll won't how up in the mapcomplete theme anymore.\nThis makes it look like it was deleted, without doing damage. A fixme will be added to the point.\n\nNote that a soft deletion is _only_ possible if these tags are provided by the theme creator, as they'll be different for every theme\n\n#### No-delete options\n\nIn some cases, the contributor might want to delete something for the wrong reason (e.g. someone who wants to have a path removed \"because the path is on their private property\").\nHowever, the path exists in reality and should thus be on OSM - otherwise the next contributor will pass by and notice \"hey, there is a path missing here! Let me redraw it in OSM!)\n\nThe correct approach is to retag the feature in such a way that it is semantically correct *and* that it doesn't show up on the theme anymore.\nA no-delete option is offered as 'reason to delete it', but secretly retags.", diff --git a/Docs/Schemas/LayoutConfigJsonJSC.ts b/Docs/Schemas/LayoutConfigJsonJSC.ts index 3e93b33a45..62698381e5 100644 --- a/Docs/Schemas/LayoutConfigJsonJSC.ts +++ b/Docs/Schemas/LayoutConfigJsonJSC.ts @@ -151,7 +151,7 @@ export default { "type": "boolean" }, "lockLocation": { - "description": "If set to true, the basemap will not scroll outside of the area visible on initial zoom.\nIf set to [[lat0, lon0], [lat1, lon1]], the map will not scroll outside of those bounds.\nOff by default, which will enable panning to the entire world", + "description": "If set to true, the basemap will not scroll outside of the area visible on initial zoom.\nIf set to [[lon, lat], [lon, lat]], the map will not scroll outside of those bounds.\nOff by default, which will enable panning to the entire world", "anyOf": [ { "type": "array", @@ -236,6 +236,9 @@ export default { "enableIframePopout": { "type": "boolean" }, + "enableNoteImports": { + "type": "boolean" + }, "overpassUrl": { "description": "Set one or more overpass URLs to use for this theme..", "anyOf": [ @@ -427,7 +430,7 @@ export default { "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option" }, "icon": { - "description": "An icon supporting this mapping; typically shown pretty small", + "description": "An icon supporting this mapping; typically shown pretty small\nType: icon", "type": "string" }, "hideInAnswer": { @@ -510,7 +513,7 @@ export default { ] }, "then": { - "description": "Badge to show\nType: icon[]", + "description": "Badge to show\nType: icon", "anyOf": [ { "$ref": "#/definitions/TagRenderingConfigJson" @@ -1196,10 +1199,25 @@ export default { }, "filter": { "description": "All the extra questions for filtering", - "type": "array", - "items": { - "$ref": "#/definitions/default" - } + "anyOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/default" + } + }, + { + "type": "object", + "properties": { + "sameAs": { + "type": "string" + } + }, + "required": [ + "sameAs" + ] + } + ] }, "deletion": { "description": "This block defines under what circumstances the delete dialog is shown for objects of this layer.\nIf set, a dialog is shown to the user to (soft) delete the point.\nThe dialog is built to be user friendly and to prevent mistakes.\nIf deletion is not possible, the dialog will hide itself and show the reason of non-deletability instead.\n\nTo configure, the following values are possible:\n\n- false: never ever show the delete button\n- true: show the default delete button\n- undefined: use the mapcomplete default to show deletion or not. Currently, this is the same as 'false' but this will change in the future\n- or: a hash with options (see below)\n\n The delete dialog\n =================\n\n\n\n#### Hard deletion if enough experience\n\nA feature can only be deleted from OpenStreetMap by mapcomplete if:\n\n- It is a node\n- No ways or relations use the node\n- The logged-in user has enough experience OR the user is the only one to have edited the point previously\n- The logged-in user has no unread messages (or has a ton of experience)\n- The user did not select one of the 'non-delete-options' (see below)\n\nIn all other cases, a 'soft deletion' is used.\n\n#### Soft deletion\n\nA 'soft deletion' is when the point isn't deleted from OSM but retagged so that it'll won't how up in the mapcomplete theme anymore.\nThis makes it look like it was deleted, without doing damage. A fixme will be added to the point.\n\nNote that a soft deletion is _only_ possible if these tags are provided by the theme creator, as they'll be different for every theme\n\n#### No-delete options\n\nIn some cases, the contributor might want to delete something for the wrong reason (e.g. someone who wants to have a path removed \"because the path is on their private property\").\nHowever, the path exists in reality and should thus be on OSM - otherwise the next contributor will pass by and notice \"hey, there is a path missing here! Let me redraw it in OSM!)\n\nThe correct approach is to retag the feature in such a way that it is semantically correct *and* that it doesn't show up on the theme anymore.\nA no-delete option is offered as 'reason to delete it', but secretly retags.", diff --git a/Docs/Schemas/LineRenderingConfigJson.schema.json b/Docs/Schemas/LineRenderingConfigJson.schema.json index b1506d9c48..27cb3195f6 100644 --- a/Docs/Schemas/LineRenderingConfigJson.schema.json +++ b/Docs/Schemas/LineRenderingConfigJson.schema.json @@ -249,7 +249,7 @@ "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option" }, "icon": { - "description": "An icon supporting this mapping; typically shown pretty small", + "description": "An icon supporting this mapping; typically shown pretty small\nType: icon", "type": "string" }, "hideInAnswer": { diff --git a/Docs/Schemas/LineRenderingConfigJsonJSC.ts b/Docs/Schemas/LineRenderingConfigJsonJSC.ts index 407a0e8e15..3068638702 100644 --- a/Docs/Schemas/LineRenderingConfigJsonJSC.ts +++ b/Docs/Schemas/LineRenderingConfigJsonJSC.ts @@ -247,7 +247,7 @@ export default { "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option" }, "icon": { - "description": "An icon supporting this mapping; typically shown pretty small", + "description": "An icon supporting this mapping; typically shown pretty small\nType: icon", "type": "string" }, "hideInAnswer": { diff --git a/Docs/Schemas/PointRenderingConfigJson.schema.json b/Docs/Schemas/PointRenderingConfigJson.schema.json index 5ffe676ec1..59a3ec4ecb 100644 --- a/Docs/Schemas/PointRenderingConfigJson.schema.json +++ b/Docs/Schemas/PointRenderingConfigJson.schema.json @@ -37,7 +37,7 @@ ] }, "then": { - "description": "Badge to show\nType: icon[]", + "description": "Badge to show\nType: icon", "anyOf": [ { "$ref": "#/definitions/TagRenderingConfigJson" @@ -253,7 +253,7 @@ "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option" }, "icon": { - "description": "An icon supporting this mapping; typically shown pretty small", + "description": "An icon supporting this mapping; typically shown pretty small\nType: icon", "type": "string" }, "hideInAnswer": { diff --git a/Docs/Schemas/PointRenderingConfigJsonJSC.ts b/Docs/Schemas/PointRenderingConfigJsonJSC.ts index 3efda42812..fcb711f8dc 100644 --- a/Docs/Schemas/PointRenderingConfigJsonJSC.ts +++ b/Docs/Schemas/PointRenderingConfigJsonJSC.ts @@ -37,7 +37,7 @@ export default { ] }, "then": { - "description": "Badge to show\nType: icon[]", + "description": "Badge to show\nType: icon", "anyOf": [ { "$ref": "#/definitions/TagRenderingConfigJson" @@ -251,7 +251,7 @@ export default { "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option" }, "icon": { - "description": "An icon supporting this mapping; typically shown pretty small", + "description": "An icon supporting this mapping; typically shown pretty small\nType: icon", "type": "string" }, "hideInAnswer": { diff --git a/Docs/Schemas/TagRenderingConfigJson.schema.json b/Docs/Schemas/TagRenderingConfigJson.schema.json index dc1d0709e2..cbc3c7cf18 100644 --- a/Docs/Schemas/TagRenderingConfigJson.schema.json +++ b/Docs/Schemas/TagRenderingConfigJson.schema.json @@ -89,7 +89,7 @@ "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option" }, "icon": { - "description": "An icon supporting this mapping; typically shown pretty small", + "description": "An icon supporting this mapping; typically shown pretty small\nType: icon", "type": "string" }, "hideInAnswer": { diff --git a/Docs/Schemas/TagRenderingConfigJsonJSC.ts b/Docs/Schemas/TagRenderingConfigJsonJSC.ts index c6de2301a7..e97118510f 100644 --- a/Docs/Schemas/TagRenderingConfigJsonJSC.ts +++ b/Docs/Schemas/TagRenderingConfigJsonJSC.ts @@ -89,7 +89,7 @@ export default { "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option" }, "icon": { - "description": "An icon supporting this mapping; typically shown pretty small", + "description": "An icon supporting this mapping; typically shown pretty small\nType: icon", "type": "string" }, "hideInAnswer": { diff --git a/Docs/Schemas/TilesourceConfigJson.schema.json b/Docs/Schemas/TilesourceConfigJson.schema.json index c6861ed297..81a6b6de36 100644 --- a/Docs/Schemas/TilesourceConfigJson.schema.json +++ b/Docs/Schemas/TilesourceConfigJson.schema.json @@ -197,7 +197,7 @@ "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option" }, "icon": { - "description": "An icon supporting this mapping; typically shown pretty small", + "description": "An icon supporting this mapping; typically shown pretty small\nType: icon", "type": "string" }, "hideInAnswer": { @@ -281,7 +281,7 @@ ] }, "then": { - "description": "Badge to show\nType: icon[]", + "description": "Badge to show\nType: icon", "anyOf": [ { "$ref": "#/definitions/TagRenderingConfigJson" diff --git a/Docs/Schemas/TilesourceConfigJsonJSC.ts b/Docs/Schemas/TilesourceConfigJsonJSC.ts index b5e8ee66d7..488f369868 100644 --- a/Docs/Schemas/TilesourceConfigJsonJSC.ts +++ b/Docs/Schemas/TilesourceConfigJsonJSC.ts @@ -195,7 +195,7 @@ export default { "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option" }, "icon": { - "description": "An icon supporting this mapping; typically shown pretty small", + "description": "An icon supporting this mapping; typically shown pretty small\nType: icon", "type": "string" }, "hideInAnswer": { @@ -278,7 +278,7 @@ export default { ] }, "then": { - "description": "Badge to show\nType: icon[]", + "description": "Badge to show\nType: icon", "anyOf": [ { "$ref": "#/definitions/TagRenderingConfigJson"