Docs: more work on the licenses

LICENSES/LOGO.txt

@@ -4,6 +4,7 @@ The attached file is the logo of an company, organization or brand.
 This logo is used under a FAIR-USE doctrine, e.g. 
 
 - in the context of a map feature, to indicate that this feature is operated by this organization or that this feature is branded similarly in the same way. Keep in mind that the data might be wrong and that no relationship between the author of the software and this organization might exist
+- in the context of a communication platform, a logo representing the platform might be used. For example, if the contributor adds a link to their Mastodon-profile, a Mastodon-logo might be shown next to it.
 - in the context of a thematic map, to indicate that this map has been developed for this organisation or with funds of this organization.
 
 The inclusion of this logo does by no means give others the right to reuse or modify this logo.

assets/layers/food/license_info.json

@@ -1,7 +1,7 @@
 [
   {
     "path": "Vegetarian-mark.svg",
-    "license": "PD",
+    "license": "PUBLIC-DOMAIN",
     "authors": [
       "European Vegetarian Union"
     ],

assets/layers/veterinary/license_info.json

@@ -1,7 +1,7 @@
 [
   {
     "path": "vet.svg",
-    "license": "PD",
+    "license": "PUBLIC-DOMAIN",
     "authors": [
       "Niels Elgaard Larsen",
       "Tim Hitchins"

assets/themes/cycle_highways/license_info.json

@@ -1,7 +1,7 @@
 [
   {
     "path": "fietssnelwegen-logo.svg",
-    "license": "LOGO-BY-THE-GOVERNMENT",
+    "license": "LOGO",
     "authors": [
       "De Vlaamse Provincies"
     ],

assets/themes/pets/license_info.json

@@ -1,7 +1,7 @@
 [
   {
     "path": "dog-food.svg",
-    "license": "PD",
+    "license": "PUBLIC-DOMAIN",
     "authors": [
       "Public Domain Symbols",
       "Jean Victor Balin ",

scripts/generateLicenseInfo.ts

@@ -208,19 +208,17 @@ export class GenerateLicenseInfo extends Script {
             "CREATIVE-COMMONS-4.0-BY-NC": "CC-BY-NC-4.0",
             "CC-BY-SA-3.0-UNPORTED": "CC-BY-SA-3.0",
             "ISC-LICENSE": "ISC",
+            "LOGO-BY-THE-GOVERNMENT": "LOGO",
+            PD: "PUBLIC-DOMAIN",
             /*  ALL-RIGHTS-RESERVED:
             PD:
                 PUBLIC-DOMAIN:
-        GNU:
-            GPL:
-                ISC-LICENSE:
-        LOGO-BY-THE-GOVERNMENT:
-        LOGO:
         TRIVIAL: //*/
         }
 
         return mappings[licenseId] ?? licenseId
     }
+
     cleanLicenseInfo(allPaths: string[], allLicenseInfos: SmallLicense[]) {
         // Read the license info file from the generated assets, creates a compiled license info in every directory
         // Note: this removes all the old license infos
@@ -245,9 +243,13 @@ export class GenerateLicenseInfo extends Script {
                 sources: license.sources,
             }
 
-            cloned.license = Utils.Dedup(
+            const licenses = Utils.Dedup(
                 cloned.license.split(";").map((l) => this.toSPDXCompliantLicense(l))
-            ).join("; ")
+            )
+            if (licenses.length > 1 && licenses.indexOf("TRIVIAL") > 0) {
+                //  licenses.splice(licenses.indexOf("TRIVIAL"), 1)
+            }
+            cloned.license = licenses.join("; ")
 
             perDirectory.get(dir).push(cloned)
         }