diff --git a/Docs/Tools/centerpoints.geojson b/Docs/Tools/centerpoints.geojson index 9217b3e69..4568ba117 100644 --- a/Docs/Tools/centerpoints.geojson +++ b/Docs/Tools/centerpoints.geojson @@ -340683,6 +340683,619 @@ ] } }, + { + "type": "Feature", + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "L'imaginaire", + "uid": "654234", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #toerisme_vlaanderen", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T21:47:09Z", + "reviewed_features": [], + "create": 0, + "modify": 1, + "delete": 0, + "area": 0, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "id": 118611994, + "host": "https://mapcomplete.osm.be/toerisme_vlaanderen.html", + "theme": "toerisme_vlaanderen", + "answer": 2, + "locale": "nl", + "imagery": "osm" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 3.1054638, + 51.0649694 + ] + } + }, + { + "type": "Feature", + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "Stinus_Clasius", + "uid": "1086503", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #aed", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T21:01:27Z", + "reviewed_features": [], + "create": 0, + "modify": 2, + "delete": 0, + "area": 0.00180065448671988, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "id": 118610877, + "host": "https://mapcomplete.osm.be/aed.html", + "theme": "aed", + "locale": "nl", + "imagery": "osm", + "add-image": 2 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 4.996756850000001, + 51.320970700000004 + ] + } + }, + { + "type": "Feature", + "properties": { + "check_user": null, + "reasons": [ + { + "id": 40, + "name": "New mapper" + } + ], + "tags": [], + "features": [], + "user": "tissie", + "uid": "11544291", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #toerisme_vlaanderen", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T19:32:21Z", + "reviewed_features": [], + "create": 1, + "modify": 16, + "delete": 0, + "area": 0.00086489841434997, + "is_suspect": true, + "harmful": null, + "checked": false, + "check_date": null, + "id": 118608266, + "host": "https://mapcomplete.osm.be/toerisme_vlaanderen.html", + "theme": "toerisme_vlaanderen", + "answer": 29, + "import": 1, + "locale": "nl", + "imagery": "osm", + "import:node/9586258366": "source: https://osm.org/note/3022934" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 4.45649525, + 51.39093335 + ] + } + }, + { + "type": "Feature", + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "L'imaginaire", + "uid": "654234", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #toerisme_vlaanderen", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T19:08:37Z", + "reviewed_features": [], + "create": 0, + "modify": 1, + "delete": 0, + "area": 2.5314093000299e-7, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "id": 118607485, + "host": "https://mapcomplete.osm.be/toerisme_vlaanderen.html", + "theme": "toerisme_vlaanderen", + "answer": 1, + "locale": "nl", + "imagery": "osm" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 3.23716075, + 51.18855405 + ] + } + }, + { + "type": "Feature", + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "Rienux", + "uid": "11911273", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #etymology", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T18:13:45Z", + "reviewed_features": [], + "create": 0, + "modify": 6, + "delete": 0, + "area": 0.000116369240680035, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "id": 118605990, + "host": "https://mapcomplete.osm.be/etymology.html", + "theme": "etymology", + "answer": 6, + "locale": "nl", + "imagery": "osm" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 4.289380850000001, + 51.0482232 + ] + } + }, + { + "type": "Feature", + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "jozin-belgium", + "uid": "1947314", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #grb", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T15:52:01Z", + "reviewed_features": [], + "create": 112, + "modify": 182, + "delete": 0, + "area": 0.000013143554639993, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "id": 118600405, + "host": "https://mapcomplete.osm.be/grb", + "move": 159, + "theme": "grb", + "import": 16, + "locale": "nl", + "imagery": "osm", + "conflation": 50 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 5.2558033, + 50.76333795 + ] + } + }, + { + "type": "Feature", + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "jozin-belgium", + "uid": "1947314", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #grb", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T14:19:57Z", + "reviewed_features": [], + "create": 1515, + "modify": 1393, + "delete": 9, + "area": 0.000143165877400018, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "id": 118596301, + "host": "https://mapcomplete.osm.be/grb", + "move": 1239, + "theme": "grb", + "answer": 1, + "import": 208, + "locale": "nl", + "imagery": "osm", + "conflation": 326 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 5.25004, + 50.7673164 + ] + } + }, + { + "type": "Feature", + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "paunofu", + "uid": "13779940", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #surveillance", + "comments_count": 0, + "source": "survey", + "imagery_used": "Not reported", + "date": "2022-03-17T14:11:44Z", + "reviewed_features": [], + "create": 0, + "modify": 2, + "delete": 0, + "area": 1.10402999997761e-9, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "id": 118595932, + "host": "https://mapcomplete.osm.be/surveillance.html", + "theme": "surveillance", + "answer": 4, + "locale": "en", + "imagery": "osm", + "change_over_5000m": 4 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 0.10483805, + 38.83519915 + ] + } + }, + { + "type": "Feature", + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "L'imaginaire", + "uid": "654234", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #toerisme_vlaanderen", + "comments_count": 0, + "source": "survey", + "imagery_used": "Not reported", + "date": "2022-03-17T12:21:16Z", + "reviewed_features": [], + "create": 0, + "modify": 4, + "delete": 0, + "area": 0, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "id": 118591272, + "host": "https://mapcomplete.osm.be/toerisme_vlaanderen.html", + "theme": "toerisme_vlaanderen", + "answer": 3, + "locale": "nl", + "imagery": "osm", + "add-image": 1 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 2.7505282, + 50.796036 + ] + } + }, + { + "type": "Feature", + "properties": { + "check_user": "jospyck", + "reasons": [ + { + "id": 40, + "name": "New mapper" + } + ], + "tags": [], + "features": [], + "user": "Jan Pirard", + "uid": "13678221", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #toerisme_vlaanderen", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T11:19:58Z", + "reviewed_features": [], + "create": 0, + "modify": 4, + "delete": 0, + "area": 0.000323085365750092, + "is_suspect": true, + "harmful": false, + "checked": true, + "check_date": "2022-03-17T13:11:23.974143Z", + "id": 118588371, + "host": "https://mapcomplete.osm.be/toerisme_vlaanderen.html", + "theme": "toerisme_vlaanderen", + "answer": 7, + "locale": "nl", + "imagery": "osm" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 5.20045715, + 50.76450655 + ] + } + }, + { + "type": "Feature", + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "L'imaginaire", + "uid": "654234", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #toerisme_vlaanderen", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T11:10:15Z", + "reviewed_features": [], + "create": 0, + "modify": 2, + "delete": 0, + "area": 0.0245139258209393, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "id": 118587883, + "host": "https://mapcomplete.osm.be/toerisme_vlaanderen.html", + "theme": "toerisme_vlaanderen", + "answer": 2, + "locale": "nl", + "imagery": "osm" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 3.3198669499999998, + 51.1142117 + ] + } + }, + { + "type": "Feature", + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "Robin van der Linde", + "uid": "5093765", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #waste", + "comments_count": 0, + "source": "survey", + "imagery_used": "Not reported", + "date": "2022-03-17T11:05:33Z", + "reviewed_features": [], + "create": 1, + "modify": 4, + "delete": 0, + "area": 0.00000327088838999726, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "id": 118587640, + "host": "https://mapcomplete.osm.be/waste.html", + "theme": "waste", + "answer": 3, + "locale": "nl", + "imagery": "osm", + "add-image": 2, + "change_over_5000m": 1, + "change_within_25m": 5 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 6.570225150000001, + 53.01745065 + ] + } + }, + { + "type": "Feature", + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "jozin-belgium", + "uid": "1947314", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #grb", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T11:05:31Z", + "reviewed_features": [], + "create": 704, + "modify": 452, + "delete": 3, + "area": 0.000107972870700042, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "id": 118587636, + "host": "https://mapcomplete.osm.be/grb", + "move": 385, + "theme": "grb", + "import": 81, + "locale": "nl", + "imagery": "osm", + "conflation": 132 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 5.251057749999999, + 50.7744625 + ] + } + }, + { + "type": "Feature", + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "jozin-belgium", + "uid": "1947314", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #grb", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T10:02:23Z", + "reviewed_features": [], + "create": 921, + "modify": 539, + "delete": 9, + "area": 0.00027927218667995, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "id": 118584609, + "host": "https://mapcomplete.osm.be/grb", + "move": 464, + "theme": "grb", + "import": 100, + "locale": "nl", + "imagery": "osm", + "conflation": 152 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 5.2565728499999995, + 50.782296 + ] + } + }, + { + "type": "Feature", + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "jozin-belgium", + "uid": "1947314", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #grb", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T10:01:29Z", + "reviewed_features": [], + "create": 44, + "modify": 10, + "delete": 0, + "area": 0.00000190340395001113, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "id": 118584566, + "host": "https://mapcomplete.osm.be/grb", + "move": 8, + "theme": "grb", + "import": 6, + "locale": "nl", + "imagery": "osm", + "conflation": 4 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 5.25756495, + 50.77894925 + ] + } + }, { "type": "Feature", "properties": { @@ -340729,7 +341342,7 @@ { "type": "Feature", "properties": { - "check_user": null, + "check_user": "L'imaginaire", "reasons": [], "tags": [], "features": [], @@ -340747,9 +341360,9 @@ "delete": 0, "area": 0.0000237232236799868, "is_suspect": false, - "harmful": null, - "checked": false, - "check_date": null, + "harmful": false, + "checked": true, + "check_date": "2022-03-17T19:57:07.984287Z", "id": 118577261, "host": "https://mapcomplete.osm.be/toerisme_vlaanderen.html", "theme": "toerisme_vlaanderen", @@ -343243,7 +343856,7 @@ "uid": "1086503", "editor": "MapComplete 0.16.7", "comment": "Adding data with #MapComplete for theme #aed", - "comments_count": 0, + "comments_count": 3, "source": "Not reported", "imagery_used": "Not reported", "date": "2022-03-15T09:09:49Z", diff --git a/Docs/Tools/graphs/Changesets per day (line) in 2022.png b/Docs/Tools/graphs/Changesets per day (line) in 2022.png index 42f2fcadb..97f54ab75 100644 Binary files a/Docs/Tools/graphs/Changesets per day (line) in 2022.png and b/Docs/Tools/graphs/Changesets per day (line) in 2022.png differ diff --git a/Docs/Tools/graphs/Changesets per day (line) met pin je punt.png b/Docs/Tools/graphs/Changesets per day (line) met pin je punt.png index 9a267e96d..132d5a338 100644 Binary files a/Docs/Tools/graphs/Changesets per day (line) met pin je punt.png and b/Docs/Tools/graphs/Changesets per day (line) met pin je punt.png differ diff --git a/Docs/Tools/graphs/Changesets per day (line).png b/Docs/Tools/graphs/Changesets per day (line).png index b30f2fb07..764ea5cb5 100644 Binary files a/Docs/Tools/graphs/Changesets per day (line).png and b/Docs/Tools/graphs/Changesets per day (line).png differ diff --git a/Docs/Tools/graphs/Changesets per host in 2022.png b/Docs/Tools/graphs/Changesets per host in 2022.png index ac90ab0a1..bcfc1b1d4 100644 Binary files a/Docs/Tools/graphs/Changesets per host in 2022.png and b/Docs/Tools/graphs/Changesets per host in 2022.png differ diff --git a/Docs/Tools/graphs/Changesets per host met pin je punt.png b/Docs/Tools/graphs/Changesets per host met pin je punt.png index 2fac0e82f..50538c362 100644 Binary files a/Docs/Tools/graphs/Changesets per host met pin je punt.png and b/Docs/Tools/graphs/Changesets per host met pin je punt.png differ diff --git a/Docs/Tools/graphs/Changesets per host.png b/Docs/Tools/graphs/Changesets per host.png index ddfacbe73..9edceefda 100644 Binary files a/Docs/Tools/graphs/Changesets per host.png and b/Docs/Tools/graphs/Changesets per host.png differ diff --git a/Docs/Tools/graphs/Changesets per minor version number in 2022.png b/Docs/Tools/graphs/Changesets per minor version number in 2022.png index 047a8f41d..fd493c89e 100644 Binary files a/Docs/Tools/graphs/Changesets per minor version number in 2022.png and b/Docs/Tools/graphs/Changesets per minor version number in 2022.png differ diff --git a/Docs/Tools/graphs/Changesets per minor version number met pin je punt.png b/Docs/Tools/graphs/Changesets per minor version number met pin je punt.png index 9b67d3663..18f8a8f97 100644 Binary files a/Docs/Tools/graphs/Changesets per minor version number met pin je punt.png and b/Docs/Tools/graphs/Changesets per minor version number met pin je punt.png differ diff --git a/Docs/Tools/graphs/Changesets per minor version number.png b/Docs/Tools/graphs/Changesets per minor version number.png index a7f89f24c..1d3bcfc9d 100644 Binary files a/Docs/Tools/graphs/Changesets per minor version number.png and b/Docs/Tools/graphs/Changesets per minor version number.png differ diff --git a/Docs/Tools/graphs/Changesets per theme (bar) in 2022.png b/Docs/Tools/graphs/Changesets per theme (bar) in 2022.png index 069edf9e9..406b881a5 100644 Binary files a/Docs/Tools/graphs/Changesets per theme (bar) in 2022.png and b/Docs/Tools/graphs/Changesets per theme (bar) in 2022.png differ diff --git a/Docs/Tools/graphs/Changesets per theme (bar) met pin je punt.png b/Docs/Tools/graphs/Changesets per theme (bar) met pin je punt.png index d2efb032b..a9a82ef57 100644 Binary files a/Docs/Tools/graphs/Changesets per theme (bar) met pin je punt.png and b/Docs/Tools/graphs/Changesets per theme (bar) met pin je punt.png differ diff --git a/Docs/Tools/graphs/Changesets per theme (bar).png b/Docs/Tools/graphs/Changesets per theme (bar).png index 4e2617c62..a49404f25 100644 Binary files a/Docs/Tools/graphs/Changesets per theme (bar).png and b/Docs/Tools/graphs/Changesets per theme (bar).png differ diff --git a/Docs/Tools/graphs/Changesets per theme (pie) in 2022.png b/Docs/Tools/graphs/Changesets per theme (pie) in 2022.png index 76ab99135..845602548 100644 Binary files a/Docs/Tools/graphs/Changesets per theme (pie) in 2022.png and b/Docs/Tools/graphs/Changesets per theme (pie) in 2022.png differ diff --git a/Docs/Tools/graphs/Changesets per theme (pie) met pin je punt.png b/Docs/Tools/graphs/Changesets per theme (pie) met pin je punt.png index 59f05fa33..3b7d08ec7 100644 Binary files a/Docs/Tools/graphs/Changesets per theme (pie) met pin je punt.png and b/Docs/Tools/graphs/Changesets per theme (pie) met pin je punt.png differ diff --git a/Docs/Tools/graphs/Changesets per theme (pie).png b/Docs/Tools/graphs/Changesets per theme (pie).png index 36c40782b..65080debe 100644 Binary files a/Docs/Tools/graphs/Changesets per theme (pie).png and b/Docs/Tools/graphs/Changesets per theme (pie).png differ diff --git a/Docs/Tools/graphs/Changesets per theme in 2022.png b/Docs/Tools/graphs/Changesets per theme in 2022.png index ba7104d76..fa1683524 100644 Binary files a/Docs/Tools/graphs/Changesets per theme in 2022.png and b/Docs/Tools/graphs/Changesets per theme in 2022.png differ diff --git a/Docs/Tools/graphs/Changesets per theme met pin je punt.png b/Docs/Tools/graphs/Changesets per theme met pin je punt.png index a880dcab0..42194a5c8 100644 Binary files a/Docs/Tools/graphs/Changesets per theme met pin je punt.png and b/Docs/Tools/graphs/Changesets per theme met pin je punt.png differ diff --git a/Docs/Tools/graphs/Changesets per theme.png b/Docs/Tools/graphs/Changesets per theme.png index 3a892937f..083e6361a 100644 Binary files a/Docs/Tools/graphs/Changesets per theme.png and b/Docs/Tools/graphs/Changesets per theme.png differ diff --git a/Docs/Tools/graphs/Changesets per version number in 2022.png b/Docs/Tools/graphs/Changesets per version number in 2022.png index 8732d535f..2840b52bf 100644 Binary files a/Docs/Tools/graphs/Changesets per version number in 2022.png and b/Docs/Tools/graphs/Changesets per version number in 2022.png differ diff --git a/Docs/Tools/graphs/Changesets per version number met pin je punt.png b/Docs/Tools/graphs/Changesets per version number met pin je punt.png index 5cf9f4623..c8b53d4ac 100644 Binary files a/Docs/Tools/graphs/Changesets per version number met pin je punt.png and b/Docs/Tools/graphs/Changesets per version number met pin je punt.png differ diff --git a/Docs/Tools/graphs/Changesets per version number.png b/Docs/Tools/graphs/Changesets per version number.png index 156b1bae0..079b4b854 100644 Binary files a/Docs/Tools/graphs/Changesets per version number.png and b/Docs/Tools/graphs/Changesets per version number.png differ diff --git a/Docs/Tools/graphs/Contributors per changeset count in 2022.png b/Docs/Tools/graphs/Contributors per changeset count in 2022.png index 71bbe1f12..2d784d067 100644 Binary files a/Docs/Tools/graphs/Contributors per changeset count in 2022.png and b/Docs/Tools/graphs/Contributors per changeset count in 2022.png differ diff --git a/Docs/Tools/graphs/Contributors per changeset count met pin je punt.png b/Docs/Tools/graphs/Contributors per changeset count met pin je punt.png index 2ac599a4d..faa301f58 100644 Binary files a/Docs/Tools/graphs/Contributors per changeset count met pin je punt.png and b/Docs/Tools/graphs/Contributors per changeset count met pin je punt.png differ diff --git a/Docs/Tools/graphs/Contributors per changeset count.png b/Docs/Tools/graphs/Contributors per changeset count.png index 5e1042773..656c7519f 100644 Binary files a/Docs/Tools/graphs/Contributors per changeset count.png and b/Docs/Tools/graphs/Contributors per changeset count.png differ diff --git a/Docs/Tools/graphs/Contributors per day in 2022.png b/Docs/Tools/graphs/Contributors per day in 2022.png index 291ca839a..e211e8fc5 100644 Binary files a/Docs/Tools/graphs/Contributors per day in 2022.png and b/Docs/Tools/graphs/Contributors per day in 2022.png differ diff --git a/Docs/Tools/graphs/Contributors per day met pin je punt.png b/Docs/Tools/graphs/Contributors per day met pin je punt.png index edf8265d5..0501c9c32 100644 Binary files a/Docs/Tools/graphs/Contributors per day met pin je punt.png and b/Docs/Tools/graphs/Contributors per day met pin je punt.png differ diff --git a/Docs/Tools/graphs/Contributors per day.png b/Docs/Tools/graphs/Contributors per day.png index 33f0eff3d..00100a2b7 100644 Binary files a/Docs/Tools/graphs/Contributors per day.png and b/Docs/Tools/graphs/Contributors per day.png differ diff --git a/Docs/Tools/graphs/Deletion-changesets per theme in 2022.png b/Docs/Tools/graphs/Deletion-changesets per theme in 2022.png index f9042b934..1a0621e5a 100644 Binary files a/Docs/Tools/graphs/Deletion-changesets per theme in 2022.png and b/Docs/Tools/graphs/Deletion-changesets per theme in 2022.png differ diff --git a/Docs/Tools/graphs/Deletion-changesets per theme met pin je punt.png b/Docs/Tools/graphs/Deletion-changesets per theme met pin je punt.png index f59d85e27..c493adca5 100644 Binary files a/Docs/Tools/graphs/Deletion-changesets per theme met pin je punt.png and b/Docs/Tools/graphs/Deletion-changesets per theme met pin je punt.png differ diff --git a/Docs/Tools/graphs/Deletion-changesets per theme.png b/Docs/Tools/graphs/Deletion-changesets per theme.png index 9b0acd504..3eca3152e 100644 Binary files a/Docs/Tools/graphs/Deletion-changesets per theme.png and b/Docs/Tools/graphs/Deletion-changesets per theme.png differ diff --git a/Docs/Tools/graphs/Empty changesets by date.png b/Docs/Tools/graphs/Empty changesets by date.png index f94118abf..c0ad22b40 100644 Binary files a/Docs/Tools/graphs/Empty changesets by date.png and b/Docs/Tools/graphs/Empty changesets by date.png differ diff --git a/Docs/Tools/stats/stats.2022-3.json b/Docs/Tools/stats/stats.2022-3.json index 05a62fbf3..dc4120586 100644 --- a/Docs/Tools/stats/stats.2022-3.json +++ b/Docs/Tools/stats/stats.2022-3.json @@ -1,5 +1,1075 @@ { "features": [ + { + "id": 118611994, + "type": "Feature", + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 3.1054638, + 51.0649694 + ], + [ + 3.1054638, + 51.0649694 + ], + [ + 3.1054638, + 51.0649694 + ], + [ + 3.1054638, + 51.0649694 + ], + [ + 3.1054638, + 51.0649694 + ] + ] + ] + }, + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "L'imaginaire", + "uid": "654234", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #toerisme_vlaanderen", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T21:47:09Z", + "reviewed_features": [], + "create": 0, + "modify": 1, + "delete": 0, + "area": 0, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "metadata": { + "host": "https://mapcomplete.osm.be/toerisme_vlaanderen.html", + "theme": "toerisme_vlaanderen", + "answer": 2, + "locale": "nl", + "imagery": "osm" + }, + "id": 118611994 + } + }, + { + "id": 118610877, + "type": "Feature", + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 4.9706113, + 51.3037531 + ], + [ + 5.0229024, + 51.3037531 + ], + [ + 5.0229024, + 51.3381883 + ], + [ + 4.9706113, + 51.3381883 + ], + [ + 4.9706113, + 51.3037531 + ] + ] + ] + }, + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "Stinus_Clasius", + "uid": "1086503", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #aed", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T21:01:27Z", + "reviewed_features": [], + "create": 0, + "modify": 2, + "delete": 0, + "area": 0.00180065448671988, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "metadata": { + "host": "https://mapcomplete.osm.be/aed.html", + "theme": "aed", + "locale": "nl", + "imagery": "osm", + "add-image": 2 + }, + "id": 118610877 + } + }, + { + "id": 118608266, + "type": "Feature", + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 4.4382719, + 51.3790681 + ], + [ + 4.4747186, + 51.3790681 + ], + [ + 4.4747186, + 51.4027986 + ], + [ + 4.4382719, + 51.4027986 + ], + [ + 4.4382719, + 51.3790681 + ] + ] + ] + }, + "properties": { + "check_user": null, + "reasons": [ + { + "id": 40, + "name": "New mapper" + } + ], + "tags": [], + "features": [], + "user": "tissie", + "uid": "11544291", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #toerisme_vlaanderen", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T19:32:21Z", + "reviewed_features": [], + "create": 1, + "modify": 16, + "delete": 0, + "area": 0.00086489841434997, + "is_suspect": true, + "harmful": null, + "checked": false, + "check_date": null, + "metadata": { + "host": "https://mapcomplete.osm.be/toerisme_vlaanderen.html", + "theme": "toerisme_vlaanderen", + "answer": 29, + "import": 1, + "locale": "nl", + "imagery": "osm", + "import:node/9586258366": "source: https://osm.org/note/3022934" + }, + "id": 118608266 + } + }, + { + "id": 118607485, + "type": "Feature", + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 3.2367616, + 51.1883955 + ], + [ + 3.2375599, + 51.1883955 + ], + [ + 3.2375599, + 51.1887126 + ], + [ + 3.2367616, + 51.1887126 + ], + [ + 3.2367616, + 51.1883955 + ] + ] + ] + }, + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "L'imaginaire", + "uid": "654234", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #toerisme_vlaanderen", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T19:08:37Z", + "reviewed_features": [], + "create": 0, + "modify": 1, + "delete": 0, + "area": 2.5314093000299e-7, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "metadata": { + "host": "https://mapcomplete.osm.be/toerisme_vlaanderen.html", + "theme": "toerisme_vlaanderen", + "answer": 1, + "locale": "nl", + "imagery": "osm" + }, + "id": 118607485 + } + }, + { + "id": 118605990, + "type": "Feature", + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 4.2809095, + 51.044789 + ], + [ + 4.2978522, + 51.044789 + ], + [ + 4.2978522, + 51.0516574 + ], + [ + 4.2809095, + 51.0516574 + ], + [ + 4.2809095, + 51.044789 + ] + ] + ] + }, + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "Rienux", + "uid": "11911273", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #etymology", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T18:13:45Z", + "reviewed_features": [], + "create": 0, + "modify": 6, + "delete": 0, + "area": 0.000116369240680035, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "metadata": { + "host": "https://mapcomplete.osm.be/etymology.html", + "theme": "etymology", + "answer": 6, + "locale": "nl", + "imagery": "osm" + }, + "id": 118605990 + } + }, + { + "id": 118600405, + "type": "Feature", + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 5.2539997, + 50.7615161 + ], + [ + 5.2576069, + 50.7615161 + ], + [ + 5.2576069, + 50.7651598 + ], + [ + 5.2539997, + 50.7651598 + ], + [ + 5.2539997, + 50.7615161 + ] + ] + ] + }, + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "jozin-belgium", + "uid": "1947314", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #grb", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T15:52:01Z", + "reviewed_features": [], + "create": 112, + "modify": 182, + "delete": 0, + "area": 0.000013143554639993, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "metadata": { + "host": "https://mapcomplete.osm.be/grb", + "move": 159, + "theme": "grb", + "import": 16, + "locale": "nl", + "imagery": "osm", + "conflation": 50 + }, + "id": 118600405 + } + }, + { + "id": 118596301, + "type": "Feature", + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 5.2434297, + 50.7619019 + ], + [ + 5.2566503, + 50.7619019 + ], + [ + 5.2566503, + 50.7727309 + ], + [ + 5.2434297, + 50.7727309 + ], + [ + 5.2434297, + 50.7619019 + ] + ] + ] + }, + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "jozin-belgium", + "uid": "1947314", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #grb", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T14:19:57Z", + "reviewed_features": [], + "create": 1515, + "modify": 1393, + "delete": 9, + "area": 0.000143165877400018, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "metadata": { + "host": "https://mapcomplete.osm.be/grb", + "move": 1239, + "theme": "grb", + "answer": 1, + "delete": 9, + "import": 208, + "locale": "nl", + "imagery": "osm", + "conflation": 326 + }, + "id": 118596301 + } + }, + { + "id": 118595932, + "type": "Feature", + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 0.1048169, + 38.8351861 + ], + [ + 0.1048592, + 38.8351861 + ], + [ + 0.1048592, + 38.8352122 + ], + [ + 0.1048169, + 38.8352122 + ], + [ + 0.1048169, + 38.8351861 + ] + ] + ] + }, + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "paunofu", + "uid": "13779940", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #surveillance", + "comments_count": 0, + "source": "survey", + "imagery_used": "Not reported", + "date": "2022-03-17T14:11:44Z", + "reviewed_features": [], + "create": 0, + "modify": 2, + "delete": 0, + "area": 1.10402999997761e-9, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "metadata": { + "host": "https://mapcomplete.osm.be/surveillance.html", + "theme": "surveillance", + "answer": 4, + "locale": "en", + "imagery": "osm", + "change_over_5000m": 4 + }, + "id": 118595932 + } + }, + { + "id": 118591272, + "type": "Feature", + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 2.7505282, + 50.796036 + ], + [ + 2.7505282, + 50.796036 + ], + [ + 2.7505282, + 50.796036 + ], + [ + 2.7505282, + 50.796036 + ], + [ + 2.7505282, + 50.796036 + ] + ] + ] + }, + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "L'imaginaire", + "uid": "654234", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #toerisme_vlaanderen", + "comments_count": 0, + "source": "survey", + "imagery_used": "Not reported", + "date": "2022-03-17T12:21:16Z", + "reviewed_features": [], + "create": 0, + "modify": 4, + "delete": 0, + "area": 0, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "metadata": { + "host": "https://mapcomplete.osm.be/toerisme_vlaanderen.html", + "theme": "toerisme_vlaanderen", + "answer": 3, + "locale": "nl", + "imagery": "osm", + "add-image": 1 + }, + "id": 118591272 + } + }, + { + "id": 118588371, + "type": "Feature", + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 5.1859969, + 50.7589208 + ], + [ + 5.2149174, + 50.7589208 + ], + [ + 5.2149174, + 50.7700923 + ], + [ + 5.1859969, + 50.7700923 + ], + [ + 5.1859969, + 50.7589208 + ] + ] + ] + }, + "properties": { + "check_user": "jospyck", + "reasons": [ + { + "id": 40, + "name": "New mapper" + } + ], + "tags": [], + "features": [], + "user": "Jan Pirard", + "uid": "13678221", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #toerisme_vlaanderen", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T11:19:58Z", + "reviewed_features": [], + "create": 0, + "modify": 4, + "delete": 0, + "area": 0.000323085365750092, + "is_suspect": true, + "harmful": false, + "checked": true, + "check_date": "2022-03-17T13:11:23.974143Z", + "metadata": { + "host": "https://mapcomplete.osm.be/toerisme_vlaanderen.html", + "theme": "toerisme_vlaanderen", + "answer": 7, + "locale": "nl", + "imagery": "osm" + }, + "id": 118588371 + } + }, + { + "id": 118587883, + "type": "Feature", + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 3.2373959, + 51.039901 + ], + [ + 3.402338, + 51.039901 + ], + [ + 3.402338, + 51.1885224 + ], + [ + 3.2373959, + 51.1885224 + ], + [ + 3.2373959, + 51.039901 + ] + ] + ] + }, + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "L'imaginaire", + "uid": "654234", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #toerisme_vlaanderen", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T11:10:15Z", + "reviewed_features": [], + "create": 0, + "modify": 2, + "delete": 0, + "area": 0.0245139258209393, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "metadata": { + "host": "https://mapcomplete.osm.be/toerisme_vlaanderen.html", + "theme": "toerisme_vlaanderen", + "answer": 2, + "locale": "nl", + "imagery": "osm" + }, + "id": 118587883 + } + }, + { + "id": 118587640, + "type": "Feature", + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 6.5677573, + 53.0171193 + ], + [ + 6.572693, + 53.0171193 + ], + [ + 6.572693, + 53.017782 + ], + [ + 6.5677573, + 53.017782 + ], + [ + 6.5677573, + 53.0171193 + ] + ] + ] + }, + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "Robin van der Linde", + "uid": "5093765", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #waste", + "comments_count": 0, + "source": "survey", + "imagery_used": "Not reported", + "date": "2022-03-17T11:05:33Z", + "reviewed_features": [], + "create": 1, + "modify": 4, + "delete": 0, + "area": 0.00000327088838999726, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "metadata": { + "host": "https://mapcomplete.osm.be/waste.html", + "theme": "waste", + "answer": 3, + "create": 1, + "locale": "nl", + "imagery": "osm", + "add-image": 2, + "change_over_5000m": 1, + "change_within_25m": 5 + }, + "id": 118587640 + } + }, + { + "id": 118587636, + "type": "Feature", + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 5.2446239, + 50.770267 + ], + [ + 5.2574916, + 50.770267 + ], + [ + 5.2574916, + 50.778658 + ], + [ + 5.2446239, + 50.778658 + ], + [ + 5.2446239, + 50.770267 + ] + ] + ] + }, + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "jozin-belgium", + "uid": "1947314", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #grb", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T11:05:31Z", + "reviewed_features": [], + "create": 704, + "modify": 452, + "delete": 3, + "area": 0.000107972870700042, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "metadata": { + "host": "https://mapcomplete.osm.be/grb", + "move": 385, + "theme": "grb", + "delete": 3, + "import": 81, + "locale": "nl", + "imagery": "osm", + "conflation": 132 + }, + "id": 118587636 + } + }, + { + "id": 118584609, + "type": "Feature", + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 5.2482268, + 50.7739306 + ], + [ + 5.2649189, + 50.7739306 + ], + [ + 5.2649189, + 50.7906614 + ], + [ + 5.2482268, + 50.7906614 + ], + [ + 5.2482268, + 50.7739306 + ] + ] + ] + }, + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "jozin-belgium", + "uid": "1947314", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #grb", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T10:02:23Z", + "reviewed_features": [], + "create": 921, + "modify": 539, + "delete": 9, + "area": 0.00027927218667995, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "metadata": { + "host": "https://mapcomplete.osm.be/grb", + "move": 464, + "theme": "grb", + "delete": 9, + "import": 100, + "locale": "nl", + "imagery": "osm", + "conflation": 152 + }, + "id": 118584609 + } + }, + { + "id": 118584599, + "type": "Feature", + "geometry": null, + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "jozin-belgium", + "uid": "1947314", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #grb", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T10:02:16Z", + "reviewed_features": [], + "create": 0, + "modify": 0, + "delete": 0, + "area": null, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "metadata": { + "host": "https://mapcomplete.osm.be/grb", + "theme": "grb", + "import": 1, + "locale": "nl", + "imagery": "osm" + }, + "id": 118584599 + } + }, + { + "id": 118584594, + "type": "Feature", + "geometry": null, + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "jozin-belgium", + "uid": "1947314", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #grb", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T10:02:10Z", + "reviewed_features": [], + "create": 0, + "modify": 0, + "delete": 0, + "area": null, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "metadata": { + "host": "https://mapcomplete.osm.be/grb", + "theme": "grb", + "import": 1, + "locale": "nl", + "imagery": "osm" + }, + "id": 118584594 + } + }, + { + "id": 118584592, + "type": "Feature", + "geometry": null, + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "jozin-belgium", + "uid": "1947314", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #grb", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T10:02:07Z", + "reviewed_features": [], + "create": 0, + "modify": 0, + "delete": 0, + "area": null, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "metadata": { + "host": "https://mapcomplete.osm.be/grb", + "theme": "grb", + "import": 2, + "locale": "nl", + "imagery": "osm" + }, + "id": 118584592 + } + }, + { + "id": 118584566, + "type": "Feature", + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 5.2566122, + 50.7784498 + ], + [ + 5.2585177, + 50.7784498 + ], + [ + 5.2585177, + 50.7794487 + ], + [ + 5.2566122, + 50.7794487 + ], + [ + 5.2566122, + 50.7784498 + ] + ] + ] + }, + "properties": { + "check_user": null, + "reasons": [], + "tags": [], + "features": [], + "user": "jozin-belgium", + "uid": "1947314", + "editor": "MapComplete 0.16.8", + "comment": "Adding data with #MapComplete for theme #grb", + "comments_count": 0, + "source": "Not reported", + "imagery_used": "Not reported", + "date": "2022-03-17T10:01:29Z", + "reviewed_features": [], + "create": 44, + "modify": 10, + "delete": 0, + "area": 0.00000190340395001113, + "is_suspect": false, + "harmful": null, + "checked": false, + "check_date": null, + "metadata": { + "host": "https://mapcomplete.osm.be/grb", + "move": 8, + "theme": "grb", + "import": 6, + "locale": "nl", + "imagery": "osm", + "conflation": 4 + }, + "id": 118584566 + } + }, { "id": 118581339, "type": "Feature", @@ -98,7 +1168,7 @@ ] }, "properties": { - "check_user": null, + "check_user": "L'imaginaire", "reasons": [], "tags": [], "features": [], @@ -116,9 +1186,9 @@ "delete": 0, "area": 0.0000237232236799868, "is_suspect": false, - "harmful": null, - "checked": false, - "check_date": null, + "harmful": false, + "checked": true, + "check_date": "2022-03-17T19:57:07.984287Z", "metadata": { "host": "https://mapcomplete.osm.be/toerisme_vlaanderen.html", "theme": "toerisme_vlaanderen", @@ -4334,7 +5404,7 @@ "uid": "1086503", "editor": "MapComplete 0.16.7", "comment": "Adding data with #MapComplete for theme #aed", - "comments_count": 0, + "comments_count": 3, "source": "Not reported", "imagery_used": "Not reported", "date": "2022-03-15T09:09:49Z", diff --git a/Models/ThemeConfig/Conversion/Conversion.ts b/Models/ThemeConfig/Conversion/Conversion.ts index 13f352eea..75f1683f2 100644 --- a/Models/ThemeConfig/Conversion/Conversion.ts +++ b/Models/ThemeConfig/Conversion/Conversion.ts @@ -19,14 +19,17 @@ export abstract class Conversion { } public static strict(fixed: { errors?: string[], warnings?: string[], information?: string[], result?: T }): T { - if (fixed?.errors !== undefined && fixed?.errors?.length > 0) { - throw fixed.errors.join("\n\n"); - } + fixed.information?.forEach(i => console.log(" ", i)) const yellow = (s) => "\x1b[33m"+s+"\x1b[0m" const red = s => '\x1b[31m'+s+'\x1b[0m' - fixed.warnings?.forEach(w => console.warn(red(` `), yellow (w))) + + if (fixed?.errors !== undefined && fixed?.errors?.length > 0) { + fixed.errors?.forEach(e => console.error(red(`ERR `+e))) + throw "Detected one or more errors, stopping now" + } + return fixed.result; } diff --git a/Models/ThemeConfig/Conversion/Validation.ts b/Models/ThemeConfig/Conversion/Validation.ts index 349fa2c34..ef02ba211 100644 --- a/Models/ThemeConfig/Conversion/Validation.ts +++ b/Models/ThemeConfig/Conversion/Validation.ts @@ -239,8 +239,25 @@ export class PrevalidateTheme extends Fuse { } export class DetectShadowedMappings extends DesugaringStep { - constructor() { + private readonly _calculatedTagNames: string[]; + constructor(layerConfig?: LayerConfigJson) { super("Checks that the mappings don't shadow each other", [], "DetectShadowedMappings"); + this._calculatedTagNames = DetectShadowedMappings.extractCalculatedTagNames(layerConfig); + } + + /** + * + * DetectShadowedMappings.extractCalculatedTagNames({calculatedTags: ["_abc:=js()"]}) // => ["_abc"] + * DetectShadowedMappings.extractCalculatedTagNames({calculatedTags: ["_abc=js()"]}) // => ["_abc"] + */ + private static extractCalculatedTagNames(layerConfig?: LayerConfigJson){ + return layerConfig?.calculatedTags?.map(ct => { + if(ct.indexOf(':=') >= 0){ + return ct.split(':=')[0] + } + return ct.split("=")[0] + }) ?? [] + } convert(json: QuestionableTagRenderingConfigJson, context: string): { result: QuestionableTagRenderingConfigJson; errors?: string[]; warnings?: string[] } { @@ -249,6 +266,10 @@ export class DetectShadowedMappings extends DesugaringStep { const ifTags = TagUtils.Tag(m.if); if(m.hideInAnswer !== undefined && m.hideInAnswer !== false && m.hideInAnswer !== true){ @@ -264,7 +285,7 @@ export class DetectShadowedMappings extends DesugaringStep { properties[k] = v @@ -277,17 +298,19 @@ export class DetectShadowedMappings extends DesugaringStep { } } if (json.tagRenderings !== undefined) { - const r = new OnEvery("tagRenderings", new ValidateTagRenderings()).convert(json, context) + const r = new OnEvery("tagRenderings", new ValidateTagRenderings(json)).convert(json, context) warnings.push(...(r.warnings??[])) errors.push(...(r.errors??[])) information.push(...(r.information??[])) diff --git a/assets/layers/bench/bench.json b/assets/layers/bench/bench.json index fcb56c8ac..41e29267b 100644 --- a/assets/layers/bench/bench.json +++ b/assets/layers/bench/bench.json @@ -73,7 +73,7 @@ "en": "Backrest: No", "de": "Rückenlehne: Nein", "fr": "Dossier : Non", - "nl": "Rugleuning ontbreekt", + "nl": "Heeft geen rugleuning", "es": "Respaldo: no", "hu": "Háttámla nincs", "id": "Sandaran: Tidak", diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json index fa984a091..6b4ca0127 100644 --- a/assets/layers/defibrillator/defibrillator.json +++ b/assets/layers/defibrillator/defibrillator.json @@ -8,7 +8,8 @@ "nl": "Defibrillatoren", "de": "Defibrillatoren", "it": "Defibrillatori", - "ru": "Дефибрилляторы" + "ru": "Дефибрилляторы", + "sl": "Defibrilatorji" }, "source": { "osmTags": "emergency=defibrillator" @@ -27,7 +28,8 @@ "nl": "Defibrillator", "de": "Defibrillator", "it": "Defibrillatore", - "ru": "Дефибриллятор" + "ru": "Дефибриллятор", + "sl": "Defibrilator" } }, "presets": [ @@ -40,7 +42,8 @@ "nl": "Defibrillator", "de": "Defibrillator", "it": "Defibrillatore", - "ru": "Дефибриллятор" + "ru": "Дефибриллятор", + "sl": "Defibrilator" }, "tags": [ "emergency=defibrillator" @@ -49,7 +52,8 @@ { "title": { "en": "defibrillator mounted on a wall", - "nl": "defibrillator die aan een muur hangt" + "nl": "defibrillator die aan een muur hangt", + "sl": "defibrilator je pritrjen na steno" }, "tags": [ "emergency=defibrillator" @@ -72,7 +76,8 @@ "fr": "Ce défibrillateur est-il disposé en intérieur ?", "nl": "Hangt deze defibrillator binnen of buiten?", "de": "Befindet sich dieser Defibrillator im Gebäude?", - "it": "Questo defibrillatore si trova all’interno?" + "it": "Questo defibrillatore si trova all’interno?", + "sl": "Ali se ta defibrilator nahaja znotraj?" }, "mappings": [ { @@ -84,7 +89,8 @@ "fr": "Ce défibrillateur est en intérieur (dans un batiment)", "nl": "Deze defibrillator bevindt zich in een gebouw", "de": "Dieser Defibrillator befindet sich im Gebäude", - "it": "Questo defibrillatore si trova all’interno" + "it": "Questo defibrillatore si trova all’interno", + "sl": "Defibrilator se nahaja znotraj" } }, { @@ -96,7 +102,8 @@ "fr": "Ce défibrillateur est situé en extérieur", "nl": "Deze defibrillator hangt buiten", "de": "Dieser Defibrillator befindet sich im Freien", - "it": "Questo defibrillatore si trova all’esterno" + "it": "Questo defibrillatore si trova all’esterno", + "sl": "Defibrilator se nahaja zunaj" } } ] @@ -109,7 +116,8 @@ "fr": "Ce défibrillateur est-il librement accessible ?", "nl": "Is deze defibrillator vrij toegankelijk?", "de": "Ist dieser Defibrillator frei zugänglich?", - "it": "Questo defibrillatore è liberamente accessibile?" + "it": "Questo defibrillatore è liberamente accessibile?", + "sl": "Ali je ta defibrilator prosto dostopen?" }, "render": { "en": "Access is {access}", @@ -118,7 +126,8 @@ "fr": "{access} accessible", "nl": "Toegankelijkheid is {access}", "de": "Zugang ist {access}", - "it": "Accesso è {access}" + "it": "Accesso è {access}", + "sl": "Dostop je {access}" }, "freeform": { "key": "access", @@ -137,7 +146,8 @@ "nl": "Publiek toegankelijk", "de": "Öffentlich zugänglich", "it": "Pubblicamente accessibile", - "ru": "Общедоступный" + "ru": "Общедоступный", + "sl": "Javno dostopen" } }, { @@ -150,7 +160,8 @@ "nl": "Publiek toegankelijk", "de": "Öffentlich zugänglich", "it": "Pubblicamente accessibile", - "ru": "Общедоступный" + "ru": "Общедоступный", + "sl": "Javno dostopen" }, "hideInAnswer": true }, @@ -164,7 +175,8 @@ "nl": "Enkel toegankelijk voor klanten", "de": "Nur für Kunden zugänglich", "it": "Accessibile solo ai clienti", - "ru": "Доступно только для клиентов" + "ru": "Доступно только для клиентов", + "sl": "Dostopen samo strankam" } }, { @@ -176,7 +188,8 @@ "fr": "Non accessible au public (par exemple réservé au personnel, au propriétaire, ...)", "nl": "Niet toegankelijk voor het publiek (bv. enkel voor personeel, de eigenaar, ...)", "de": "Nicht für die Öffentlichkeit zugänglich (z.B. nur für das Personal, die Eigentümer, ...)", - "it": "Non accessibile al pubblico (ad esempio riservato al personale, ai proprietari, etc.)" + "it": "Non accessibile al pubblico (ad esempio riservato al personale, ai proprietari, etc.)", + "sl": "Ni dostopen splošni javnosti (npr. samo za osebje, za lastnike, ...)" } }, { @@ -186,7 +199,8 @@ "nl": "Niet toegankelijk, mogelijk enkel voor professionals", "fr": "Pas accessible, peut-être uniquement à usage professionnel", "it": "Non accessibile, potrebbe essere solo per uso professionale", - "de": "Nicht zugänglich, möglicherweise nur für betriebliche Nutzung" + "de": "Nicht zugänglich, möglicherweise nur für betriebliche Nutzung", + "sl": "Ni dostopen, morda samo za profesionalno rabo" } } ], @@ -198,7 +212,8 @@ "nl": "Is dit een gewone automatische defibrillator of een manueel toestel enkel voor professionals?", "fr": "Est-ce un défibrillateur automatique normal ou un défibrillateur manuel à usage professionnel uniquement ?", "it": "Si tratta di un normale defibrillatore automatico o un defibrillatore manuale riservato ai professionisti?", - "de": "Ist dies ein normaler automatischer Defibrillator oder ein manueller Defibrillator nur für Profis?" + "de": "Ist dies ein normaler automatischer Defibrillator oder ein manueller Defibrillator nur für Profis?", + "sl": "Ali je to navaden avtomatski defibrilator ali ročni defibrilator namenjen poklicnim reševalcem?" }, "condition": { "and": [ @@ -213,7 +228,8 @@ "nl": "Er is geen info over het soort toestel", "fr": "Il n'y a pas d'information sur le type de dispositif", "it": "Non vi sono informazioni riguardanti il tipo di questo dispositivo", - "de": "Es gibt keine Informationen über den Gerätetyp" + "de": "Es gibt keine Informationen über den Gerätetyp", + "sl": "Ni informacij o vrsti naprave" }, "hideInAnswer": true }, @@ -224,7 +240,8 @@ "nl": "Dit is een manueel toestel enkel voor professionals", "fr": "C'est un défibrillateur manuel pour professionnel", "it": "Questo è un defibrillatore manuale per professionisti", - "de": "Dies ist ein manueller Defibrillator für den professionellen Einsatz" + "de": "Dies ist ein manueller Defibrillator für den professionellen Einsatz", + "sl": "To je ročni defibrilator za poklicne reševalce" } }, { @@ -235,14 +252,16 @@ "fr": "C'est un défibrillateur automatique manuel", "it": "È un normale defibrillatore automatico", "ru": "Это обычный автоматический дефибриллятор", - "de": "Dies ist ein normaler automatischer Defibrillator" + "de": "Dies ist ein normaler automatischer Defibrillator", + "sl": "To je normalen avtomatski defibrilator" } }, { "if": "defibrillator~*", "then": { "en": "This is a special type of defibrillator: {defibrillator}", - "nl": "Dit is een speciaal type defibrillator: {defibrillator}" + "nl": "Dit is een speciaal type defibrillator: {defibrillator}", + "sl": "To je posebna vrsta defibrilatorja: {defibrillator}" }, "hideInAnswer": true } @@ -257,7 +276,8 @@ "fr": "À quel étage est situé ce défibrillateur ?", "nl": "Op welke verdieping bevindt deze defibrillator zich?", "de": "In welchem Stockwerk befindet sich dieser Defibrillator?", - "it": "A che piano si trova questo defibrillatore?" + "it": "A che piano si trova questo defibrillatore?", + "sl": "V katerem nadstropju je defibrilator?" }, "condition": { "and": [ @@ -275,7 +295,8 @@ "fr": "Ce défibrillateur est à l'étage {level}", "nl": "De defibrillator bevindt zicht op verdieping {level}", "de": "Dieser Defibrallator befindet sich im {level}. Stockwerk", - "it": "Questo defibrillatore è al piano {level}" + "it": "Questo defibrillatore è al piano {level}", + "sl": "Ta defibrilator je v {level}. nadstropju" }, "mappings": [ { @@ -285,7 +306,8 @@ "nl": "Deze defibrillator bevindt zich gelijkvloers", "fr": "Ce défibrillateur est au rez-de-chaussée", "it": "Questo defibrillatore è al pian terreno", - "de": "Dieser Defibrillator befindet sich im Erdgeschoss" + "de": "Dieser Defibrillator befindet sich im Erdgeschoss", + "sl": "Ta defibrilator je v pritličju" } }, { @@ -295,7 +317,8 @@ "nl": "Deze defibrillator is op de eerste verdieping", "fr": "Ce défibrillateur est au premier étage", "it": "Questo defibrillatore è al primo piano", - "de": "Dieser Defibrillator befindet sich in der ersten Etage" + "de": "Dieser Defibrillator befindet sich in der ersten Etage", + "sl": "Ta defibrilator je v prvem nadstropju" } } ], @@ -307,7 +330,8 @@ "en": "Extra information about the location (in the local languagel):
{defibrillator:location}", "fr": "Informations supplémentaires à propos de l'emplacement (dans la langue locale) :
{defibrillator:location}", "it": "Informazioni supplementari circa la posizione (in lingua locale):
{defibrillator:location}", - "de": "Zusätzliche Informationen über den Standort (in der Landessprache):
{defibrillator:location}" + "de": "Zusätzliche Informationen über den Standort (in der Landessprache):
{defibrillator:location}", + "sl": "Dodatne informacije o lokaciji (v lokalnem jeziku):
{defibrillator:location}" }, "question": { "en": "Please give some explanation on where the defibrillator can be found (in the local language)", @@ -316,7 +340,8 @@ "fr": "Veuillez indiquez plus précisément où se situe le défibrillateur (dans la langue local)", "nl": "Gelieve meer informatie te geven over de exacte locatie van de defibrillator (in de plaatselijke taal)", "de": "Bitte geben Sie einige Erläuterungen dazu, wo der Defibrillator zu finden ist (in der lokalen Sprache)", - "it": "Indica più precisamente dove si trova il defibrillatore (in lingua locale)" + "it": "Indica più precisamente dove si trova il defibrillatore (in lingua locale)", + "sl": "Prosimo, opišite kje se nahaja defibrilator (v lokalnem jeziku)" }, "freeform": { "type": "text", @@ -330,7 +355,8 @@ "en": "Extra information about the location (in English):
{defibrillator:location:en}", "fr": "Informations supplémentaires à propos de l'emplacement (en anglais) :
{defibrillator:location:en}", "it": "Informazioni supplementari circa la posizione (in inglese):
{defibrillator:location:en}", - "de": "Zusätzliche Informationen über den Standort (auf Englisch):
{defibrillator:location:en}" + "de": "Zusätzliche Informationen über den Standort (auf Englisch):
{defibrillator:location:en}", + "sl": "Dodatne informacije o lokaciji (v Angleščini):
{defibrillator:location:en}" }, "question": { "en": "Please give some explanation on where the defibrillator can be found (in English)", @@ -339,7 +365,8 @@ "fr": "Veuillez indiquez plus précisément où se situe le défibrillateur (en englais)", "nl": "Gelieve meer informatie te geven over de exacte locatie van de defibrillator (in het Engels)", "de": "Bitte geben Sie einige Erläuterungen dazu, wo der Defibrillator zu finden ist (auf Englisch)", - "it": "Indica più precisamente dove si trova il defibrillatore (in inglese)" + "it": "Indica più precisamente dove si trova il defibrillatore (in inglese)", + "sl": "Prosimo, opišite kje se nahaja defibrilator (v Angleščini)" }, "freeform": { "type": "text", @@ -353,7 +380,8 @@ "en": "Extra information about the location (in French):
{defibrillator:location:fr}", "fr": "Informations supplémentaires à propos de l'emplacement (en Français) :
{defibrillator:location:fr}", "it": "Informazioni supplementari circa la posizione (in francese):
{defibrillator:location:fr}", - "de": "Zusätzliche Informationen zum Standort (auf Französisch):
{defibrillator:location:fr}" + "de": "Zusätzliche Informationen zum Standort (auf Französisch):
{defibrillator:location:fr}", + "sl": "Dodatne informacije o lokaciji (v Francoščini):
{defibrillator:location:fr}" }, "question": { "en": "Please give some explanation on where the defibrillator can be found (in French)", @@ -362,7 +390,8 @@ "fr": "Veuillez indiquez plus précisément où se situe le défibrillateur (en français)", "nl": "Gelieve meer informatie te geven over de exacte locatie van de defibrillator (in het Frans)", "de": "Bitte geben Sie einige Erläuterungen dazu, wo der Defibrillator zu finden ist (auf Französisch)", - "it": "Indica più precisamente dove si trova il defibrillatore (in francese)" + "it": "Indica più precisamente dove si trova il defibrillatore (in francese)", + "sl": "Prosimo, opišite kje se nahaja defibrilator (v Francoščini)" }, "freeform": { "type": "text", @@ -377,14 +406,16 @@ "en": "Official identification number of the device: {ref}", "fr": "Numéro d'identification officiel de ce dispositif : {ref}", "it": "Numero identificativo ufficiale di questo dispositivo:{ref}", - "de": "Offizielle Identifikationsnummer des Geräts: {ref}" + "de": "Offizielle Identifikationsnummer des Geräts: {ref}", + "sl": "Uradna identifikacijska številka te naprave: {ref}" }, "question": { "en": "What is the official identification number of the device? (if visible on device)", "nl": "Wat is het officieel identificatienummer van het toestel? (indien zichtbaar op toestel)", "fr": "Quel est le numéro d'identification officiel de ce dispositif ? (si il est visible sur le dispositif)", "it": "Qual è il numero identificativo ufficiale di questo dispositivo? (se visibile sul dispositivo)", - "de": "Wie lautet die offizielle Identifikationsnummer des Geräts? (falls am Gerät sichtbar)" + "de": "Wie lautet die offizielle Identifikationsnummer des Geräts? (falls am Gerät sichtbar)", + "sl": "Kakšna je uradna identifikacijska številka te naprave? (če je vidna na napravi)" }, "freeform": { "type": "text", @@ -398,14 +429,16 @@ "nl": "Email voor vragen over deze defibrillator: {email}", "fr": "Adresse électronique pour des questions à propos de ce défibrillateur : {email}", "it": "Indirizzo email per le domande su questo defibrillatore:{email}", - "de": "E-Mail für Fragen zu diesem Defibrillator: {email}" + "de": "E-Mail für Fragen zu diesem Defibrillator: {email}", + "sl": "Email naslov za vprašanja o tem defibrilatorju: {email}" }, "question": { "en": "What is the email for questions about this defibrillator?", "nl": "Wat is het email-adres voor vragen over deze defibrillator", "fr": "Quelle est l'adresse électronique pour des questions à propos de ce défibrillateur ?", "it": "Qual è l’indirizzo email per le domande riguardanti questo defibrillatore?", - "de": "Wie lautet die E-Mail für Fragen zu diesem Defibrillator?" + "de": "Wie lautet die E-Mail für Fragen zu diesem Defibrillator?", + "sl": "Kakšen je email naslov za vprašanja o tem defibrilatorju?" }, "freeform": { "key": "email", @@ -419,14 +452,16 @@ "fr": "Numéro de téléphone pour questions sur le défibrillateur : {phone}", "nl": "Telefoonnummer voor vragen over deze defibrillator: {phone}", "it": "Numero di telefono per le domande su questo defibrillatore:{phone}", - "de": "Telefonnummer für Fragen zu diesem Defibrillator: {phone}" + "de": "Telefonnummer für Fragen zu diesem Defibrillator: {phone}", + "sl": "Telefonska številka za vprašanja o tem defibrilatorju: {phone}" }, "question": { "en": "What is the phone number for questions about this defibrillator?", "fr": "Quel est le numéro de téléphone pour questions sur le défibrillateur ?", "nl": "Wat is het telefoonnummer voor vragen over deze defibrillator", "it": "Qual è il numero di telefono per le domande riguardanti questo defibrillatore?", - "de": "Wie lautet die Telefonnummer für Fragen zu diesem Defibrillator?" + "de": "Wie lautet die Telefonnummer für Fragen zu diesem Defibrillator?", + "sl": "Kakšna je telefonska številka za vprašanja o tem defibrilatorju?" }, "freeform": { "key": "phone", @@ -441,7 +476,8 @@ "fr": "{opening_hours_table(opening_hours)}", "it": "{opening_hours_table(opening_hours)}", "ru": "{opening_hours_table(opening_hours)}", - "de": "{opening_hours_table(opening_hours)}" + "de": "{opening_hours_table(opening_hours)}", + "sl": "{opening_hours_table(opening_hours)}" }, "question": { "en": "At what times is this defibrillator available?", @@ -449,7 +485,8 @@ "fr": "À quels horaires ce défibrillateur est-il accessible ?", "it": "In quali orari è disponibile questo defibrillatore?", "ru": "В какое время доступен этот дефибриллятор?", - "de": "Zu welchen Zeiten ist dieser Defibrillator verfügbar?" + "de": "Zu welchen Zeiten ist dieser Defibrillator verfügbar?", + "sl": "Ob katerih urah je ta defibrilator na voljo?" }, "freeform": { "key": "opening_hours", @@ -463,7 +500,8 @@ "nl": "24/7 open (inclusief feestdagen)", "fr": "Ouvert 24/7 (jours feriés inclus)", "it": "Aperto 24/7 (festivi inclusi)", - "de": "24/7 geöffnet (auch an Feiertagen)" + "de": "24/7 geöffnet (auch an Feiertagen)", + "sl": "Na voljo 24/7 (tudi za praznike)" } } ], @@ -477,14 +515,16 @@ "it": "Informazioni supplementari: {description}", "ru": "Дополнительная информация: {description}", "de": "Zusätzliche Informationen: {description}", - "id": "Informasi tambahan: {description}" + "id": "Informasi tambahan: {description}", + "sl": "Dodatne informacije: {description}" }, "question": { "en": "Is there any useful information for users that you haven't been able to describe above? (leave blank if no)", "nl": "Is er nog iets bijzonder aan deze defibrillator dat je nog niet hebt kunnen meegeven? (laat leeg indien niet)", "fr": "Y a-t-il des informations utiles pour les utilisateurs que vous n'avez pas pu décrire ci-dessus ? (laisser vide sinon)", "it": "Vi sono altre informazioni utili agli utenti che non è stato possibile aggiungere prima? (lasciare vuoto in caso negativo)", - "de": "Gibt es nützliche Informationen für Benutzer, die Sie oben nicht beschreiben konnten? (leer lassen, wenn nein)" + "de": "Gibt es nützliche Informationen für Benutzer, die Sie oben nicht beschreiben konnten? (leer lassen, wenn nein)", + "sl": "Ali imate še kakšne uporabne informacije za uporabnike, ki jih niste mogli podati zgoraj? (pustite prazno če jih nimate)" }, "freeform": { "key": "description", @@ -498,14 +538,16 @@ "nl": "Wanneer is deze defibrillator het laatst gecontroleerd in OpenStreetMap?", "fr": "Quand le défibrillateur a-t-il été vérifié pour la dernière fois ?", "it": "Quando è stato verificato per l’ultima volta questo defibrillatore?", - "de": "Wann wurde dieser Defibrillator zuletzt überprüft?" + "de": "Wann wurde dieser Defibrillator zuletzt überprüft?", + "sl": "Kdaj je bil ta defibrilator nazadnje opažen?" }, "render": { "en": "This defibrillator was last surveyed on {survey:date}", "nl": "Deze defibrillator is nagekeken in OSM op {survey:date}", "fr": "Ce défibrillateur a été vérifié pour la dernière fois le {survey:date}", "it": "Questo defibrillatore è stato verificato per l‘ultima volta in data {survey:date}", - "de": "Dieser Defibrillator wurde zuletzt am {survey:date} überprüft" + "de": "Dieser Defibrillator wurde zuletzt am {survey:date} überprüft", + "sl": "Ta defibrilator je bil nazadnje opažen {survey:date}" }, "freeform": { "key": "survey:date", @@ -520,7 +562,8 @@ "fr": "Vérifié aujourd'hui !", "it": "Verificato oggi!", "ru": "Проверено сегодня!", - "de": "Heute überprüft!" + "de": "Heute überprüft!", + "sl": "Preverjeno danes!" } } ], @@ -533,14 +576,16 @@ "fr": "Informations supplémentaires pour les experts d'OpenStreetMap : {fixme}", "it": "Informazioni supplementari per gli esperti di OpenStreetMap: {fixme}", "de": "Zusätzliche Informationen für OpenStreetMap-Experten: {fixme}", - "ru": "Дополнительная информация для экспертов OpenStreetMap: {fixme}" + "ru": "Дополнительная информация для экспертов OpenStreetMap: {fixme}", + "sl": "Dodatne informacije za OpenStreetMap strokovnjake: {fixme}" }, "question": { "en": "Is there something wrong with how this is mapped, that you weren't able to fix here? (leave a note to OpenStreetMap experts)", "nl": "Is er iets mis met de informatie over deze defibrillator dat je hier niet opgelost kreeg? (laat hier een berichtje achter voor OpenStreetMap experts)", "fr": "Y a-t-il quelque chose qui ne va pas dans la manière dont ça a été cartographié, et que vous n'avez pas pu réparer ici ? (laisser une note pour les experts d'OpenStreetMap)", "it": "C’è qualcosa di sbagliato riguardante come è stato mappato, che non si è potuto correggere qua? (lascia una nota agli esperti di OpenStreetMap)", - "de": "Gibt es einen Fehler in der Kartierung, den Sie hier nicht beheben konnten? (hinterlasse eine Notiz an OpenStreetMap-Experten)" + "de": "Gibt es einen Fehler in der Kartierung, den Sie hier nicht beheben konnten? (hinterlasse eine Notiz an OpenStreetMap-Experten)", + "sl": "Ali je kaj narobe s tem vnosom na zemljevid, in tega niste mogli sami popraviti tu? (pustite opombo OpenStreetMap strokovnjakom)" }, "freeform": { "key": "fixme", @@ -583,6 +628,7 @@ ], "description": { "en": "A layer showing defibrillators which can be used in case of emergency. This contains public defibrillators, but also defibrillators which might need staff to fetch the actual device", - "nl": "Een laag die defibrillatoren toont die je kan gebruiken bij noodgevallen. Dit omvat zowel publiek beschikbare toestellen als defibrillatoren waarvoor het toestel enkel door personeel aangeboden kan worden" + "nl": "Een laag die defibrillatoren toont die je kan gebruiken bij noodgevallen. Dit omvat zowel publiek beschikbare toestellen als defibrillatoren waarvoor het toestel enkel door personeel aangeboden kan worden", + "sl": "Sloj prikazuje defibrilatorje, ki jih je možno uporabiti v primeru sile. Sloj poleg javno dostopnih defibrilatorjev vsebuje tudi tiste, ki za dostop morda potrebujejo pomoč osebja" } } \ No newline at end of file diff --git a/assets/themes/aed/aed.json b/assets/themes/aed/aed.json index 8255a8705..3765f73fa 100644 --- a/assets/themes/aed/aed.json +++ b/assets/themes/aed/aed.json @@ -16,7 +16,8 @@ "nb_NO": "Åpne AED-kart", "sv": "Öppna AED-karta", "pl": "Otwórz mapę AED", - "pt_BR": "Abrir mapa AED" + "pt_BR": "Abrir mapa AED", + "sl": "Zemljevid defibrilatorjev (AED)" }, "maintainer": "MapComplete", "icon": "./assets/themes/aed/aed.svg", @@ -36,7 +37,8 @@ "pl": "Na tej mapie można znaleźć i oznaczyć defibrylatory w okolicy", "pt_BR": "Neste mapa, pode-se encontrar e marcar desfibriladores próximos", "nb_NO": "Defibrillatorer i nærheten", - "hu": "Ezen a térképen a közeli defibrillátorokat lehet megtalálni és feltüntetni" + "hu": "Ezen a térképen a közeli defibrillátorokat lehet megtalálni és feltüntetni", + "sl": "Na tem zemljevidu lahko poiščete in označite bližnje defibrilatorje" }, "version": "2020-08-29", "startLat": 0, diff --git a/assets/themes/buurtnatuur/buurtnatuur.json b/assets/themes/buurtnatuur/buurtnatuur.json index 97526b843..705397547 100644 --- a/assets/themes/buurtnatuur/buurtnatuur.json +++ b/assets/themes/buurtnatuur/buurtnatuur.json @@ -538,16 +538,7 @@ ] }, "then": "Beheer door een privépersoon", - "hideInAnswer": true - }, - { - "if": { - "and": [ - "operator:type=private", - "operator=" - ] - }, - "then": "Beheer door een privépersoon" + "addExtraTags": ["operator="] } ], "condition": { diff --git a/assets/themes/campersite/campersite.json b/assets/themes/campersite/campersite.json index bc792011e..fedd61276 100644 --- a/assets/themes/campersite/campersite.json +++ b/assets/themes/campersite/campersite.json @@ -199,12 +199,8 @@ "nl": "Kan gratis gebruikt worden", "pt_BR": "Pode ser usado de graça", "de": "Nutzung kostenlos" - } - }, - { - "if": "fee=no", - "then": "Can be used for free", - "hideInAnswer": true + }, + "addExtraTags": ["charge="] } ] }, diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json index e9d02407d..679a779db 100644 --- a/assets/themes/climbing/climbing.json +++ b/assets/themes/climbing/climbing.json @@ -961,23 +961,6 @@ "it": "È possibile arrampicarsi qua?" }, "mappings": [ - { - "if": { - "and": [ - "sport!~climbing" - ] - }, - "then": { - "en": "Climbing is not possible here", - "de": "Hier kann nicht geklettert werden", - "ja": "ここでは登ることができない", - "nb_NO": "Klatring er ikke mulig her", - "nl": "Klimmen is hier niet mogelijk", - "fr": "Escalader n’est pas possible", - "it": "Non è possibile arrampicarsi qua" - }, - "hideInAnswer": true - }, { "if": { "and": [ @@ -1005,6 +988,23 @@ "fr": "Escalader n’est pas possible", "it": "Non è possibile arrampicarsi qua" } + }, + { + "if": { + "and": [ + "sport!~climbing" + ] + }, + "then": { + "en": "Climbing is not possible here", + "de": "Hier kann nicht geklettert werden", + "ja": "ここでは登ることができない", + "nb_NO": "Klatring er ikke mulig her", + "nl": "Klimmen is hier niet mogelijk", + "fr": "Escalader n’est pas possible", + "it": "Non è possibile arrampicarsi qua" + }, + "hideInAnswer": true } ] } diff --git a/assets/themes/grb_import/grb.json b/assets/themes/grb_import/grb.json index 812c981b2..4eb84c717 100644 --- a/assets/themes/grb_import/grb.json +++ b/assets/themes/grb_import/grb.json @@ -129,16 +129,12 @@ }, { "if": "building=apartments", - "then": "An apartment building - highrise for living" + "then": "An apartment building (highrise building for living)" }, { "if": "building=office", "then": "An office building - highrise for work" }, - { - "if": "building=apartments", - "then": "An apartment building" - }, { "if": "building=shed", "then": "A small shed, e.g. in a garden" diff --git a/assets/themes/grb_import/grb_fixme.json b/assets/themes/grb_import/grb_fixme.json index 2ae057dfd..f86e294e8 100644 --- a/assets/themes/grb_import/grb_fixme.json +++ b/assets/themes/grb_import/grb_fixme.json @@ -127,16 +127,12 @@ }, { "if": "building=apartments", - "then": "An apartment building - highrise for living" + "then": "An apartment building (a highrise building for living)" }, { "if": "building=office", "then": "An office building - highrise for work" }, - { - "if": "building=apartments", - "then": "An apartment building" - }, { "if": "building=shed", "then": "A small shed, e.g. in a garden" diff --git a/assets/themes/uk_addresses/uk_addresses.json b/assets/themes/uk_addresses/uk_addresses.json index 4a46793bf..e09a24ae0 100644 --- a/assets/themes/uk_addresses/uk_addresses.json +++ b/assets/themes/uk_addresses/uk_addresses.json @@ -256,13 +256,14 @@ }, "mappings": [ { - "if": "addr:unit=", - "then": "
Sub-unit (e.g. \"1\", \"Flat 2\", \"Unit C\")
", - "hideInAnswer": true + "if": "not:addr:unit=yes", + "then": "There is no sub-unit within this address", + "addExtraTags": ["addr:unit="] }, { "if": "addr:unit=", - "then": "There is no sub-unit within this address" + "then": "
Sub-unit (e.g. \"1\", \"Flat 2\", \"Unit C\")
", + "hideInAnswer": true } ], "condition": { @@ -291,17 +292,12 @@ "addr:housename=" ] }, - "then": "
House or building name
", - "hideInAnswer": true + "then": "This building has no housename" }, { - "if": { - "and": [ - "nohousename=yes", - "addr:housename=" - ] - }, - "then": "This building has no housename" + "if": "addr:housename=", + "then": "
House or building name
", + "hideInAnswer": true }, { "#": "By adding nohousenumber!=yes, this option will trigger when first added, but will be untriggered if a housenumber is added, resulting in the question poping up!", @@ -329,10 +325,18 @@ ] }, "mappings": [ + { + "if": "nohousenumber=yes", + "then": { + "en": "This building has no house number", + "nl": "Dit gebouw heeft geen huisnummer", + "de": "Dieses Gebäude hat keine Hausnummer" + }, + "addExtraTags": [ "addr:housenumber="] + }, { "if": { "and": [ - "nohousenumber=yes", "addr:housenumber=" ] }, @@ -340,19 +344,6 @@ "en": "
Number (e.g. 1, 1A, 2)
" }, "hideInAnswer": true - }, - { - "if": { - "and": [ - "nohousenumber=yes", - "addr:housenumber=" - ] - }, - "then": { - "en": "This building has no house number", - "nl": "Dit gebouw heeft geen huisnummer", - "de": "Dieses Gebäude hat keine Hausnummer" - } } ] }, @@ -373,17 +364,17 @@ }, "mappings": [ { + "if": "not:addr:substreet=yes", + "then": { + "en": "No extra place name is given or needed" + }, + "addExtraTags": ["addr:substreet="] + },{ "if": "addr:substreet=", "then": { "en": "
Place (e.g. \"Castle Mews\", \"West Business Park\")
" }, "hideInAnswer": true - }, - { - "if": "addr:substreet=", - "then": { - "en": "No extra place name is given or needed" - } } ], "condition": "addr:parentstreet=" @@ -403,18 +394,19 @@ ] }, "mappings": [ + { + "if": "not:addr:substreet=yes", + "then": { + "en": "No extra place name is given or needed" + }, + "addExtraTags": ["addr:substreet="] + }, { "if": "addr:substreet=", "then": { "en": "
Place (e.g. \"Castle Mews\", \"West Business Park\")
" }, "hideInAnswer": true - }, - { - "if": "addr:substreet=", - "then": { - "en": "No extra place name is given or needed" - } } ], "condition": { @@ -479,15 +471,9 @@ }, "mappings": [ { - "if": "addr:parentstreet=", - "then": { - "en": "
Parent street name
" - }, - "hideInAnswer": true - }, - { - "if": "addr:parentstreet=", - "then": "No parent street name is needed within this address" + "if": "not:addr:parentstreet=yes", + "then": "No parent street name is needed within this address", + "addExtraTags": ["addr:parentstreet="] }, { "if": "addr:parentstreet:={_closest_street:0:name}", @@ -503,6 +489,13 @@ "if": "addr:parentstreet:={_closest_street:2:name}", "then": "{_closest_street:2:name}", "hideInAnswer": "_closest_street:2:name=" + }, + { + "if": "addr:parentstreet=", + "then": { + "en": "
Parent street name
" + }, + "hideInAnswer": true } ], "condition": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index b71c9de87..b3e597656 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -262,7 +262,7 @@ "then": "Heeft een rugleuning" }, "1": { - "then": "Rugleuning ontbreekt" + "then": "Heeft geen rugleuning" } }, "question": "Heeft deze zitbank een rugleuning?" diff --git a/langs/layers/sl.json b/langs/layers/sl.json new file mode 100644 index 000000000..cea248a3e --- /dev/null +++ b/langs/layers/sl.json @@ -0,0 +1,130 @@ +{ + "defibrillator": { + "description": "Sloj prikazuje defibrilatorje, ki jih je možno uporabiti v primeru sile. Sloj poleg javno dostopnih defibrilatorjev vsebuje tudi tiste, ki za dostop morda potrebujejo pomoč osebja", + "name": "Defibrilatorji", + "presets": { + "0": { + "title": "Defibrilator" + }, + "1": { + "title": "defibrilator je pritrjen na steno" + } + }, + "tagRenderings": { + "defibrillator-access": { + "mappings": { + "0": { + "then": "Javno dostopen" + }, + "1": { + "then": "Javno dostopen" + }, + "2": { + "then": "Dostopen samo strankam" + }, + "3": { + "then": "Ni dostopen splošni javnosti (npr. samo za osebje, za lastnike, ...)" + }, + "4": { + "then": "Ni dostopen, morda samo za profesionalno rabo" + } + }, + "question": "Ali je ta defibrilator prosto dostopen?", + "render": "Dostop je {access}" + }, + "defibrillator-defibrillator": { + "mappings": { + "0": { + "then": "Ni informacij o vrsti naprave" + }, + "1": { + "then": "To je ročni defibrilator za poklicne reševalce" + }, + "2": { + "then": "To je normalen avtomatski defibrilator" + }, + "3": { + "then": "To je posebna vrsta defibrilatorja: {defibrillator}" + } + }, + "question": "Ali je to navaden avtomatski defibrilator ali ročni defibrilator namenjen poklicnim reševalcem?" + }, + "defibrillator-defibrillator:location": { + "question": "Prosimo, opišite kje se nahaja defibrilator (v lokalnem jeziku)", + "render": "Dodatne informacije o lokaciji (v lokalnem jeziku):
{defibrillator:location}" + }, + "defibrillator-defibrillator:location:en": { + "question": "Prosimo, opišite kje se nahaja defibrilator (v Angleščini)", + "render": "Dodatne informacije o lokaciji (v Angleščini):
{defibrillator:location:en}" + }, + "defibrillator-defibrillator:location:fr": { + "question": "Prosimo, opišite kje se nahaja defibrilator (v Francoščini)", + "render": "Dodatne informacije o lokaciji (v Francoščini):
{defibrillator:location:fr}" + }, + "defibrillator-description": { + "question": "Ali imate še kakšne uporabne informacije za uporabnike, ki jih niste mogli podati zgoraj? (pustite prazno če jih nimate)", + "render": "Dodatne informacije: {description}" + }, + "defibrillator-email": { + "question": "Kakšen je email naslov za vprašanja o tem defibrilatorju?", + "render": "Email naslov za vprašanja o tem defibrilatorju: {email}" + }, + "defibrillator-fixme": { + "question": "Ali je kaj narobe s tem vnosom na zemljevid, in tega niste mogli sami popraviti tu? (pustite opombo OpenStreetMap strokovnjakom)", + "render": "Dodatne informacije za OpenStreetMap strokovnjake: {fixme}" + }, + "defibrillator-indoors": { + "mappings": { + "0": { + "then": "Defibrilator se nahaja znotraj" + }, + "1": { + "then": "Defibrilator se nahaja zunaj" + } + }, + "question": "Ali se ta defibrilator nahaja znotraj?" + }, + "defibrillator-level": { + "mappings": { + "0": { + "then": "Ta defibrilator je v pritličju" + }, + "1": { + "then": "Ta defibrilator je v prvem nadstropju" + } + }, + "question": "V katerem nadstropju je defibrilator?", + "render": "Ta defibrilator je v {level}. nadstropju" + }, + "defibrillator-opening_hours": { + "mappings": { + "0": { + "then": "Na voljo 24/7 (tudi za praznike)" + } + }, + "question": "Ob katerih urah je ta defibrilator na voljo?", + "render": "{opening_hours_table(opening_hours)}" + }, + "defibrillator-phone": { + "question": "Kakšna je telefonska številka za vprašanja o tem defibrilatorju?", + "render": "Telefonska številka za vprašanja o tem defibrilatorju: {phone}" + }, + "defibrillator-ref": { + "question": "Kakšna je uradna identifikacijska številka te naprave? (če je vidna na napravi)", + "render": "Uradna identifikacijska številka te naprave: {ref}" + }, + "defibrillator-survey:date": { + "mappings": { + "0": { + "then": "Preverjeno danes!" + } + }, + "question": "Kdaj je bil ta defibrilator nazadnje opažen?", + "render": "Ta defibrilator je bil nazadnje opažen {survey:date}" + } + }, + "title": { + "render": "Defibrilator" + } + } +} \ No newline at end of file diff --git a/langs/nl.json b/langs/nl.json index 2f8dfeee0..c0c5a7c6a 100644 --- a/langs/nl.json +++ b/langs/nl.json @@ -60,7 +60,7 @@ "intro": "Kies hieronder welk punt je wilt toevoegen
", "layerNotEnabled": "De laag {layer} is gedeactiveerd. Activeer deze om een punt toe te voegen", "openLayerControl": "Open de laag-instellingen", - "pleaseLogin": "Gelieve je aan te melden om een punt to te voegen", + "pleaseLogin": "Gelieve je aan te melden om een punt toe te voegen", "presetInfo": "Het nieuwe object krijgt de attributen {tags}", "stillLoading": "De data worden nog geladen. Nog even geduld en dan kan je een punt toevoegen.", "title": "Nieuw punt toevoegen?", diff --git a/langs/shared-questions/sl.json b/langs/shared-questions/sl.json new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/langs/shared-questions/sl.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/langs/sl.json b/langs/sl.json new file mode 100644 index 000000000..de66f409d --- /dev/null +++ b/langs/sl.json @@ -0,0 +1,38 @@ +{ + "general": { + "back": "Nazaj", + "cancel": "Prekliči", + "confirm": "Potrdi", + "pickLanguage": "Izberite jezik: ", + "skip": "Preskoči to vprašanje", + "weekdays": { + "abbreviations": { + "friday": "Pet", + "monday": "Pon", + "saturday": "Sob", + "sunday": "Ned", + "thursday": "Čet", + "tuesday": "Tor", + "wednesday": "Sre" + }, + "friday": "Petek", + "monday": "Ponedeljek", + "saturday": "Sobota", + "sunday": "Nedelja", + "thursday": "Četrtek", + "tuesday": "Torek", + "wednesday": "Sreda" + } + }, + "image": { + "addPicture": "Dodaj sliko", + "doDelete": "Odstrani sliko", + "dontDelete": "Prekliči", + "isDeleted": "Izbrisana" + }, + "index": { + "intro": "MapComplete je pregledovalnik in urejevalnik zemljevida OpenStreetMap, ki prikazuje in omogoča urejanje informacij na določeno tematiko.", + "pickTheme": "Za začetek spodaj izberite tematiko.", + "title": "Dobrodošli na MapComplete" + } +} \ No newline at end of file diff --git a/langs/themes/de.json b/langs/themes/de.json index be8b80098..fdd86635a 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -442,10 +442,10 @@ "climbing-possible": { "mappings": { "0": { - "then": "Hier kann nicht geklettert werden" + "then": "Hier kann geklettert werden" }, "1": { - "then": "Hier kann geklettert werden" + "then": "Hier kann nicht geklettert werden" }, "2": { "then": "Hier kann nicht geklettert werden" diff --git a/langs/themes/en.json b/langs/themes/en.json index deae423e0..34df504ca 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -442,10 +442,10 @@ "climbing-possible": { "mappings": { "0": { - "then": "Climbing is not possible here" + "then": "Climbing is possible here" }, "1": { - "then": "Climbing is possible here" + "then": "Climbing is not possible here" }, "2": { "then": "Climbing is not possible here" diff --git a/langs/themes/fr.json b/langs/themes/fr.json index b92bbb0f7..1c8db0eee 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -428,10 +428,10 @@ "climbing-possible": { "mappings": { "0": { - "then": "Escalader n’est pas possible" + "then": "Escalader est possible" }, "1": { - "then": "Escalader est possible" + "then": "Escalader n’est pas possible" }, "2": { "then": "Escalader n’est pas possible" diff --git a/langs/themes/it.json b/langs/themes/it.json index 3534e7343..473be090f 100644 --- a/langs/themes/it.json +++ b/langs/themes/it.json @@ -436,10 +436,10 @@ "climbing-possible": { "mappings": { "0": { - "then": "Non è possibile arrampicarsi qua" + "then": "È possibile arrampicarsi qua" }, "1": { - "then": "È possibile arrampicarsi qua" + "then": "Non è possibile arrampicarsi qua" }, "2": { "then": "Non è possibile arrampicarsi qua" diff --git a/langs/themes/ja.json b/langs/themes/ja.json index 3af65c887..f0a7a60c0 100644 --- a/langs/themes/ja.json +++ b/langs/themes/ja.json @@ -364,10 +364,10 @@ "climbing-possible": { "mappings": { "0": { - "then": "ここでは登ることができない" + "then": "ここでは登ることができる" }, "1": { - "then": "ここでは登ることができる" + "then": "ここでは登ることができない" }, "2": { "then": "ここでは登ることができない" diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json index da448944f..aedb5cf48 100644 --- a/langs/themes/nb_NO.json +++ b/langs/themes/nb_NO.json @@ -119,10 +119,10 @@ "climbing-possible": { "mappings": { "0": { - "then": "Klatring er ikke mulig her" + "then": "Klatring er mulig her" }, "1": { - "then": "Klatring er mulig her" + "then": "Klatring er ikke mulig her" }, "2": { "then": "Klatring er ikke mulig her" diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 3b591ad64..0bede9a50 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -398,13 +398,13 @@ "climbing-possible": { "mappings": { "0": { - "then": "Klimmen is hier niet mogelijk" + "then": "Klimmen is hier niet toegelaten" }, "1": { "then": "Klimmen is hier niet toegelaten" }, "2": { - "then": "Klimmen is hier niet toegelaten" + "then": "Klimmen is hier niet mogelijk" } } } diff --git a/langs/themes/sl.json b/langs/themes/sl.json new file mode 100644 index 000000000..babdb5bc0 --- /dev/null +++ b/langs/themes/sl.json @@ -0,0 +1,6 @@ +{ + "aed": { + "description": "Na tem zemljevidu lahko poiščete in označite bližnje defibrilatorje", + "title": "Zemljevid defibrilatorjev (AED)" + } +} \ No newline at end of file diff --git a/theme.html b/theme.html index 2636d1e1d..82d445aa6 100644 --- a/theme.html +++ b/theme.html @@ -49,7 +49,7 @@
-
' +