diff --git a/assets/layers/bench/license_info.json b/assets/layers/bench/license_info.json index 97fa914894..95762c96fc 100644 --- a/assets/layers/bench/license_info.json +++ b/assets/layers/bench/license_info.json @@ -2,7 +2,11 @@ { "path": "bench.svg", "license": "CC0", - "authors": [], - "sources": [] + "authors": [ + "Tobias Zwick" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/" + ] } ] \ No newline at end of file diff --git a/assets/layers/toilet/license_info.json b/assets/layers/toilet/license_info.json index 0e96479eb9..9d629c5b41 100644 --- a/assets/layers/toilet/license_info.json +++ b/assets/layers/toilet/license_info.json @@ -12,7 +12,7 @@ "license": "CC-BY", "authors": [ "asianson.design", - " Pieter Vander Vennet" + "Pieter Vander Vennet" ], "sources": [ "https://thenounproject.com/term/urinal/1307984/" @@ -22,6 +22,8 @@ "path": "wheelchair.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Wheelchair_symbol.svg" + ] } ] \ No newline at end of file diff --git a/assets/layers/trail/license_info.json b/assets/layers/trail/license_info.json index 2fd505af67..8f560aaad3 100644 --- a/assets/layers/trail/license_info.json +++ b/assets/layers/trail/license_info.json @@ -23,6 +23,8 @@ "path": "wheelchair.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Wheelchair_symbol.svg" + ] } ] \ No newline at end of file diff --git a/assets/layers/watermill/license_info.json b/assets/layers/watermill/license_info.json deleted file mode 100644 index befe373ad7..0000000000 --- a/assets/layers/watermill/license_info.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - { - "path": "watermill.svg", - "license": "CC0", - "authors": [], - "sources": [] - } -] \ No newline at end of file diff --git a/assets/layers/watermill/watermill.json b/assets/layers/watermill/watermill.json deleted file mode 100644 index 7518a72978..0000000000 --- a/assets/layers/watermill/watermill.json +++ /dev/null @@ -1,191 +0,0 @@ -{ - "id": "watermill", - "name": { - "nl": "Watermolens", - "en": "Watermill", - "de": "Wassermühlen", - "ru": "Водяная мельница", - "id": "Kincir Air", - "fr": "Moulin à eau", - "ca": "Molí d'aigua", - "da": "Vandmølle" - }, - "minzoom": 12, - "source": { - "osmTags": { - "and": [ - "man_made=watermill" - ] - } - }, - "title": { - "render": { - "nl": "Watermolens" - }, - "mappings": [ - { - "if": { - "and": [ - "name:nl~*" - ] - }, - "then": { - "nl": "{name:nl}" - } - }, - { - "if": { - "and": [ - "name~*" - ] - }, - "then": { - "nl": "{name}" - } - } - ] - }, - "description": { - "nl": "Watermolens" - }, - "tagRenderings": [ - "images", - { - "render": { - "nl": "De toegankelijkheid van dit gebied is: {access:description}" - }, - "question": { - "nl": "Is dit gebied toegankelijk?" - }, - "freeform": { - "key": "access:description" - }, - "mappings": [ - { - "if": { - "and": [ - "access=yes", - "fee=" - ] - }, - "then": { - "nl": "Vrij toegankelijk" - } - }, - { - "if": { - "and": [ - "access=no", - "fee=" - ] - }, - "then": { - "nl": "Niet toegankelijk" - } - }, - { - "if": { - "and": [ - "access=private", - "fee=" - ] - }, - "then": { - "nl": "Niet toegankelijk, want privégebied" - } - }, - { - "if": { - "and": [ - "access=permissive", - "fee=" - ] - }, - "then": { - "nl": "Toegankelijk, ondanks dat het privegebied is" - } - }, - { - "if": { - "and": [ - "access=guided", - "fee=" - ] - }, - "then": { - "nl": "Enkel toegankelijk met een gids of tijdens een activiteit" - } - }, - { - "if": { - "and": [ - "access=yes", - "fee=yes" - ] - }, - "then": { - "nl": "Toegankelijk mits betaling" - } - } - ], - "id": "Access tag" - }, - { - "render": { - "nl": "Beheer door {operator}" - }, - "question": { - "nl": "Wie beheert dit pad?" - }, - "freeform": { - "key": "operator" - }, - "mappings": [ - { - "if": { - "and": [ - "operator=Natuurpunt" - ] - }, - "then": { - "nl": "Dit gebied wordt beheerd door Natuurpunt" - }, - "icon": { - "path": "./assets/themes/buurtnatuur/Natuurpunt.jpg", - "class": "small" - } - }, - { - "if": { - "and": [ - "operator~(n|N)atuurpunt.*" - ] - }, - "then": { - "nl": "Dit gebied wordt beheerd door {operator}" - }, - "hideInAnswer": true, - "icon": { - "path": "./assets/themes/buurtnatuur/Natuurpunt.jpg", - "class": "small" - } - } - ], - "id": "Operator tag" - } - ], - "mapRendering": [ - { - "icon": { - "render": "./assets/layers/watermill/watermill.svg" - }, - "iconSize": { - "render": "50,50,center" - }, - "location": [ - "point", - "centroid" - ] - } - ] -} \ No newline at end of file diff --git a/assets/layers/watermill/watermill.svg b/assets/layers/watermill/watermill.svg deleted file mode 100644 index 86c14d61da..0000000000 --- a/assets/layers/watermill/watermill.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json index 9352c1631e..bc33899655 100644 --- a/assets/svg/license_info.json +++ b/assets/svg/license_info.json @@ -499,12 +499,6 @@ "https://www.iconpacks.net/free-icon-pack/gender-107.html" ] }, - { - "path": "gender_female.svg", - "license": "CC0", - "authors": [], - "sources": [] - }, { "path": "gender_female.svg", "license": "CC0", @@ -525,12 +519,6 @@ "https://www.iconpacks.net/free-icon-pack/gender-107.html" ] }, - { - "path": "gender_male.svg", - "license": "CC0", - "authors": [], - "sources": [] - }, { "path": "gender_male.svg", "license": "CC0", @@ -551,12 +539,6 @@ "https://www.iconpacks.net/free-icon-pack/gender-107.html" ] }, - { - "path": "gender_trans.svg", - "license": "CC0", - "authors": [], - "sources": [] - }, { "path": "gender_trans.svg", "license": "CC0", @@ -899,7 +881,7 @@ }, { "path": "none.svg", - "license": "CC0", + "license": "trivial", "authors": [], "sources": [] }, @@ -1277,9 +1259,11 @@ }, { "path": "teardrop_with_hole_green.svg", - "license": "CC0", + "license": "Creative Commons 4.0 BY-NC", "authors": [], - "sources": [] + "sources": [ + "https://pngimg.com/image/46283" + ] }, { "path": "translate.svg", diff --git a/assets/themes/charging_stations/license_info.json b/assets/themes/charging_stations/license_info.json index d254afc9ea..58aeb1bc46 100644 --- a/assets/themes/charging_stations/license_info.json +++ b/assets/themes/charging_stations/license_info.json @@ -13,8 +13,13 @@ { "path": "car.svg", "license": "CC0", - "authors": [], - "sources": [] + "authors": [ + "Simon Child", + "The Noun Project" + ], + "sources": [ + "https://thenounproject.com/icon/electric-car-55511/" + ] }, { "path": "logo.svg", diff --git a/assets/themes/natuurpunt/license_info.json b/assets/themes/natuurpunt/license_info.json index cf4381e088..ca5cbf4149 100644 --- a/assets/themes/natuurpunt/license_info.json +++ b/assets/themes/natuurpunt/license_info.json @@ -3,37 +3,49 @@ "path": "bench.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://osoc.be/editions/2021/nature-moves" + ] }, { "path": "birdhide.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://osoc.be/editions/2021/nature-moves" + ] }, { "path": "drips.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://osoc.be/editions/2021/nature-moves" + ] }, { "path": "information.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://osoc.be/editions/2021/nature-moves" + ] }, { "path": "information_board.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://osoc.be/editions/2021/nature-moves" + ] }, { "path": "nature_reserve.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://osoc.be/editions/2021/nature-moves" + ] }, { "path": "natuurpunt.png", @@ -49,72 +61,88 @@ "path": "parking.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://osoc.be/editions/2021/nature-moves" + ] }, { "path": "parkingbike.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://osoc.be/editions/2021/nature-moves" + ] }, { "path": "parkingmotor.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://osoc.be/editions/2021/nature-moves" + ] }, { "path": "parkingwheels.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://osoc.be/editions/2021/nature-moves" + ] }, { "path": "picnic_table.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://osoc.be/editions/2021/nature-moves" + ] }, { "path": "pushchair.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://osoc.be/editions/2021/nature-moves" + ] }, { "path": "toilets.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://osoc.be/editions/2021/nature-moves" + ] }, { "path": "trail.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://osoc.be/editions/2021/nature-moves" + ] }, { "path": "urinal.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://osoc.be/editions/2021/nature-moves" + ] }, { "path": "walk_wheelchair.svg", "license": "CC0", "authors": [], - "sources": [] - }, - { - "path": "watermill.svg", - "license": "CC0", - "authors": [], - "sources": [] + "sources": [ + "https://osoc.be/editions/2021/nature-moves" + ] }, { "path": "wheelchair.svg", "license": "CC0", "authors": [], - "sources": [] + "sources": [ + "https://osoc.be/editions/2021/nature-moves" + ] } ] \ No newline at end of file diff --git a/assets/themes/natuurpunt/natuurpunt.json b/assets/themes/natuurpunt/natuurpunt.json index 9ad06bc60e..205563aa2d 100644 --- a/assets/themes/natuurpunt/natuurpunt.json +++ b/assets/themes/natuurpunt/natuurpunt.json @@ -323,24 +323,6 @@ ] } }, - { - "builtin": "watermill", - "override": { - "minzoom": "14", - "source": { - "geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson", - "geoJsonZoomLevel": 12, - "isOsmCache": true - }, - "mapRendering": [ - { - "icon": { - "render": "circle:#FE6F32;./assets/themes/natuurpunt/watermill.svg" - } - } - ] - } - }, { "builtin": "gps_track", "override": { @@ -353,4 +335,4 @@ "enableIframePopout": false, "enableBackgroundLayerSelection": false, "enableNoteImports": false -} \ No newline at end of file +} diff --git a/assets/themes/natuurpunt/watermill.svg b/assets/themes/natuurpunt/watermill.svg deleted file mode 100644 index 856d9c6dc7..0000000000 --- a/assets/themes/natuurpunt/watermill.svg +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - diff --git a/assets/themes/toerisme_vlaanderen/license_info.json b/assets/themes/toerisme_vlaanderen/license_info.json index feefa82985..250e58d305 100644 --- a/assets/themes/toerisme_vlaanderen/license_info.json +++ b/assets/themes/toerisme_vlaanderen/license_info.json @@ -107,9 +107,11 @@ }, { "path": "logo.svg", - "license": "CC0", + "license": "Creative Commons 4.0 BY-NC", "authors": [], - "sources": [] + "sources": [ + "https://pngimg.com/image/46283" + ] }, { "path": "observation_platform.svg", diff --git a/assets/themes/width/license_info.json b/assets/themes/width/license_info.json index 20cd905558..638345cb85 100644 --- a/assets/themes/width/license_info.json +++ b/assets/themes/width/license_info.json @@ -2,7 +2,9 @@ { "path": "icon.svg", "license": "CC0; trivial", - "authors": [], + "authors": [ + "Pieter Vander Vennet" + ], "sources": [] } ] \ No newline at end of file diff --git a/scripts/generateLicenseInfo.ts b/scripts/generateLicenseInfo.ts index 3a8b7567ba..30b26cd602 100644 --- a/scripts/generateLicenseInfo.ts +++ b/scripts/generateLicenseInfo.ts @@ -279,7 +279,23 @@ function main(args: string[]) { const invalidLicenses = licenseInfos .filter((l) => (l.license ?? "") === "") .map((l) => `License for artwork ${l.path} is empty string or undefined`) + + let invalid = 0 for (const licenseInfo of licenseInfos) { + const isTrivial = + licenseInfo.license + .split(";") + .map((l) => l.trim().toLowerCase()) + .indexOf("trivial") >= 0 + if (licenseInfo.sources.length + licenseInfo.authors.length == 0 && !isTrivial) { + invalid++ + invalidLicenses.push( + "Invalid license: No sources nor authors given in the license for " + + JSON.stringify(licenseInfo) + ) + continue + } + for (const source of licenseInfo.sources) { if (source == "") { invalidLicenses.push( @@ -294,7 +310,7 @@ function main(args: string[]) { } } - if (missingLicenses.length > 0) { + if (missingLicenses.length > 0 || invalidLicenses.length) { const msg = `There are ${missingLicenses.length} licenses missing and ${invalidLicenses.length} invalid licenses.` console.log(missingLicenses.concat(invalidLicenses).join("\n")) console.error(msg)