From c7d4007f93543e9df7ed411c93979d2b4c218b6e Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 27 Jul 2023 14:10:08 +0200 Subject: [PATCH] Add licenses on the last files --- .reuse/dep5 | 40 +- LICENSES/ALL-RIGHTS-RESERVED.txt | 10 + LICENSES/TRIVIAL.txt | 4 + LICENSES/UBUNTU-FONT-LICENSE.txt | 96 + .../bike_repair_station/license_info.json | 4 +- .../pump_example.png.license | 2 +- .../pump_example_round.jpg.license | 2 +- .../layers/charging_station/license_info.json | 2 +- .../under_construction.svg.license | 2 +- .../layers/food/Vegetarian-mark.svg.license | 2 +- assets/layers/food/license_info.json | 2 +- assets/layers/nature_reserve/ANB.jpg.license | 2 +- .../nature_reserve/Natuurpunt.jpg.license | 2 +- .../nature_reserve/groen_logo.svg.license | 2 +- .../layers/nature_reserve/license_info.json | 6 +- assets/layers/play_forest/icon.svg.license | 2 +- assets/layers/play_forest/license_info.json | 2 +- assets/layers/questions/license_info.json | 4 +- .../layers/questions/send_email.svg.license | 2 +- assets/layers/veterinary/license_info.json | 2 +- assets/layers/veterinary/vet.svg.license | 2 +- assets/svg/close.svg.license | 2 +- assets/svg/compass.svg.license | 2 +- assets/svg/cross_bottom_right.svg.license | 2 +- assets/svg/crosshair-locked.svg.license | 2 +- assets/svg/crosshair.svg.license | 2 +- assets/svg/direction_gradient.svg.license | 2 +- assets/svg/envelope.svg.license | 2 +- assets/svg/gear.svg.license | 2 +- assets/svg/help.svg.license | 2 +- assets/svg/layers.svg.license | 2 +- assets/svg/liberapay.svg.license | 2 +- assets/svg/license_info.json | 134 +- assets/svg/loading.svg.license | 2 +- assets/svg/logo.svg.license | 2 +- assets/svg/logout.svg.license | 2 +- assets/svg/mapcomplete_logo.svg.license | 2 +- assets/svg/mapillary.svg.license | 2 +- assets/svg/mapillary_black.svg.license | 2 +- assets/svg/mastodon.svg.license | 2 +- assets/svg/min.svg.license | 2 +- assets/svg/no_checkmark.svg.license | 2 +- assets/svg/osm-logo.svg.license | 2 +- assets/svg/pin.svg.license | 2 +- assets/svg/plantnet_logo.svg.license | 2 +- assets/svg/plus.svg.license | 2 +- assets/svg/reload.svg.license | 2 +- assets/svg/ring.svg.license | 2 +- assets/svg/share.svg.license | 2 +- assets/svg/square.svg.license | 2 +- assets/svg/star.svg.license | 2 +- assets/svg/star_half.svg.license | 2 +- assets/svg/star_outline.svg.license | 2 +- assets/svg/star_outline_half.svg.license | 2 +- assets/svg/up.svg.license | 2 +- assets/svg/wikidata.svg.license | 2 +- .../svg/wikimedia-commons-white.svg.license | 2 +- assets/svg/wikipedia.svg.license | 2 +- assets/themes/advertising/Mug.jpg.license | 2 +- assets/themes/advertising/license_info.json | 2 +- assets/themes/buurtnatuur/ANB.jpg.license | 2 +- .../themes/buurtnatuur/Buurtnatuur-Welkom.txt | 21 - .../themes/buurtnatuur/Natuurpunt.jpg.license | 2 +- .../themes/buurtnatuur/groen_logo.svg.license | 2 +- assets/themes/buurtnatuur/license_info.json | 8 +- assets/themes/buurtnatuur/logo.svg.license | 2 +- .../charging_stations/license_info.json | 4 +- .../themes/charging_stations/logo.svg.license | 2 +- .../themes/charging_stations/plug.svg.license | 2 +- .../fietssnelwegen-logo.svg.license | 2 +- .../fietsambassade_gent_logo.svg.license | 2 +- ...fietsambassade_gent_logo_small.svg.license | 2 +- assets/themes/cyclofix/license_info.json | 18 +- assets/themes/pets/dog-food.svg.license | 2 +- assets/themes/pets/license_info.json | 2 +- ...epartement_Omgeving_Vlaanderen.png.license | 2 +- assets/themes/speelplekken/license_info.json | 8 +- .../provincie_antwerpen.jpg.license | 2 +- .../speelplekken/social_image.jpg.license | 2 +- .../themes/speelplekken/youtube.svg.license | 2 +- .../toerisme_vlaanderen/license_info.json | 2 +- .../toerisme_vlaanderen/logo.png.license | 2 +- .../islington_small_piece.geojson | 2162 ----------------- assets/themes/width/icon.svg.license | 2 +- assets/themes/width/license_info.json | 2 +- scripts/generateLicenseInfo.ts | 20 +- 86 files changed, 332 insertions(+), 2349 deletions(-) create mode 100644 LICENSES/ALL-RIGHTS-RESERVED.txt create mode 100644 LICENSES/TRIVIAL.txt create mode 100644 LICENSES/UBUNTU-FONT-LICENSE.txt delete mode 100644 assets/themes/buurtnatuur/Buurtnatuur-Welkom.txt delete mode 100644 assets/themes/uk_addresses/islington_small_piece.geojson diff --git a/.reuse/dep5 b/.reuse/dep5 index 36a66a3b8..77c517fd6 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -3,11 +3,47 @@ Upstream-Name: MapComplete Upstream-Contact: Pieter Vander Vennet Source: https://github.com/pietervdvn/MapComplete -Files: scripts/* src/* *.html Docs/* assets/*/*/*.json langs/* test/* assets/*/*/*.json public/assets/*/*/*.json public/css/* +Files: scripts/* src/* *.html Docs/* langs/* test/* ublic/css/* CODE_OF_CONDUCT.md CONTRIBUTING.md README.md package.json Copyright: MapComplete contributors License: GPL-3.0-or-later -Files: *.config.* .vscode/* .tool-versions .prettierrc.json .prettierignore .nvmrc .gitpod .gitignore .github/* .editorconfig .git-blame-ignore-revse +Files: assets/*/*/*.json assets/*/*/*.css assets/*/*/*.csv assets/*/*/*.protojson assets/*/*/*.md assets/*/*/*.ts assets/*/*/*.txt public/css/* +Copyright: MapComplete contributors +Comment: various assets, mostly layers and themes +License: GPL-3.0-or-later + +Files: assets/**/license_info.json public/*/license_info.json +Copyright: MapComplete contributors +Comment: Various files detailing the license info of a file +License: GPL-3.0-or-later + +Files: *.config.* .vscode/* .tool-versions .prettierrc.json .prettierignore .nvmrc .gitpod .gitignore .github/* .editorconfig .git-blame-ignore-revs tsconfig.json tslint.json package-lock.json Copyright: MapComplete contributors Comment: Miscellaneous config files, no real 'creative work' but still a pain to get right License: CC0-1.0 + +Files: public/assets/templates/*.svg +Copyright: MapComplete contributors +Comment: export templates +License: GPL-3.0-or-later + +Files: public/assets/templates/*.js public/assets/fonts/*.js +Copyright: MapComplete contributors +Comment: fonts for exports +License: UBUNTU-FONT-LICENSE + + +Files: public/assets/*.svg public/assets/*.png public/apple_touch_icon.png +Copyright: MapComplete contributors +Comment: various MapComplete logos +License: GPL-3.0-or-later + +Files: public/maplibre-gl.css +Copyright: MapLibre-gl +Comment: https://www.npmjs.com/package/maplibre-gl +License: BSD-3-Clause + +Files: LICENSES/*.txt +Copyright: License author +Comment: under what license falls a license text? +License: CC0-1.0 diff --git a/LICENSES/ALL-RIGHTS-RESERVED.txt b/LICENSES/ALL-RIGHTS-RESERVED.txt new file mode 100644 index 000000000..3a1a9917f --- /dev/null +++ b/LICENSES/ALL-RIGHTS-RESERVED.txt @@ -0,0 +1,10 @@ +ALL RIGHTS RESERVED + +This file is used within the software project because permission was granted to this software project, either implicit or explicit. +However, there is no other specific license for this file, thus making it unsuited for reuse. + +For example: + +- permission was asked and obtained to use it, but without granting an open license +- artwork was designed for a commissioned part of the software, but this artwork was not released under a specific license +- a font or icon is used to use the correct style of the organisation ordering a part of the software. This does not give third-parties the right to reuse those fonts diff --git a/LICENSES/TRIVIAL.txt b/LICENSES/TRIVIAL.txt new file mode 100644 index 000000000..2392b9e54 --- /dev/null +++ b/LICENSES/TRIVIAL.txt @@ -0,0 +1,4 @@ +TRIVIAL + +The file is a simple geometrical form and does not meet the criteria for a "creative work". +As such, the work can be reused as if it were part of the public domain. diff --git a/LICENSES/UBUNTU-FONT-LICENSE.txt b/LICENSES/UBUNTU-FONT-LICENSE.txt new file mode 100644 index 000000000..ae78a8f94 --- /dev/null +++ b/LICENSES/UBUNTU-FONT-LICENSE.txt @@ -0,0 +1,96 @@ +------------------------------- +UBUNTU FONT LICENCE Version 1.0 +------------------------------- + +PREAMBLE +This licence allows the licensed fonts to be used, studied, modified and +redistributed freely. The fonts, including any derivative works, can be +bundled, embedded, and redistributed provided the terms of this licence +are met. The fonts and derivatives, however, cannot be released under +any other licence. The requirement for fonts to remain under this +licence does not require any document created using the fonts or their +derivatives to be published under this licence, as long as the primary +purpose of the document is not to be a vehicle for the distribution of +the fonts. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this licence and clearly marked as such. This may +include source files, build scripts and documentation. + +"Original Version" refers to the collection of Font Software components +as received under this licence. + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to +a new environment. + +"Copyright Holder(s)" refers to all individuals and companies who have a +copyright ownership of the Font Software. + +"Substantially Changed" refers to Modified Versions which can be easily +identified as dissimilar to the Font Software by users of the Font +Software comparing the Original Version with the Modified Version. + +To "Propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification and with or without charging +a redistribution fee), making available to the public, and in some +countries other activities as well. + +PERMISSION & CONDITIONS +This licence does not grant any rights under trademark law and all such +rights are reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of the Font Software, to propagate the Font Software, subject to +the below conditions: + +1) Each copy of the Font Software must contain the above copyright +notice and this licence. These can be included either as stand-alone +text files, human-readable headers or in the appropriate machine- +readable metadata fields within text or binary files as long as those +fields can be easily viewed by the user. + +2) The font name complies with the following: +(a) The Original Version must retain its name, unmodified. +(b) Modified Versions which are Substantially Changed must be renamed to +avoid use of the name of the Original Version or similar names entirely. +(c) Modified Versions which are not Substantially Changed must be +renamed to both (i) retain the name of the Original Version and (ii) add +additional naming elements to distinguish the Modified Version from the +Original Version. The name of such Modified Versions must be the name of +the Original Version, with "derivative X" where X represents the name of +the new work, appended to that name. + +3) The name(s) of the Copyright Holder(s) and any contributor to the +Font Software shall not be used to promote, endorse or advertise any +Modified Version, except (i) as required by this licence, (ii) to +acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with +their explicit written permission. + +4) The Font Software, modified or unmodified, in part or in whole, must +be distributed entirely under this licence, and must not be distributed +under any other licence. The requirement for fonts to remain under this +licence does not affect any document created using the Font Software, +except any version of the Font Software extracted from a document +created using the Font Software may only be distributed under this +licence. + +TERMINATION +This licence becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF +COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER +DEALINGS IN THE FONT SOFTWARE. diff --git a/assets/layers/bike_repair_station/license_info.json b/assets/layers/bike_repair_station/license_info.json index 6eff80345..3f9a9b363 100644 --- a/assets/layers/bike_repair_station/license_info.json +++ b/assets/layers/bike_repair_station/license_info.json @@ -43,7 +43,7 @@ }, { "path": "pump_example.png", - "license": "USED-WITH-PERMISSION; ALL-RIGHTS-RESERVED", + "license": "ALL-RIGHTS-RESERVED", "authors": [ "Turvec Solutions" ], @@ -61,7 +61,7 @@ }, { "path": "pump_example_round.jpg", - "license": "USED-WITH-PERMISSION; ALL-RIGHTS-RESERVED", + "license": "ALL-RIGHTS-RESERVED", "authors": [ "©Altinnova" ], diff --git a/assets/layers/bike_repair_station/pump_example.png.license b/assets/layers/bike_repair_station/pump_example.png.license index d220d0bdf..2f29b4e67 100644 --- a/assets/layers/bike_repair_station/pump_example.png.license +++ b/assets/layers/bike_repair_station/pump_example.png.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Turvec Solutions -SPDX-License-Identifier: USED-WITH-PERMISSION; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/layers/bike_repair_station/pump_example_round.jpg.license b/assets/layers/bike_repair_station/pump_example_round.jpg.license index 8bebac341..696296a94 100644 --- a/assets/layers/bike_repair_station/pump_example_round.jpg.license +++ b/assets/layers/bike_repair_station/pump_example_round.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: ©Altinnova -SPDX-License-Identifier: USED-WITH-PERMISSION; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/layers/charging_station/license_info.json b/assets/layers/charging_station/license_info.json index d0d4e9ba2..b3e7f14bc 100644 --- a/assets/layers/charging_station/license_info.json +++ b/assets/layers/charging_station/license_info.json @@ -117,7 +117,7 @@ }, { "path": "under_construction.svg", - "license": "PUBLIC-DOMAIN", + "license": "CC0-1.0", "authors": [ "Sarang" ], diff --git a/assets/layers/charging_station/under_construction.svg.license b/assets/layers/charging_station/under_construction.svg.license index 29bc7cf6d..32f929b5e 100644 --- a/assets/layers/charging_station/under_construction.svg.license +++ b/assets/layers/charging_station/under_construction.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Sarang -SPDX-License-Identifier: PUBLIC-DOMAIN \ No newline at end of file +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/food/Vegetarian-mark.svg.license b/assets/layers/food/Vegetarian-mark.svg.license index c7e057e6e..55f9e8ef7 100644 --- a/assets/layers/food/Vegetarian-mark.svg.license +++ b/assets/layers/food/Vegetarian-mark.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: European Vegetarian Union -SPDX-License-Identifier: PD \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/layers/food/license_info.json b/assets/layers/food/license_info.json index aae3af1da..fa0db0ddc 100644 --- a/assets/layers/food/license_info.json +++ b/assets/layers/food/license_info.json @@ -1,7 +1,7 @@ [ { "path": "Vegetarian-mark.svg", - "license": "PUBLIC-DOMAIN", + "license": "LOGO", "authors": [ "European Vegetarian Union" ], diff --git a/assets/layers/nature_reserve/ANB.jpg.license b/assets/layers/nature_reserve/ANB.jpg.license index 6d48803f7..919f752bb 100644 --- a/assets/layers/nature_reserve/ANB.jpg.license +++ b/assets/layers/nature_reserve/ANB.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Agentschap Natuur en Bos -SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/layers/nature_reserve/Natuurpunt.jpg.license b/assets/layers/nature_reserve/Natuurpunt.jpg.license index 17b956445..e429d2683 100644 --- a/assets/layers/nature_reserve/Natuurpunt.jpg.license +++ b/assets/layers/nature_reserve/Natuurpunt.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Natuurpunt -SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/layers/nature_reserve/groen_logo.svg.license b/assets/layers/nature_reserve/groen_logo.svg.license index 537a9d776..81a8cecc7 100644 --- a/assets/layers/nature_reserve/groen_logo.svg.license +++ b/assets/layers/nature_reserve/groen_logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Groen -SPDX-License-Identifier: ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/layers/nature_reserve/license_info.json b/assets/layers/nature_reserve/license_info.json index 60ea0b1ab..c4204b9b6 100644 --- a/assets/layers/nature_reserve/license_info.json +++ b/assets/layers/nature_reserve/license_info.json @@ -1,7 +1,7 @@ [ { "path": "ANB.jpg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Agentschap Natuur en Bos" ], @@ -11,7 +11,7 @@ }, { "path": "Natuurpunt.jpg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Natuurpunt" ], @@ -21,7 +21,7 @@ }, { "path": "groen_logo.svg", - "license": "ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Groen" ], diff --git a/assets/layers/play_forest/icon.svg.license b/assets/layers/play_forest/icon.svg.license index 0b32f5548..919f752bb 100644 --- a/assets/layers/play_forest/icon.svg.license +++ b/assets/layers/play_forest/icon.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Agentschap Natuur en Bos -SPDX-License-Identifier: ? \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/layers/play_forest/license_info.json b/assets/layers/play_forest/license_info.json index 61d53c4a5..199a2e07c 100644 --- a/assets/layers/play_forest/license_info.json +++ b/assets/layers/play_forest/license_info.json @@ -1,7 +1,7 @@ [ { "path": "icon.svg", - "license": "?", + "license": "LOGO", "authors": [ "Agentschap Natuur en Bos" ], diff --git a/assets/layers/questions/license_info.json b/assets/layers/questions/license_info.json index 7ed8663fd..cbc306b77 100644 --- a/assets/layers/questions/license_info.json +++ b/assets/layers/questions/license_info.json @@ -277,13 +277,13 @@ }, { "path": "send_email.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "send_email.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, diff --git a/assets/layers/questions/send_email.svg.license b/assets/layers/questions/send_email.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/layers/questions/send_email.svg.license +++ b/assets/layers/questions/send_email.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/layers/veterinary/license_info.json b/assets/layers/veterinary/license_info.json index 9fa958690..103f074d4 100644 --- a/assets/layers/veterinary/license_info.json +++ b/assets/layers/veterinary/license_info.json @@ -1,7 +1,7 @@ [ { "path": "vet.svg", - "license": "PUBLIC-DOMAIN", + "license": "CC0-1.0", "authors": [ "Niels Elgaard Larsen", "Tim Hitchins" diff --git a/assets/layers/veterinary/vet.svg.license b/assets/layers/veterinary/vet.svg.license index 13ab13ddd..47b1e9e6b 100644 --- a/assets/layers/veterinary/vet.svg.license +++ b/assets/layers/veterinary/vet.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Niels Elgaard Larsen; Tim Hitchins -SPDX-License-Identifier: PD \ No newline at end of file +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/close.svg.license b/assets/svg/close.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/close.svg.license +++ b/assets/svg/close.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/compass.svg.license b/assets/svg/compass.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/compass.svg.license +++ b/assets/svg/compass.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/cross_bottom_right.svg.license b/assets/svg/cross_bottom_right.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/cross_bottom_right.svg.license +++ b/assets/svg/cross_bottom_right.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/crosshair-locked.svg.license b/assets/svg/crosshair-locked.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/crosshair-locked.svg.license +++ b/assets/svg/crosshair-locked.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/crosshair.svg.license b/assets/svg/crosshair.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/crosshair.svg.license +++ b/assets/svg/crosshair.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/direction_gradient.svg.license b/assets/svg/direction_gradient.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/direction_gradient.svg.license +++ b/assets/svg/direction_gradient.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/envelope.svg.license b/assets/svg/envelope.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/envelope.svg.license +++ b/assets/svg/envelope.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/gear.svg.license b/assets/svg/gear.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/gear.svg.license +++ b/assets/svg/gear.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/help.svg.license b/assets/svg/help.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/help.svg.license +++ b/assets/svg/help.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/layers.svg.license b/assets/svg/layers.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/layers.svg.license +++ b/assets/svg/layers.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/liberapay.svg.license b/assets/svg/liberapay.svg.license index 19f94b865..9a56f9841 100644 --- a/assets/svg/liberapay.svg.license +++ b/assets/svg/liberapay.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: LiberaPay -SPDX-License-Identifier: LOGO-(ALL-RIGHTS-RESERVED) \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json index 58615ac1e..64347a9ec 100644 --- a/assets/svg/license_info.json +++ b/assets/svg/license_info.json @@ -203,13 +203,13 @@ }, { "path": "close.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "close.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, @@ -223,13 +223,13 @@ }, { "path": "compass.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "compass.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, @@ -251,31 +251,31 @@ }, { "path": "cross_bottom_right.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "cross_bottom_right.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "crosshair-locked.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "crosshair.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "crosshair.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, @@ -309,13 +309,13 @@ }, { "path": "direction_gradient.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "direction_gradient.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, @@ -383,13 +383,13 @@ }, { "path": "envelope.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "envelope.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, @@ -453,13 +453,13 @@ }, { "path": "gear.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "gear.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, @@ -553,13 +553,13 @@ }, { "path": "help.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "help.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, @@ -617,13 +617,13 @@ }, { "path": "layers.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "layers.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, @@ -637,7 +637,7 @@ }, { "path": "liberapay.svg", - "license": "LOGO-(ALL-RIGHTS-RESERVED)", + "license": "LOGO", "authors": [ "LiberaPay" ], @@ -647,7 +647,7 @@ }, { "path": "loading.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, @@ -701,31 +701,31 @@ }, { "path": "logo.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "logo.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "logout.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "logout.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "mapcomplete_logo.svg", - "license": "LOGO; CC-BY-SA-4.0", + "license": "LOGO AND CC-BY-SA-4.0", "authors": [ "Pieter Vander Vennet", " OSM" @@ -736,7 +736,7 @@ }, { "path": "mapcomplete_logo.svg", - "license": "LOGO; CC-BY-SA-4.0", + "license": "LOGO AND CC-BY-SA-4.0", "authors": [ "Pieter Vander Vennet", " OSM" @@ -747,7 +747,7 @@ }, { "path": "mapillary.svg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Mapillary" ], @@ -757,7 +757,7 @@ }, { "path": "mapillary.svg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Mapillary" ], @@ -767,7 +767,7 @@ }, { "path": "mapillary_black.svg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Mapillary" ], @@ -777,7 +777,7 @@ }, { "path": "mapillary_black.svg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Mapillary" ], @@ -787,7 +787,7 @@ }, { "path": "mastodon.svg", - "license": "LOGO; GNU-AFFERO-GENERAL-PUBLIC-LICENSE", + "license": "LOGO AND AGPL-3.0-or-later", "authors": [ "Mastodon" ], @@ -797,13 +797,13 @@ }, { "path": "min.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "min.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, @@ -843,13 +843,13 @@ }, { "path": "no_checkmark.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "no_checkmark.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, @@ -899,7 +899,7 @@ }, { "path": "osm-logo.svg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [], "sources": [ "https://www.OpenStreetMap.org" @@ -907,7 +907,7 @@ }, { "path": "osm-logo.svg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [], "sources": [ "https://www.OpenStreetMap.org" @@ -955,19 +955,19 @@ }, { "path": "pin.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "pin.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "plantnet_logo.svg", - "license": "LOGO-(FAIR-USAGE)", + "license": "LOGO", "authors": [ "https://plantnet.org" ], @@ -977,13 +977,13 @@ }, { "path": "plus.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "plus.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, @@ -1009,13 +1009,13 @@ }, { "path": "reload.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "reload.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, @@ -1037,13 +1037,13 @@ }, { "path": "ring.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "ring.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, @@ -1113,13 +1113,13 @@ }, { "path": "share.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "share.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, @@ -1145,61 +1145,61 @@ }, { "path": "square.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "square.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "star.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "star.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "star_half.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "star_half.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "star_outline.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "star_outline.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "star_outline_half.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "star_outline_half.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, @@ -1269,13 +1269,13 @@ }, { "path": "up.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "up.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, @@ -1289,7 +1289,7 @@ }, { "path": "wikidata.svg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Wikidata" ], @@ -1299,7 +1299,7 @@ }, { "path": "wikidata.svg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Wikidata" ], @@ -1309,7 +1309,7 @@ }, { "path": "wikimedia-commons-white.svg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Wikimedia" ], @@ -1319,7 +1319,7 @@ }, { "path": "wikimedia-commons-white.svg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Wikimedia" ], @@ -1329,7 +1329,7 @@ }, { "path": "wikipedia.svg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Wikipedia" ], @@ -1339,7 +1339,7 @@ }, { "path": "wikipedia.svg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Wikipedia" ], diff --git a/assets/svg/loading.svg.license b/assets/svg/loading.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/loading.svg.license +++ b/assets/svg/loading.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/logo.svg.license b/assets/svg/logo.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/logo.svg.license +++ b/assets/svg/logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/logout.svg.license b/assets/svg/logout.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/logout.svg.license +++ b/assets/svg/logout.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/mapcomplete_logo.svg.license b/assets/svg/mapcomplete_logo.svg.license index cc023575a..27072db67 100644 --- a/assets/svg/mapcomplete_logo.svg.license +++ b/assets/svg/mapcomplete_logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Pieter Vander Vennet; OSM -SPDX-License-Identifier: LOGO; CC-BY-SA-4.0 \ No newline at end of file +SPDX-License-Identifier: LOGO AND CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/svg/mapillary.svg.license b/assets/svg/mapillary.svg.license index 7b259f1c7..c0b41f41c 100644 --- a/assets/svg/mapillary.svg.license +++ b/assets/svg/mapillary.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Mapillary -SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/svg/mapillary_black.svg.license b/assets/svg/mapillary_black.svg.license index 7b259f1c7..c0b41f41c 100644 --- a/assets/svg/mapillary_black.svg.license +++ b/assets/svg/mapillary_black.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Mapillary -SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/svg/mastodon.svg.license b/assets/svg/mastodon.svg.license index 3aa2f9625..734852b4d 100644 --- a/assets/svg/mastodon.svg.license +++ b/assets/svg/mastodon.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Mastodon -SPDX-License-Identifier: LOGO; GNU-AFFERO-GENERAL-PUBLIC-LICENSE \ No newline at end of file +SPDX-License-Identifier: LOGO AND AGPL-3.0-or-later \ No newline at end of file diff --git a/assets/svg/min.svg.license b/assets/svg/min.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/min.svg.license +++ b/assets/svg/min.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/no_checkmark.svg.license b/assets/svg/no_checkmark.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/no_checkmark.svg.license +++ b/assets/svg/no_checkmark.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/osm-logo.svg.license b/assets/svg/osm-logo.svg.license index 6f3e18813..a8026aac0 100644 --- a/assets/svg/osm-logo.svg.license +++ b/assets/svg/osm-logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/svg/pin.svg.license b/assets/svg/pin.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/pin.svg.license +++ b/assets/svg/pin.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/plantnet_logo.svg.license b/assets/svg/plantnet_logo.svg.license index 0cbf3fb72..0c21c18ac 100644 --- a/assets/svg/plantnet_logo.svg.license +++ b/assets/svg/plantnet_logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: https://plantnet.org -SPDX-License-Identifier: LOGO-(FAIR-USAGE) \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/svg/plus.svg.license b/assets/svg/plus.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/plus.svg.license +++ b/assets/svg/plus.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/reload.svg.license b/assets/svg/reload.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/reload.svg.license +++ b/assets/svg/reload.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/ring.svg.license b/assets/svg/ring.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/ring.svg.license +++ b/assets/svg/ring.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/share.svg.license b/assets/svg/share.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/share.svg.license +++ b/assets/svg/share.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/square.svg.license b/assets/svg/square.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/square.svg.license +++ b/assets/svg/square.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/star.svg.license b/assets/svg/star.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/star.svg.license +++ b/assets/svg/star.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/star_half.svg.license b/assets/svg/star_half.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/star_half.svg.license +++ b/assets/svg/star_half.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/star_outline.svg.license b/assets/svg/star_outline.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/star_outline.svg.license +++ b/assets/svg/star_outline.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/star_outline_half.svg.license b/assets/svg/star_outline_half.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/star_outline_half.svg.license +++ b/assets/svg/star_outline_half.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/up.svg.license b/assets/svg/up.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/svg/up.svg.license +++ b/assets/svg/up.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/wikidata.svg.license b/assets/svg/wikidata.svg.license index 811da3ded..5435f678e 100644 --- a/assets/svg/wikidata.svg.license +++ b/assets/svg/wikidata.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Wikidata -SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/svg/wikimedia-commons-white.svg.license b/assets/svg/wikimedia-commons-white.svg.license index 4151a9346..744248e98 100644 --- a/assets/svg/wikimedia-commons-white.svg.license +++ b/assets/svg/wikimedia-commons-white.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Wikimedia -SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/svg/wikipedia.svg.license b/assets/svg/wikipedia.svg.license index 71774b109..fd1a25c87 100644 --- a/assets/svg/wikipedia.svg.license +++ b/assets/svg/wikipedia.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Wikipedia -SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/themes/advertising/Mug.jpg.license b/assets/themes/advertising/Mug.jpg.license index d56ca0e4b..299926561 100644 --- a/assets/themes/advertising/Mug.jpg.license +++ b/assets/themes/advertising/Mug.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Carol M. Highsmith -SPDX-License-Identifier: PUBLIC-DOMAIN \ No newline at end of file +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/advertising/license_info.json b/assets/themes/advertising/license_info.json index d47f217a3..d62237edd 100644 --- a/assets/themes/advertising/license_info.json +++ b/assets/themes/advertising/license_info.json @@ -141,7 +141,7 @@ }, { "path": "Mug.jpg", - "license": "PUBLIC-DOMAIN", + "license": "CC0-1.0", "authors": [ "Carol M. Highsmith" ], diff --git a/assets/themes/buurtnatuur/ANB.jpg.license b/assets/themes/buurtnatuur/ANB.jpg.license index 6d48803f7..919f752bb 100644 --- a/assets/themes/buurtnatuur/ANB.jpg.license +++ b/assets/themes/buurtnatuur/ANB.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Agentschap Natuur en Bos -SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/themes/buurtnatuur/Buurtnatuur-Welkom.txt b/assets/themes/buurtnatuur/Buurtnatuur-Welkom.txt deleted file mode 100644 index bf60e401d..000000000 --- a/assets/themes/buurtnatuur/Buurtnatuur-Welkom.txt +++ /dev/null @@ -1,21 +0,0 @@ -Hallo, - -Je maakte een bijdrage aan OpenStreetMap met BuurtNatuur! Proficiat en welkom bij de community. - -Je antwoorden en toevoegingen gaan rechtstreeks naar OpenStreetMap. OpenStreetMap is een kaart die werkt zoals Wikipedia: -het staat mensen vrij om zelf data toe te voegen; in het geval van buurtnatuur.be informatie over natuur en bossen. -De data van OpenStreetMap zijn ook vrij en gratis te gebruiken door iedereen die dat wil – applicaties zoals Maps.me, OsmAnd, Pokémon Go, Facebook, Snapchat, RouteYou en de Natuurpunt-app gebruiken OpnStreetMap. Maar ook toeristische diensten (zoals Westtoer) doen dat steeds vaker. - -Kortom, omdat je via buurtnatuur.be info gaf over natuur en bos, wordt dit zichtbaar op ál deze kaarten. - -Heb je verder nog vragen over OpenStreetMap? Wil je weten welke data we allemaal hebben en verzamelen? - -- Je kan meer lezen op [onze wiki-website](https://wiki.openstreetmap.org/wiki/NL:Hoofdpagina). -- Je kan dit berichtje beantwoorden (zie onderaan). -- Je kan terecht op [online chat](https://app.element.io/#/room/#osmbe:matrix.org). -- Je kan naar onze [bijeenkomsten komen](https://www.meetup.com/OpenStreetMap-Belgium/). -- Je kan de kaart ook bekijken op [openstreetmap.org](https://www.openstreetmap.org/). Daar kun je ook meer geavanceerde bewerkingen uitvoeren dan mogelijk is met BuurtNatuur. - -Happy Mapping! -Pieter Vander Vennet -OpenStreetMap België \ No newline at end of file diff --git a/assets/themes/buurtnatuur/Natuurpunt.jpg.license b/assets/themes/buurtnatuur/Natuurpunt.jpg.license index 17b956445..e429d2683 100644 --- a/assets/themes/buurtnatuur/Natuurpunt.jpg.license +++ b/assets/themes/buurtnatuur/Natuurpunt.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Natuurpunt -SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/themes/buurtnatuur/groen_logo.svg.license b/assets/themes/buurtnatuur/groen_logo.svg.license index 1a7b157d0..81a8cecc7 100644 --- a/assets/themes/buurtnatuur/groen_logo.svg.license +++ b/assets/themes/buurtnatuur/groen_logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Groen -SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/themes/buurtnatuur/license_info.json b/assets/themes/buurtnatuur/license_info.json index ff5eb0f61..cad654550 100644 --- a/assets/themes/buurtnatuur/license_info.json +++ b/assets/themes/buurtnatuur/license_info.json @@ -1,7 +1,7 @@ [ { "path": "ANB.jpg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Agentschap Natuur en Bos" ], @@ -11,7 +11,7 @@ }, { "path": "Natuurpunt.jpg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Natuurpunt" ], @@ -31,7 +31,7 @@ }, { "path": "groen_logo.svg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Groen" ], @@ -41,7 +41,7 @@ }, { "path": "logo.svg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Groen" ], diff --git a/assets/themes/buurtnatuur/logo.svg.license b/assets/themes/buurtnatuur/logo.svg.license index 1a7b157d0..81a8cecc7 100644 --- a/assets/themes/buurtnatuur/logo.svg.license +++ b/assets/themes/buurtnatuur/logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Groen -SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/themes/charging_stations/license_info.json b/assets/themes/charging_stations/license_info.json index 87331691c..3ed3f769d 100644 --- a/assets/themes/charging_stations/license_info.json +++ b/assets/themes/charging_stations/license_info.json @@ -23,13 +23,13 @@ }, { "path": "logo.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "plug.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [], "sources": [] } diff --git a/assets/themes/charging_stations/logo.svg.license b/assets/themes/charging_stations/logo.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/themes/charging_stations/logo.svg.license +++ b/assets/themes/charging_stations/logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/themes/charging_stations/plug.svg.license b/assets/themes/charging_stations/plug.svg.license index b580e3632..0dedec0e0 100644 --- a/assets/themes/charging_stations/plug.svg.license +++ b/assets/themes/charging_stations/plug.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/themes/cycle_highways/fietssnelwegen-logo.svg.license b/assets/themes/cycle_highways/fietssnelwegen-logo.svg.license index 491f19057..cc83736f4 100644 --- a/assets/themes/cycle_highways/fietssnelwegen-logo.svg.license +++ b/assets/themes/cycle_highways/fietssnelwegen-logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: De Vlaamse Provincies -SPDX-License-Identifier: LOGO-BY-THE-GOVERNMENT \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/themes/cyclofix/fietsambassade_gent_logo.svg.license b/assets/themes/cyclofix/fietsambassade_gent_logo.svg.license index b510fa42d..c56e036d8 100644 --- a/assets/themes/cyclofix/fietsambassade_gent_logo.svg.license +++ b/assets/themes/cyclofix/fietsambassade_gent_logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: De Fietsambassade -SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/themes/cyclofix/fietsambassade_gent_logo_small.svg.license b/assets/themes/cyclofix/fietsambassade_gent_logo_small.svg.license index b510fa42d..c56e036d8 100644 --- a/assets/themes/cyclofix/fietsambassade_gent_logo_small.svg.license +++ b/assets/themes/cyclofix/fietsambassade_gent_logo_small.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: De Fietsambassade -SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/themes/cyclofix/license_info.json b/assets/themes/cyclofix/license_info.json index 165ac31ec..52d92a9bf 100644 --- a/assets/themes/cyclofix/license_info.json +++ b/assets/themes/cyclofix/license_info.json @@ -1,7 +1,21 @@ [ + { + "path": "SocialImage.jpeg", + "license": "CC-BY-SA-4.0", + "authors": [ + "Pieter Fiers", + "Thibault Declercq", + "Pierre Barban", + "Joost Schouppe", + "Pieter Vander Vennet" + ], + "sources": [ + "https://osoc.be/editions/2020/cyclofix" + ] + }, { "path": "fietsambassade_gent_logo.svg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "De Fietsambassade" ], @@ -11,7 +25,7 @@ }, { "path": "fietsambassade_gent_logo_small.svg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "De Fietsambassade" ], diff --git a/assets/themes/pets/dog-food.svg.license b/assets/themes/pets/dog-food.svg.license index ceb7153fa..4c1b95088 100644 --- a/assets/themes/pets/dog-food.svg.license +++ b/assets/themes/pets/dog-food.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Public Domain Symbols; Jean Victor Balin ; Niels Elgaard Larsen -SPDX-License-Identifier: PD \ No newline at end of file +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/pets/license_info.json b/assets/themes/pets/license_info.json index 7bfabe9b0..afe54e593 100644 --- a/assets/themes/pets/license_info.json +++ b/assets/themes/pets/license_info.json @@ -1,7 +1,7 @@ [ { "path": "dog-food.svg", - "license": "PUBLIC-DOMAIN", + "license": "CC0-1.0", "authors": [ "Public Domain Symbols", "Jean Victor Balin ", diff --git a/assets/themes/speelplekken/Departement_Omgeving_Vlaanderen.png.license b/assets/themes/speelplekken/Departement_Omgeving_Vlaanderen.png.license index c3bbb0cb1..02d097f95 100644 --- a/assets/themes/speelplekken/Departement_Omgeving_Vlaanderen.png.license +++ b/assets/themes/speelplekken/Departement_Omgeving_Vlaanderen.png.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Departement Omgeving, Vlaamse Overheid -SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/themes/speelplekken/license_info.json b/assets/themes/speelplekken/license_info.json index 6842601cc..e704b7936 100644 --- a/assets/themes/speelplekken/license_info.json +++ b/assets/themes/speelplekken/license_info.json @@ -1,7 +1,7 @@ [ { "path": "Departement_Omgeving_Vlaanderen.png", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Departement Omgeving, Vlaamse Overheid" ], @@ -22,7 +22,7 @@ }, { "path": "provincie_antwerpen.jpg", - "license": "LOGO; ALL-RIGHTS-RESERVED", + "license": "LOGO", "authors": [ "Provincie Antwerpen" ], @@ -32,7 +32,7 @@ }, { "path": "social_image.jpg", - "license": "LOGO-(ALL-RIGHTS-RESERVED)", + "license": "LOGO", "authors": [ "Createlli" ], @@ -75,7 +75,7 @@ }, { "path": "youtube.svg", - "license": "LOGO-(ALL-RIGHTS-RESERVED)", + "license": "LOGO", "authors": [ "Youtube" ], diff --git a/assets/themes/speelplekken/provincie_antwerpen.jpg.license b/assets/themes/speelplekken/provincie_antwerpen.jpg.license index 933d61ac8..f10fdfff1 100644 --- a/assets/themes/speelplekken/provincie_antwerpen.jpg.license +++ b/assets/themes/speelplekken/provincie_antwerpen.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Provincie Antwerpen -SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/themes/speelplekken/social_image.jpg.license b/assets/themes/speelplekken/social_image.jpg.license index 61a994887..396c5a1ee 100644 --- a/assets/themes/speelplekken/social_image.jpg.license +++ b/assets/themes/speelplekken/social_image.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Createlli -SPDX-License-Identifier: LOGO-(ALL-RIGHTS-RESERVED) \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/themes/speelplekken/youtube.svg.license b/assets/themes/speelplekken/youtube.svg.license index 1d2dc630c..35f5b360a 100644 --- a/assets/themes/speelplekken/youtube.svg.license +++ b/assets/themes/speelplekken/youtube.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Youtube -SPDX-License-Identifier: LOGO-(ALL-RIGHTS-RESERVED) \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/license_info.json b/assets/themes/toerisme_vlaanderen/license_info.json index 5bb89aa0d..3b5f36e52 100644 --- a/assets/themes/toerisme_vlaanderen/license_info.json +++ b/assets/themes/toerisme_vlaanderen/license_info.json @@ -97,7 +97,7 @@ }, { "path": "logo.png", - "license": "LOGO-(ALL-RIGHTS-RESERVED)", + "license": "LOGO", "authors": [ "Toerisme Vlaanderen" ], diff --git a/assets/themes/toerisme_vlaanderen/logo.png.license b/assets/themes/toerisme_vlaanderen/logo.png.license index e75e5dc25..123463272 100644 --- a/assets/themes/toerisme_vlaanderen/logo.png.license +++ b/assets/themes/toerisme_vlaanderen/logo.png.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Toerisme Vlaanderen -SPDX-License-Identifier: LOGO-(ALL-RIGHTS-RESERVED) \ No newline at end of file +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/themes/uk_addresses/islington_small_piece.geojson b/assets/themes/uk_addresses/islington_small_piece.geojson deleted file mode 100644 index b6c9c14b3..000000000 --- a/assets/themes/uk_addresses/islington_small_piece.geojson +++ /dev/null @@ -1,2162 +0,0 @@ -{ - "type": "FeatureCollection", - "generator": "JOSM", - "features": [ - { - "type": "Feature", - "properties": { - "inspireid": "44760782", - "uprn_count": "19" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08528530407, - 51.52103754846 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760166", - "uprn_count": "18" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08518862375, - 51.52302887251 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53875715", - "uprn_count": "176" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08768220681, - 51.52027207654 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "48199892", - "uprn_count": "32" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.09051161088, - 51.52328524465 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760298", - "uprn_count": "21" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08519096645, - 51.52229137569 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760648", - "uprn_count": "43" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.09039984580, - 51.52168966695 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760158", - "uprn_count": "4" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08979845152, - 51.52470373164 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760268", - "uprn_count": "1" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08584518403, - 51.52362781792 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760606", - "uprn_count": "34" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08574285775, - 51.52447487890 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760147", - "uprn_count": "13" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08478417875, - 51.52230226544 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760181", - "uprn_count": "1" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08597751642, - 51.52262480980 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "59756691", - "uprn_count": "68" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.09000674703, - 51.52412334790 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53839893", - "uprn_count": "12" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08632490840, - 51.51956380364 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760254", - "uprn_count": "5" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08445931332, - 51.52362994921 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760985", - "uprn_count": "1" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08550522898, - 51.52481338112 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53517508", - "uprn_count": "1" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08531729267, - 51.52055437518 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760172", - "uprn_count": "7" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08621709906, - 51.52245066605 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53815743", - "uprn_count": "28" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08609559738, - 51.52000280555 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760229", - "uprn_count": "2" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08466859613, - 51.52247735237 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "52054693", - "uprn_count": "4" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08869160634, - 51.52496110557 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760329", - "uprn_count": "6" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08610136910, - 51.52318693588 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760753", - "uprn_count": "9" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08538513949, - 51.52424009690 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760164", - "uprn_count": "13" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.09008514341, - 51.52505292621 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760216", - "uprn_count": "190" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08700282926, - 51.52503663329 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760279", - "uprn_count": "3" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08530920735, - 51.52549852437 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44613792", - "uprn_count": "72" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08833908631, - 51.52631952661 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760639", - "uprn_count": "7" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08580868931, - 51.52429800891 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760153", - "uprn_count": "4" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08456440427, - 51.52329504288 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760200", - "uprn_count": "95" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08770188351, - 51.52407460026 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "47582675", - "uprn_count": "8" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08892578863, - 51.52706921088 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760263", - "uprn_count": "5" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08583263531, - 51.52548367268 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44613655", - "uprn_count": "18" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08843733386, - 51.52669877413 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760564", - "uprn_count": "4" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.09046694451, - 51.52125764642 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760143", - "uprn_count": "1" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08576039998, - 51.52479998964 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "57943078", - "uprn_count": "80" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08990077541, - 51.52590434415 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760178", - "uprn_count": "13" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08479378350, - 51.52288142387 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760247", - "uprn_count": "16" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08570423028, - 51.52383831047 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "60347715", - "uprn_count": "6" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08913137569, - 51.52638282816 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760169", - "uprn_count": "8" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08741982002, - 51.52232472527 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53876178", - "uprn_count": "14" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08848929384, - 51.51968662476 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "58831132", - "uprn_count": "120" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08811742827, - 51.52524678003 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760702", - "uprn_count": "17" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08626679662, - 51.52229285532 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "56996893", - "uprn_count": "5" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08961930563, - 51.52736429296 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760161", - "uprn_count": "30" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08903973308, - 51.52443351442 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "57212602", - "uprn_count": "6" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.09025128250, - 51.52349660479 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760214", - "uprn_count": "30" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08491766007, - 51.52195690215 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760274", - "uprn_count": "6" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08710416098, - 51.52394294309 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44613782", - "uprn_count": "11" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08630939921, - 51.52567781493 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760635", - "uprn_count": "5" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08591747289, - 51.52406421610 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760150", - "uprn_count": "12" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08736624492, - 51.52184217908 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760190", - "uprn_count": "1" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08950436522, - 51.52301269883 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53842347", - "uprn_count": "8" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08629952517, - 51.51902467199 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760261", - "uprn_count": "7" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08870422830, - 51.52481415717 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44613643", - "uprn_count": "108" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08522752552, - 51.52590169102 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760506", - "uprn_count": "12" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08680870061, - 51.52270885497 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53529840", - "uprn_count": "14" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08752332940, - 51.52076211974 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "55694053", - "uprn_count": "7" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08582489157, - 51.52423214013 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760232", - "uprn_count": "5" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08460415534, - 51.52252827681 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "55841333", - "uprn_count": "23" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.09046401124, - 51.52500845422 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760366", - "uprn_count": "8" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08665901033, - 51.52347731730 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760167", - "uprn_count": "13" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08523817483, - 51.52199801036 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53875840", - "uprn_count": "21" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08790573136, - 51.52005170198 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760300", - "uprn_count": "3" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08523971621, - 51.52550166079 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760673", - "uprn_count": "13" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08740702488, - 51.52227145851 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760159", - "uprn_count": "37" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.09015395806, - 51.52469077487 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760210", - "uprn_count": "10" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08735406455, - 51.52190815063 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760269", - "uprn_count": "3" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08517606458, - 51.52360663718 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44613767", - "uprn_count": "38" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08894666543, - 51.52728330710 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760630", - "uprn_count": "9" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08596436686, - 51.52399163027 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760148", - "uprn_count": "90" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08559244253, - 51.52179703997 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53555715", - "uprn_count": "23" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.09069974009, - 51.52099643929 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "54843927", - "uprn_count": "36" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08536900467, - 51.52258204957 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760186", - "uprn_count": "60" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08749154622, - 51.52123763708 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "59797478", - "uprn_count": "12" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08460319625, - 51.52285695300 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53842288", - "uprn_count": "6" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08651616784, - 51.51911374360 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760258", - "uprn_count": "5" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08880030229, - 51.52508388296 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760450", - "uprn_count": "12" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08877219383, - 51.52489267275 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760989", - "uprn_count": "3" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.09008638232, - 51.52338474772 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53523418", - "uprn_count": "36" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08833393118, - 51.52076103473 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760173", - "uprn_count": "17" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08907044601, - 51.52478857712 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "56354285", - "uprn_count": "41" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08708248675, - 51.51950432943 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53815989", - "uprn_count": "12" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08712150084, - 51.52007985063 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760230", - "uprn_count": "3" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08459866660, - 51.52256307871 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53894914", - "uprn_count": "53" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08932705394, - 51.52020780589 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760340", - "uprn_count": "57" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08700821071, - 51.52470369200 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760757", - "uprn_count": "94" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08629573687, - 51.52185922605 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760165", - "uprn_count": "7" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08568241478, - 51.52253231799 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760289", - "uprn_count": "1" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08494465189, - 51.52548899801 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760645", - "uprn_count": "6" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08589810776, - 51.52411473063 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "57797640", - "uprn_count": "12" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08496788091, - 51.52179114697 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "56970529", - "uprn_count": "1" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08673035105, - 51.52606173015 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760156", - "uprn_count": "11" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08743964400, - 51.52240633893 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53673626", - "uprn_count": "20" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08457962682, - 51.52315791127 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760202", - "uprn_count": "63" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08514280715, - 51.52153941124 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "47582725", - "uprn_count": "2" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08903179064, - 51.52700439325 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760266", - "uprn_count": "66" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08958919395, - 51.52486571171 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44613662", - "uprn_count": "2" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.09055456990, - 51.52704347329 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760589", - "uprn_count": "10" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08739339578, - 51.52221604989 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "47863432", - "uprn_count": "20" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08656652832, - 51.52377354927 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760179", - "uprn_count": "1" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08735058986, - 51.52204111283 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760248", - "uprn_count": "7" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08545068911, - 51.52547159555 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760404", - "uprn_count": "23" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08569047233, - 51.52316678822 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "60347880", - "uprn_count": "156" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08873887407, - 51.52589244765 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760981", - "uprn_count": "8" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08508447894, - 51.52250703445 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53517488", - "uprn_count": "13" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08540249619, - 51.52063943555 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760170", - "uprn_count": "23" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08950340680, - 51.52518881505 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53815719", - "uprn_count": "8" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08580214812, - 51.51976909788 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760228", - "uprn_count": "4" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08461864254, - 51.52260180398 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53877676", - "uprn_count": "29" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08850676500, - 51.52023902397 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760314", - "uprn_count": "15" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08872036555, - 51.52471439061 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760751", - "uprn_count": "180" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08677326589, - 51.52308738524 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760162", - "uprn_count": "3" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08893070202, - 51.52527974813 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760215", - "uprn_count": "13" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08750749576, - 51.52270832689 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760278", - "uprn_count": "6" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08509855123, - 51.52550722342 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44613787", - "uprn_count": "11" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.09045829084, - 51.52773739133 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760638", - "uprn_count": "6" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08587468014, - 51.52417859166 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760151", - "uprn_count": "15" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08738616252, - 51.52175540266 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760195", - "uprn_count": "8" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08577241806, - 51.52228063806 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760262", - "uprn_count": "7" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08881139622, - 51.52515946758 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44613654", - "uprn_count": "30" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08841210101, - 51.52660740062 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760559", - "uprn_count": "2" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.09036979446, - 51.52201621806 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760051", - "uprn_count": "8" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08651408714, - 51.52230407716 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53530202", - "uprn_count": "21" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08558143776, - 51.52017053246 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760177", - "uprn_count": "115" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.09011378562, - 51.52279114581 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760235", - "uprn_count": "41" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08631542933, - 51.52256625361 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760839", - "uprn_count": "19" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.09069863118, - 51.52235527530 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760168", - "uprn_count": "1" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08591546179, - 51.52346670045 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53876171", - "uprn_count": "112" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08780026547, - 51.51966975438 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760301", - "uprn_count": "4" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08517005909, - 51.52550434483 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760686", - "uprn_count": "8" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08683964335, - 51.52238336083 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760160", - "uprn_count": "12" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08554780465, - 51.52227517161 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "54668028", - "uprn_count": "8" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08868565970, - 51.52707814958 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760271", - "uprn_count": "9" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08511551871, - 51.52564108792 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44613778", - "uprn_count": "4" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08556279304, - 51.52566116202 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "58775318", - "uprn_count": "5" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08476391706, - 51.52322955215 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760634", - "uprn_count": "6" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08575556474, - 51.52523072818 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760149", - "uprn_count": "7" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08736477713, - 51.52209660754 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "57099529", - "uprn_count": "14" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08747715586, - 51.52255778464 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760189", - "uprn_count": "1" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08645676995, - 51.52485658336 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53842336", - "uprn_count": "16" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08644851873, - 51.51932417520 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "55728650", - "uprn_count": "15" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08606772431, - 51.51932747399 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760259", - "uprn_count": "7" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08879089932, - 51.52501718371 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "56517732", - "uprn_count": "16" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08537944456, - 51.52045732895 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44613640", - "uprn_count": "1" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08508351171, - 51.52602201951 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760498", - "uprn_count": "9" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08737904118, - 51.52215533460 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "60457716", - "uprn_count": "12" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08741608314, - 51.52162504468 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "50741600", - "uprn_count": "11" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08601118306, - 51.52237364065 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53528831", - "uprn_count": "18" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08796303430, - 51.52075390699 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760174", - "uprn_count": "3" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08975339083, - 51.52521825973 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "53815990", - "uprn_count": "6" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08698937756, - 51.52000181841 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760231", - "uprn_count": "1" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08485451783, - 51.52255188290 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "51082874", - "uprn_count": "15" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08930634369, - 51.52701309542 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "44760352", - "uprn_count": "14" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08734604831, - 51.52197314390 - ] - } - }, - { - "type": "Feature", - "properties": { - "inspireid": "56669648", - "uprn_count": "8" - }, - "geometry": { - "type": "Point", - "coordinates": [ - -0.08851621061, - 51.52684922637 - ] - } - } - ] -} \ No newline at end of file diff --git a/assets/themes/width/icon.svg.license b/assets/themes/width/icon.svg.license index bc8dad3c0..9c10d311a 100644 --- a/assets/themes/width/icon.svg.license +++ b/assets/themes/width/icon.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Pieter Vander Vennet -SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/themes/width/license_info.json b/assets/themes/width/license_info.json index f95a2f9b5..77750dab1 100644 --- a/assets/themes/width/license_info.json +++ b/assets/themes/width/license_info.json @@ -1,7 +1,7 @@ [ { "path": "icon.svg", - "license": "CC0-1.0; TRIVIAL", + "license": "TRIVIAL", "authors": [ "Pieter Vander Vennet" ], diff --git a/scripts/generateLicenseInfo.ts b/scripts/generateLicenseInfo.ts index 96c106b2c..246e4c622 100644 --- a/scripts/generateLicenseInfo.ts +++ b/scripts/generateLicenseInfo.ts @@ -192,7 +192,9 @@ export class GenerateLicenseInfo extends Script { * @param licenseId */ toSPDXCompliantLicense(licenseId: string): string { - licenseId = licenseId.trim().replaceAll(" ", "-") + licenseId = licenseId.trim() + licenseId = licenseId.replaceAll("-AND-", " AND ") + if (!(licenseId.endsWith("-only") || licenseId.endsWith("-or-later"))) { licenseId = licenseId.toUpperCase() } @@ -210,6 +212,7 @@ export class GenerateLicenseInfo extends Script { "ISC-LICENSE": "ISC", "LOGO-BY-THE-GOVERNMENT": "LOGO", PD: "PUBLIC-DOMAIN", + "LOGO-(ALL-RIGHTS-RESERVED)": "LOGO", /* ALL-RIGHTS-RESERVED: PD: PUBLIC-DOMAIN: @@ -243,13 +246,16 @@ export class GenerateLicenseInfo extends Script { sources: license.sources, } - const licenses = Utils.Dedup( + cloned.license = Utils.Dedup( cloned.license.split(";").map((l) => this.toSPDXCompliantLicense(l)) - ) - if (licenses.length > 1 && licenses.indexOf("TRIVIAL") > 0) { - // licenses.splice(licenses.indexOf("TRIVIAL"), 1) + ).join("; ") + if (cloned.license === "CC0-1.0; TRIVIAL") { + cloned.license = "TRIVIAL" } - cloned.license = licenses.join("; ") + if (cloned.license === "LOGO; ALL-RIGHTS-RESERVED") { + cloned.license = "LOGO" + } + cloned.license = cloned.license.split("; ").join(" AND ") perDirectory.get(dir).push(cloned) } @@ -342,7 +348,7 @@ export class GenerateLicenseInfo extends Script { let licenseInfos = this.generateLicenseInfos(licensePaths) const artwork = contents.filter( - (pth) => pth.match(/(.svg|.png|.jpg|.ttf|.otf|.woff)$/i) != null + (pth) => pth.match(/(.svg|.png|.jpg|.ttf|.otf|.woff|.jpeg)$/i) != null ) const missingLicenses = this.missingLicenseInfos(licenseInfos, artwork) if (args.indexOf("--prompt") >= 0 || args.indexOf("--query") >= 0) {